Auto-update from upstream

4 files changed, 57 insertions, 27 deletions

diff --git a/drivers/pci/hotplug.c b/drivers/pci/hotplug.c
index e1743be31909..1c97e7dd130b 100644
--- a/drivers/pci/hotplug.c
+++ b/drivers/pci/hotplug.c
@@ -3,8 +3,8 @@
 #include <linux/module.h>
 #include "pci.h"
 
-int pci_hotplug (struct device *dev, char **envp, int num_envp,
-                 char *buffer, int buffer_size)
+int pci_uevent(struct device *dev, char **envp, int num_envp,
+               char *buffer, int buffer_size)
 {
         struct pci_dev *pdev;
         int i = 0;
@@ -17,34 +17,34 @@ int pci_hotplug (struct device *dev, char **envp, int num_envp,
         if (!pdev)
                 return -ENODEV;
 
-        if (add_hotplug_env_var(envp, num_envp, &i,
-                                buffer, buffer_size, &length,
-                                "PCI_CLASS=%04X", pdev->class))
+        if (add_uevent_var(envp, num_envp, &i,
+                           buffer, buffer_size, &length,
+                           "PCI_CLASS=%04X", pdev->class))
                 return -ENOMEM;
 
-        if (add_hotplug_env_var(envp, num_envp, &i,
-                                buffer, buffer_size, &length,
-                                "PCI_ID=%04X:%04X", pdev->vendor, pdev->device))
+        if (add_uevent_var(envp, num_envp, &i,
+                           buffer, buffer_size, &length,
+                           "PCI_ID=%04X:%04X", pdev->vendor, pdev->device))
                 return -ENOMEM;
 
-        if (add_hotplug_env_var(envp, num_envp, &i,
-                                buffer, buffer_size, &length,
-                                "PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,
-                                pdev->subsystem_device))
+        if (add_uevent_var(envp, num_envp, &i,
+                           buffer, buffer_size, &length,
+                           "PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,
+                           pdev->subsystem_device))
                 return -ENOMEM;
 
-        if (add_hotplug_env_var(envp, num_envp, &i,
-                                buffer, buffer_size, &length,
-                                "PCI_SLOT_NAME=%s", pci_name(pdev)))
+        if (add_uevent_var(envp, num_envp, &i,
+                           buffer, buffer_size, &length,
+                           "PCI_SLOT_NAME=%s", pci_name(pdev)))
                 return -ENOMEM;
 
-        if (add_hotplug_env_var(envp, num_envp, &i,
-                                buffer, buffer_size, &length,
-                                "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",
-                                pdev->vendor, pdev->device,
-                                pdev->subsystem_vendor, pdev->subsystem_device,
-                                (u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
-                                (u8)(pdev->class)))
+        if (add_uevent_var(envp, num_envp, &i,
+                           buffer, buffer_size, &length,
+                           "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",
+                           pdev->vendor, pdev->device,
+                           pdev->subsystem_vendor, pdev->subsystem_device,
+                           (u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
+                           (u8)(pdev->class)))
                 return -ENOMEM;
 
         envp[i] = NULL;
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index a9046d4b8af3..7146b69b812c 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -502,8 +502,8 @@ void pci_dev_put(struct pci_dev *dev)
 }
 
 #ifndef CONFIG_HOTPLUG
-int pci_hotplug (struct device *dev, char **envp, int num_envp,
-                 char *buffer, int buffer_size)
+int pci_uevent(struct device *dev, char **envp, int num_envp,
+               char *buffer, int buffer_size)
 {
         return -ENODEV;
 }
@@ -512,7 +512,7 @@ int pci_hotplug (struct device *dev, char **envp, int num_envp,
 struct bus_type pci_bus_type = {
         .name           = "pci",
         .match          = pci_bus_match,
-        .hotplug        = pci_hotplug,
+        .uevent         = pci_uevent,
         .suspend        = pci_device_suspend,
         .resume         = pci_device_resume,
         .dev_attrs      = pci_dev_attrs,
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 6527b36c9a61..294849d24590 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -1,7 +1,7 @@
 /* Functions internal to the PCI core code */
 
-extern int pci_hotplug (struct device *dev, char **envp, int num_envp,
-                         char *buffer, int buffer_size);
+extern int pci_uevent(struct device *dev, char **envp, int num_envp,
+                      char *buffer, int buffer_size);
 extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);
 extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);
 extern void pci_cleanup_rom(struct pci_dev *dev);
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 3a4f49f4effb..f28ebdd3958a 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1098,6 +1098,23 @@ static void __init quirk_alder_ioapic(struct pci_dev *pdev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_EESSC,      quirk_alder_ioapic );
 #endif
 
+enum ide_combined_type { COMBINED = 0, IDE = 1, LIBATA = 2 };
+/* Defaults to combined */
+static enum ide_combined_type combined_mode;
+
+static int __init combined_setup(char *str)
+{
+        if (!strncmp(str, "ide", 3))
+                combined_mode = IDE;
+        else if (!strncmp(str, "libata", 6))
+                combined_mode = LIBATA;
+        else /* "combined" or anything else defaults to old behavior */
+                combined_mode = COMBINED;
+
+        return 1;
+}
+__setup("combined_mode=", combined_setup);
+
 #ifdef CONFIG_SCSI_SATA_INTEL_COMBINED
 static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev)
 {
@@ -1164,6 +1181,19 @@ static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev)
         if (prog & comb)
                 return;
 
+        /* Don't reserve any so the IDE driver can get them (but only if
+         * combined_mode=ide).
+         */
+        if (combined_mode == IDE)
+                return;
+
+        /* Grab them both for libata if combined_mode=libata. */
+        if (combined_mode == LIBATA) {
+                request_region(0x1f0, 8, "libata");     /* port 0 */
+                request_region(0x170, 8, "libata");     /* port 1 */
+                return;
+        }
+
         /* SATA port is in legacy mode.  Reserve port so that
          * IDE driver does not attempt to use it.  If request_region
          * fails, it will be obvious at boot time, so we don't bother