<p>Marc Jones has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20277">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/stoneyridge: Move ACPI madt table to soc<br><br>Move the mainboard madt tables to generic soc ACPI code.<br><br>Change-Id: I49fb55b1315da8fe65421b43fc4312ed588d5ecb<br>Signed-off-by: Marc Jones <marcj303@gmail.com><br>---<br>M src/mainboard/amd/gardenia/acpi_tables.c<br>M src/mainboard/google/kahlee/acpi_tables.c<br>M src/soc/amd/stoneyridge/acpi.c<br>3 files changed, 31 insertions(+), 94 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/20277/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/amd/gardenia/acpi_tables.c b/src/mainboard/amd/gardenia/acpi_tables.c<br>index 1b4f90c..8d4d1cf 100644<br>--- a/src/mainboard/amd/gardenia/acpi_tables.c<br>+++ b/src/mainboard/amd/gardenia/acpi_tables.c<br>@@ -1,8 +1,4 @@<br> /*<br>- * This file is part of the coreboot project.<br>- *<br>- * Copyright (C) 2015 Advanced Micro Devices, Inc.<br>- *<br> * This program is free software; you can redistribute it and/or modify<br> * it under the terms of the GNU General Public License as published by<br> * the Free Software Foundation; version 2 of the License.<br>@@ -13,46 +9,6 @@<br> * GNU General Public License for more details.<br> */<br> <br>-#include <agesawrapper.h><br>-<br>-#include <console/console.h><br>-#include <string.h><br>-#include <arch/acpi.h><br>-#include <arch/acpigen.h><br>-#include <arch/ioapic.h><br>-#include <device/pci.h><br>-#include <device/pci_ids.h><br>-#include <cpu/x86/msr.h><br>-#include <cpu/amd/mtrr.h><br>-#include <cpu/amd/amdfam16.h><br>-<br>-#define IO_APIC2_ADDR 0xFEC20000<br>-<br>-unsigned long acpi_fill_madt(unsigned long current)<br>-{<br>- /* create all subtables for processors */<br>- current = acpi_create_madt_lapics(current);<br>-<br>- /* Write Kern IOAPIC, only one */<br>- current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current, CONFIG_MAX_CPUS,<br>- IO_APIC_ADDR, 0);<br>-<br>- /* TODO: Remove the hardcode */<br>- current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current, CONFIG_MAX_CPUS+1,<br>- IO_APIC2_ADDR, 24);<br>-<br>- current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)<br>- current, 0, 0, 2, 0);<br>- current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)<br>- current, 0, 9, 9, 0xF);<br>- /* 0: mean bus 0--->ISA */<br>- /* 0: PIC 0 */<br>- /* 2: APIC 2 */<br>- /* 5 mean: 0101 --> Edge-triggered, Active high */<br>-<br>- /* create all subtables for processors */<br>- current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)current, 0xff, 5, 1);<br>- /* 1: LINT1 connect to NMI */<br>-<br>- return current;<br>-}<br>+/*<br>+ * Blank file required by build system assumptions of this file being present.<br>+ */<br>diff --git a/src/mainboard/google/kahlee/acpi_tables.c b/src/mainboard/google/kahlee/acpi_tables.c<br>index 1b4f90c..8d4d1cf 100644<br>--- a/src/mainboard/google/kahlee/acpi_tables.c<br>+++ b/src/mainboard/google/kahlee/acpi_tables.c<br>@@ -1,8 +1,4 @@<br> /*<br>- * This file is part of the coreboot project.<br>- *<br>- * Copyright (C) 2015 Advanced Micro Devices, Inc.<br>- *<br> * This program is free software; you can redistribute it and/or modify<br> * it under the terms of the GNU General Public License as published by<br> * the Free Software Foundation; version 2 of the License.<br>@@ -13,46 +9,6 @@<br> * GNU General Public License for more details.<br> */<br> <br>-#include <agesawrapper.h><br>-<br>-#include <console/console.h><br>-#include <string.h><br>-#include <arch/acpi.h><br>-#include <arch/acpigen.h><br>-#include <arch/ioapic.h><br>-#include <device/pci.h><br>-#include <device/pci_ids.h><br>-#include <cpu/x86/msr.h><br>-#include <cpu/amd/mtrr.h><br>-#include <cpu/amd/amdfam16.h><br>-<br>-#define IO_APIC2_ADDR 0xFEC20000<br>-<br>-unsigned long acpi_fill_madt(unsigned long current)<br>-{<br>- /* create all subtables for processors */<br>- current = acpi_create_madt_lapics(current);<br>-<br>- /* Write Kern IOAPIC, only one */<br>- current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current, CONFIG_MAX_CPUS,<br>- IO_APIC_ADDR, 0);<br>-<br>- /* TODO: Remove the hardcode */<br>- current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current, CONFIG_MAX_CPUS+1,<br>- IO_APIC2_ADDR, 24);<br>-<br>- current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)<br>- current, 0, 0, 2, 0);<br>- current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)<br>- current, 0, 9, 9, 0xF);<br>- /* 0: mean bus 0--->ISA */<br>- /* 0: PIC 0 */<br>- /* 2: APIC 2 */<br>- /* 5 mean: 0101 --> Edge-triggered, Active high */<br>-<br>- /* create all subtables for processors */<br>- current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)current, 0xff, 5, 1);<br>- /* 1: LINT1 connect to NMI */<br>-<br>- return current;<br>-}<br>+/*<br>+ * Blank file required by build system assumptions of this file being present.<br>+ */<br>diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c<br>index 34164f4..1e03d50 100644<br>--- a/src/soc/amd/stoneyridge/acpi.c<br>+++ b/src/soc/amd/stoneyridge/acpi.c<br>@@ -23,6 +23,7 @@<br> #include <arch/acpi.h><br> #include <arch/acpigen.h><br> #include <arch/io.h><br>+#include <arch/ioapic.h><br> #include <cbmem.h><br> #include <device/device.h><br> #include <soc/acpi.h><br>@@ -30,7 +31,31 @@<br> #include <soc/nvs.h><br> #include <soc/smi.h><br> <br>+unsigned long acpi_fill_madt(unsigned long current)<br>+{<br>+ /* create all subtables for processors */<br>+ current = acpi_create_madt_lapics(current);<br> <br>+ /* Write Kern IOAPIC, only one */<br>+ current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current, CONFIG_MAX_CPUS,<br>+ IO_APIC_ADDR, 0);<br>+<br>+<br>+ /* 0: mean bus 0--->ISA */<br>+ /* 0: PIC 0 */<br>+ /* 2: APIC 2 */<br>+ /* 5 mean: 0101 --> Edge-triggered, Active high */<br>+ current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)<br>+ current, 0, 0, 2, 0);<br>+ current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)<br>+ current, 0, 9, 9, 0xF);<br>+<br>+ /* create all subtables for processors */<br>+ current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)current, 0xff, 5, 1);<br>+ /* 1: LINT1 connect to NMI */<br>+<br>+ return current;<br>+}<br> /*<br> * Reference section 5.2.9 Fixed ACPI Description Table (FADT)<br> * in the ACPI 3.0b specification.<br></pre><p>To view, visit <a href="https://review.coreboot.org/20277">change 20277</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/20277"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I49fb55b1315da8fe65421b43fc4312ed588d5ecb </div>
<div style="display:none"> Gerrit-Change-Number: 20277 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marc Jones <marc@marcjonesconsulting.com> </div>