From 0d19289e840f9c711f50a74437d1b3856222db03 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Tue, 6 Feb 2024 16:55:29 +0100 Subject: arch/x86/ioapic: use uintptr_t for IOAPIC base address MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use uintptr_t for the IOAPIC base parameter of the various IOAPIC- related functions to avoid needing type casts in the callers. This also allows dropping the VIO_APIC_VADDR define and consistently use the IO_APIC_ADDR define instead. Signed-off-by: Felix Held Change-Id: I912943e923ff092708e90138caa5e1daf269a69f Reviewed-on: https://review.coreboot.org/c/coreboot/+/80358 Reviewed-by: Elyes Haouas Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier Reviewed-by: Jérémy Compostella --- src/mainboard/apple/macbook21/mptable.c | 2 +- src/mainboard/asus/p2b/variants/p2b-d/mptable.c | 2 +- src/mainboard/asus/p2b/variants/p2b-ds/mptable.c | 2 +- src/mainboard/getac/p470/mptable.c | 2 +- src/mainboard/ibase/mb899/mptable.c | 2 +- src/mainboard/intel/d945gclf/mptable.c | 2 +- src/mainboard/kontron/986lcd-m/mptable.c | 2 +- src/mainboard/lenovo/t60/mptable.c | 2 +- src/mainboard/lenovo/x60/mptable.c | 2 +- src/mainboard/roda/rk886ex/mptable.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/apple/macbook21/mptable.c b/src/mainboard/apple/macbook21/mptable.c index 823c8563a4..fcf46a26e4 100644 --- a/src/mainboard/apple/macbook21/mptable.c +++ b/src/mainboard/apple/macbook21/mptable.c @@ -18,7 +18,7 @@ static void *smp_write_config_table(void *v) mptable_write_buses(mc, NULL, &isa_bus); /* I/O APICs: APIC ID Version State Address */ - u8 ioapic_id = smp_write_ioapic_from_hw(mc, VIO_APIC_VADDR); + u8 ioapic_id = smp_write_ioapic_from_hw(mc, IO_APIC_ADDR); /* Legacy Interrupts */ mptable_add_isa_interrupts(mc, isa_bus, ioapic_id, 0); diff --git a/src/mainboard/asus/p2b/variants/p2b-d/mptable.c b/src/mainboard/asus/p2b/variants/p2b-d/mptable.c index 7536077048..e6b54595da 100644 --- a/src/mainboard/asus/p2b/variants/p2b-d/mptable.c +++ b/src/mainboard/asus/p2b/variants/p2b-d/mptable.c @@ -17,7 +17,7 @@ static void *smp_write_config_table(void *v) mptable_write_buses(mc, NULL, &isa_bus); /* External Intel 82093AA IOAPIC. */ - u8 ioapic_id = smp_write_ioapic_from_hw(mc, VIO_APIC_VADDR); + u8 ioapic_id = smp_write_ioapic_from_hw(mc, IO_APIC_ADDR); /* Legacy Interrupts */ mptable_add_isa_interrupts(mc, isa_bus, ioapic_id, 0); diff --git a/src/mainboard/asus/p2b/variants/p2b-ds/mptable.c b/src/mainboard/asus/p2b/variants/p2b-ds/mptable.c index 2c22ce2d71..f06fc6039c 100644 --- a/src/mainboard/asus/p2b/variants/p2b-ds/mptable.c +++ b/src/mainboard/asus/p2b/variants/p2b-ds/mptable.c @@ -17,7 +17,7 @@ static void *smp_write_config_table(void *v) mptable_write_buses(mc, NULL, &isa_bus); /* External Intel 82093AA IOAPIC. */ - u8 ioapic_id = smp_write_ioapic_from_hw(mc, VIO_APIC_VADDR); + u8 ioapic_id = smp_write_ioapic_from_hw(mc, IO_APIC_ADDR); /* Legacy Interrupts */ mptable_add_isa_interrupts(mc, isa_bus, ioapic_id, 0); diff --git a/src/mainboard/getac/p470/mptable.c b/src/mainboard/getac/p470/mptable.c index a85b5197f2..d7a4af65c3 100644 --- a/src/mainboard/getac/p470/mptable.c +++ b/src/mainboard/getac/p470/mptable.c @@ -18,7 +18,7 @@ static void *smp_write_config_table(void *v) mptable_write_buses(mc, NULL, &isa_bus); /* I/O APICs: APIC ID Version State Address */ - u8 ioapic_id = smp_write_ioapic_from_hw(mc, VIO_APIC_VADDR); + u8 ioapic_id = smp_write_ioapic_from_hw(mc, IO_APIC_ADDR); /* Legacy Interrupts */ mptable_add_isa_interrupts(mc, isa_bus, ioapic_id, 0); diff --git a/src/mainboard/ibase/mb899/mptable.c b/src/mainboard/ibase/mb899/mptable.c index a9ad7c763e..bb4379685e 100644 --- a/src/mainboard/ibase/mb899/mptable.c +++ b/src/mainboard/ibase/mb899/mptable.c @@ -37,7 +37,7 @@ static void *smp_write_config_table(void *v) mptable_write_buses(mc, NULL, &isa_bus); /* I/O APICs: APIC ID Version State Address */ - u8 ioapic_id = smp_write_ioapic_from_hw(mc, VIO_APIC_VADDR); + u8 ioapic_id = smp_write_ioapic_from_hw(mc, IO_APIC_ADDR); /* Legacy Interrupts */ diff --git a/src/mainboard/intel/d945gclf/mptable.c b/src/mainboard/intel/d945gclf/mptable.c index 8dde3a7eb4..7ab47b4b37 100644 --- a/src/mainboard/intel/d945gclf/mptable.c +++ b/src/mainboard/intel/d945gclf/mptable.c @@ -18,7 +18,7 @@ static void *smp_write_config_table(void *v) mptable_write_buses(mc, NULL, &isa_bus); /* I/O APICs: APIC ID Version State Address */ - u8 ioapic_id = smp_write_ioapic_from_hw(mc, VIO_APIC_VADDR); + u8 ioapic_id = smp_write_ioapic_from_hw(mc, IO_APIC_ADDR); /* Legacy Interrupts */ diff --git a/src/mainboard/kontron/986lcd-m/mptable.c b/src/mainboard/kontron/986lcd-m/mptable.c index b0bfbe71c5..5ee3288e77 100644 --- a/src/mainboard/kontron/986lcd-m/mptable.c +++ b/src/mainboard/kontron/986lcd-m/mptable.c @@ -33,7 +33,7 @@ static void *smp_write_config_table(void *v) mptable_write_buses(mc, NULL, &isa_bus); /* I/O APICs: APIC ID Version State Address */ - u8 ioapic_id = smp_write_ioapic_from_hw(mc, VIO_APIC_VADDR); + u8 ioapic_id = smp_write_ioapic_from_hw(mc, IO_APIC_ADDR); /* Legacy Interrupts */ mptable_add_isa_interrupts(mc, isa_bus, ioapic_id, 0); diff --git a/src/mainboard/lenovo/t60/mptable.c b/src/mainboard/lenovo/t60/mptable.c index b4231d3ea4..f640085824 100644 --- a/src/mainboard/lenovo/t60/mptable.c +++ b/src/mainboard/lenovo/t60/mptable.c @@ -18,7 +18,7 @@ static void *smp_write_config_table(void *v) mptable_write_buses(mc, NULL, &isa_bus); /* I/O APICs: APIC ID Version State Address */ - u8 ioapic_id = smp_write_ioapic_from_hw(mc, VIO_APIC_VADDR); + u8 ioapic_id = smp_write_ioapic_from_hw(mc, IO_APIC_ADDR); /* Legacy Interrupts */ mptable_add_isa_interrupts(mc, isa_bus, ioapic_id, 0); diff --git a/src/mainboard/lenovo/x60/mptable.c b/src/mainboard/lenovo/x60/mptable.c index 8e972a7dec..73e9c1b8d4 100644 --- a/src/mainboard/lenovo/x60/mptable.c +++ b/src/mainboard/lenovo/x60/mptable.c @@ -18,7 +18,7 @@ static void *smp_write_config_table(void *v) mptable_write_buses(mc, NULL, &isa_bus); /* I/O APICs: APIC ID Version State Address */ - u8 ioapic_id = smp_write_ioapic_from_hw(mc, VIO_APIC_VADDR); + u8 ioapic_id = smp_write_ioapic_from_hw(mc, IO_APIC_ADDR); /* Legacy Interrupts */ mptable_add_isa_interrupts(mc, isa_bus, ioapic_id, 0); diff --git a/src/mainboard/roda/rk886ex/mptable.c b/src/mainboard/roda/rk886ex/mptable.c index d7bc09e220..3ce1cbc80b 100644 --- a/src/mainboard/roda/rk886ex/mptable.c +++ b/src/mainboard/roda/rk886ex/mptable.c @@ -18,7 +18,7 @@ static void *smp_write_config_table(void *v) mptable_write_buses(mc, NULL, &isa_bus); /* I/O APICs: APIC ID Version State Address */ - u8 ioapic_id = smp_write_ioapic_from_hw(mc, VIO_APIC_VADDR); + u8 ioapic_id = smp_write_ioapic_from_hw(mc, IO_APIC_ADDR); /* Legacy Interrupts */ mptable_add_isa_interrupts(mc, isa_bus, ioapic_id, 0); -- cgit v1.2.3