qemu: drop "northbridge.c" from src/cpu/...
authorStefan Reinauer <stepan@coresystems.de>
Mon, 29 Mar 2010 21:17:25 +0000 (21:17 +0000)
committerStefan Reinauer <stepan@openbios.org>
Mon, 29 Mar 2010 21:17:25 +0000 (21:17 +0000)
It's not a real northbridge, so I just move it into the mainboard directory for
now (until we maybe have a qemu-q35 image some day?)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5316 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

14 files changed:
src/cpu/Kconfig
src/cpu/Makefile.inc
src/cpu/emulation/Kconfig [deleted file]
src/cpu/emulation/Makefile.inc [deleted file]
src/cpu/emulation/qemu-x86/Kconfig [deleted file]
src/cpu/emulation/qemu-x86/Makefile.inc [deleted file]
src/cpu/emulation/qemu-x86/chip.h [deleted file]
src/cpu/emulation/qemu-x86/northbridge.c [deleted file]
src/cpu/emulation/qemu-x86/northbridge.h [deleted file]
src/mainboard/emulation/qemu-x86/Kconfig
src/mainboard/emulation/qemu-x86/Makefile.inc
src/mainboard/emulation/qemu-x86/chip.h
src/mainboard/emulation/qemu-x86/northbridge.c [new file with mode: 0644]
src/mainboard/emulation/qemu-x86/romstage.c

index c33618570546ee8df6e729571af005700af985ef..c63cf2b52d784ad39b56397cf7281ba02050c89c 100644 (file)
@@ -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
index 4e588069a03516d43f2852ba2bc6c46ab5779b06..57273cf8c302551cf140c3dbdf0661fd050acb50 100644 (file)
@@ -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 (file)
index 25d55e6..0000000
+++ /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 (file)
index f98d385..0000000
+++ /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 (file)
index dd7fcef..0000000
+++ /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 (file)
index ea44b26..0000000
+++ /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 (file)
index 1183200..0000000
+++ /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 (file)
index d2e5abe..0000000
+++ /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 (file)
index 9ff688b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef NORTHBRIDGE_EMULATION_QEMU_X86_H
-#define NORTHBRIDGE_EMULATION_QEMU_X86_H
-
-
-#endif /* NORTHBRIDGE_EMULATION_QEMU_X86 */
index 2894c45bec505cc9d0c7950a110e29a954427891..27a334d073a8e89bd5f7f2a0ce9d060d556eda45 100644 (file)
@@ -2,7 +2,6 @@ config BOARD_EMULATION_QEMU_X86
        bool "QEMU x86"
        select ARCH_X86
        select SOUTHBRIDGE_INTEL_I82371EB
-       select CPU_EMULATION_QEMU_X86
        select ROMCC
        select HAVE_PIRQ_TABLE
        select BOARD_ROMSIZE_KB_256
index 76784015ba298e4eb736de1e2a5e37653b2fc3ae..20ca9771ab63dd2f3c971174e0f3022204b67b25 100644 (file)
@@ -1 +1,3 @@
 ROMCCFLAGS := -mcpu=i386 -O
+
+obj-y += northbridge.o
index 06f11d08629333efc36805ed06f74acfb8f00419..b9394195d7e5fa86d29ec9130af1dce84a850aff 100644 (file)
@@ -2,3 +2,10 @@ extern struct chip_operations mainboard_ops;
 
 struct mainboard_config {
 };
+
+struct cpu_emulation_qemu_x86_config
+{
+};
+
+extern struct chip_operations cpu_emulation_qemu_x86_ops;
+
diff --git a/src/mainboard/emulation/qemu-x86/northbridge.c b/src/mainboard/emulation/qemu-x86/northbridge.c
new file mode 100644 (file)
index 0000000..4184d14
--- /dev/null
@@ -0,0 +1,158 @@
+#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 <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,
+};
index f9da1b518812b674dfff25758e1773df9af83db4..9739d06eab09830b4abb56ff97a3dc5e74f47282 100644 (file)
@@ -1,6 +1,5 @@
 #define ASSEMBLY 1
 
-
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
@@ -19,7 +18,7 @@
 static void main(void)
 {
        /*      init_timer();*/
-       outb(5, 0x80);
+       post_code(0x05);
        
        uart_init();
        console_init();