PCI hotplug: shpchp: use generic pci_configure_slot()

Use the generic pci_configure_slot() rather than the SHPC-specific
program_fw_provided_values().

Unlike the previous SHPC-specific code, pci_configure_slot() programs PCIe
settings when an _HPX method provides them, so if it's possible to have an
SHPC-managed PCIe device, it can now be configured.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Acked-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

2 files changed, 1 insertions, 68 deletions

diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index ad6a255cf0a..bd588eb8e92 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -188,19 +188,12 @@ static inline const char *slot_name(struct slot *slot)
 
 #ifdef CONFIG_ACPI
 #include <linux/pci-acpi.h>
-static inline int get_hp_params_from_firmware(struct pci_dev *dev,
-                                              struct hotplug_params *hpp)
-{
-        return acpi_get_hp_params_from_firmware(dev, hpp);
-}
-
 static inline int get_hp_hw_control_from_firmware(struct pci_dev *dev)
 {
         u32 flags = OSC_SHPC_NATIVE_HP_CONTROL;
         return acpi_get_hp_hw_control_from_firmware(dev, flags);
 }
 #else
-#define get_hp_params_from_firmware(dev, hpp) (-ENODEV)
 #define get_hp_hw_control_from_firmware(dev) (0)
 #endif
 
diff --git a/drivers/pci/hotplug/shpchp_pci.c b/drivers/pci/hotplug/shpchp_pci.c
index aa315e52529..8c3d3219f22 100644
--- a/drivers/pci/hotplug/shpchp_pci.c
+++ b/drivers/pci/hotplug/shpchp_pci.c
@@ -34,66 +34,6 @@
 #include "../pci.h"
 #include "shpchp.h"
 
-static void program_fw_provided_values(struct pci_dev *dev)
-{
-        u16 pci_cmd, pci_bctl;
-        struct pci_dev *cdev;
-        struct hotplug_params hpp;
-
-        /* Program hpp values for this device */
-        if (!(dev->hdr_type == PCI_HEADER_TYPE_NORMAL ||
-                        (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE &&
-                        (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI)))
-                return;
-
-        /* use default values if we can't get them from firmware */
-        if (get_hp_params_from_firmware(dev, &hpp) ||
-            !hpp.t0 || (hpp.t0->revision > 1)) {
-                warn("Could not get hotplug parameters. Use defaults\n");
-                hpp.t0 = &hpp.type0_data;
-                hpp.t0->revision = 0;
-                hpp.t0->cache_line_size = 8;
-                hpp.t0->latency_timer = 0x40;
-                hpp.t0->enable_serr = 0;
-                hpp.t0->enable_perr = 0;
-        }
-
-        pci_write_config_byte(dev,
-                              PCI_CACHE_LINE_SIZE, hpp.t0->cache_line_size);
-        pci_write_config_byte(dev, PCI_LATENCY_TIMER, hpp.t0->latency_timer);
-        pci_read_config_word(dev, PCI_COMMAND, &pci_cmd);
-        if (hpp.t0->enable_serr)
-                pci_cmd |= PCI_COMMAND_SERR;
-        else
-                pci_cmd &= ~PCI_COMMAND_SERR;
-        if (hpp.t0->enable_perr)
-                pci_cmd |= PCI_COMMAND_PARITY;
-        else
-                pci_cmd &= ~PCI_COMMAND_PARITY;
-        pci_write_config_word(dev, PCI_COMMAND, pci_cmd);
-
-        /* Program bridge control value and child devices */
-        if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
-                pci_write_config_byte(dev, PCI_SEC_LATENCY_TIMER,
-                                hpp.t0->latency_timer);
-                pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &pci_bctl);
-                if (hpp.t0->enable_serr)
-                        pci_bctl |= PCI_BRIDGE_CTL_SERR;
-                else
-                        pci_bctl &= ~PCI_BRIDGE_CTL_SERR;
-                if (hpp.t0->enable_perr)
-                        pci_bctl |= PCI_BRIDGE_CTL_PARITY;
-                else
-                        pci_bctl &= ~PCI_BRIDGE_CTL_PARITY;
-                pci_write_config_word(dev, PCI_BRIDGE_CONTROL, pci_bctl);
-                if (dev->subordinate) {
-                        list_for_each_entry(cdev, &dev->subordinate->devices,
-                                        bus_list)
-                                program_fw_provided_values(cdev);
-                }
-        }
-}
-
 int __ref shpchp_configure_device(struct slot *p_slot)
 {
         struct pci_dev *dev;
@@ -153,7 +93,7 @@ int __ref shpchp_configure_device(struct slot *p_slot)
                         child->subordinate = pci_do_scan_bus(child);
                         pci_bus_size_bridges(child);
                 }
-                program_fw_provided_values(dev);
+                pci_configure_slot(dev);
                 pci_dev_put(dev);
         }