deprecate usage of pci_scan_bus_parented()

PATCH New Jiang Liu 1 participant 6 messages Jun 21, 2013

Subsystems (4)

PCI virtio core Xen hypervisor interface Xen PCI

lore

Share & tools

lore

Jiang Liu

author

2013-06-21 16:12 UTC #0 lore raw

v2 cover deprecate usage of pci_scan_bus_parented()

From: Jiang Liu <[email protected]>

This patch tries to deprecate usage of pci_scan_bus_parented(). It applies to
https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git next

V2:
Kill pci_scan_bus_parented() instead of marking it as deprecated

Jiang Liu (3):
PCI: export three functions to support modular host bridge driver PCI, xen-pcifront: use new PCI interfaces to simplify implementation
PCI: kill pci_scan_bus_parented()

 arch/tile/kernel/pci.c     |  3 --
 drivers/pci/host-bridge.c  |  1 +
 drivers/pci/probe.c        | 20 +-----------
 drivers/pci/remove.c       |  7 +++++
 drivers/pci/xen-pcifront.c | 76 +++++++++++++++++++++-------------------------
 include/linux/pci.h        |  3 +-
 6 files changed, 44 insertions(+), 66 deletions(-)

Signature · 1 line

1.8.1.2

Jiang Liu

author

2013-06-21 16:12 UTC #1 lore raw

PATCH v2 1/3 PCI: export three functions to support modular host bridge driver

From: Jiang Liu <[email protected]>

The xen-pcifront host bridge driver could be built as a module, so export pci_create_root_bus(), pci_stop_and_remove_root_bus() and pci_set_host_bridge_release() to support modular host bridge driver. It's a preparation for coming xen-pcifront refinement.

Signed-off-by Jiang Liu <[email protected]>

Cc Konrad Rzeszutek Wilk <[email protected]>

Cc Jeremy Fitzhardinge <[email protected]>

Cc [email protected]

---
 drivers/pci/host-bridge.c | 1 +
 drivers/pci/probe.c       | 1 +
 drivers/pci/remove.c      | 7 +++++++
 include/linux/pci.h       | 1 +
 4 files changed, 10 insertions(+)

drivers/pci/host-bridge.c +1 -0

index a68dc61..6e390a6 100644
@@ -34,6 +34,7 @@ void pci_set_host_bridge_release(struct pci_host_bridge *bridge,
 	bridge->release_fn = release_fn;
 	bridge->release_data = release_data;
 }
+EXPORT_SYMBOL(pci_set_host_bridge_release);
 
 static bool resource_contains(struct resource *res1, struct resource *res2)
 {

drivers/pci/probe.c +1 -0

index 46ada5c..ed768d8 100644
@@ -1801,6 +1801,7 @@ err_out:
 	kfree(b);
 	return NULL;
 }
+EXPORT_SYMBOL(pci_create_root_bus);
 
 int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max)
 {

drivers/pci/remove.c +7 -0

index 8fc54b7..f328668 100644
@@ -147,3 +147,10 @@ void pci_remove_root_bus(struct pci_bus *bus)
 	/* remove the host bridge */
 	put_device(&host_bridge->dev);
 }
+
+void pci_stop_and_remove_root_bus(struct pci_bus *bus)
+{
+	pci_stop_root_bus(bus);
+	pci_remove_root_bus(bus);
+}
+EXPORT_SYMBOL(pci_stop_and_remove_root_bus);

include/linux/pci.h +1 -0

index 0fd1f15..f1229c7 100644
@@ -757,6 +757,7 @@ void pci_remove_bus(struct pci_bus *b);
 void pci_stop_and_remove_bus_device(struct pci_dev *dev);
 void pci_stop_root_bus(struct pci_bus *bus);
 void pci_remove_root_bus(struct pci_bus *bus);
+void pci_stop_and_remove_root_bus(struct pci_bus *bus);
 void pci_setup_cardbus(struct pci_bus *bus);
 void pci_sort_breadthfirst(void);
 #define dev_is_pci(d) ((d)->bus == &pci_bus_type)

Signature · 1 line

1.8.1.2

Jiang Liu

author

2013-06-21 16:12 UTC #2 lore raw

PATCH v2 2/3 PCI, xen-pcifront: use new PCI interfaces to simplify implementation

In reply to Jiang Liu

From: Jiang Liu <[email protected]>

Use new PCI interfaces to simplify xen-pcifront implementation:
1) Use pci_create_root_bus() instead of pci_scan_bus_parented() because pci_scan_bus_parented() is marked as __deprecated.This also gets rid of a duplicated call of pci_bus_start_devices().
2) Use pci_stop_and_remove_root_bus() instead of open-coded private implementation.
3) Use pci_set_host_bridge_release() to release data structures associated with PCI root buses.
4) Use pci_bus_get()/pci_bus_put() to manage PCI root bus reference count.

