intel/i945: Consolidate MADT handling
Change-Id: Ic3cdfa6086a45aa231aa817d5ef6998823589818 Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/7108 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
parent
8346aca83a
commit
d5d94ea90a
|
@ -33,31 +33,3 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||||
gnvs->cmbp = 0x01;
|
gnvs->cmbp = 0x01;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned long acpi_fill_madt(unsigned long current)
|
|
||||||
{
|
|
||||||
/* Local APICs */
|
|
||||||
current = acpi_create_madt_lapics(current);
|
|
||||||
|
|
||||||
/* IOAPIC */
|
|
||||||
current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current,
|
|
||||||
2, IO_APIC_ADDR, 0);
|
|
||||||
|
|
||||||
/* LAPIC_NMI */
|
|
||||||
current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)
|
|
||||||
current, 0,
|
|
||||||
MP_IRQ_POLARITY_HIGH |
|
|
||||||
MP_IRQ_TRIGGER_EDGE, 0x01);
|
|
||||||
current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)
|
|
||||||
current, 1, MP_IRQ_POLARITY_HIGH |
|
|
||||||
MP_IRQ_TRIGGER_EDGE, 0x01);
|
|
||||||
|
|
||||||
/* INT_SRC_OVR */
|
|
||||||
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
|
||||||
current, 0, 0, 2, MP_IRQ_POLARITY_HIGH | MP_IRQ_TRIGGER_EDGE);
|
|
||||||
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
|
||||||
current, 0, 9, 9, MP_IRQ_POLARITY_HIGH | MP_IRQ_TRIGGER_LEVEL);
|
|
||||||
|
|
||||||
|
|
||||||
return current;
|
|
||||||
}
|
|
||||||
|
|
|
@ -81,30 +81,6 @@ static long acpi_create_ecdt(acpi_ecdt_t * ecdt)
|
||||||
return header->length;
|
return header->length;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned long acpi_fill_madt(unsigned long current)
|
|
||||||
{
|
|
||||||
/* Local APICs */
|
|
||||||
current = acpi_create_madt_lapics(current);
|
|
||||||
|
|
||||||
/* IOAPIC */
|
|
||||||
current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current,
|
|
||||||
2, IO_APIC_ADDR, 0);
|
|
||||||
|
|
||||||
/* INT_SRC_OVR */
|
|
||||||
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
|
||||||
current, 0, 0, 2, 0);
|
|
||||||
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
|
||||||
current, 0, 9, 9, MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_HIGH);
|
|
||||||
|
|
||||||
/* LAPIC_NMI */
|
|
||||||
current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)
|
|
||||||
current, 0, 0x0005, 0x01);
|
|
||||||
current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)
|
|
||||||
current, 1, 0x0005, 0x01);
|
|
||||||
|
|
||||||
return current;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define ALIGN_CURRENT current = (ALIGN(current, 16))
|
#define ALIGN_CURRENT current = (ALIGN(current, 16))
|
||||||
unsigned long mainboard_write_acpi_tables(device_t device,
|
unsigned long mainboard_write_acpi_tables(device_t device,
|
||||||
unsigned long start,
|
unsigned long start,
|
||||||
|
|
|
@ -33,21 +33,3 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||||
gnvs->cmbp = 0x01;
|
gnvs->cmbp = 0x01;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned long acpi_fill_madt(unsigned long current)
|
|
||||||
{
|
|
||||||
/* Local APICs */
|
|
||||||
current = acpi_create_madt_lapics(current);
|
|
||||||
|
|
||||||
/* IOAPIC */
|
|
||||||
current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current,
|
|
||||||
2, IO_APIC_ADDR, 0);
|
|
||||||
|
|
||||||
/* INT_SRC_OVR */
|
|
||||||
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
|
||||||
current, 0, 0, 2, 0);
|
|
||||||
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
|
||||||
current, 0, 9, 9, MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_HIGH);
|
|
||||||
|
|
||||||
return current;
|
|
||||||
}
|
|
||||||
|
|
|
@ -30,21 +30,3 @@
|
||||||
void acpi_create_gnvs(global_nvs_t *gnvs)
|
void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned long acpi_fill_madt(unsigned long current)
|
|
||||||
{
|
|
||||||
/* Local APICs */
|
|
||||||
current = acpi_create_madt_lapics(current);
|
|
||||||
|
|
||||||
/* IOAPIC */
|
|
||||||
current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current,
|
|
||||||
2, IO_APIC_ADDR, 0);
|
|
||||||
|
|
||||||
/* INT_SRC_OVR */
|
|
||||||
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
|
||||||
current, 0, 0, 2, 0);
|
|
||||||
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
|
||||||
current, 0, 9, 9, MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_HIGH);
|
|
||||||
|
|
||||||
return current;
|
|
||||||
}
|
|
||||||
|
|
|
@ -33,21 +33,3 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||||
gnvs->cmbp = 0x01;
|
gnvs->cmbp = 0x01;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned long acpi_fill_madt(unsigned long current)
|
|
||||||
{
|
|
||||||
/* Local APICs */
|
|
||||||
current = acpi_create_madt_lapics(current);
|
|
||||||
|
|
||||||
/* IOAPIC */
|
|
||||||
current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current,
|
|
||||||
2, IO_APIC_ADDR, 0);
|
|
||||||
|
|
||||||
/* INT_SRC_OVR */
|
|
||||||
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
|
||||||
current, 0, 0, 2, 0);
|
|
||||||
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
|
||||||
current, 0, 9, 9, MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_HIGH);
|
|
||||||
|
|
||||||
return current;
|
|
||||||
}
|
|
||||||
|
|
|
@ -33,31 +33,3 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||||
gnvs->cmbp = 0x01;
|
gnvs->cmbp = 0x01;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned long acpi_fill_madt(unsigned long current)
|
|
||||||
{
|
|
||||||
/* Local APICs */
|
|
||||||
current = acpi_create_madt_lapics(current);
|
|
||||||
|
|
||||||
/* IOAPIC */
|
|
||||||
current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current,
|
|
||||||
2, IO_APIC_ADDR, 0);
|
|
||||||
|
|
||||||
/* LAPIC_NMI */
|
|
||||||
current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)
|
|
||||||
current, 0,
|
|
||||||
MP_IRQ_POLARITY_HIGH |
|
|
||||||
MP_IRQ_TRIGGER_EDGE, 0x01);
|
|
||||||
current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)
|
|
||||||
current, 1, MP_IRQ_POLARITY_HIGH |
|
|
||||||
MP_IRQ_TRIGGER_EDGE, 0x01);
|
|
||||||
|
|
||||||
/* INT_SRC_OVR */
|
|
||||||
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
|
||||||
current, 0, 0, 2, MP_IRQ_POLARITY_HIGH | MP_IRQ_TRIGGER_EDGE);
|
|
||||||
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
|
||||||
current, 0, 9, 9, MP_IRQ_POLARITY_HIGH | MP_IRQ_TRIGGER_LEVEL);
|
|
||||||
|
|
||||||
|
|
||||||
return current;
|
|
||||||
}
|
|
||||||
|
|
|
@ -33,31 +33,3 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||||
gnvs->cmbp = 0x01;
|
gnvs->cmbp = 0x01;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned long acpi_fill_madt(unsigned long current)
|
|
||||||
{
|
|
||||||
/* Local APICs */
|
|
||||||
current = acpi_create_madt_lapics(current);
|
|
||||||
|
|
||||||
/* IOAPIC */
|
|
||||||
current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current,
|
|
||||||
2, IO_APIC_ADDR, 0);
|
|
||||||
|
|
||||||
/* LAPIC_NMI */
|
|
||||||
current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)
|
|
||||||
current, 0,
|
|
||||||
MP_IRQ_POLARITY_HIGH |
|
|
||||||
MP_IRQ_TRIGGER_EDGE, 0x01);
|
|
||||||
current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)
|
|
||||||
current, 1, MP_IRQ_POLARITY_HIGH |
|
|
||||||
MP_IRQ_TRIGGER_EDGE, 0x01);
|
|
||||||
|
|
||||||
/* INT_SRC_OVR */
|
|
||||||
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
|
||||||
current, 0, 0, 2, MP_IRQ_POLARITY_HIGH | MP_IRQ_TRIGGER_EDGE);
|
|
||||||
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
|
||||||
current, 0, 9, 9, MP_IRQ_POLARITY_HIGH | MP_IRQ_TRIGGER_LEVEL);
|
|
||||||
|
|
||||||
|
|
||||||
return current;
|
|
||||||
}
|
|
||||||
|
|
|
@ -33,31 +33,3 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
|
||||||
gnvs->cmbp = 0x01;
|
gnvs->cmbp = 0x01;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned long acpi_fill_madt(unsigned long current)
|
|
||||||
{
|
|
||||||
/* Local APICs */
|
|
||||||
current = acpi_create_madt_lapics(current);
|
|
||||||
|
|
||||||
/* IOAPIC */
|
|
||||||
current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current,
|
|
||||||
2, IO_APIC_ADDR, 0);
|
|
||||||
|
|
||||||
/* LAPIC_NMI */
|
|
||||||
current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)
|
|
||||||
current, 0,
|
|
||||||
MP_IRQ_POLARITY_HIGH |
|
|
||||||
MP_IRQ_TRIGGER_EDGE, 0x01);
|
|
||||||
current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)
|
|
||||||
current, 1, MP_IRQ_POLARITY_HIGH |
|
|
||||||
MP_IRQ_TRIGGER_EDGE, 0x01);
|
|
||||||
|
|
||||||
/* INT_SRC_OVR */
|
|
||||||
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
|
||||||
current, 0, 0, 2, MP_IRQ_POLARITY_HIGH | MP_IRQ_TRIGGER_EDGE);
|
|
||||||
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
|
||||||
current, 0, 9, 9, MP_IRQ_POLARITY_HIGH | MP_IRQ_TRIGGER_LEVEL);
|
|
||||||
|
|
||||||
|
|
||||||
return current;
|
|
||||||
}
|
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
#include "i82801gx.h"
|
#include "i82801gx.h"
|
||||||
#include <cpu/x86/smm.h>
|
#include <cpu/x86/smm.h>
|
||||||
#include <arch/acpigen.h>
|
#include <arch/acpigen.h>
|
||||||
|
#include <arch/smp/mpspec.h>
|
||||||
#include <cbmem.h>
|
#include <cbmem.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <drivers/intel/gma/i915.h>
|
#include <drivers/intel/gma/i915.h>
|
||||||
|
@ -452,6 +453,34 @@ static void lpc_init(struct device *dev)
|
||||||
i82801gx_fixups(dev);
|
i82801gx_fixups(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsigned long acpi_fill_madt(unsigned long current)
|
||||||
|
{
|
||||||
|
/* Local APICs */
|
||||||
|
current = acpi_create_madt_lapics(current);
|
||||||
|
|
||||||
|
/* IOAPIC */
|
||||||
|
current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current,
|
||||||
|
2, IO_APIC_ADDR, 0);
|
||||||
|
|
||||||
|
/* LAPIC_NMI */
|
||||||
|
current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)
|
||||||
|
current, 0,
|
||||||
|
MP_IRQ_POLARITY_HIGH |
|
||||||
|
MP_IRQ_TRIGGER_EDGE, 0x01);
|
||||||
|
current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)
|
||||||
|
current, 1, MP_IRQ_POLARITY_HIGH |
|
||||||
|
MP_IRQ_TRIGGER_EDGE, 0x01);
|
||||||
|
|
||||||
|
/* INT_SRC_OVR */
|
||||||
|
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
||||||
|
current, 0, 0, 2, MP_IRQ_POLARITY_HIGH | MP_IRQ_TRIGGER_EDGE);
|
||||||
|
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
|
||||||
|
current, 0, 9, 9, MP_IRQ_POLARITY_HIGH | MP_IRQ_TRIGGER_LEVEL);
|
||||||
|
|
||||||
|
|
||||||
|
return current;
|
||||||
|
}
|
||||||
|
|
||||||
void acpi_fill_fadt(acpi_fadt_t * fadt)
|
void acpi_fill_fadt(acpi_fadt_t * fadt)
|
||||||
{
|
{
|
||||||
device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));
|
device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));
|
||||||
|
|
Loading…
Reference in New Issue