Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/58406 )
Change subject: sb,soc/intel: Replace set_ioapic_id() with setup_ioapic() ......................................................................
sb,soc/intel: Replace set_ioapic_id() with setup_ioapic()
This adds delivery of PIC/i8259 interrupts via ExtNMI on the affected platfoms.
Change-Id: If99e321fd9b153101d71e1b995b43dba48d8763f Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/58406 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/intel/broadwell/pch/lpc.c M src/soc/intel/common/block/lpc/lpc_lib.c M src/soc/intel/denverton_ns/lpc.c M src/southbridge/intel/bd82x6x/lpc.c M src/southbridge/intel/i82371eb/isa.c M src/southbridge/intel/i82801dx/lpc.c M src/southbridge/intel/i82801gx/lpc.c M src/southbridge/intel/ibexpeak/lpc.c M src/southbridge/intel/lynxpoint/lpc.c 9 files changed, 9 insertions(+), 9 deletions(-)
Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved
diff --git a/src/soc/intel/broadwell/pch/lpc.c b/src/soc/intel/broadwell/pch/lpc.c index a3de7ac..b68a8cf 100644 --- a/src/soc/intel/broadwell/pch/lpc.c +++ b/src/soc/intel/broadwell/pch/lpc.c @@ -33,7 +33,7 @@ /* PCH-LP has 40 redirection entries */ ioapic_set_max_vectors(VIO_APIC_VADDR, 40);
- set_ioapic_id(VIO_APIC_VADDR, 0x02); + setup_ioapic(VIO_APIC_VADDR, 0x02); }
static void enable_hpet(struct device *dev) diff --git a/src/soc/intel/common/block/lpc/lpc_lib.c b/src/soc/intel/common/block/lpc/lpc_lib.c index 43434df..1393714 100644 --- a/src/soc/intel/common/block/lpc/lpc_lib.c +++ b/src/soc/intel/common/block/lpc/lpc_lib.c @@ -283,7 +283,7 @@ /* affirm full set of redirection table entries ("write once") */ ioapic_set_max_vectors(VIO_APIC_VADDR, PCH_REDIR_ETR);
- set_ioapic_id((void *)IO_APIC_ADDR, 0x02); + setup_ioapic((void *)IO_APIC_ADDR, 0x02); }
static const uint8_t pch_interrupt_routing[PIRQ_COUNT] = { diff --git a/src/soc/intel/denverton_ns/lpc.c b/src/soc/intel/denverton_ns/lpc.c index f0a7058..0fcaeb1 100644 --- a/src/soc/intel/denverton_ns/lpc.c +++ b/src/soc/intel/denverton_ns/lpc.c @@ -34,7 +34,7 @@ /* affirm full set of redirection table entries ("write once") */ ioapic_set_max_vectors(VIO_APIC_VADDR, PCH_REDIR_ETR);
- set_ioapic_id((void *)IO_APIC_ADDR, IO_APIC0); + setup_ioapic((void *)IO_APIC_ADDR, IO_APIC0); }
/* interrupt router lookup for internal devices */ diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c index 51d6b07..ae92ca9 100644 --- a/src/southbridge/intel/bd82x6x/lpc.c +++ b/src/southbridge/intel/bd82x6x/lpc.c @@ -44,7 +44,7 @@ /* affirm full set of redirection table entries ("write once") */ ioapic_lock_max_vectors(VIO_APIC_VADDR);
- set_ioapic_id(VIO_APIC_VADDR, 0x02); + setup_ioapic(VIO_APIC_VADDR, 0x02); }
static void pch_enable_serial_irqs(struct device *dev) diff --git a/src/southbridge/intel/i82371eb/isa.c b/src/southbridge/intel/i82371eb/isa.c index 3d586bd..c2411f2b 100644 --- a/src/southbridge/intel/i82371eb/isa.c +++ b/src/southbridge/intel/i82371eb/isa.c @@ -61,7 +61,7 @@ pci_write_config16(dev, XBCS, reg16);
/* Set and verify the IOAPIC ID. */ - set_ioapic_id(VIO_APIC_VADDR, ioapic_id); + setup_ioapic(VIO_APIC_VADDR, ioapic_id); if (ioapic_id != get_ioapic_id(VIO_APIC_VADDR)) die("IOAPIC error!\n"); } diff --git a/src/southbridge/intel/i82801dx/lpc.c b/src/southbridge/intel/i82801dx/lpc.c index 321c605..34d93c4 100644 --- a/src/southbridge/intel/i82801dx/lpc.c +++ b/src/southbridge/intel/i82801dx/lpc.c @@ -48,7 +48,7 @@ pci_write_config32(dev, GEN_CNTL, reg32); printk(BIOS_DEBUG, "IOAPIC Southbridge enabled %x\n", reg32);
- set_ioapic_id(VIO_APIC_VADDR, 0x02); + setup_ioapic(VIO_APIC_VADDR, 0x02);
ioapic_set_boot_config(VIO_APIC_VADDR, true); } diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c index ababe67..794d34a 100644 --- a/src/southbridge/intel/i82801gx/lpc.c +++ b/src/southbridge/intel/i82801gx/lpc.c @@ -33,7 +33,7 @@ */ static void i82801gx_enable_ioapic(struct device *dev) { - set_ioapic_id(VIO_APIC_VADDR, 0x02); + setup_ioapic(VIO_APIC_VADDR, 0x02); }
static void i82801gx_enable_serial_irqs(struct device *dev) diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c index fa53db2..01836b1 100644 --- a/src/southbridge/intel/ibexpeak/lpc.c +++ b/src/southbridge/intel/ibexpeak/lpc.c @@ -37,7 +37,7 @@ /* affirm full set of redirection table entries ("write once") */ ioapic_lock_max_vectors(VIO_APIC_VADDR);
- set_ioapic_id(VIO_APIC_VADDR, 0x01); + setup_ioapic(VIO_APIC_VADDR, 0x01); }
static void pch_enable_serial_irqs(struct device *dev) diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c index 72f6d80..ea84def 100644 --- a/src/southbridge/intel/lynxpoint/lpc.c +++ b/src/southbridge/intel/lynxpoint/lpc.c @@ -42,7 +42,7 @@ else ioapic_lock_max_vectors(VIO_APIC_VADDR);
- set_ioapic_id(VIO_APIC_VADDR, 0x02); + setup_ioapic(VIO_APIC_VADDR, 0x02);
}