2 files changed, 35 insertions, 1 deletions

diff --git a/arch/i386/pci/common.c b/arch/i386/pci/common.c
index f6bc48da4d2a..dbece776c5b2 100644
--- a/arch/i386/pci/common.c
+++ b/arch/i386/pci/common.c
@@ -8,6 +8,7 @@
 #include <linux/pci.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
+#include <linux/dmi.h>
 
 #include <asm/acpi.h>
 #include <asm/segment.h>
@@ -120,11 +121,42 @@ void __devinit  pcibios_fixup_bus(struct pci_bus *b)
         pci_read_bridge_bases(b);
 }
 
+/*
+ * Enable renumbering of PCI bus# ranges to reach all PCI busses (Cardbus)
+ */
+#ifdef __i386__
+static int __devinit assign_all_busses(struct dmi_system_id *d)
+{
+        pci_probe |= PCI_ASSIGN_ALL_BUSSES;
+        printk(KERN_INFO "%s detected: enabling PCI bus# renumbering"
+                        " (pci=assign-busses)\n", d->ident);
+        return 0;
+}
+#endif
+
+/*
+ * Laptops which need pci=assign-busses to see Cardbus cards
+ */
+static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = {
+#ifdef __i386__
+        {
+                .callback = assign_all_busses,
+                .ident = "Samsung X20 Laptop",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Samsung Electronics"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "SX20S"),
+                },
+        },
+#endif          /* __i386__ */
+        {}
+};
 
 struct pci_bus * __devinit pcibios_scan_root(int busnum)
 {
         struct pci_bus *bus = NULL;
 
+        dmi_check_system(pciprobe_dmi_table);
+
         while ((bus = pci_find_next_bus(bus)) != NULL) {
                 if (bus->number == busnum) {
                         /* Already scanned */
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 542e7dfb371b..e3dc3063e05b 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -589,13 +589,15 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max
                     (child->number > bus->subordinate) ||
                     (child->number < bus->number) ||
                     (child->subordinate < bus->number)) {
-                        printk(KERN_WARNING "PCI: Bus #%02x (-#%02x) may be "
+                        printk(KERN_WARNING "PCI: Bus #%02x (-#%02x) is "
                                "hidden behind%s bridge #%02x (-#%02x)%s\n",
                                child->number, child->subordinate,
                                bus->self->transparent ? " transparent" : " ",
                                bus->number, bus->subordinate,
                                pcibios_assign_all_busses() ? " " :
                                " (try 'pci=assign-busses')");
+                        printk(KERN_WARNING "Please report the result to "
+                               "linux-kernel to fix this permanently\n");
                 }
                 bus = bus->parent;
         }