Signed-off-by Jiang Liu <[email protected]>

Cc Konrad Rzeszutek Wilk <[email protected]>

Cc Jeremy Fitzhardinge <[email protected]>

Cc [email protected]

---
 drivers/pci/xen-pcifront.c | 76 +++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 42 deletions(-)

drivers/pci/xen-pcifront.c +34 ~~-42~~

index 966abc6..a323287 100644
@@ -25,11 +25,6 @@
 #define INVALID_GRANT_REF (0)
 #define INVALID_EVTCHN    (-1)
 
-struct pci_bus_entry {
-	struct list_head list;
-	struct pci_bus *bus;
-};
-
 #define _PDEVB_op_active		(0)
 #define PDEVB_op_active			(1 << (_PDEVB_op_active))

@@ -47,12 +42,12 @@ struct pcifront_device {
 	struct xen_pci_sharedinfo *sh_info;
 	struct work_struct op_work;
 	unsigned long flags;
-
 };
 
 struct pcifront_sd {
 	int domain;
 	struct pcifront_device *pdev;
+	struct resource busn_res;
 };
 
 static inline struct pcifront_device *

@@ -67,6 +62,12 @@ static inline void pcifront_init_sd(struct pcifront_sd *sd,
 {
 	sd->domain = domain;
 	sd->pdev = pdev;
+
+	/* Xen pci-backend doesn't export P2P bridges */
+	sd->busn_res.start = bus;
+	sd->busn_res.end = bus;
+	sd->busn_res.flags = IORESOURCE_BUS;
+	sd->busn_res.name = "PCI busn";
 }
 
 static DEFINE_SPINLOCK(pcifront_dev_lock);

@@ -441,12 +442,19 @@ static int pcifront_scan_bus(struct pcifront_device *pdev,
 	return 0;
 }
 
+static void pcifront_release_sd(struct pci_host_bridge *bridge)
+{
+	struct pcifront_sd *sd = bridge->release_data;
+
+	kfree(sd);
+}
+
 static int pcifront_scan_root(struct pcifront_device *pdev,
 				 unsigned int domain, unsigned int bus)
 {
 	struct pci_bus *b;
 	struct pcifront_sd *sd = NULL;
-	struct pci_bus_entry *bus_entry = NULL;
+	LIST_HEAD(resources);
 	int err = 0;
 
 #ifndef CONFIG_PCI_DOMAINS

@@ -463,16 +471,18 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
 	dev_info(&pdev->xdev->dev, "Creating PCI Frontend Bus %04x:%02x\n",
 		 domain, bus);
 
-	bus_entry = kmalloc(sizeof(*bus_entry), GFP_KERNEL);
-	sd = kmalloc(sizeof(*sd), GFP_KERNEL);
-	if (!bus_entry || !sd) {
+	sd = kzalloc(sizeof(*sd), GFP_KERNEL);
+	if (!sd) {
 		err = -ENOMEM;
 		goto err_out;
 	}
 	pcifront_init_sd(sd, domain, bus, pdev);
 
-	b = pci_scan_bus_parented(&pdev->xdev->dev, bus,
-				  &pcifront_bus_ops, sd);
+	pci_add_resource(&resources, &ioport_resource);
+	pci_add_resource(&resources, &iomem_resource);
+	pci_add_resource(&resources, &sd->busn_res);
+	b = pci_create_root_bus(&pdev->xdev->dev, bus, &pcifront_bus_ops,
+				sd, &resources);
 	if (!b) {
 		dev_err(&pdev->xdev->dev,
 			"Error creating PCI Frontend Bus!\n");

@@ -480,12 +490,13 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
 		goto err_out;
 	}
 
-	bus_entry->bus = b;
+	pci_set_host_bridge_release(to_pci_host_bridge(b->bridge),
+				    pcifront_release_sd, sd);
 
-	list_add(&bus_entry->list, &pdev->root_buses);
-
-	/* pci_scan_bus_parented skips devices which do not have a have
-	* devfn==0. The pcifront_scan_bus enumerates all devfn. */
+	/*
+	 * The pcifront_scan_bus enumerates all devfn, no matter function 0
+	 * exists or not.
+	 */
 	err = pcifront_scan_bus(pdev, domain, bus, b);
 
 	/* Claim resources before going "live" with our devices */

@@ -497,7 +508,6 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
 	return err;
 
 err_out:
-	kfree(bus_entry);
 	kfree(sd);
 
 	return err;

@@ -538,35 +548,17 @@ static int pcifront_rescan_root(struct pcifront_device *pdev,
 	return err;
 }
 
-static void free_root_bus_devs(struct pci_bus *bus)
-{
-	struct pci_dev *dev;
-
-	while (!list_empty(&bus->devices)) {
-		dev = container_of(bus->devices.next, struct pci_dev,
-				   bus_list);
-		dev_dbg(&dev->dev, "removing device\n");
-		pci_stop_and_remove_bus_device(dev);
-	}
-}
-
 static void pcifront_free_roots(struct pcifront_device *pdev)
 {
-	struct pci_bus_entry *bus_entry, *t;
+	struct pcifront_sd *sd;
+	struct pci_bus *bus, *temp;
 
 	dev_dbg(&pdev->xdev->dev, "cleaning up root buses\n");
 
-	list_for_each_entry_safe(bus_entry, t, &pdev->root_buses, list) {
-		list_del(&bus_entry->list);
-
-		free_root_bus_devs(bus_entry->bus);
-
-		kfree(bus_entry->bus->sysdata);
-
-		device_unregister(bus_entry->bus->bridge);
-		pci_remove_bus(bus_entry->bus);
-
-		kfree(bus_entry);
+	list_for_each_entry_safe(bus, temp, &pci_root_buses, node) {
+		sd = bus->sysdata;
+		if (sd->pdev == pdev)
+			pci_stop_and_remove_root_bus(bus);
 	}
 }

Signature · 1 line

1.8.1.2

Jiang Liu

author

2013-06-21 16:12 UTC #3 lore raw

PATCH v2 3/3 PCI: kill pci_scan_bus_parented()

In reply to Jiang Liu

From: Jiang Liu <[email protected]>

Now there's no caller of pci_scan_bus_parented(), so kill it.

Signed-off-by Jiang Liu <[email protected]>

Cc Chris Metcalf <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

Cc Thierry Reding <[email protected]>

Cc [email protected]

---
 arch/tile/kernel/pci.c |  3 ---
 drivers/pci/probe.c    | 19 -------------------
 include/linux/pci.h    |  2 --
 3 files changed, 24 deletions(-)

arch/tile/kernel/pci.c +0 -3

index 67237d3..936e087 100644
@@ -309,9 +309,6 @@ int __init pcibios_init(void)
 			 *
 			 * It reads the PCI tree for this bus into the Linux
 			 * data structures.
-			 *
-			 * This is inlined in linux/pci.h and calls into
-			 * pci_scan_bus_parented() in probe.c.
 			 */
 			pci_add_resource(&resources, &ioport_resource);
 			pci_add_resource(&resources, &iomem_resource);

drivers/pci/probe.c +0 ~~-19~~

index ed768d8..af30772 100644
@@ -1901,25 +1901,6 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int bus,
 }
 EXPORT_SYMBOL(pci_scan_root_bus);
 
-/* Deprecated; use pci_scan_root_bus() instead */
-struct pci_bus *pci_scan_bus_parented(struct device *parent,
-		int bus, struct pci_ops *ops, void *sysdata)
-{
-	LIST_HEAD(resources);
-	struct pci_bus *b;
-
-	pci_add_resource(&resources, &ioport_resource);
-	pci_add_resource(&resources, &iomem_resource);
-	pci_add_resource(&resources, &busn_resource);
-	b = pci_create_root_bus(parent, bus, ops, sysdata, &resources);
-	if (b)
-		pci_scan_child_bus(b);
-	else
-		pci_free_resource_list(&resources);
-	return b;
-}
-EXPORT_SYMBOL(pci_scan_bus_parented);
-
 struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops,
 					void *sysdata)
 {

include/linux/pci.h +0 -2

index f1229c7..41ec0a5 100644
@@ -720,8 +720,6 @@ void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
 void pcibios_scan_specific_bus(int busn);
 struct pci_bus *pci_find_bus(int domain, int busnr);
 void pci_bus_add_devices(const struct pci_bus *bus);
-struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus,
-				      struct pci_ops *ops, void *sysdata);
 struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata);
 struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
 				    struct pci_ops *ops, void *sysdata,

Signature · 1 line

1.8.1.2

Jiang Liu

author

2013-06-21 16:12 UTC #4 lore raw

PATCH v2 3/3 PCI: mark pci_scan_bus_parented() as __deprecated

In reply to Jiang Liu

From: Jiang Liu <[email protected]>

Mark pci_scan_bus_parented() as __deprecated and clean up outdated comments.

Signed-off-by Jiang Liu <[email protected]>

Cc Chris Metcalf <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

Cc Thierry Reding <[email protected]>

Cc [email protected]

---
 arch/tile/kernel/pci.c |  3 ---
 drivers/pci/probe.c    | 19 -------------------
 include/linux/pci.h    |  2 --
 3 files changed, 24 deletions(-)

arch/tile/kernel/pci.c +0 -3

index 67237d3..936e087 100644
@@ -309,9 +309,6 @@ int __init pcibios_init(void)
 			 *
 			 * It reads the PCI tree for this bus into the Linux
 			 * data structures.
-			 *
-			 * This is inlined in linux/pci.h and calls into
-			 * pci_scan_bus_parented() in probe.c.
 			 */
 			pci_add_resource(&resources, &ioport_resource);
 			pci_add_resource(&resources, &iomem_resource);

drivers/pci/probe.c +0 ~~-19~~

index ed768d8..af30772 100644
@@ -1901,25 +1901,6 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int bus,
 }
 EXPORT_SYMBOL(pci_scan_root_bus);
 
