diff options
| -rw-r--r-- | src/soc/intel/broadwell/pch/lpc.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/common/block/lpc/lpc_lib.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/denverton_ns/lpc.c | 4 | ||||
| -rw-r--r-- | src/southbridge/intel/bd82x6x/lpc.c | 4 | ||||
| -rw-r--r-- | src/southbridge/intel/ibexpeak/lpc.c | 4 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/lpc.c | 5 |
6 files changed, 13 insertions, 12 deletions
diff --git a/src/soc/intel/broadwell/pch/lpc.c b/src/soc/intel/broadwell/pch/lpc.c index 40cc61e4b2..a3de7ac213 100644 --- a/src/soc/intel/broadwell/pch/lpc.c +++ b/src/soc/intel/broadwell/pch/lpc.c @@ -29,11 +29,11 @@ static void pch_enable_ioapic(struct device *dev) 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) diff --git a/src/soc/intel/common/block/lpc/lpc_lib.c b/src/soc/intel/common/block/lpc/lpc_lib.c index c2278df248..43434df0af 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 @@ void lpc_disable_clkrun(void) /* 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] = { diff --git a/src/soc/intel/denverton_ns/lpc.c b/src/soc/intel/denverton_ns/lpc.c index 7f47e5ed71..f0a7058df5 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 */ diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c index b1f5ec8430..51d6b07064 100644 --- a/src/southbridge/intel/bd82x6x/lpc.c +++ b/src/southbridge/intel/bd82x6x/lpc.c @@ -41,10 +41,10 @@ static void pch_enable_ioapic(struct device *dev) 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") */ ioapic_lock_max_vectors(VIO_APIC_VADDR); + + set_ioapic_id(VIO_APIC_VADDR, 0x02); } static void pch_enable_serial_irqs(struct device *dev) diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c index f1cf7a3b7f..fa53db20f8 100644 --- a/src/southbridge/intel/ibexpeak/lpc.c +++ b/src/southbridge/intel/ibexpeak/lpc.c @@ -34,10 +34,10 @@ typedef struct southbridge_intel_ibexpeak_config config_t; */ static void pch_enable_ioapic(struct device *dev) { - set_ioapic_id(VIO_APIC_VADDR, 0x01); - /* affirm full set of redirection table entries ("write once") */ ioapic_lock_max_vectors(VIO_APIC_VADDR); + + set_ioapic_id(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 ef75d2f77d..72f6d80977 100644 --- a/src/southbridge/intel/lynxpoint/lpc.c +++ b/src/southbridge/intel/lynxpoint/lpc.c @@ -35,14 +35,15 @@ static void pch_enable_ioapic(struct device *dev) 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 */ if (pch_is_lp()) ioapic_set_max_vectors(VIO_APIC_VADDR, 40); else ioapic_lock_max_vectors(VIO_APIC_VADDR); + + set_ioapic_id(VIO_APIC_VADDR, 0x02); + } static void pch_enable_serial_irqs(struct device *dev) |