s390/pci: separate zbus registration from scanning

Now that the zbus can be created without being scanned we can go one
step further and make registering a device to a zbus independent from
scanning it. This way the zbus handling becomes much more natural
in that functions can be registered on the zbus to be scanned later more
closely resembling the handling of both real PCI hardware and other
virtual PCI busses like Hyper-V's virtual PCI bus (see for example
drivers/pci/controller/pci-hyperv.c:create_root_hv_pci_bus()).

Having zbus registration separate from scanning allows us to return
fully initialized but still disabled zdevs from zpci_create_device()
which can then be configured just as we would configure a zdev from
standby (minus the SCLP Configure already done by the platform).  There
is still the exception that a PCI function with non-zero devfn can be
plugged before its PCI bus, which depends on the function with zero
devfn, is created. In this case the zdev returend from
zpci_create_device() is still missing its bus, hotplug slot, and
resources which need to be created later but at least it doesn't wait in
the enabled state and can otherwise be treated as initialized.

With this we also separate the initial PCI scan using CLP List PCI
Functions into two phases. In the CLP loop's callback we only register
each function with a virtual zbus creating the latter as needed. Then,
after we have built this virtual PCI topology based on our list of
zbusses, we can make use of the common code functionality to scan each
complete zbus as a separate child bus.

Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Acked-by: Pierre Morel <pmorel@linux.ibm.com>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index d810ea4d358ffd755b4450bd32d0d56f6e8eeba2..35c2af9371a9e953c2d6c3159ce0b8c414281772 100644 (file)
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -201,7 +201,7 @@ extern unsigned int s390_pci_no_rid;
   Prototypes
 ----------------------------------------------------------------------------- */
 /* Base stuff */
-int zpci_create_device(u32 fid, u32 fh, enum zpci_state state);
+struct zpci_dev *zpci_create_device(u32 fid, u32 fh, enum zpci_state state);
 int zpci_enable_device(struct zpci_dev *);
 int zpci_disable_device(struct zpci_dev *);
 int zpci_configure_device(struct zpci_dev *zdev, u32 fh);

diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index 023c3c2ab7f10c611bd498cf71afa8c7be70afb8..d6c6b5119a144e82b1ebc3cedec2e9aa00a00ec5 100644 (file)
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -690,9 +690,9 @@ int zpci_disable_device(struct zpci_dev *zdev)
  * Creates a new zpci device and adds it to its, possibly newly created, zbus
  * as well as zpci_list.
  *
- * Returns: 0 on success, an error value otherwise
+ * Returns: the zdev on success or an error pointer otherwise
  */
