From d165357ec37ce89ff4ee05f6d0bcfac6e766c1df Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Tue, 8 Jun 2021 11:31:19 +0300 Subject: sb,soc/intel: Use register_new_ioapic_gsi0() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6b0e4021595fb160ae3bf798468f4505b460266f Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/55314 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/soc/intel/broadwell/pch/lpc.c | 2 +- src/soc/intel/common/block/lpc/lpc_lib.c | 2 +- src/soc/intel/denverton_ns/lpc.c | 2 +- src/southbridge/intel/bd82x6x/lpc.c | 2 +- src/southbridge/intel/i82801dx/lpc.c | 2 +- src/southbridge/intel/i82801gx/lpc.c | 2 +- src/southbridge/intel/i82801ix/lpc.c | 2 +- src/southbridge/intel/i82801jx/lpc.c | 2 +- src/southbridge/intel/ibexpeak/lpc.c | 2 +- src/southbridge/intel/lynxpoint/lpc.c | 3 +-- 10 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/soc/intel/broadwell/pch/lpc.c b/src/soc/intel/broadwell/pch/lpc.c index 5a1623f341..1ddee34122 100644 --- a/src/soc/intel/broadwell/pch/lpc.c +++ b/src/soc/intel/broadwell/pch/lpc.c @@ -33,7 +33,7 @@ static void pch_enable_ioapic(struct device *dev) /* PCH-LP has 40 redirection entries */ ioapic_set_max_vectors(VIO_APIC_VADDR, 40); - setup_ioapic(VIO_APIC_VADDR, 0x02); + register_new_ioapic_gsi0(VIO_APIC_VADDR); } 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 d499918570..c820203d6d 100644 --- a/src/soc/intel/common/block/lpc/lpc_lib.c +++ b/src/soc/intel/common/block/lpc/lpc_lib.c @@ -387,7 +387,7 @@ void pch_enable_ioapic(void) /* affirm full set of redirection table entries ("write once") */ ioapic_set_max_vectors(VIO_APIC_VADDR, PCH_REDIR_ETR); - setup_ioapic((void *)IO_APIC_ADDR, 0x02); + register_new_ioapic_gsi0((void *)IO_APIC_ADDR); } 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 5d1eda5e23..7ebca1eb94 100644 --- a/src/soc/intel/denverton_ns/lpc.c +++ b/src/soc/intel/denverton_ns/lpc.c @@ -34,7 +34,7 @@ static void pch_enable_ioapic(struct device *dev) /* affirm full set of redirection table entries ("write once") */ ioapic_set_max_vectors(VIO_APIC_VADDR, PCH_REDIR_ETR); - setup_ioapic((void *)IO_APIC_ADDR, IO_APIC0); + register_new_ioapic_gsi0((void *)IO_APIC_ADDR); } /* interrupt router lookup for internal devices */ diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c index 46351890cd..7c10c817ea 100644 --- a/src/southbridge/intel/bd82x6x/lpc.c +++ b/src/southbridge/intel/bd82x6x/lpc.c @@ -44,7 +44,7 @@ static void pch_enable_ioapic(struct device *dev) /* affirm full set of redirection table entries ("write once") */ ioapic_lock_max_vectors(VIO_APIC_VADDR); - setup_ioapic(VIO_APIC_VADDR, 0x02); + register_new_ioapic_gsi0(VIO_APIC_VADDR); } static void pch_enable_serial_irqs(struct device *dev) diff --git a/src/southbridge/intel/i82801dx/lpc.c b/src/southbridge/intel/i82801dx/lpc.c index 1de3766563..1569c1c14b 100644 --- a/src/southbridge/intel/i82801dx/lpc.c +++ b/src/southbridge/intel/i82801dx/lpc.c @@ -50,7 +50,7 @@ static void i82801dx_enable_ioapic(struct device *dev) pci_write_config32(dev, GEN_CNTL, reg32); printk(BIOS_DEBUG, "IOAPIC Southbridge enabled %x\n", reg32); - setup_ioapic(VIO_APIC_VADDR, 0x02); + register_new_ioapic_gsi0(VIO_APIC_VADDR); 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 90d4eabefe..ec0df2722c 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) { - setup_ioapic(VIO_APIC_VADDR, 0x02); + register_new_ioapic_gsi0(VIO_APIC_VADDR); } static void i82801gx_enable_serial_irqs(struct device *dev) diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c index 8d44384cea..24b8a27e63 100644 --- a/src/southbridge/intel/i82801ix/lpc.c +++ b/src/southbridge/intel/i82801ix/lpc.c @@ -35,7 +35,7 @@ static void i82801ix_enable_apic(struct device *dev) /* Lock maximum redirection entries (MRE), R/WO register. */ ioapic_lock_max_vectors(VIO_APIC_VADDR); - setup_ioapic(VIO_APIC_VADDR, 2); /* ICH7 code uses id 2. */ + register_new_ioapic_gsi0(VIO_APIC_VADDR); } static void i82801ix_enable_serial_irqs(struct device *dev) diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c index 1297837e33..7dfc33ff3f 100644 --- a/src/southbridge/intel/i82801jx/lpc.c +++ b/src/southbridge/intel/i82801jx/lpc.c @@ -36,7 +36,7 @@ static void i82801jx_enable_apic(struct device *dev) /* Lock maximum redirection entries (MRE), R/WO register. */ ioapic_lock_max_vectors(VIO_APIC_VADDR); - setup_ioapic(VIO_APIC_VADDR, 2); /* ICH7 code uses id 2. */ + register_new_ioapic_gsi0(VIO_APIC_VADDR); } static void i82801jx_enable_serial_irqs(struct device *dev) diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c index d4e3098ad2..f0d0ac92ed 100644 --- a/src/southbridge/intel/ibexpeak/lpc.c +++ b/src/southbridge/intel/ibexpeak/lpc.c @@ -35,7 +35,7 @@ static void pch_enable_ioapic(struct device *dev) /* affirm full set of redirection table entries ("write once") */ ioapic_lock_max_vectors(VIO_APIC_VADDR); - setup_ioapic(VIO_APIC_VADDR, 0x01); + register_new_ioapic_gsi0(VIO_APIC_VADDR); } 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 20e40cbacb..b8e9d5f595 100644 --- a/src/southbridge/intel/lynxpoint/lpc.c +++ b/src/southbridge/intel/lynxpoint/lpc.c @@ -42,8 +42,7 @@ static void pch_enable_ioapic(struct device *dev) else ioapic_lock_max_vectors(VIO_APIC_VADDR); - setup_ioapic(VIO_APIC_VADDR, 0x02); - + register_new_ioapic_gsi0(VIO_APIC_VADDR); } static void pch_enable_serial_irqs(struct device *dev) -- cgit v1.2.3