Replace spaces with tabs in smp.c, and opportunistically clean up a handful of minor coding style violations. No functional change intended. Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx> --- lib/x86/smp.c | 129 +++++++++++++++++++++++++------------------------- 1 file changed, 64 insertions(+), 65 deletions(-) diff --git a/lib/x86/smp.c b/lib/x86/smp.c index 2ac0ef74..b24675fd 100644 --- a/lib/x86/smp.c +++ b/lib/x86/smp.c @@ -21,128 +21,127 @@ static atomic_t active_cpus; static __attribute__((used)) void ipi(void) { - void (*function)(void *data) = ipi_function; - void *data = ipi_data; - bool wait = ipi_wait; + void (*function)(void *data) = ipi_function; + void *data = ipi_data; + bool wait = ipi_wait; - if (!wait) { - ipi_done = 1; - apic_write(APIC_EOI, 0); - } - function(data); - atomic_dec(&active_cpus); - if (wait) { - ipi_done = 1; - apic_write(APIC_EOI, 0); - } + if (!wait) { + ipi_done = 1; + apic_write(APIC_EOI, 0); + } + function(data); + atomic_dec(&active_cpus); + if (wait) { + ipi_done = 1; + apic_write(APIC_EOI, 0); + } } asm ( - "ipi_entry: \n" - " call ipi \n" + "ipi_entry: \n" + " call ipi \n" #ifndef __x86_64__ - " iret" + " iret" #else - " iretq" + " iretq" #endif - ); + ); int cpu_count(void) { - return _cpu_count; + return _cpu_count; } int smp_id(void) { - unsigned id; + unsigned id; - asm ("mov %%gs:0, %0" : "=r"(id)); - return id; + asm ("mov %%gs:0, %0" : "=r"(id)); + return id; } static void setup_smp_id(void *data) { - asm ("mov %0, %%gs:0" : : "r"(apic_id()) : "memory"); + asm ("mov %0, %%gs:0" : : "r"(apic_id()) : "memory"); } -static void __on_cpu(int cpu, void (*function)(void *data), void *data, - int wait) +static void __on_cpu(int cpu, void (*function)(void *data), void *data, int wait) { - unsigned int target = id_map[cpu]; + const u32 ipi_icr = APIC_INT_ASSERT | APIC_DEST_PHYSICAL | APIC_DM_FIXED | IPI_VECTOR; + unsigned int target = id_map[cpu]; - spin_lock(&ipi_lock); - if (target == smp_id()) - function(data); - else { - atomic_inc(&active_cpus); - ipi_done = 0; - ipi_function = function; - ipi_data = data; - ipi_wait = wait; - apic_icr_write(APIC_INT_ASSERT | APIC_DEST_PHYSICAL | APIC_DM_FIXED - | IPI_VECTOR, target); - while (!ipi_done) - ; - } - spin_unlock(&ipi_lock); + spin_lock(&ipi_lock); + if (target == smp_id()) { + function(data); + } else { + atomic_inc(&active_cpus); + ipi_done = 0; + ipi_function = function; + ipi_data = data; + ipi_wait = wait; + apic_icr_write(ipi_icr, target); + while (!ipi_done) + ; + } + spin_unlock(&ipi_lock); } void on_cpu(int cpu, void (*function)(void *data), void *data) { - __on_cpu(cpu, function, data, 1); + __on_cpu(cpu, function, data, 1); } void on_cpu_async(int cpu, void (*function)(void *data), void *data) { - __on_cpu(cpu, function, data, 0); + __on_cpu(cpu, function, data, 0); } void on_cpus(void (*function)(void *data), void *data) { - int cpu; + int cpu; - for (cpu = cpu_count() - 1; cpu >= 0; --cpu) - on_cpu_async(cpu, function, data); + for (cpu = cpu_count() - 1; cpu >= 0; --cpu) + on_cpu_async(cpu, function, data); - while (cpus_active() > 1) - pause(); + while (cpus_active() > 1) + pause(); } int cpus_active(void) { - return atomic_read(&active_cpus); + return atomic_read(&active_cpus); } void smp_init(void) { - int i; - void ipi_entry(void); + int i; + void ipi_entry(void); - _cpu_count = fwcfg_get_nb_cpus(); + _cpu_count = fwcfg_get_nb_cpus(); - setup_idt(); - init_apic_map(); - set_idt_entry(IPI_VECTOR, ipi_entry, 0); + setup_idt(); + init_apic_map(); + set_idt_entry(IPI_VECTOR, ipi_entry, 0); - setup_smp_id(0); - for (i = 1; i < cpu_count(); ++i) - on_cpu(i, setup_smp_id, 0); + setup_smp_id(0); + for (i = 1; i < cpu_count(); ++i) + on_cpu(i, setup_smp_id, 0); - atomic_inc(&active_cpus); + atomic_inc(&active_cpus); } static void do_reset_apic(void *data) { - reset_apic(); + reset_apic(); } void smp_reset_apic(void) { - int i; + int i; - reset_apic(); - for (i = 1; i < cpu_count(); ++i) - on_cpu(i, do_reset_apic, 0); + reset_apic(); + for (i = 1; i < cpu_count(); ++i) + on_cpu(i, do_reset_apic, 0); - atomic_inc(&active_cpus); + atomic_inc(&active_cpus); } -- 2.35.0.rc0.227.g00780c9af4-goog