Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1428024 > unrolled thread
| Started by | Jan Kiszka <jan.kiszka@siemens.com> |
|---|---|
| First post | 2016-06-21 20:10 +0200 |
| Last post | 2016-06-22 08:30 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] pci: Add support for unbinding the generic PCI host controller Jan Kiszka <jan.kiszka@siemens.com> - 2016-06-21 20:10 +0200
Re: [PATCH] pci: Add support for unbinding the generic PCI host controller Will Deacon <will.deacon@arm.com> - 2016-06-22 08:30 +0200
| From | Jan Kiszka <jan.kiszka@siemens.com> |
|---|---|
| Date | 2016-06-21 20:10 +0200 |
| Subject | [PATCH] pci: Add support for unbinding the generic PCI host controller |
| Message-ID | <rMyhz-Qq-1@gated-at.bofh.it> |
Particularly useful when working in virtual environments where the
controller may come and go, but possibly not only there.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
drivers/pci/ecam.h | 1 +
drivers/pci/host/pci-host-common.c | 13 +++++++++++++
drivers/pci/host/pci-host-generic.c | 1 +
3 files changed, 15 insertions(+)
diff --git a/drivers/pci/ecam.h b/drivers/pci/ecam.h
index 9878beb..5a5f607 100644
--- a/drivers/pci/ecam.h
+++ b/drivers/pci/ecam.h
@@ -63,5 +63,6 @@ extern struct pci_ecam_ops pci_generic_ecam_ops;
/* for DT-based PCI controllers that support ECAM */
int pci_host_common_probe(struct platform_device *pdev,
struct pci_ecam_ops *ops);
+int pci_host_common_remove(struct platform_device *pdev);
#endif
#endif
diff --git a/drivers/pci/host/pci-host-common.c b/drivers/pci/host/pci-host-common.c
index 8cba7ab..c0ff4b1 100644
--- a/drivers/pci/host/pci-host-common.c
+++ b/drivers/pci/host/pci-host-common.c
@@ -164,6 +164,19 @@ int pci_host_common_probe(struct platform_device *pdev,
}
pci_bus_add_devices(bus);
+ platform_set_drvdata(pdev, bus);
+ return 0;
+}
+
+int pci_host_common_remove(struct platform_device *pdev)
+{
+ struct pci_bus *bus = platform_get_drvdata(pdev);
+
+ pci_lock_rescan_remove();
+ pci_stop_root_bus(bus);
+ pci_remove_root_bus(bus);
+ pci_unlock_rescan_remove();
+
return 0;
}
diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
index 6eaceab..0a2e75b 100644
--- a/drivers/pci/host/pci-host-generic.c
+++ b/drivers/pci/host/pci-host-generic.c
@@ -65,6 +65,7 @@ static struct platform_driver gen_pci_driver = {
.of_match_table = gen_pci_of_match,
},
.probe = gen_pci_probe,
+ .remove = pci_host_common_remove,
};
module_platform_driver(gen_pci_driver);
--
2.1.4
[toc] | [next] | [standalone]
| From | Will Deacon <will.deacon@arm.com> |
|---|---|
| Date | 2016-06-22 08:30 +0200 |
| Message-ID | <rMJPH-8fv-7@gated-at.bofh.it> |
| In reply to | #1428024 |
Hi Jan,
On Tue, Jun 21, 2016 at 08:07:50PM +0200, Jan Kiszka wrote:
> Particularly useful when working in virtual environments where the
> controller may come and go, but possibly not only there.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> drivers/pci/ecam.h | 1 +
> drivers/pci/host/pci-host-common.c | 13 +++++++++++++
> drivers/pci/host/pci-host-generic.c | 1 +
> 3 files changed, 15 insertions(+)
>
> diff --git a/drivers/pci/ecam.h b/drivers/pci/ecam.h
> index 9878beb..5a5f607 100644
> --- a/drivers/pci/ecam.h
> +++ b/drivers/pci/ecam.h
> @@ -63,5 +63,6 @@ extern struct pci_ecam_ops pci_generic_ecam_ops;
> /* for DT-based PCI controllers that support ECAM */
> int pci_host_common_probe(struct platform_device *pdev,
> struct pci_ecam_ops *ops);
> +int pci_host_common_remove(struct platform_device *pdev);
> #endif
> #endif
> diff --git a/drivers/pci/host/pci-host-common.c b/drivers/pci/host/pci-host-common.c
> index 8cba7ab..c0ff4b1 100644
> --- a/drivers/pci/host/pci-host-common.c
> +++ b/drivers/pci/host/pci-host-common.c
> @@ -164,6 +164,19 @@ int pci_host_common_probe(struct platform_device *pdev,
> }
>
> pci_bus_add_devices(bus);
> + platform_set_drvdata(pdev, bus);
> + return 0;
> +}
> +
> +int pci_host_common_remove(struct platform_device *pdev)
> +{
> + struct pci_bus *bus = platform_get_drvdata(pdev);
> +
> + pci_lock_rescan_remove();
> + pci_stop_root_bus(bus);
> + pci_remove_root_bus(bus);
> + pci_unlock_rescan_remove();
A couple of comments/questions about this:
- The probe path seems to have some stateful operations outside of PCI
resources. For example, kzalloc'ing the bus_range resource in
of_pci_get_host_bridge_resources. Do we need to clean these up
explicitly?
- Similarly, we don't seem to tear-down the config space mappings and
data structures for that, so we leak VA space afaict.
Will
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web