These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / pci / hotplug / pciehp_core.c

diff --git a/kernel/drivers/pci/hotplug/pciehp_core.c b/kernel/drivers/pci/hotplug/pciehp_core.c
index 07aa722..612b21a 100644 (file)
--- a/kernel/drivers/pci/hotplug/pciehp_core.c
+++ b/kernel/drivers/pci/hotplug/pciehp_core.c
@@ -77,11 +77,6 @@ static int reset_slot                (struct hotplug_slot *slot, int probe);
  */
 static void release_slot(struct hotplug_slot *hotplug_slot)
 {
-       struct slot *slot = hotplug_slot->private;
-
-       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
-                __func__, hotplug_slot_name(hotplug_slot));
-
        kfree(hotplug_slot->ops);
        kfree(hotplug_slot->info);
        kfree(hotplug_slot);
@@ -129,14 +124,10 @@ static int init_slot(struct controller *ctrl)
        slot->hotplug_slot = hotplug;
        snprintf(name, SLOT_NAME_SIZE, "%u", PSN(ctrl));
 
-       ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:00 sun=%x\n",
-                pci_domain_nr(ctrl->pcie->port->subordinate),
-                ctrl->pcie->port->subordinate->number, PSN(ctrl));
        retval = pci_hp_register(hotplug,
                                 ctrl->pcie->port->subordinate, 0, name);
        if (retval)
-               ctrl_err(ctrl,
-                        "pci_hp_register failed with error %d\n", retval);
+               ctrl_err(ctrl, "pci_hp_register failed: error %d\n", retval);
 out:
        if (retval) {
                kfree(ops);
@@ -158,9 +149,6 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
 {
        struct slot *slot = hotplug_slot->private;
 
-       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
-                 __func__, slot_name(slot));
-
        pciehp_set_attention_status(slot, status);
        return 0;
 }
@@ -170,9 +158,6 @@ static int enable_slot(struct hotplug_slot *hotplug_slot)
 {
        struct slot *slot = hotplug_slot->private;
 
-       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
-                __func__, slot_name(slot));
-
        return pciehp_sysfs_enable_slot(slot);
 }
 
@@ -181,9 +166,6 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
 {
        struct slot *slot = hotplug_slot->private;
 
-       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
-                 __func__, slot_name(slot));
-
        return pciehp_sysfs_disable_slot(slot);
 }
 
@@ -191,9 +173,6 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
        struct slot *slot = hotplug_slot->private;
 
-       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
-                 __func__, slot_name(slot));
-
        pciehp_get_power_status(slot, value);
        return 0;
 }
@@ -202,9 +181,6 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
        struct slot *slot = hotplug_slot->private;
 
-       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
-                 __func__, slot_name(slot));
-
        pciehp_get_attention_status(slot, value);
        return 0;
 }
@@ -213,9 +189,6 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
        struct slot *slot = hotplug_slot->private;
 
-       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
-                __func__, slot_name(slot));
-
        pciehp_get_latch_status(slot, value);
        return 0;
 }
@@ -224,9 +197,6 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
        struct slot *slot = hotplug_slot->private;
 
-       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
-                __func__, slot_name(slot));
-
        pciehp_get_adapter_status(slot, value);
        return 0;
 }
@@ -235,9 +205,6 @@ static int reset_slot(struct hotplug_slot *hotplug_slot, int probe)
 {
        struct slot *slot = hotplug_slot->private;
 
-       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
-                __func__, slot_name(slot));
-
        return pciehp_reset_slot(slot, probe);
 }
 
@@ -248,24 +215,21 @@ static int pciehp_probe(struct pcie_device *dev)
        struct slot *slot;
        u8 occupied, poweron;
 
-       if (pciehp_force)
-               dev_info(&dev->device,
-                        "Bypassing BIOS check for pciehp use on %s\n",
-                        pci_name(dev->port));
-       else if (pciehp_acpi_slot_detection_check(dev->port))
-               goto err_out_none;
+       /* If this is not a "hotplug" service, we have no business here. */
+       if (dev->service != PCIE_PORT_SERVICE_HP)
+               return -ENODEV;
 
        if (!dev->port->subordinate) {
                /* Can happen if we run out of bus numbers during probe */
                dev_err(&dev->device,
                        "Hotplug bridge without secondary bus, ignoring\n");
-               goto err_out_none;
+               return -ENODEV;
        }
 
        ctrl = pcie_init(dev);
        if (!ctrl) {
                dev_err(&dev->device, "Controller initialization failed\n");
-               goto err_out_none;
+               return -ENODEV;
        }
        set_service_data(dev, ctrl);
 
@@ -275,14 +239,14 @@ static int pciehp_probe(struct pcie_device *dev)
                if (rc == -EBUSY)
                        ctrl_warn(ctrl, "Slot already registered by another hotplug driver\n");
                else
-                       ctrl_err(ctrl, "Slot initialization failed\n");
+                       ctrl_err(ctrl, "Slot initialization failed (%d)\n", rc);
                goto err_out_release_ctlr;
        }
 
        /* Enable events after we have setup the data structures */
        rc = pcie_init_notification(ctrl);
        if (rc) {
-               ctrl_err(ctrl, "Notification initialization failed\n");
+               ctrl_err(ctrl, "Notification initialization failed (%d)\n", rc);
                goto err_out_free_ctrl_slot;
        }
 
@@ -305,7 +269,6 @@ err_out_free_ctrl_slot:
        cleanup_slot(ctrl);
 err_out_release_ctlr:
        pciehp_release_ctrl(ctrl);
-err_out_none:
        return -ENODEV;
 }
 
@@ -366,7 +329,6 @@ static int __init pcied_init(void)
 {
        int retval = 0;
 
-       pciehp_firmware_init();
        retval = pcie_port_service_register(&hpdriver_portdrv);
        dbg("pcie_port_service_register = %d\n", retval);
        info(DRIVER_DESC " version: " DRIVER_VERSION "\n");