From c94d6dbee5f1408c8792b9664a2d5ab6a5b6413e Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 26 Aug 2005 23:39:44 +0000
Subject: [PATCH] fix CardBus issue for Compaq R3000 series laptop

Approved by:	anholt (mentor)
---
 sys/dev/pci/pci_pci.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c
index 29a82e1f5909..2795f02efdd9 100644
--- a/sys/dev/pci/pci_pci.c
+++ b/sys/dev/pci/pci_pci.c
@@ -186,6 +186,24 @@ pcib_attach_common(device_t dev)
     case 0x060513d7:		/* Toshiba ???? */
 	sc->flags |= PCIB_SUBTRACTIVE;
 	break;
+
+    /* Compaq R3000 BIOS sets wrong subordinate bus number. */
+    case 0x00dd10de:
+	{
+	    char *cp;
+
+	    cp = getenv("smbios.planar.maker");
+	    if (cp == NULL || strncmp(cp, "Compal", 6) != 0)
+		break;
+	    cp = getenv("smbios.planar.product");
+	    if (cp == NULL || strncmp(cp, "08A0", 4) != 0)
+		break;
+	    if (sc->subbus < 0xa) {
+		pci_write_config(dev, PCIR_SUBBUS_1, 0xa, 1);
+		sc->subbus = pci_read_config(dev, PCIR_SUBBUS_1, 1);
+	    }
+	    break;
+	}
     }
 
     /*