-int zpci_create_device(u32 fid, u32 fh, enum zpci_state state)
+struct zpci_dev *zpci_create_device(u32 fid, u32 fh, enum zpci_state state)
 {
        struct zpci_dev *zdev;
        int rc;
@@ -700,7 +700,7 @@ int zpci_create_device(u32 fid, u32 fh, enum zpci_state state)
        zpci_dbg(3, "add fid:%x, fh:%x, c:%d\n", fid, fh, state);
        zdev = kzalloc(sizeof(*zdev), GFP_KERNEL);
        if (!zdev)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        /* FID and Function Handle are the static/dynamic identifiers */
        zdev->fid = fid;
@@ -727,14 +727,14 @@ int zpci_create_device(u32 fid, u32 fh, enum zpci_state state)
        list_add_tail(&zdev->entry, &zpci_list);
        spin_unlock(&zpci_list_lock);
 
-       return 0;
+       return zdev;
 
 error_destroy_iommu:
        zpci_destroy_iommu(zdev);
 error:
        zpci_dbg(0, "add fid:%x, rc:%d\n", fid, rc);
        kfree(zdev);
-       return rc;
+       return ERR_PTR(rc);
 }
 
 /**
@@ -959,6 +959,7 @@ static int __init pci_base_init(void)
        rc = clp_scan_pci_devices();
        if (rc)
                goto out_find;
+       zpci_bus_scan_busses();
 
        s390_pci_initialized = 1;
        return 0;

diff --git a/arch/s390/pci/pci_bus.c b/arch/s390/pci/pci_bus.c
index 9bc869afe0119fe9fdbb42d440131ff341c7b5cf..9629f9779c79b1c7d89207ad645a628b45ac1b18 100644 (file)
--- a/arch/s390/pci/pci_bus.c
+++ b/arch/s390/pci/pci_bus.c
@@ -160,6 +160,23 @@ int zpci_bus_scan_bus(struct zpci_bus *zbus)
        return ret;
 }
 
+/* zpci_bus_scan_busses - Scan all registered busses
+ *
+ * Scan all available zbusses
+ *
+ */
+void zpci_bus_scan_busses(void)
+{
+       struct zpci_bus *zbus = NULL;
+
+       mutex_lock(&zbus_list_lock);
+       list_for_each_entry(zbus, &zbus_list, bus_next) {
+               zpci_bus_scan_bus(zbus);
+               cond_resched();
+       }
+       mutex_unlock(&zbus_list_lock);
+}
+
 /* zpci_bus_create_pci_bus - Create the PCI bus associated with this zbus
  * @zbus: the zbus holding the zdevices
  * @f0: function 0 of the bus
@@ -387,24 +404,6 @@ int zpci_bus_device_register(struct zpci_dev *zdev, struct pci_ops *ops)
        if (rc)
                goto error;
 
-       if (zdev->state != ZPCI_FN_STATE_CONFIGURED)
-               return 0;
-
-       /* the PCI function will be scanned once function 0 appears */
-       if (!zdev->zbus->bus)
-               return 0;
-
-       /* For function 0 scan whole bus as we might have to pick up existing
-        * functions waiting for it to allow creating the PCI bus
-        */
-       if (zdev->devfn == 0 && zdev->zbus->multifunction)
-               rc = zpci_bus_scan_bus(zdev->zbus);
-       else
-               rc = zpci_bus_scan_device(zdev);
-
-       if (rc)
-               goto error;
-
        return 0;
 
 error:

diff --git a/arch/s390/pci/pci_bus.h b/arch/s390/pci/pci_bus.h
index 981876ae3bd721903e22bd88dd53688e17158235..b877a97e6745bc9121e46bde83d3b937099f67d9 100644 (file)
--- a/arch/s390/pci/pci_bus.h
+++ b/arch/s390/pci/pci_bus.h
@@ -11,6 +11,7 @@ int zpci_bus_device_register(struct zpci_dev *zdev, struct pci_ops *ops);
 void zpci_bus_device_unregister(struct zpci_dev *zdev);
 
 int zpci_bus_scan_bus(struct zpci_bus *zbus);
+void zpci_bus_scan_busses(void);
 
 int zpci_bus_scan_device(struct zpci_dev *zdev);
 void zpci_bus_remove_device(struct zpci_dev *zdev, bool set_error);

diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c
index ae3054d8549124bc5953b7fb5dc94723652db81a..1178b48a66df1b67695a7b72bae7a8c0850796f9 100644 (file)
--- a/arch/s390/pci/pci_event.c
+++ b/arch/s390/pci/pci_event.c
@@ -104,13 +104,15 @@ static void __zpci_event_availability(struct zpci_ccdf_avail *ccdf)
        switch (ccdf->pec) {
        case 0x0301: /* Reserved|Standby -> Configured */
                if (!zdev) {
-                       zpci_create_device(ccdf->fid, ccdf->fh, ZPCI_FN_STATE_CONFIGURED);
-                       break;
+                       zdev = zpci_create_device(ccdf->fid, ccdf->fh, ZPCI_FN_STATE_CONFIGURED);
+                       if (IS_ERR(zdev))
+                               break;
+               } else {
+                       /* the configuration request may be stale */
+                       if (zdev->state != ZPCI_FN_STATE_STANDBY)
+                               break;
+                       zdev->state = ZPCI_FN_STATE_CONFIGURED;
                }
-               /* the configuration request may be stale */
-               if (zdev->state != ZPCI_FN_STATE_STANDBY)
-                       break;
-               zdev->state = ZPCI_FN_STATE_CONFIGURED;
                zpci_configure_device(zdev, ccdf->fh);
                break;
        case 0x0302: /* Reserved -> Standby */