diff options
Diffstat (limited to 'src/cpu')
-rw-r--r-- | src/cpu/Kconfig | 1 | ||||
-rw-r--r-- | src/cpu/Makefile.inc | 1 | ||||
-rw-r--r-- | src/cpu/emulation/Kconfig | 2 | ||||
-rw-r--r-- | src/cpu/emulation/Makefile.inc | 1 | ||||
-rw-r--r-- | src/cpu/emulation/qemu-x86/Kconfig | 3 | ||||
-rw-r--r-- | src/cpu/emulation/qemu-x86/Makefile.inc | 1 | ||||
-rw-r--r-- | src/cpu/emulation/qemu-x86/chip.h | 6 | ||||
-rw-r--r-- | src/cpu/emulation/qemu-x86/northbridge.c | 159 | ||||
-rw-r--r-- | src/cpu/emulation/qemu-x86/northbridge.h | 5 |
9 files changed, 0 insertions, 179 deletions
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig index c336185705..c63cf2b52d 100644 --- a/src/cpu/Kconfig +++ b/src/cpu/Kconfig @@ -1,5 +1,4 @@ source src/cpu/amd/Kconfig -source src/cpu/emulation/Kconfig source src/cpu/intel/Kconfig source src/cpu/via/Kconfig source src/cpu/x86/Kconfig diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc index 4e588069a0..57273cf8c3 100644 --- a/src/cpu/Makefile.inc +++ b/src/cpu/Makefile.inc @@ -1,4 +1,3 @@ subdirs-y += amd subdirs-y += intel subdirs-y += via -subdirs-y += emulation diff --git a/src/cpu/emulation/Kconfig b/src/cpu/emulation/Kconfig deleted file mode 100644 index 25d55e689b..0000000000 --- a/src/cpu/emulation/Kconfig +++ /dev/null @@ -1,2 +0,0 @@ -source src/cpu/emulation/qemu-x86/Kconfig - diff --git a/src/cpu/emulation/Makefile.inc b/src/cpu/emulation/Makefile.inc deleted file mode 100644 index f98d3854be..0000000000 --- a/src/cpu/emulation/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -subdirs-$(CONFIG_CPU_EMULATION_QEMU_X86) += qemu-x86 diff --git a/src/cpu/emulation/qemu-x86/Kconfig b/src/cpu/emulation/qemu-x86/Kconfig deleted file mode 100644 index dd7fcef78c..0000000000 --- a/src/cpu/emulation/qemu-x86/Kconfig +++ /dev/null @@ -1,3 +0,0 @@ -config CPU_EMULATION_QEMU_X86 - bool - diff --git a/src/cpu/emulation/qemu-x86/Makefile.inc b/src/cpu/emulation/qemu-x86/Makefile.inc deleted file mode 100644 index ea44b26cbe..0000000000 --- a/src/cpu/emulation/qemu-x86/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -obj-y += northbridge.o diff --git a/src/cpu/emulation/qemu-x86/chip.h b/src/cpu/emulation/qemu-x86/chip.h deleted file mode 100644 index 1183200ff7..0000000000 --- a/src/cpu/emulation/qemu-x86/chip.h +++ /dev/null @@ -1,6 +0,0 @@ -struct cpu_emulation_qemu_x86_config -{ -}; - -extern struct chip_operations cpu_emulation_qemu_x86_ops; - diff --git a/src/cpu/emulation/qemu-x86/northbridge.c b/src/cpu/emulation/qemu-x86/northbridge.c deleted file mode 100644 index d2e5abea91..0000000000 --- a/src/cpu/emulation/qemu-x86/northbridge.c +++ /dev/null @@ -1,159 +0,0 @@ -#include <console/console.h> -#include <arch/io.h> -#include <stdint.h> -#include <device/device.h> -#include <device/pci.h> -#include <stdlib.h> -#include <string.h> -#include <bitops.h> -#include "chip.h" -#include "northbridge.h" -#include <delay.h> - -static void ram_resource(device_t dev, unsigned long index, - unsigned long basek, unsigned long sizek) -{ - struct resource *resource; - - if (!sizek) { - return; - } - resource = new_resource(dev, index); - resource->base = ((resource_t)basek) << 10; - resource->size = ((resource_t)sizek) << 10; - resource->flags = IORESOURCE_MEM | IORESOURCE_CACHEABLE | \ - IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; -} - -static void tolm_test(void *gp, struct device *dev, struct resource *new) -{ - struct resource **best_p = gp; - struct resource *best; - best = *best_p; - if (!best || (best->base > new->base)) { - best = new; - } - *best_p = best; -} - -static uint32_t find_pci_tolm(struct bus *bus) -{ - struct resource *min; - uint32_t tolm; - min = 0; - search_bus_resources(bus, IORESOURCE_MEM, IORESOURCE_MEM, tolm_test, &min); - tolm = 0xffffffffUL; - if (min && tolm > min->base) { - tolm = min->base; - } - return tolm; -} - -#if CONFIG_WRITE_HIGH_TABLES==1 -#define HIGH_TABLES_SIZE 64 // maximum size of high tables in KB -extern uint64_t high_tables_base, high_tables_size; -#endif - -static void cpu_pci_domain_set_resources(device_t dev) -{ - static const uint8_t ramregs[] = { - 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x56, 0x57 - }; - device_t mc_dev; - uint32_t pci_tolm; - - pci_tolm = find_pci_tolm(&dev->link[0]); - mc_dev = dev->link[0].children; - if (mc_dev) { - unsigned long tomk, tolmk; - unsigned char rambits; - int i, idx; - - for(rambits = 0, i = 0; i < ARRAY_SIZE(ramregs); i++) { - unsigned char reg; - reg = pci_read_config8(mc_dev, ramregs[i]); - /* these are ENDING addresses, not sizes. - * if there is memory in this slot, then reg will be > rambits. - * So we just take the max, that gives us total. - * We take the highest one to cover for once and future coreboot - * bugs. We warn about bugs. - */ - if (reg > rambits) - rambits = reg; - if (reg < rambits) - printk(BIOS_ERR, "ERROR! register 0x%x is not set!\n", - ramregs[i]); - } - if (rambits == 0) { - printk(BIOS_ERR, "RAM size config registers are empty; defaulting to 64 MBytes\n"); - rambits = 8; - } - printk(BIOS_DEBUG, "I would set ram size to 0x%x Kbytes\n", (rambits)*8*1024); - tomk = rambits*8*1024; - /* Compute the top of Low memory */ - tolmk = pci_tolm >> 10; - if (tolmk >= tomk) { - /* The PCI hole does not overlap the memory. */ - tolmk = tomk; - } - - /* Report the memory regions. */ - idx = 10; - ram_resource(dev, idx++, 0, 640); - ram_resource(dev, idx++, 768, tolmk - 768); - -#if CONFIG_WRITE_HIGH_TABLES==1 - /* Leave some space for ACPI, PIRQ and MP tables */ - high_tables_base = (tomk - HIGH_TABLES_SIZE) * 1024; - high_tables_size = HIGH_TABLES_SIZE * 1024; -#endif - } - assign_resources(&dev->link[0]); -} - -static void cpu_pci_domain_read_resources(struct device *dev) -{ - struct resource *res; - - pci_domain_read_resources(dev); - - /* Reserve space for the IOAPIC. This should be in the Southbridge, - * but I couldn't tell which device to put it in. */ - res = new_resource(dev, 2); - res->base = 0xfec00000UL; - res->size = 0x100000UL; - res->limit = 0xffffffffUL; - res->flags = IORESOURCE_MEM | IORESOURCE_FIXED | IORESOURCE_STORED | - IORESOURCE_ASSIGNED; - - /* Reserve space for the LAPIC. There's one in every processor, but - * the space only needs to be reserved once, so we do it here. */ - res = new_resource(dev, 3); - res->base = 0xfee00000UL; - res->size = 0x10000UL; - res->limit = 0xffffffffUL; - res->flags = IORESOURCE_MEM | IORESOURCE_FIXED | IORESOURCE_STORED | - IORESOURCE_ASSIGNED; -} - -static struct device_operations pci_domain_ops = { - .read_resources = cpu_pci_domain_read_resources, - .set_resources = cpu_pci_domain_set_resources, - .enable_resources = enable_childrens_resources, - .init = 0, - .scan_bus = pci_domain_scan_bus, -}; - -static void enable_dev(struct device *dev) -{ - /* Set the operations if it is a special bus type */ - if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) { - dev->ops = &pci_domain_ops; - pci_set_method(dev); - } -} - -struct chip_operations cpu_emulation_qemu_x86_ops = { - CHIP_NAME("QEMU Northbridge") - .enable_dev = enable_dev, -}; diff --git a/src/cpu/emulation/qemu-x86/northbridge.h b/src/cpu/emulation/qemu-x86/northbridge.h deleted file mode 100644 index 9ff688be2f..0000000000 --- a/src/cpu/emulation/qemu-x86/northbridge.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef NORTHBRIDGE_EMULATION_QEMU_X86_H -#define NORTHBRIDGE_EMULATION_QEMU_X86_H - - -#endif /* NORTHBRIDGE_EMULATION_QEMU_X86 */ |