sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coreboot-v2: drop this ugly historic union name in v2 that was dropped in v3

Browse Source 
a long time ago. This will make it easier to port v2 boards forward to v3 at
some point (and other things)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3964 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer
2009-02-28 20:10:20 +00:00
committed by Stefan Reinauer
parent 3c924d2f48
commit 2b34db8d1d
99 changed files with 433 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cpu/amd/dualcore/amd_sibling.c
View File

@ -142,7 +142,7 @@ void amd_sibling_init(device_t cpu)
#if 1
printk_debug("CPU: %u %d siblings\n",
cpu->path.u.apic.apic_id,
cpu->path.apic.apic_id,
siblings);
#endif
@ -151,8 +151,8 @@ void amd_sibling_init(device_t cpu)
id = get_node_core_id(nb_cfg_54); // pre e0 nb_cfg_54 can not be set
/* See if I am a sibling cpu */
//if ((cpu->path.u.apic.apic_id>>(nb_cfg_54?0:3)) & siblings ) { // siblings = 1, 3, 7, 15,....
//if ( ( (cpu->path.u.apic.apic_id>>(nb_cfg_54?0:3)) % (siblings+1) ) != 0 ) {
//if ((cpu->path.apic.apic_id>>(nb_cfg_54?0:3)) & siblings ) { // siblings = 1, 3, 7, 15,....
//if ( ( (cpu->path.apic.apic_id>>(nb_cfg_54?0:3)) % (siblings+1) ) != 0 ) {
if(id.coreid != 0) {
if (disable_siblings) {
cpu->enabled = 0;
@ -168,12 +168,12 @@ void amd_sibling_init(device_t cpu)
device_t new;
/* Build the cpu device path */
cpu_path.type = DEVICE_PATH_APIC;
cpu_path.u.apic.apic_id = cpu->path.u.apic.apic_id + i * (nb_cfg_54?1:8);
cpu_path.apic.apic_id = cpu->path.apic.apic_id + i * (nb_cfg_54?1:8);
if(id.nodeid == 0) {
// need some special processing, because may the bsp is not lifted, but the core1 is lifted
//defined in northbridge.c
if(sysconf.enabled_apic_ext_id && (!sysconf.lift_bsp_apicid)) {
cpu->path.u.apic.apic_id += sysconf.apicid_offset;
cpu->path.apic.apic_id += sysconf.apicid_offset;
}
}
@ -188,13 +188,13 @@ void amd_sibling_init(device_t cpu)
new->initialized = 0;
}
new->path.u.apic.node_id = cpu->path.u.apic.node_id;
new->path.u.apic.core_id = i;
new->path.apic.node_id = cpu->path.apic.node_id;
new->path.apic.core_id = i;
#if 1
printk_debug("CPU: %u has sibling %u\n",
cpu->path.u.apic.apic_id,
new->path.u.apic.apic_id);
cpu->path.apic.apic_id,
new->path.apic.apic_id);
#endif
if(new->enabled && !new->initialized)

2
src/cpu/amd/model_gx2/vsmsetup.c
View File

