[SeaBIOS] [PATCH 3/5] pci: remove old pci initilaization code
Gerd Hoffmann
kraxel at redhat.com
Mon Jul 11 09:20:30 CEST 2011
Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>
---
Makefile | 2 +-
src/pci_region.c | 77 ---------------------
src/pciinit.c | 197 ------------------------------------------------------
src/util.h | 29 --------
4 files changed, 1 insertions(+), 304 deletions(-)
delete mode 100644 src/pci_region.c
diff --git a/Makefile b/Makefile
index 2786c9e..47828e5 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ SRC16=$(SRCBOTH) system.c disk.c font.c
SRC32FLAT=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \
acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \
lzmadecode.c bootsplash.c jpeg.c usb-hub.c paravirt.c \
- pci_region.c biostables.c xen.c bmp.c
+ biostables.c xen.c bmp.c
SRC32SEG=util.c output.c pci.c pcibios.c apm.c stacks.c
cc-option = $(shell if test -z "`$(1) $(2) -S -o /dev/null -xc \
diff --git a/src/pci_region.c b/src/pci_region.c
deleted file mode 100644
index 1d9de71..0000000
--- a/src/pci_region.c
+++ /dev/null
@@ -1,77 +0,0 @@
-// helper functions to manage pci io/memory/prefetch memory region
-//
-// Copyright (C) 2009 Isaku Yamahata <yamahata at valinux co jp>
-//
-// This file may be distributed under the terms of the GNU LGPLv3 license.
-//
-//
-
-#include "util.h"
-
-#define PCI_REGION_DISABLED (-1)
-
-void pci_region_init(struct pci_region *r, u32 first, u32 last)
-{
- r->first = first;
- r->last = last;
-
- r->cur_first = r->first;
-}
-
-// PCI_REGION_DISABLED represents that the region is in special state.
-// its value is chosen such that cur_first can't be PCI_REGION_DISABLED
-// normally.
-// NOTE: the area right below 4G is used for LAPIC, so such area can't
-// be used for PCI memory.
-u32 pci_region_disable(struct pci_region *r)
-{
- return r->cur_first = PCI_REGION_DISABLED;
-}
-
-static int pci_region_disabled(const struct pci_region *r)
-{
- return r->cur_first == PCI_REGION_DISABLED;
-}
-
-static u32 pci_region_alloc_align(struct pci_region *r, u32 size, u32 align)
-{
- if (pci_region_disabled(r)) {
- return 0;
- }
-
- u32 s = ALIGN(r->cur_first, align);
- if (s > r->last || s < r->cur_first) {
- return 0;
- }
- u32 e = s + size;
- if (e < s || e - 1 > r->last) {
- return 0;
- }
- r->cur_first = e;
- return s;
-}
-
-u32 pci_region_alloc(struct pci_region *r, u32 size)
-{
- return pci_region_alloc_align(r, size, size);
-}
-
-u32 pci_region_align(struct pci_region *r, u32 align)
-{
- return pci_region_alloc_align(r, 0, align);
-}
-
-void pci_region_revert(struct pci_region *r, u32 addr)
-{
- r->cur_first = addr;
-}
-
-u32 pci_region_addr(const struct pci_region *r)
-{
- return r->cur_first;
-}
-
-u32 pci_region_size(const struct pci_region *r)
-{
- return r->last - r->first + 1;
-}
diff --git a/src/pciinit.c b/src/pciinit.c
index a26eb77..a0e932b 100644
--- a/src/pciinit.c
+++ b/src/pciinit.c
@@ -18,10 +18,6 @@
#define PCI_BRIDGE_IO_MIN 0x1000
#define PCI_BRIDGE_MEM_MIN 0x100000
-static struct pci_region pci_bios_io_region;
-static struct pci_region pci_bios_mem_region;
-static struct pci_region pci_bios_prefmem_region;
-
enum pci_region_type {
PCI_REGION_TYPE_IO,
PCI_REGION_TYPE_MEM,
@@ -113,88 +109,6 @@ static void pci_set_io_region_addr(u16 bdf, int region_num, u32 addr)
ofs = pci_bar(bdf, region_num);
pci_config_writel(bdf, ofs, addr);
- dprintf(1, "region %d: 0x%08x\n", region_num, addr);
-}
-
-/*
- * return value
- * 0: 32bit BAR
- * non 0: 64bit BAR
- */
-static int pci_bios_allocate_region(u16 bdf, int region_num)
-{
- return 0;
-
- struct pci_region *r;
- u32 ofs = pci_bar(bdf, region_num);
-
- u32 old = pci_config_readl(bdf, ofs);
- u32 mask;
- if (region_num == PCI_ROM_SLOT) {
- mask = PCI_ROM_ADDRESS_MASK;
- pci_config_writel(bdf, ofs, mask);
- } else {
- if (old & PCI_BASE_ADDRESS_SPACE_IO)
- mask = PCI_BASE_ADDRESS_IO_MASK;
- else
- mask = PCI_BASE_ADDRESS_MEM_MASK;
- pci_config_writel(bdf, ofs, ~0);
- }
- u32 val = pci_config_readl(bdf, ofs);
- pci_config_writel(bdf, ofs, old);
-
- u32 size = (~(val & mask)) + 1;
- if (val != 0) {
- const char *type;
- const char *msg;
- if (val & PCI_BASE_ADDRESS_SPACE_IO) {
- r = &pci_bios_io_region;
- type = "io";
- msg = "";
- } else if ((val & PCI_BASE_ADDRESS_MEM_PREFETCH) &&
- /* keep behaviour on bus = 0 */
- pci_bdf_to_bus(bdf) != 0 &&
- /* If pci_bios_prefmem_addr == 0, keep old behaviour */
- pci_region_addr(&pci_bios_prefmem_region) != 0) {
- r = &pci_bios_prefmem_region;
- type = "prefmem";
- msg = "decrease BUILD_PCIMEM_SIZE and recompile. size %x";
- } else {
- r = &pci_bios_mem_region;
- type = "mem";
- msg = "increase BUILD_PCIMEM_SIZE and recompile.";
- }
- u32 addr = pci_region_alloc(r, size);
- if (addr > 0) {
- pci_set_io_region_addr(bdf, region_num, addr);
- } else {
- size = 0;
- dprintf(1,
- "%s region of (bdf 0x%x bar %d) can't be mapped. "
- "%s size %x\n",
- type, bdf, region_num, msg, pci_region_size(r));
- }
- }
-
- 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 && size > 0) {
- pci_config_writel(bdf, ofs + 4, 0);
- }
- return is_64bit;
-}
-
-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);
- if (is_64bit){
- i++;
- }
- }
}
/* return the global irq number corresponding to a given device irq
@@ -243,93 +157,6 @@ 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;
- pci_bios_allocate_region(bdf, 0);
- pci_bios_allocate_region(bdf, 1);
- pci_bios_allocate_region(bdf, PCI_ROM_SLOT);
-
- u32 io_old = pci_region_addr(&pci_bios_io_region);
- u32 mem_old = pci_region_addr(&pci_bios_mem_region);
- u32 prefmem_old = pci_region_addr(&pci_bios_prefmem_region);
-
- /* IO BASE is assumed to be 16 bit */
- if (pci_region_align(&pci_bios_io_region, PCI_IO_ALIGN) == 0) {
- pci_region_disable(&pci_bios_io_region);
- }
- if (pci_region_align(&pci_bios_mem_region, PCI_MEMORY_ALIGN) == 0) {
- pci_region_disable(&pci_bios_mem_region);
- }
- if (pci_region_align(&pci_bios_prefmem_region,
- PCI_PREF_MEMORY_ALIGN) == 0) {
- pci_region_disable(&pci_bios_prefmem_region);
- }
-
- u32 io_base = pci_region_addr(&pci_bios_io_region);
- u32 mem_base = pci_region_addr(&pci_bios_mem_region);
- u32 prefmem_base = pci_region_addr(&pci_bios_prefmem_region);
-
- u8 secbus = pci_config_readb(bdf, PCI_SECONDARY_BUS);
- if (secbus > 0) {
- pci_bios_init_device_in_bus(secbus);
- }
-
- u32 io_end = pci_region_align(&pci_bios_io_region, PCI_IO_ALIGN);
- if (io_end == 0) {
- pci_region_revert(&pci_bios_io_region, io_old);
- io_base = 0xffff;
- io_end = 1;
- }
- pci_config_writeb(bdf, PCI_IO_BASE, io_base >> PCI_IO_SHIFT);
- pci_config_writew(bdf, PCI_IO_BASE_UPPER16, 0);
- pci_config_writeb(bdf, PCI_IO_LIMIT, (io_end - 1) >> PCI_IO_SHIFT);
- pci_config_writew(bdf, PCI_IO_LIMIT_UPPER16, 0);
-
- u32 mem_end = pci_region_align(&pci_bios_mem_region, PCI_MEMORY_ALIGN);
- if (mem_end == 0) {
- pci_region_revert(&pci_bios_mem_region, mem_old);
- mem_base = 0xffffffff;
- mem_end = 1;
- }
- pci_config_writew(bdf, PCI_MEMORY_BASE, mem_base >> PCI_MEMORY_SHIFT);
- pci_config_writew(bdf, PCI_MEMORY_LIMIT, (mem_end -1) >> PCI_MEMORY_SHIFT);
-
- u32 prefmem_end = pci_region_align(&pci_bios_prefmem_region,
- PCI_PREF_MEMORY_ALIGN);
- if (prefmem_end == 0) {
- pci_region_revert(&pci_bios_prefmem_region, prefmem_old);
- prefmem_base = 0xffffffff;
- prefmem_end = 1;
- }
- pci_config_writew(bdf, PCI_PREF_MEMORY_BASE,
- prefmem_base >> PCI_PREF_MEMORY_SHIFT);
- pci_config_writew(bdf, PCI_PREF_MEMORY_LIMIT,
- (prefmem_end - 1) >> PCI_PREF_MEMORY_SHIFT);
- pci_config_writel(bdf, PCI_PREF_BASE_UPPER32, 0);
- pci_config_writel(bdf, PCI_PREF_LIMIT_UPPER32, 0);
-
- dprintf(1, "PCI: br io = [0x%x, 0x%x)\n", io_base, io_end);
- dprintf(1, "PCI: br mem = [0x%x, 0x%x)\n", mem_base, mem_end);
- dprintf(1, "PCI: br pref = [0x%x, 0x%x)\n", prefmem_base, prefmem_end);
-
- u16 cmd = pci_config_readw(bdf, PCI_COMMAND);
- cmd &= ~PCI_COMMAND_IO;
- if (io_end > io_base) {
- cmd |= PCI_COMMAND_IO;
- }
- cmd &= ~PCI_COMMAND_MEMORY;
- if (mem_end > mem_base || prefmem_end > prefmem_base) {
- cmd |= PCI_COMMAND_MEMORY;
- }
- cmd |= PCI_COMMAND_MASTER;
- pci_config_writew(bdf, PCI_COMMAND, cmd);
-
- pci_config_maskw(bdf, PCI_BRIDGE_CONTROL, 0, PCI_BRIDGE_CTL_SERR);
-}
-#endif
-
static void storage_ide_init(struct pci_device *pci, void *arg)
{
u16 bdf = pci->bdf;
@@ -346,7 +173,6 @@ static void piix_ide_init(struct pci_device *pci, void *arg)
u16 bdf = pci->bdf;
pci_config_writew(bdf, 0x40, 0x8000); // enable IDE0
pci_config_writew(bdf, 0x42, 0x8000); // enable IDE1
- pci_bios_allocate_regions(pci, NULL);
}
static void pic_ibm_init(struct pci_device *pci, void *arg)
@@ -380,15 +206,6 @@ 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),
-
PCI_DEVICE_END,
};
@@ -769,12 +586,6 @@ pci_setup(void)
u32 start = BUILD_PCIMEM_START;
u32 end = BUILD_IOAPIC_ADDR;
- pci_region_init(&pci_bios_io_region, 0xc000, 64 * 1024 - 1);
- pci_region_init(&pci_bios_mem_region,
- BUILD_PCIMEM_START, BUILD_PCIMEM_END - 1);
- pci_region_init(&pci_bios_prefmem_region,
- BUILD_PCIPREFMEM_START, BUILD_PCIPREFMEM_END - 1);
-
dprintf(1, "=== PCI bus & bridge init ===\n");
pci_bios_init_bus();
@@ -794,14 +605,6 @@ pci_setup(void)
pci_bios_init_bus_bases(&busses[0]);
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);
diff --git a/src/util.h b/src/util.h
index 303c524..b245386 100644
--- a/src/util.h
+++ b/src/util.h
@@ -344,35 +344,6 @@ void make_bios_writable(void);
void make_bios_readonly(void);
void qemu_prep_reset(void);
-// pci_region.c
-// region allocator. pci region allocates the requested region
-// sequentially with overflow check.
-struct pci_region {
- // The region is [first, last].
- u32 first;
- u32 last;
-
- // The next allocation starts from here.
- // i.e. [start, cur_first) is allocated.
- // Right after initialization cur_first == first.
- u32 cur_first;
-};
-// initialize the pci_region of [first, last]
-// last must not be 0xffffffff
-void pci_region_init(struct pci_region *r, u32 first, u32 last);
-// allocate the region of size
-u32 pci_region_alloc(struct pci_region *r, u32 size);
-// make the next allocation aligned to align
-u32 pci_region_align(struct pci_region *r, u32 align);
-// revert the allocation to addr.
-void pci_region_revert(struct pci_region *r, u32 addr);
-// make the allocation fail.
-u32 pci_region_disable(struct pci_region *r);
-// returns the current allocation point.
-u32 pci_region_addr(const struct pci_region *r);
-// returns the region size.
-u32 pci_region_size(const struct pci_region *r);
-
// pciinit.c
extern const u8 pci_irqs[4];
void pci_setup(void);
--
1.7.1
More information about the SeaBIOS
mailing list