diff options
| author | Richard Braun <rbraun@sceen.net> | 2014-05-21 20:45:30 +0200 |
|---|---|---|
| committer | Richard Braun <rbraun@sceen.net> | 2014-05-21 20:45:30 +0200 |
| commit | da8214c9c4ef6f0e199504da6fb5fe8e3715daa2 (patch) | |
| tree | 3e474e04cb4f70820d109060a49257c15824e763 | |
| parent | cc427d6558f1fb7095d78a888f9ab16e3ddb87c6 (diff) | |
x86/lapic: clarify interface
Make it clear that destinations are APIC IDs and not kernel-assigned
processor IDs.
| -rw-r--r-- | arch/x86/machine/lapic.c | 24 | ||||
| -rw-r--r-- | arch/x86/machine/lapic.h | 8 |
2 files changed, 16 insertions, 16 deletions
diff --git a/arch/x86/machine/lapic.c b/arch/x86/machine/lapic.c index c16e6a88..a4012b93 100644 --- a/arch/x86/machine/lapic.c +++ b/arch/x86/machine/lapic.c @@ -269,14 +269,14 @@ lapic_ap_setup(void) } static void -lapic_ipi(uint32_t dest, uint32_t icr) +lapic_ipi(uint32_t apic_id, uint32_t icr) { uint32_t value; if ((icr & LAPIC_ICR_DEST_MASK) == 0) { value = lapic_read(&lapic_map->icr_high); value &= ~LAPIC_DEST_MASK; - value |= dest << LAPIC_DEST_SHIFT; + value |= apic_id << LAPIC_DEST_SHIFT; lapic_write(&lapic_map->icr_high, value); } @@ -298,33 +298,33 @@ lapic_ipi_wait(void) } void -lapic_ipi_init_assert(uint32_t dest) +lapic_ipi_init_assert(uint32_t apic_id) { - lapic_ipi(dest, LAPIC_ICR_TRIGGER_LEVEL | LAPIC_ICR_LEVEL_ASSERT - | LAPIC_ICR_DELIVERY_INIT); + lapic_ipi(apic_id, LAPIC_ICR_TRIGGER_LEVEL | LAPIC_ICR_LEVEL_ASSERT + | LAPIC_ICR_DELIVERY_INIT); lapic_ipi_wait(); } void -lapic_ipi_init_deassert(uint32_t dest) +lapic_ipi_init_deassert(uint32_t apic_id) { - lapic_ipi(dest, LAPIC_ICR_TRIGGER_LEVEL | LAPIC_ICR_DELIVERY_INIT); + lapic_ipi(apic_id, LAPIC_ICR_TRIGGER_LEVEL | LAPIC_ICR_DELIVERY_INIT); lapic_ipi_wait(); } void -lapic_ipi_startup(uint32_t dest, uint32_t vector) +lapic_ipi_startup(uint32_t apic_id, uint32_t vector) { - lapic_ipi(dest, LAPIC_ICR_DELIVERY_STARTUP - | (vector & LAPIC_ICR_VECTOR_MASK)); + lapic_ipi(apic_id, LAPIC_ICR_DELIVERY_STARTUP + | (vector & LAPIC_ICR_VECTOR_MASK)); lapic_ipi_wait(); } void -lapic_ipi_send(uint32_t dest, uint32_t vector) +lapic_ipi_send(uint32_t apic_id, uint32_t vector) { lapic_ipi_wait(); - lapic_ipi(dest, vector & LAPIC_ICR_VECTOR_MASK); + lapic_ipi(apic_id, vector & LAPIC_ICR_VECTOR_MASK); } void diff --git a/arch/x86/machine/lapic.h b/arch/x86/machine/lapic.h index 285874d2..c8981b0b 100644 --- a/arch/x86/machine/lapic.h +++ b/arch/x86/machine/lapic.h @@ -39,14 +39,14 @@ void lapic_ap_setup(void); /* * Functions used when initializing an AP. */ -void lapic_ipi_init_assert(uint32_t dest); -void lapic_ipi_init_deassert(uint32_t dest); -void lapic_ipi_startup(uint32_t dest, uint32_t vector); +void lapic_ipi_init_assert(uint32_t apic_id); +void lapic_ipi_init_deassert(uint32_t apic_id); +void lapic_ipi_startup(uint32_t apic_id, uint32_t vector); /* * Fixed/broadcast inter-processor interrupts. */ -void lapic_ipi_send(uint32_t dest, uint32_t vector); +void lapic_ipi_send(uint32_t apic_id, uint32_t vector); void lapic_ipi_broadcast(uint32_t vector); /* |