Patchwork [3/8] seabios: pciinit: make pci memory space assignment 64bit aware.

login
register
mail settings
Submitter Isaku Yamahata
Date June 17, 2010, 11:03 a.m.
Message ID <7bbf1a5dd97d80d984136e79f8501295a8fa50ab.1276771355.git.yamahata@valinux.co.jp>
Download mbox | patch
Permalink /patch/56020/
State New
Headers show

Comments

Isaku Yamahata - June 17, 2010, 11:03 a.m.
make pci memory space assignment 64bit aware.
If 64bit memory space is found while assigning pci memory space,
clear higher bit and skip to next bar.

This patch is preparation for q35 chipset initialization which
has 64bit bar.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
 src/pciinit.c |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

Patch

diff --git a/src/pciinit.c b/src/pciinit.c
index 488c77b..b635e44 100644
--- a/src/pciinit.c
+++ b/src/pciinit.c
@@ -37,7 +37,12 @@  static void pci_set_io_region_addr(u16 bdf, int region_num, u32 addr)
     dprintf(1, "region %d: 0x%08x\n", region_num, addr);
 }
 
-static void pci_bios_allocate_region(u16 bdf, int region_num)
+/*
+ * return value
+ *      0:     32bit BAR
+ *      non 0: 64bit BAR
+ */
+static int pci_bios_allocate_region(u16 bdf, int region_num)
 {
     u32 *paddr;
     int ofs;
@@ -71,13 +76,23 @@  static void pci_bios_allocate_region(u16 bdf, int region_num)
         pci_set_io_region_addr(bdf, region_num, *paddr);
         *paddr += size;
     }
+
+    int is_64bit = !(val & PCI_BASE_ADDRESS_SPACE_IO) &&
+        (val & PCI_BASE_ADDRESS_MEM_TYPE_MASK) == PCI_BASE_ADDRESS_MEM_TYPE_64;
+    if (is_64bit) {
+        pci_config_writel(bdf, ofs + 4, 0);
+    }
+    return is_64bit;
 }
 
 static void pci_bios_allocate_regions(u16 bdf)
 {
     int i;
     for (i = 0; i < PCI_NUM_REGIONS; i++) {
-        pci_bios_allocate_region(bdf, i);
+        int is_64bit = pci_bios_allocate_region(bdf, i);
+        if (is_64bit){
+            i++;
+        }
     }
 }