Changeset c90aed4 in mainline for uspace/drv/bus/pci/pciintel/pci.c

Timestamp:

2013-05-23T17:25:28Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

192565b, 94dfb92

Parents:

4a5a18be

Message:

explicitly enable PCI bus mastering for each PCI bus function (this fixes #539)
a nicer way would be to enable the bus mastering only for devices/functions actually claimed by a driver, but the DDF needs some polishing in these areas

File:

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

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

@@ -327 +327 @@
 
         /* Vendor ID & Device ID, length(incl \0) 22 */
-        rc = snprintf(match_id_str, ID_MAX_STR_LEN, "pci/ven=%04x&dev=%04x",
-            fun->vendor_id, fun->device_id);
+        rc = snprintf(match_id_str, ID_MAX_STR_LEN, "pci/ven=%04"
+            PRIx16 "&dev=%04" PRIx16, fun->vendor_id, fun->device_id);
         if (rc < 0) {
                 ddf_msg(LVL_ERROR, "Failed creating match ID str: %s",
@@ -758 +758 @@
         fun->vendor_id = pci_conf_read_16(fun, PCI_VENDOR_ID);
         fun->device_id = pci_conf_read_16(fun, PCI_DEVICE_ID);
+        
+        /* Explicitly enable PCI bus mastering */
+        fun->command = pci_conf_read_16(fun, PCI_COMMAND) |
+            PCI_COMMAND_MASTER;
+        pci_conf_write_16(fun, PCI_COMMAND, fun->command);
+        
         fun->class_code = pci_conf_read_8(fun, PCI_BASE_CLASS);
         fun->subclass_code = pci_conf_read_8(fun, PCI_SUB_CLASS);