Changeset 54861ca in mainline

Timestamp:

2016-10-31T23:16:37Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

340513c

Parents:

6c34be69

Message:

Define sun4u's pci_conf_regs absolute

We need to pass precise PCI memory and IO ranges to the pci driver,
so pci_conf_regs cannot be relative.

File:

• uspace/drv/platform/sun4u/sun4u.c (modified) (3 diffs)

uspace/drv/platform/sun4u/sun4u.c

@@ -59 +59 @@
 #define PBM_SIZE                UINT64_C(0x00200000000)
 
-#define PBM_PCI_CONFIG_OFFSET   UINT64_C(0x00001000000)
+#define PBM_PCI_CONFIG_BASE     UINT64_C(0x00001000000)
 #define PBM_PCI_CONFIG_SIZE     UINT64_C(0x00001000000)
+
+#define PBM_PCI_IO_BASE         UINT64_C(0x00002000000)
+#define PBM_PCI_IO_SIZE         UINT64_C(0x00001000000)
+
+#define PBM_PCI_MEM_BASE        UINT64_C(0x00100000000)
+#define PBM_PCI_MEM_SIZE        UINT64_C(0x00100000000)
 
 typedef struct sun4u_fun {
@@ -85 +91 @@
                 .type = MEM_RANGE,
                 .res.mem_range = {
-                        .address = PBM_PCI_CONFIG_OFFSET,
+                        .address = PBM_BASE + PBM_PCI_CONFIG_BASE,
                         .size = PBM_PCI_CONFIG_SIZE,
-                        .relative = true,
+                        .relative = false,
                         .endianness = LITTLE_ENDIAN
                 }
@@ -100 +106 @@
         .pio_window = {
                 .mem = {
-                        .base = PBM_BASE,
-                        .size = PBM_SIZE
+                        .base = PBM_BASE + PBM_PCI_MEM_BASE,
+                        .size = PBM_PCI_MEM_SIZE
                 },
                 .io = {
-                        .base = PBM_BASE,
-                        .size = PBM_SIZE
+                        .base = PBM_BASE + PBM_PCI_IO_BASE,
+                        .size = PBM_PCI_IO_SIZE
                 }
         }