-/* Deprecated; use pci_scan_root_bus() instead */
-struct pci_bus *pci_scan_bus_parented(struct device *parent,
-		int bus, struct pci_ops *ops, void *sysdata)
-{
-	LIST_HEAD(resources);
-	struct pci_bus *b;
-
-	pci_add_resource(&resources, &ioport_resource);
-	pci_add_resource(&resources, &iomem_resource);
-	pci_add_resource(&resources, &busn_resource);
-	b = pci_create_root_bus(parent, bus, ops, sysdata, &resources);
-	if (b)
-		pci_scan_child_bus(b);
-	else
-		pci_free_resource_list(&resources);
-	return b;
-}
-EXPORT_SYMBOL(pci_scan_bus_parented);
-
 struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops,
 					void *sysdata)
 {

include/linux/pci.h +0 -2

index f1229c7..41ec0a5 100644
@@ -720,8 +720,6 @@ void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
 void pcibios_scan_specific_bus(int busn);
 struct pci_bus *pci_find_bus(int domain, int busnr);
 void pci_bus_add_devices(const struct pci_bus *bus);
-struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus,
-				      struct pci_ops *ops, void *sysdata);
 struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata);
 struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
 				    struct pci_ops *ops, void *sysdata,

Signature · 1 line

