diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2009-02-28 20:10:20 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2009-02-28 20:10:20 +0000 |
| commit | 2b34db8d1de2d63ffa829fe03db0ce2aaba40233 (patch) | |
| tree | ba18eb28d25a5e5d28c3b8609b5a292982eed08c /src/cpu/amd/dualcore/amd_sibling.c | |
| parent | 3c924d2f48ba1bb6a9d5a20453f230bb6be726e0 (diff) | |
| download | coreboot-2b34db8d1de2d63ffa829fe03db0ce2aaba40233.tar.xz | |
coreboot-v2: drop this ugly historic union name in v2 that was dropped in v3
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
Diffstat (limited to 'src/cpu/amd/dualcore/amd_sibling.c')
| -rw-r--r-- | src/cpu/amd/dualcore/amd_sibling.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/cpu/amd/dualcore/amd_sibling.c b/src/cpu/amd/dualcore/amd_sibling.c index 3bd604a79f..15c319c4a9 100644 --- a/src/cpu/amd/dualcore/amd_sibling.c +++ b/src/cpu/amd/dualcore/amd_sibling.c @@ -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) |