Ticket #2005: hp6715b_pci_fixup.diff

src/add-ons/kernel/bus_managers/pci/pci_fixup.cpp

@@ -122 +122 @@
     dprintf("intel_fixup_ahci: 0x90: 0x%02lx\n", pci->ReadPciConfig(domain, bus, device, function, 0x90, 1));
 }
 
+/* The HP6715b bios assigns the SB600 audio and sata overlapping pci memory regions.  Thus preventing
+   correct operation of both devices.  For now we disable audio and zero it's BARs.  Long term solution
+   will require the device to be remapped
+*/
+static void
+ati_fixup_sb600(PCI *pci, int domain, uint8 bus, uint8 device, uint8 function, uint16 deviceId)
+{
+    static uint32 sataBar = 0;
+    static uint32 audioBar = 0;
 
+    switch (deviceId)
+    {
+        case 0x4383: //could add subsystem Id check if really paranoid [103c:30c2]
+            // Read BAR[0]
+            audioBar = pci->ReadPciConfig(domain, bus, device, function, PCI_base_registers, 4);
+            audioBar &= PCI_address_memory_32_mask;
+            dprintf("Found SB600 HD Audio (Azalia) 0x%08lx\n", audioBar);
+            break;
+        case 0x4380:
+            // Read BAR[5]
+            sataBar = pci->ReadPciConfig(domain, bus, device, function, PCI_base_registers + (5*4), 4);
+            sataBar &= PCI_address_memory_32_mask;
+            dprintf("Found SB600 Sata 0x%08lx\n", sataBar);
+            break;
+        default:
+            return;
+    }
+
+    if (audioBar == 0xD0608000 && sataBar == 0xD0609000) 
+    {   
+        dprintf("Disabling SB600 audio bar due to overlapping resources (seen on HP6715b laptop)\n");
+        // turn everything off
+        pci->WritePciConfig(domain, bus, device, function, PCI_command, 2, 0);
+        pci->WritePciConfig(domain, bus, device, function, PCI_base_registers + 0, 4, 0);  
+        pci->WritePciConfig(domain, bus, device, function, PCI_base_registers + 4, 4, 0);
+        pci->WritePciConfig(domain, bus, device, function, PCI_base_registers + 8, 4, 0);
+        pci->WritePciConfig(domain, bus, device, function, PCI_base_registers + 12, 4, 0);
+        pci->WritePciConfig(domain, bus, device, function, PCI_base_registers + 16, 4, 0);
+    }
+}
+
 void
 pci_fixup_device(PCI *pci, int domain, uint8 bus, uint8 device, uint8 function)
 {
@@ -139 +179 @@
         case 0x8086:
             intel_fixup_ahci(pci, domain, bus, device, function, deviceId);
             break;
+
+        case 0x1002:
+            ati_fixup_sb600(pci, domain, bus, device, function, deviceId);
+            break;
+
+        default:
+            break;
     }
 }