1.8.1.2

Jiang Liu

author

2013-06-21 16:12 UTC #5 lore raw

PATCH v2 3/3 PCI: mark pci_scan_bus_parented() as __deprecated

In reply to Jiang Liu

From: Jiang Liu <[email protected]>

Mark pci_scan_bus_parented() as __deprecated and clean up outdated comments.

Signed-off-by Jiang Liu <[email protected]>

Cc Chris Metcalf <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

Cc Thierry Reding <[email protected]>

Cc [email protected]

---
 arch/tile/kernel/pci.c |  3 ---
 drivers/pci/probe.c    | 19 -------------------
 include/linux/pci.h    |  2 --
 3 files changed, 24 deletions(-)

arch/tile/kernel/pci.c +0 -3

index 67237d3..936e087 100644
@@ -309,9 +309,6 @@ int __init pcibios_init(void)
 			 *
 			 * It reads the PCI tree for this bus into the Linux
 			 * data structures.
-			 *
-			 * This is inlined in linux/pci.h and calls into
-			 * pci_scan_bus_parented() in probe.c.
 			 */
 			pci_add_resource(&resources, &ioport_resource);
 			pci_add_resource(&resources, &iomem_resource);

drivers/pci/probe.c +0 ~~-19~~

index ed768d8..af30772 100644
@@ -1901,25 +1901,6 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int bus,
 }
 EXPORT_SYMBOL(pci_scan_root_bus);
 
-/* Deprecated; use pci_scan_root_bus() instead */
-struct pci_bus *pci_scan_bus_parented(struct device *parent,
-		int bus, struct pci_ops *ops, void *sysdata)
-{
-	LIST_HEAD(resources);
-	struct pci_bus *b;
-
-	pci_add_resource(&resources, &ioport_resource);
-	pci_add_resource(&resources, &iomem_resource);
-	pci_add_resource(&resources, &busn_resource);
-	b = pci_create_root_bus(parent, bus, ops, sysdata, &resources);
-	if (b)
-		pci_scan_child_bus(b);
-	else
-		pci_free_resource_list(&resources);
-	return b;
-}
-EXPORT_SYMBOL(pci_scan_bus_parented);
-
 struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops,
 					void *sysdata)
 {

include/linux/pci.h +0 -2

index f1229c7..41ec0a5 100644
@@ -720,8 +720,6 @@ void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
 void pcibios_scan_specific_bus(int busn);
 struct pci_bus *pci_find_bus(int domain, int busnr);
 void pci_bus_add_devices(const struct pci_bus *bus);
-struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus,
-				      struct pci_ops *ops, void *sysdata);
 struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata);
 struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
 				    struct pci_ops *ops, void *sysdata,

Signature · 1 line

1.8.1.2