@ -651,7 +651,7 @@ pcibios(unsigned long *pedi, unsigned long *pesi, unsigned long *pebp,
// busnum is an unsigned char;
// devfn is an int, so we mask it off.
busdevfn = (dev->bus->secondary << 8)
| (dev->path.u.pci.devfn & 0xff);
| (dev->path.pci.devfn & 0xff);
printk_debug("0x%x: return 0x%x\n", func, busdevfn);
*pebx = busdevfn;
retval = 0;

2
src/cpu/amd/model_lx/vsmsetup.c
View File

@ -661,7 +661,7 @@ pcibios(unsigned long *pedi, unsigned long *pesi, unsigned long *pebp,
// busnum is an unsigned char;
// devfn is an int, so we mask it off.
busdevfn = (dev->bus->secondary << 8)
| (dev->path.u.pci.devfn & 0xff);
| (dev->path.pci.devfn & 0xff);
printk_debug("0x%x: return 0x%x\n", func,
busdevfn);
*pebx = busdevfn;

12
src/cpu/intel/hyperthreading/intel_sibling.c
View File

@ -32,12 +32,12 @@ void intel_sibling_init(device_t cpu)
#if 1
printk_debug("CPU: %u %d siblings\n",
cpu->path.u.apic.apic_id,
cpu->path.apic.apic_id,
siblings);
#endif
/* See if I am a sibling cpu */
if (cpu->path.u.apic.apic_id & (siblings -1)) {
if (cpu->path.apic.apic_id & (siblings -1)) {
if (disable_siblings) {
cpu->enabled = 0;
}
@ -50,7 +50,7 @@ void intel_sibling_init(device_t cpu)
device_t new;
/* Build the cpu device path */
cpu_path.type = DEVICE_PATH_APIC;
cpu_path.u.apic.apic_id = cpu->path.u.apic.apic_id + i;
cpu_path.apic.apic_id = cpu->path.apic.apic_id + i;
/* Allocate the new cpu device structure */
@ -62,14 +62,14 @@ void intel_sibling_init(device_t cpu)
#if 1
printk_debug("CPU: %u has sibling %u\n",
cpu->path.u.apic.apic_id,
new->path.u.apic.apic_id);
cpu->path.apic.apic_id,
new->path.apic.apic_id);
#endif
/* Start the new cpu */
if (!start_cpu(new)) {
/* Record the error in cpu? */
printk_err("CPU %u would not start!\n",
new->path.u.apic.apic_id);
new->path.apic.apic_id);
}
}

2
src/cpu/simple_init/simple_cpu_init.c
View File

@ -17,7 +17,7 @@ void initialize_cpus(struct bus *cpu_bus)
/* Get the device path of the boot cpu */
cpu_path.type = DEVICE_PATH_CPU;
cpu_path.u.cpu.id = 0;
cpu_path.cpu.id = 0;
/* Find the device struct for the boot cpu */
info->cpu = alloc_find_dev(cpu_bus, &cpu_path);

10
src/cpu/x86/lapic/lapic_cpu_init.c
View File

@ -223,7 +223,7 @@ int start_cpu(device_t cpu)
spin_lock(&start_cpu_lock);
/* Get the cpu's apicid */
apicid = cpu->path.u.apic.apic_id;
apicid = cpu->path.apic.apic_id;
/* Get an index for the new processor */
index = ++last_cpu_index;
@ -389,7 +389,7 @@ static void start_other_cpus(struct bus *cpu_bus, device_t bsp_cpu)
if (!start_cpu(cpu)) {
/* Record the error in cpu? */
printk_err("CPU 0x%02x would not start!\n",
cpu->path.u.apic.apic_id);
cpu->path.apic.apic_id);
}
#if SERIAL_CPU_INIT == 1
#if CONFIG_MAX_CPUS>2
@ -421,7 +421,7 @@ static void wait_other_cpus_stop(struct bus *cpu_bus)
}
if (!cpu->initialized) {
printk_err("CPU 0x%02x did not initialize!\n",
cpu->path.u.apic.apic_id);
cpu->path.apic.apic_id);
}
}
printk_debug("All AP CPUs stopped\n");
@ -455,11 +455,11 @@ void initialize_cpus(struct bus *cpu_bus)
/* Get the device path of the boot cpu */
cpu_path.type = DEVICE_PATH_APIC;
cpu_path.u.apic.apic_id = lapicid();
cpu_path.apic.apic_id = lapicid();
#else
/* Get the device path of the boot cpu */
cpu_path.type = DEVICE_PATH_CPU;
cpu_path.u.cpu.id = 0;
cpu_path.cpu.id = 0;
#endif
/* Find the device structure for the boot cpu */