aboutsummaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/amd/dualcore/amd_sibling.c18
-rw-r--r--src/cpu/amd/model_gx2/vsmsetup.c2
-rw-r--r--src/cpu/amd/model_lx/vsmsetup.c2
-rw-r--r--src/cpu/intel/hyperthreading/intel_sibling.c12
-rw-r--r--src/cpu/simple_init/simple_cpu_init.c2
-rw-r--r--src/cpu/x86/lapic/lapic_cpu_init.c10
6 files changed, 23 insertions, 23 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)
diff --git a/src/cpu/amd/model_gx2/vsmsetup.c b/src/cpu/amd/model_gx2/vsmsetup.c
index 8c0adf891a..dc1b680836 100644
--- a/src/cpu/amd/model_gx2/vsmsetup.c
+++ b/src/cpu/amd/model_gx2/vsmsetup.c
@@ -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;
diff --git a/src/cpu/amd/model_lx/vsmsetup.c b/src/cpu/amd/model_lx/vsmsetup.c
index baf96c0bbc..9c47a4f6d9 100644
--- a/src/cpu/amd/model_lx/vsmsetup.c
+++ b/src/cpu/amd/model_lx/vsmsetup.c
@@ -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;
diff --git a/src/cpu/intel/hyperthreading/intel_sibling.c b/src/cpu/intel/hyperthreading/intel_sibling.c
index 13bfdf35fb..35f509e195 100644
--- a/src/cpu/intel/hyperthreading/intel_sibling.c
+++ b/src/cpu/intel/hyperthreading/intel_sibling.c
@@ -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);
}
}
diff --git a/src/cpu/simple_init/simple_cpu_init.c b/src/cpu/simple_init/simple_cpu_init.c
index e0a80c6820..2138497a04 100644
--- a/src/cpu/simple_init/simple_cpu_init.c
+++ b/src/cpu/simple_init/simple_cpu_init.c
@@ -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);
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index 4a879c561a..2025621aa8 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -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 */
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 02:52:19 +0000