commit ea6d12a0de8af000fb72a873b63364462f280643
author Kyösti Mälkki <kyosti.malkki@gmail.com> Tue Jun 08 11:25:29 2021 +0300
committer Felix Held <felix-coreboot@felixheld.de> Fri Oct 22 14:15:52 2021 +0000
tree d2dc78444c6a3447641bab81b10bc2018a9ea056
parent 6139ff9c9aa0b941b1c178058e4d10baa23fff70

sb,soc/intel: Set IOAPIC max entries before APIC ID

This allows to replace set_ioapic_id() call with setup_ioapic()
that also clears redirection table entries.

Change-Id: I854f19c997a96bcdccb11a0906431e3291788cb6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55308
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

src/soc/intel/broadwell/pch/lpc.c

diff --git a/src/soc/intel/broadwell/pch/lpc.c b/src/soc/intel/broadwell/pch/lpc.c
index 40cc61e..a3de7ac 100644
--- a/src/soc/intel/broadwell/pch/lpc.c
+++ b/src/soc/intel/broadwell/pch/lpc.c
@@ -29,11 +29,11 @@
 	pci_write_config16(dev, LPC_IBDF,
 		PCH_IOAPIC_PCI_BUS << 8 | PCH_IOAPIC_PCI_SLOT << 3);
 
-	set_ioapic_id(VIO_APIC_VADDR, 0x02);
-
 	/* affirm full set of redirection table entries ("write once") */
 	/* PCH-LP has 40 redirection entries */
 	ioapic_set_max_vectors(VIO_APIC_VADDR, 40);
+
+	set_ioapic_id(VIO_APIC_VADDR, 0x02);
 }
 
 static void enable_hpet(struct device *dev)

src/soc/intel/common/block/lpc/lpc_lib.c

diff --git a/src/soc/intel/common/block/lpc/lpc_lib.c b/src/soc/intel/common/block/lpc/lpc_lib.c
index c2278df..43434df 100644
--- a/src/soc/intel/common/block/lpc/lpc_lib.c
+++ b/src/soc/intel/common/block/lpc/lpc_lib.c
@@ -280,10 +280,10 @@
 /* Enable PCH IOAPIC */
 void pch_enable_ioapic(void)
 {
-	set_ioapic_id((void *)IO_APIC_ADDR, 0x02);
-
 	/* 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);
 }
 
 static const uint8_t pch_interrupt_routing[PIRQ_COUNT] = {

src/soc/intel/denverton_ns/lpc.c

diff --git a/src/soc/intel/denverton_ns/lpc.c b/src/soc/intel/denverton_ns/lpc.c
index 7f47e5e..f0a7058 100644
--- a/src/soc/intel/denverton_ns/lpc.c
+++ b/src/soc/intel/denverton_ns/lpc.c
@@ -31,10 +31,10 @@
  */
 static void pch_enable_ioapic(struct device *dev)
 {
-	set_ioapic_id((void *)IO_APIC_ADDR, IO_APIC0);
-
 	/* 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);
 }
 
 /* interrupt router lookup for internal devices */