[SeaBIOS] [PATCH 2/4] pci: activate two-pass pci initialization code
Gerd Hoffmann
kraxel at redhat.com
Fri Jun 24 17:24:36 CEST 2011
This patch actually enables the two-pass pci initialization and
deactivates the old pci initialization bits.
Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>
---
src/pciinit.c | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/pciinit.c b/src/pciinit.c
index 80bc7ad..5b16bef 100644
--- a/src/pciinit.c
+++ b/src/pciinit.c
@@ -122,6 +122,8 @@ static void pci_set_io_region_addr(u16 bdf, int region_num, u32 addr)
*/
static int pci_bios_allocate_region(u16 bdf, int region_num)
{
+ return 0;
+
struct pci_region *r;
u32 ofs = pci_bar(bdf, region_num);
@@ -183,6 +185,8 @@ static int pci_bios_allocate_region(u16 bdf, int region_num)
static void pci_bios_allocate_regions(struct pci_device *pci, void *arg)
{
+ return;
+
int i;
for (i = 0; i < PCI_NUM_REGIONS; i++) {
int is_64bit = pci_bios_allocate_region(pci->bdf, i);
@@ -238,6 +242,7 @@ static const struct pci_device_id pci_isa_bridge_tbl[] = {
#define PCI_PREF_MEMORY_ALIGN (1UL << 20)
#define PCI_PREF_MEMORY_SHIFT 16
+#if 0
static void pci_bios_init_device_bridge(struct pci_device *pci, void *arg)
{
u16 bdf = pci->bdf;
@@ -322,6 +327,7 @@ static void pci_bios_init_device_bridge(struct pci_device *pci, void *arg)
pci_config_maskw(bdf, PCI_BRIDGE_CONTROL, 0, PCI_BRIDGE_CTL_SERR);
}
+#endif
static void storage_ide_init(struct pci_device *pci, void *arg)
{
@@ -373,9 +379,11 @@ static const struct pci_device_id pci_class_tbl[] = {
PCI_DEVICE_CLASS(PCI_VENDOR_ID_APPLE, 0x0017, 0xff00, apple_macio_init),
PCI_DEVICE_CLASS(PCI_VENDOR_ID_APPLE, 0x0022, 0xff00, apple_macio_init),
+#if 0
/* PCI bridge */
PCI_DEVICE_CLASS(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_BRIDGE_PCI,
pci_bios_init_device_bridge),
+#endif
/* default */
PCI_DEVICE(PCI_ANY_ID, PCI_ANY_ID, pci_bios_allocate_regions),
@@ -636,6 +644,7 @@ static void pci_bios_check_device(struct pci_bus *bus, struct pci_device *dev)
static void pci_bios_map_device(struct pci_bus *bus, struct pci_device *dev)
{
+ u16 bdf = dev->bdf;
int i;
if (dev->class == PCI_CLASS_BRIDGE_PCI) {
@@ -643,6 +652,8 @@ static void pci_bios_map_device(struct pci_bus *bus, struct pci_device *dev)
return;
}
struct pci_bus *s = busses + dev->secondary_bus;
+ u32 limit;
+
s->io_base = pci_bios_bus_get_addr
(bus, PCI_BASE_ADDRESS_SPACE_IO, s->io_size);
s->mem_base = pci_bios_bus_get_addr
@@ -651,7 +662,25 @@ static void pci_bios_map_device(struct pci_bus *bus, struct pci_device *dev)
(bus, PCI_BASE_ADDRESS_MEM_PREFETCH, s->prefmem_size);
dprintf(1, "PCI: init bases bus %d (secondary)\n", dev->secondary_bus);
pci_bios_init_bus_bases(s);
- /* TODO: commit assignments */
+
+ limit = s->io_base + s->io_size - 1;
+ pci_config_writeb(bdf, PCI_IO_BASE, s->io_base >> PCI_IO_SHIFT);
+ pci_config_writew(bdf, PCI_IO_BASE_UPPER16, 0);
+ pci_config_writeb(bdf, PCI_IO_LIMIT, limit >> PCI_IO_SHIFT);
+ pci_config_writew(bdf, PCI_IO_LIMIT_UPPER16, 0);
+
+ limit = s->mem_base + s->mem_size - 1;
+ pci_config_writew(bdf, PCI_MEMORY_BASE, s->mem_base >> PCI_MEMORY_SHIFT);
+ pci_config_writew(bdf, PCI_MEMORY_LIMIT, limit >> PCI_MEMORY_SHIFT);
+
+ limit = s->prefmem_base + s->prefmem_size - 1;
+ pci_config_writew(bdf, PCI_PREF_MEMORY_BASE,
+ s->prefmem_base >> PCI_PREF_MEMORY_SHIFT);
+ pci_config_writew(bdf, PCI_PREF_MEMORY_LIMIT,
+ limit >> PCI_PREF_MEMORY_SHIFT);
+ pci_config_writel(bdf, PCI_PREF_BASE_UPPER32, 0);
+ pci_config_writel(bdf, PCI_PREF_LIMIT_UPPER32, 0);
+
pci_bios_map_device_in_bus(dev->secondary_bus);
return;
}
@@ -666,7 +695,7 @@ static void pci_bios_map_device(struct pci_bus *bus, struct pci_device *dev)
dprintf(1, " bar %d, addr %x, size %x [%s]\n",
i, addr, dev->r[i].size,
dev->r[i].addr & PCI_BASE_ADDRESS_SPACE_IO ? "io" : "mem");
- /* TODO: commit assignments */
+ pci_set_io_region_addr(bdf, i, addr);
if (dev->r[i].is64) {
i++;
@@ -869,11 +898,14 @@ pci_setup(void)
dprintf(1, "=== PCI new allocation pass #2 ===\n");
pci_bios_map_device_in_bus(0 /* host bus */);
+#if 0
dprintf(1, "=== PCI old allocation pass ===\n");
struct pci_device *pci;
foreachpci(pci) {
pci_init_device(pci_isa_bridge_tbl, pci, NULL);
}
+#endif
+
pci_bios_init_device_in_bus(0 /* host bus */);
free(busses);
--
1.7.1
More information about the SeaBIOS
mailing list