diff options
| author | Damien Zammit <damien@zamaudio.com> | 2024-12-10 07:29:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2024-12-10 18:54:53 +0100 |
| commit | d439c27340d472ce920a4b96cbec71af199de665 (patch) | |
| tree | 987835a5cbf24cd791d265503f3fda19f5d72fb9 | |
| parent | 79d66af4d2b325c6c6f9e6bbfce03eacdec740aa (diff) | |
| download | gnumach-d439c27340d472ce920a4b96cbec71af199de665.tar.gz gnumach-d439c27340d472ce920a4b96cbec71af199de665.tar.bz2 gnumach-d439c27340d472ce920a4b96cbec71af199de665.zip | |
i386/apic: Fix logical id numbering
The number is actually a mask bit per cpu.
Message-ID: <20241210072926.911061-2-damien@zamaudio.com>
| -rw-r--r-- | i386/i386/apic.c | 2 | ||||
| -rw-r--r-- | i386/i386/apic.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/i386/i386/apic.c b/i386/i386/apic.c index 7ec8c49b..e0941c6a 100644 --- a/i386/i386/apic.c +++ b/i386/i386/apic.c @@ -337,7 +337,7 @@ lapic_setup(void) /* Every 8th cpu is in the same logical group */ dummy = lapic->logical_dest.r; - lapic->logical_dest.r = 0x01000000 << (APIC_LOGICAL_ID(cpu)); + lapic->logical_dest.r = APIC_LOGICAL_ID(cpu) << 24; dummy = lapic->lvt_lint0.r; lapic->lvt_lint0.r = dummy | LAPIC_DISABLE; diff --git a/i386/i386/apic.h b/i386/i386/apic.h index ec910456..cb700c44 100644 --- a/i386/i386/apic.h +++ b/i386/i386/apic.h @@ -314,7 +314,7 @@ extern uint32_t *hpet_addr; /* Since Logical Destination Register only has 8 bits of mask, * we can only address 8 unique groups of cpus for IPIs. */ -#define APIC_LOGICAL_ID(cpu) ((cpu) % 8) +#define APIC_LOGICAL_ID(cpu) (1u << ((cpu) % 8)) /* Set or clear a bit in a 255-bit APIC mask register. These registers are spread through eight 32-bit registers. */ |