MFp4:

The hack for setting the bus has been moved down into the cbb driver.
I've been running without this hack in my tree for so long I had
forgotten that I'd removed it :-).  Please let me know if this causes
difficulty for your laptop.

1 files changed, 0 insertions, 14 deletions

diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index ec8b6df..29557d2 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -155,25 +155,11 @@ cardbus_attach_card(device_t cbdev)
 {
 	device_t brdev = device_get_parent(cbdev);
 	int cardattached = 0;
-	static int curr_bus_number = 2; /* XXX EVILE BAD (see below) */
 	int bus, slot, func;
 
 	cardbus_detach_card(cbdev); /* detach existing cards */
-
 	POWER_ENABLE_SOCKET(brdev, cbdev);
 	bus = pcib_get_bus(cbdev);
-	if (bus == 0) {
-		/*
-		 * XXX EVILE BAD XXX
-		 * Not all BIOSes initialize the secondary bus number properly,
-		 * so if the default is bad, we just put one in and hope it
-		 * works.
-		 */
-		bus = curr_bus_number;
-		pci_write_config(brdev, PCIR_SECBUS_2, curr_bus_number, 1);
-		pci_write_config(brdev, PCIR_SUBBUS_2, curr_bus_number + 2, 1);
-		curr_bus_number += 3;
-	}
 	/* For each function, set it up and try to attach a driver to it */
 	for (slot = 0; slot <= CARDBUS_SLOTMAX; slot++) {
 		int cardbusfunchigh = 0;