sb/intel: Don't set ACPI_EN twice
It is already done once when enabling PMBASE in early init. Change-Id: I14289c9164ee1488c192fce721d86c89fa5cc736 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/47207 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
@@ -222,7 +222,7 @@ static void pch_enable_bars(void)
|
|||||||
|
|
||||||
pci_write_config32(PCH_LPC_DEV, PMBASE, DEFAULT_PMBASE | 1);
|
pci_write_config32(PCH_LPC_DEV, PMBASE, DEFAULT_PMBASE | 1);
|
||||||
|
|
||||||
pci_write_config8(PCH_LPC_DEV, ACPI_CNTL, 0x80);
|
pci_write_config8(PCH_LPC_DEV, ACPI_CNTL, ACPI_EN);
|
||||||
|
|
||||||
pci_write_config32(PCH_LPC_DEV, GPIO_BASE, DEFAULT_GPIOBASE | 1);
|
pci_write_config32(PCH_LPC_DEV, GPIO_BASE, DEFAULT_GPIOBASE | 1);
|
||||||
|
|
||||||
|
@@ -44,9 +44,6 @@ static void pch_enable_ioapic(struct device *dev)
|
|||||||
pci_write_config16(dev, LPC_IBDF,
|
pci_write_config16(dev, LPC_IBDF,
|
||||||
PCH_IOAPIC_PCI_BUS << 8 | PCH_IOAPIC_PCI_SLOT << 3);
|
PCH_IOAPIC_PCI_BUS << 8 | PCH_IOAPIC_PCI_SLOT << 3);
|
||||||
|
|
||||||
/* Enable ACPI I/O range decode */
|
|
||||||
pci_write_config8(dev, ACPI_CNTL, ACPI_EN);
|
|
||||||
|
|
||||||
set_ioapic_id(VIO_APIC_VADDR, 0x02);
|
set_ioapic_id(VIO_APIC_VADDR, 0x02);
|
||||||
|
|
||||||
/* affirm full set of redirection table entries ("write once") */
|
/* affirm full set of redirection table entries ("write once") */
|
||||||
|
@@ -35,9 +35,6 @@
|
|||||||
*/
|
*/
|
||||||
static void i82801gx_enable_ioapic(struct device *dev)
|
static void i82801gx_enable_ioapic(struct device *dev)
|
||||||
{
|
{
|
||||||
/* Enable ACPI I/O range decode */
|
|
||||||
pci_write_config8(dev, ACPI_CNTL, ACPI_EN);
|
|
||||||
|
|
||||||
set_ioapic_id(VIO_APIC_VADDR, 0x02);
|
set_ioapic_id(VIO_APIC_VADDR, 0x02);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -33,7 +33,7 @@ void ibexpeak_setup_bars(void)
|
|||||||
|
|
||||||
pci_write_config32(PCI_DEV(0, 0x1f, 0), PMBASE, DEFAULT_PMBASE | 1);
|
pci_write_config32(PCI_DEV(0, 0x1f, 0), PMBASE, DEFAULT_PMBASE | 1);
|
||||||
/* Enable ACPI BAR */
|
/* Enable ACPI BAR */
|
||||||
pci_write_config8(PCI_DEV(0, 0x1f, 0), 0x44 /* ACPI_CNTL */, 0x80);
|
pci_write_config8(PCH_LPC_DEV, ACPI_CNTL, ACPI_EN);
|
||||||
|
|
||||||
printk(BIOS_DEBUG, " done.\n");
|
printk(BIOS_DEBUG, " done.\n");
|
||||||
|
|
||||||
|
@@ -39,9 +39,6 @@ static void pch_enable_ioapic(struct device *dev)
|
|||||||
{
|
{
|
||||||
u32 reg32;
|
u32 reg32;
|
||||||
|
|
||||||
/* Enable ACPI I/O range decode */
|
|
||||||
pci_write_config8(dev, ACPI_CNTL, ACPI_EN);
|
|
||||||
|
|
||||||
set_ioapic_id(VIO_APIC_VADDR, 0x01);
|
set_ioapic_id(VIO_APIC_VADDR, 0x01);
|
||||||
/* affirm full set of redirection table entries ("write once") */
|
/* affirm full set of redirection table entries ("write once") */
|
||||||
reg32 = io_apic_read(VIO_APIC_VADDR, 0x01);
|
reg32 = io_apic_read(VIO_APIC_VADDR, 0x01);
|
||||||
|
@@ -40,7 +40,7 @@ static void pch_enable_bars(void)
|
|||||||
|
|
||||||
pci_write_config32(PCH_LPC_DEV, PMBASE, DEFAULT_PMBASE | 1);
|
pci_write_config32(PCH_LPC_DEV, PMBASE, DEFAULT_PMBASE | 1);
|
||||||
/* Enable ACPI BAR */
|
/* Enable ACPI BAR */
|
||||||
pci_write_config8(PCH_LPC_DEV, ACPI_CNTL, 0x80);
|
pci_write_config8(PCH_LPC_DEV, ACPI_CNTL, ACPI_EN);
|
||||||
|
|
||||||
pci_write_config32(PCH_LPC_DEV, GPIO_BASE, DEFAULT_GPIOBASE | 1);
|
pci_write_config32(PCH_LPC_DEV, GPIO_BASE, DEFAULT_GPIOBASE | 1);
|
||||||
|
|
||||||
|
@@ -41,9 +41,6 @@ static void pch_enable_ioapic(struct device *dev)
|
|||||||
pci_write_config16(dev, LPC_IBDF,
|
pci_write_config16(dev, LPC_IBDF,
|
||||||
PCH_IOAPIC_PCI_BUS << 8 | PCH_IOAPIC_PCI_SLOT << 3);
|
PCH_IOAPIC_PCI_BUS << 8 | PCH_IOAPIC_PCI_SLOT << 3);
|
||||||
|
|
||||||
/* Enable ACPI I/O range decode */
|
|
||||||
pci_write_config8(dev, ACPI_CNTL, ACPI_EN);
|
|
||||||
|
|
||||||
set_ioapic_id(VIO_APIC_VADDR, 0x02);
|
set_ioapic_id(VIO_APIC_VADDR, 0x02);
|
||||||
|
|
||||||
/* affirm full set of redirection table entries ("write once") */
|
/* affirm full set of redirection table entries ("write once") */
|
||||||
|
Reference in New Issue
Block a user