Changes in uspace/drv/bus/pci/pciintel/pci.c [82721f5:65f77f4] in mainline

File:

• uspace/drv/bus/pci/pciintel/pci.c (modified) (3 diffs)

uspace/drv/bus/pci/pciintel/pci.c

@@ -454 +454 @@
 {
         /* Value of the BAR */
-        uint32_t val, mask;
+        uint32_t val;
+        uint32_t bar;
+        uint32_t mask;
+
         /* IO space address */
         bool io;
@@ -492 +495 @@
         /* Get the address mask. */
         pci_conf_write_32(fun, addr, 0xffffffff);
-        mask &= pci_conf_read_32(fun, addr);
-        
+        bar = pci_conf_read_32(fun, addr);
+
+        /*
+         * Unimplemented BARs read back as all 0's.
+         */
+        if (!bar)
+                return addr + (addrw64 ? 8 : 4);
+
+        mask &= bar;    
+
         /* Restore the original value. */
         pci_conf_write_32(fun, addr, val);
@@ -541 +552 @@
 {
         uint8_t irq = pci_conf_read_8(fun, PCI_BRIDGE_INT_LINE);
-        if (irq != 0xff)
+        uint8_t pin = pci_conf_read_8(fun, PCI_BRIDGE_INT_PIN);
+
+        if (pin != 0 && irq != 0xff)
                 pci_add_interrupt(fun, irq);
 }