summaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
authorEric Biederman <ebiederm@xmission.com>2004-10-14 20:54:17 +0000
committerEric Biederman <ebiederm@xmission.com>2004-10-14 20:54:17 +0000
commitb78c1972feed4c57eebba8f94de86a91e32c3fa7 (patch)
tree2ba60cfe9866f4d1e2de1d9727d0e548139afb35 /src/boot
parentcadfd4c462673bcb44cdb1f193e52c95a888762a (diff)
downloadcoreboot-b78c1972feed4c57eebba8f94de86a91e32c3fa7.tar.xz
- First pass through with with device tree enhancement merge. Most of the mechanisms should
be in place but don't expect anything to quite work yet. git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1662 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/elfboot.c6
-rw-r--r--src/boot/hardwaremain.c176
2 files changed, 26 insertions, 156 deletions
diff --git a/src/boot/elfboot.c b/src/boot/elfboot.c
index 272aee9d73..eeb4e40cd4 100644
--- a/src/boot/elfboot.c
+++ b/src/boot/elfboot.c
@@ -440,6 +440,12 @@ static int load_elf_segments(
end = dest + ptr->s_memsz;
middle = dest + ptr->s_filesz;
start_offset = ptr->s_offset;
+#if 1
+ if (ptr->s_filesz == 0) {
+ start_offset = offset;
+ }
+#endif
+
printk_spew("[ 0x%016lx, %016lx, 0x%016lx) <- %016lx\n",
(unsigned long)dest,
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index efaf59519d..d292e5dcd4 100644
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -27,129 +27,28 @@ it with the version available from LANL.
#include <console/console.h>
-#include <cpu/cpu.h>
#include <mem.h>
#include <version.h>
-#include <smp/start_stop.h>
#include <boot/tables.h>
-#include <part/sizeram.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/chip.h>
#include <delay.h>
+#include <stdlib.h>
#include <part/hard_reset.h>
-#include <smp/atomic.h>
#include <boot/elf.h>
-
-#ifndef CONFIG_MAX_PHYSICAL_CPUS
-#define CONFIG_MAX_PHYSICAL_CPUS CONFIG_MAX_CPUS
-#endif
-
-#if CONFIG_FS_STREAM == 1
-extern int filo(struct lb_memory *);
-#endif
-
-/* The processor map.
- * Now that SMP is in linuxbios, and Linux counts on us
- * giving accurate information about processors, we need a map
- * of what processors are out there. This could be a bit mask,
- * but we will be optimistic and hope we someday run on
- * REALLY BIG SMPs. Also we may need more than one bit of
- * info per processor at some point. I hope we don't need
- * anything more complex than an int.
- */
-static unsigned long processor_map[CONFIG_MAX_CPUS];
-
-static struct mem_range *get_ramsize(void)
-{
- struct mem_range *mem = 0;
- if (!mem) {
- mem = sizeram();
- }
- if (!mem) {
- printk_emerg("No memory size information!\n");
- for(;;) {
- /* Ensure this loop is not optimized away */
- asm volatile("":/* outputs */:/*inputs */ :"memory");
- }
- }
- return mem;
-}
-
-
-#if CONFIG_SMP == 1
-/* Number of cpus that are currently running in linuxbios */
-static atomic_t active_cpus = ATOMIC_INIT(1);
-
-/**
- * @brief Initialize secondary processors.
- *
- *
- * @todo move this into a method of per cpu data structure.
- */
-void secondary_cpu_init(void)
-{
- struct mem_range *mem;
- unsigned long id;
- int index;
-
- atomic_inc(&active_cpus);
-
- printk_debug("%s\n", __FUNCTION__);
- mem = get_ramsize();
- id = cpu_initialize(mem);
- index = processor_index(id);
- printk_debug("%s %d/%u\n", __FUNCTION__ , index, id);
- processor_map[index] = CPU_ENABLED;
-
- atomic_dec(&active_cpus);
- stop_cpu(id);
-}
-
-static void wait_for_other_cpus(void)
-{
- int old_active_count, active_count;
- int i;
- old_active_count = 1;
-
- active_count = atomic_read(&active_cpus);
- while (active_count > 1) {
- if (active_count != old_active_count) {
- printk_info("Waiting for %d CPUS to stop\n",
- active_count);
- old_active_count = active_count;
- }
- active_count = atomic_read(&active_cpus);
- }
-
- for (i = 0; i < CONFIG_MAX_CPUS; i++) {
- if (!(processor_map[i] & CPU_ENABLED)) {
- printk_err("CPU %d did not initialize!\n", i);
- processor_map[i] = 0;
- }
- }
-
- printk_debug("All AP CPUs stopped\n");
-}
-
-#else /* CONIFG_SMP */
-#define wait_for_other_cpus() do {} while(0)
-#endif /* CONFIG_SMP */
-
-/**
- * @brief Main program of LinuxBIOS
- *
- * @param boot_complete
- */
void hardwaremain(int boot_complete)
{
- /* Processor ID of the BOOT cpu (i.e. the one running this code) */
- unsigned long boot_cpu;
- int boot_index;
- struct mem_range *mem, *tmem;
+ /* the order here is a bit tricky. We don't want to do much of
+ * anything that uses config registers until after PciAllocateResources
+ * since that function also figures out what kind of config strategy
+ * to use (type 1 or type 2).
+ * so we turn on cache, then worry about PCI setup, then do other
+ * things, so that the other work can use the PciRead* and PciWrite*
+ * functions.
+ */
struct lb_memory *lb_mem;
- unsigned long totalmem;
post_code(0x80);
@@ -160,8 +59,8 @@ void hardwaremain(int boot_complete)
post_code(0x39);
printk_notice("LinuxBIOS-%s%s %s %s...\n",
- linuxbios_version, linuxbios_extra_version,
- linuxbios_build, (boot_complete)?"rebooting":"booting");
+ linuxbios_version, linuxbios_extra_version, linuxbios_build,
+ (boot_complete)?"rebooting":"booting");
post_code(0x40);
@@ -172,66 +71,31 @@ void hardwaremain(int boot_complete)
CONFIGURE(CONF_PASS_PRE_PCI);
- /* determine how software can generate PCI configuration transactions
- * in this system */
+ /* pick how to scan the bus. This is first so we can get at memory size. */
printk_info("Finding PCI configuration type.\n");
pci_set_method();
post_code(0x5f);
-
- /* convert static device structures into dynamic device structures
- * before probing dynamic devices. */
enumerate_static_devices();
-
- /* probe the existence of dynamic devices and construct the dynamic
- * device tree. */
dev_enumerate();
post_code(0x66);
-
- /* probe and assign the resources required by the dynamic devices */
+ /* Now do the real bus.
+ * We round the total ram up a lot for thing like the SISFB, which
+ * shares high memory with the CPU.
+ */
dev_configure();
post_code(0x88);
- /* enable the resources probed and assigned in dev_configure() */
dev_enable();
- /* do the device specific init in additional to simple resources
- * allocation performed in dev_enable() */
dev_initialize();
post_code(0x89);
CONFIGURE(CONF_PASS_POST_PCI);
- /* this is done last because some devices may 'steal' memory from
- * the system during device initialization. */
- mem = get_ramsize();
- post_code(0x70);
- for (totalmem = 0, tmem = mem; tmem->sizek; tmem++) {
- totalmem += tmem->sizek;
- }
- /* Round to the nearest mega */
- printk_info("totalram: %ldM\n", (totalmem + 512) >> 10);
-
- /* fully initialize the boot processor */
- boot_cpu = cpu_initialize(mem);
- boot_index = processor_index(boot_cpu);
- printk_spew("BOOT CPU is %d\n", boot_cpu);
- processor_map[boot_index] = CPU_BOOTPROCESSOR|CPU_ENABLED;
-
- /* start up other processors, it works like a pthread_create() or
- * fork(), instead of running the initialization code for all devices
- * as the boot processor, they start from secondary_cpu_init(), doing
- * cpu initialization only. */
- post_code(0x75);
- startup_other_cpus(processor_map);
-
- /* like pthread_join() or wait(), wait other processors finishing
- * their execution of secondary_cpu_init() and make certain we are
- * the only cpu running in LinuxBIOS */
- wait_for_other_cpus();
-
- /* Now that we have collected all of our information, write our
- * configuration tables. */
- lb_mem = write_tables(mem, processor_map);
+ /* Now that we have collected all of our information
+ * write our configuration tables.
+ */
+ lb_mem = write_tables();
CONFIGURE(CONF_PASS_PRE_BOOT);