diff options
Diffstat (limited to 'src/arch/arm64/cpu.c')
-rw-r--r-- | src/arch/arm64/cpu.c | 225 |
1 files changed, 5 insertions, 220 deletions
diff --git a/src/arch/arm64/cpu.c b/src/arch/arm64/cpu.c index a263e1b873..eb08735292 100644 --- a/src/arch/arm64/cpu.c +++ b/src/arch/arm64/cpu.c @@ -19,163 +19,19 @@ #include <stdint.h> #include <stdlib.h> -#include <arch/barrier.h> #include <arch/lib_helpers.h> #include <cpu/cpu.h> #include <console/console.h> -#include <gic.h> #include "cpu-internal.h" -static struct cpu_info cpu_infos[CONFIG_MAX_CPUS]; +struct cpu_info cpu_infos[CONFIG_MAX_CPUS]; struct cpu_info *bsp_cpu_info; -static inline struct cpu_info *cpu_info_for_cpu(unsigned int id) -{ - return &cpu_infos[id]; -} - struct cpu_info *cpu_info(void) { return cpu_info_for_cpu(smp_processor_id()); } -static int cpu_online(struct cpu_info *ci) -{ - return load_acquire(&ci->online) != 0; -} - -static void cpu_mark_online(struct cpu_info *ci) -{ - store_release(&ci->online, 1); -} - -static inline void cpu_disable_dev(device_t dev) -{ - dev->enabled = 0; -} - -static struct cpu_driver *locate_cpu_driver(uint32_t midr) -{ - struct cpu_driver *cur; - - for (cur = cpu_drivers; cur != ecpu_drivers; cur++) { - const struct cpu_device_id *id_table = cur->id_table; - - for (; id_table->midr != CPU_ID_END; id_table++) { - if (id_table->midr == midr) - return cur; - } - } - return NULL; -} - -static int cpu_set_device_operations(device_t dev) -{ - uint32_t midr; - struct cpu_driver *driver; - - midr = raw_read_midr_el1(); - driver = locate_cpu_driver(midr); - - if (driver == NULL) { - printk(BIOS_WARNING, "No CPU driver for MIDR %08x\n", midr); - return -1; - } - dev->ops = driver->ops; - return 0; -} - -/* Set up default SCR values. */ -static void el3_init(void) -{ - uint32_t scr; - - if (get_current_el() != EL3) - return; - - scr = raw_read_scr_el3(); - /* Default to non-secure EL1 and EL0. */ - scr &= ~(SCR_NS_MASK); - scr |= SCR_NS_ENABLE; - /* Disable IRQ, FIQ, and external abort interrupt routing. */ - scr &= ~(SCR_IRQ_MASK | SCR_FIQ_MASK | SCR_EA_MASK); - scr |= SCR_IRQ_DISABLE | SCR_FIQ_DISABLE | SCR_EA_DISABLE; - /* Enable HVC */ - scr &= ~(SCR_HVC_MASK); - scr |= SCR_HVC_ENABLE; - /* Disable SMC */ - scr &= ~(SCR_SMC_MASK); - scr |= SCR_SMC_DISABLE; - /* Disable secure instruction fetches. */ - scr &= ~(SCR_SIF_MASK); - scr |= SCR_SIF_DISABLE; - /* All lower exception levels 64-bit by default. */ - scr &= ~(SCR_RW_MASK); - scr |= SCR_LOWER_AARCH64; - /* Disable secure EL1 access to secure timer. */ - scr &= ~(SCR_ST_MASK); - scr |= SCR_ST_DISABLE; - /* Don't trap on WFE or WFI instructions. */ - scr &= ~(SCR_TWI_MASK | SCR_TWE_MASK); - scr |= SCR_TWI_DISABLE | SCR_TWE_DISABLE; - raw_write_scr_el3(scr); - isb(); -} - -static void init_this_cpu(void *arg) -{ - struct cpu_info *ci = arg; - device_t dev = ci->cpu; - - cpu_set_device_operations(dev); - - el3_init(); - - /* Initialize the GIC. */ - gic_init(); - - if (dev->ops != NULL && dev->ops->init != NULL) { - dev->initialized = 1; - printk(BIOS_DEBUG, "%s init\n", dev_path(dev)); - dev->ops->init(dev); - } -} - -/* Fill in cpu_info structures according to device tree. */ -static void init_cpu_info(struct bus *bus) -{ - device_t cur; - - for (cur = bus->children; cur != NULL; cur = cur->sibling) { - struct cpu_info *ci; - unsigned int id = cur->path.cpu.id; - - if (cur->path.type != DEVICE_PATH_CPU) - continue; - - /* IDs are currently mapped 1:1 with logical CPU numbers. */ - if (id >= CONFIG_MAX_CPUS) { - printk(BIOS_WARNING, - "CPU id %x too large. Disabling.\n", id); - cpu_disable_dev(cur); - continue; - } - - ci = cpu_info_for_cpu(id); - if (ci->cpu != NULL) { - printk(BIOS_WARNING, - "Duplicate ID %x in device tree.\n", id); - cpu_disable_dev(cur); - } - - ci->cpu = cur; - ci->id = cur->path.cpu.id; - } - - /* Mark current cpu online. */ - cpu_mark_online(cpu_info()); -} - static inline int action_queue_empty(struct cpu_action_queue *q) { return load_acquire_exclusive(&q->todo) == NULL; @@ -246,8 +102,8 @@ static void action_run_on_cpu(struct cpu_info *ci, struct cpu_action *action, { struct cpu_action_queue *q = &ci->action_queue; - /* Don't run actions on non-online or enabled devices. */ - if (!cpu_online(ci) || ci->cpu == NULL || !ci->cpu->enabled) + /* Don't run actions on non-online cpus. */ + if (!cpu_online(ci)) return; if (ci->id == smp_processor_id()) { @@ -333,14 +189,12 @@ int arch_run_on_all_cpus_but_self_async(struct cpu_action *action) return __arch_run_on_all_cpus_but_self(action, 0); } -void arch_secondary_cpu_init(void) + +void arch_cpu_wait_for_action(void) { struct cpu_info *ci = cpu_info(); struct cpu_action_queue *q = &ci->action_queue; - /* Mark this CPU online. */ - cpu_mark_online(ci); - while (1) { struct cpu_action *orig; struct cpu_action action; @@ -351,72 +205,3 @@ void arch_secondary_cpu_init(void) action_queue_complete(q, orig); } } - -void arch_initialize_cpus(device_t cluster, struct cpu_control_ops *cntrl_ops) -{ - size_t max_cpus; - size_t i; - struct cpu_info *ci; - void (*entry)(void); - struct bus *bus; - - if (cluster->path.type != DEVICE_PATH_CPU_CLUSTER) { - printk(BIOS_ERR, - "CPU init failed. Device is not a CPU_CLUSTER: %s\n", - dev_path(cluster)); - return; - } - - bus = cluster->link_list; - - /* Check if no children under this device. */ - if (bus == NULL) - return; - - entry = prepare_secondary_cpu_startup(); - - /* Initialize the cpu_info structures. */ - init_cpu_info(bus); - max_cpus = cntrl_ops->total_cpus(); - - if (max_cpus > CONFIG_MAX_CPUS) { - printk(BIOS_WARNING, - "max_cpus (%zu) exceeds CONFIG_MAX_CPUS (%zu).\n", - max_cpus, (size_t)CONFIG_MAX_CPUS); - max_cpus = CONFIG_MAX_CPUS; - } - - for (i = 0; i < max_cpus; i++) { - device_t dev; - struct cpu_action action; - - ci = cpu_info_for_cpu(i); - dev = ci->cpu; - - /* Disregard CPUs not in device tree. */ - if (dev == NULL) - continue; - - /* Skip disabled CPUs. */ - if (!dev->enabled) - continue; - - if (!cpu_online(ci)) { - /* Start the CPU. */ - printk(BIOS_DEBUG, "Starting CPU%x\n", ci->id); - if (cntrl_ops->start_cpu(ci->id, entry)) { - printk(BIOS_ERR, - "Failed to start CPU%x\n", ci->id); - continue; - } - /* Wait for CPU to come online. */ - while (!cpu_online(ci)); - printk(BIOS_DEBUG, "CPU%x online.\n", ci->id); - } - - /* Send it the init action. */ - action.run = init_this_cpu; - action.arg = ci; - action_run_on_cpu(ci, &action, 1); - } -} |