Changeset 230385c in mainline

Timestamp:

2012-01-24T02:41:51Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

690d2e7

Parents:

948911d

Message:

pci: Setup addr port and data port separately.

We will need this for non-pc pci.

Location:

uspace/drv

Files:

• bus/pci/pciintel/pci.c (modified) (2 diffs)
• bus/pci/pciintel/pci.h (modified) (1 diff)
• infrastructure/rootpc/rootpc.c (modified) (2 diffs)

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

@@ -650 +650 @@
         got_res = true;
         
+        
+        assert(hw_resources.count > 1);
+        assert(hw_resources.resources[0].type == IO_RANGE);
+        assert(hw_resources.resources[0].res.io_range.size >= 4);
+        
+        assert(hw_resources.resources[1].type == IO_RANGE);
+        assert(hw_resources.resources[1].res.io_range.size >= 4);
+        
         ddf_msg(LVL_DEBUG, "conf_addr = %" PRIx64 ".",
             hw_resources.resources[0].res.io_range.address);
-        
-        assert(hw_resources.count > 0);
-        assert(hw_resources.resources[0].type == IO_RANGE);
-        assert(hw_resources.resources[0].res.io_range.size == 8);
+        ddf_msg(LVL_DEBUG, "data_addr = %" PRIx64 ".",
+            hw_resources.resources[1].res.io_range.address);
         
         bus->conf_io_addr =
             (uint32_t) hw_resources.resources[0].res.io_range.address;
-        
-        if (pio_enable((void *)(uintptr_t)bus->conf_io_addr, 8,
+        bus->conf_io_data =
+            (uint32_t) hw_resources.resources[1].res.io_range.address;
+        
+        if (pio_enable((void *)(uintptr_t)bus->conf_io_addr, 4,
             &bus->conf_addr_port)) {
                 ddf_msg(LVL_ERROR, "Failed to enable configuration ports.");
@@ -666 +674 @@
                 goto fail;
         }
-        bus->conf_data_port = (char *) bus->conf_addr_port + 4;
+        if (pio_enable((void *)(uintptr_t)bus->conf_io_data, 4,
+            &bus->conf_data_port)) {
+                ddf_msg(LVL_ERROR, "Failed to enable configuration ports.");
+                rc = EADDRNOTAVAIL;
+                goto fail;
+        }
         
         /* Make the bus device more visible. It has no use yet. */

uspace/drv/bus/pci/pciintel/pci.h

@@ -46 +46 @@
         ddf_dev_t *dnode;
         uint32_t conf_io_addr;
+        uint32_t conf_io_data;
         void *conf_data_port;
         void *conf_addr_port;

uspace/drv/infrastructure/rootpc/rootpc.c

@@ -77 +77 @@
 };
 
-static hw_resource_t pci_conf_regs = {
-        .type = IO_RANGE,
-        .res.io_range = {
-                .address = 0xCF8,
-                .size = 8,
-                .endianness = LITTLE_ENDIAN
+static hw_resource_t pci_conf_regs[] = {
+        {
+                .type = IO_RANGE,
+                .res.io_range = {
+                        .address = 0xCF8,
+                        .size = 4,
+                        .endianness = LITTLE_ENDIAN
+                }
+        },
+        {
+                .type = IO_RANGE,
+                .res.io_range = {
+                        .address = 0xCFC,
+                        .size = 4,
+                        .endianness = LITTLE_ENDIAN
+                }
         }
 };
@@ -88 +98 @@
 static rootpc_fun_t pci_data = {
         .hw_resources = {
-                1,
-                &pci_conf_regs
+                sizeof(pci_conf_regs)/sizeof(pci_conf_regs[0]),
+                pci_conf_regs
         }
 };