soc/amd/picasso: Give the mainboard the ability to modify the MADT table

By default legacy ISA IRQs use edge triggering. Depending on what
devices are used the IRQ types might need to be changed. We add a
setting to the device tree to allow the mainboard to configure the IRS
IRQs.

BUG=b:145102877
TEST=Booted trembyle and was able to use the keyboard.

Change-Id: Ie95e8cc7ca835fb60bee8f10d5f28def6c2801dc
Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/2033493
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41577
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Raul E Rangel 2020-01-31 12:53:45 -07:00 committed by Felix Held
parent a0bf2d6cf5
commit 93b62e6170
2 changed files with 33 additions and 2 deletions

View File

@ -10,6 +10,7 @@
#include <acpi/acpigen.h> #include <acpi/acpigen.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <arch/ioapic.h> #include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
#include <cbmem.h> #include <cbmem.h>
#include <device/device.h> #include <device/device.h>
@ -23,6 +24,7 @@
#include <soc/nvs.h> #include <soc/nvs.h>
#include <soc/gpio.h> #include <soc/gpio.h>
#include <version.h> #include <version.h>
#include "chip.h"
unsigned long acpi_fill_mcfg(unsigned long current) unsigned long acpi_fill_mcfg(unsigned long current)
{ {
@ -38,6 +40,11 @@ unsigned long acpi_fill_mcfg(unsigned long current)
unsigned long acpi_fill_madt(unsigned long current) unsigned long acpi_fill_madt(unsigned long current)
{ {
const struct soc_amd_picasso_config *cfg = config_of_soc();
unsigned int i;
uint8_t irq;
uint8_t flags;
/* create all subtables for processors */ /* create all subtables for processors */
current = acpi_create_madt_lapics(current); current = acpi_create_madt_lapics(current);
@ -51,8 +58,20 @@ unsigned long acpi_fill_madt(unsigned long current)
/* 5 mean: 0101 --> Edge-triggered, Active high */ /* 5 mean: 0101 --> Edge-triggered, Active high */
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *) current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
current, 0, 0, 2, 0); current, 0, 0, 2, 0);
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *) current += acpi_create_madt_irqoverride(
current, 0, 9, 9, 0xf); (acpi_madt_irqoverride_t *)current, 0, 9, 9,
MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_LOW);
for (i = 0; i < ARRAY_SIZE(cfg->irq_override); ++i) {
irq = cfg->irq_override[i].irq;
flags = cfg->irq_override[i].flags;
if (!flags)
continue;
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, 0,
irq, irq, flags);
}
/* create all subtables for processors */ /* create all subtables for processors */
current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)current, current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)current,

View File

@ -12,6 +12,7 @@
#include <soc/iomap.h> #include <soc/iomap.h>
#include <soc/southbridge.h> #include <soc/southbridge.h>
#include <acpi/acpi_device.h> #include <acpi/acpi_device.h>
#include <arch/smp/mpspec.h>
struct soc_amd_picasso_config { struct soc_amd_picasso_config {
struct soc_amd_common_config common_config; struct soc_amd_common_config common_config;
@ -34,6 +35,17 @@ struct soc_amd_picasso_config {
I2S_PINS_UNCONF = 7, /* All pads will be input mode */ I2S_PINS_UNCONF = 7, /* All pads will be input mode */
} acp_pin_cfg; } acp_pin_cfg;
/**
* IRQ 0 - 15 have a default trigger of edge and default polarity of high.
* If you have a device that requires a different configuration you can override the
* settings here.
*/
struct {
uint8_t irq;
/* See MP_IRQ_* from mpspec.h */
uint8_t flags;
} irq_override[16];
/* Options for these are in src/arch/x86/include/acpi/acpi.h */ /* Options for these are in src/arch/x86/include/acpi/acpi.h */
uint8_t fadt_pm_profile; uint8_t fadt_pm_profile;
uint16_t fadt_boot_arch; uint16_t fadt_boot_arch;