coreboot-gerrit November 2022

coreboot-gerrit@coreboot.org

1 participants
7286 discussions

[S] Change in coreboot[master]: soc/intel/tigerlake: Fix setting `HyperThreading`
by Sean Rhodes (Code Review) 13 Nov '22

13 Nov '22

Attention is currently required from: Tarun Tuli, Subrata Banik, Angel Pons. Sean Rhodes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/69534 ) Change subject: soc/intel/tigerlake: Fix setting `HyperThreading` ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/69534 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iea60b89f6f970eb9aee8c7bec026ab5c2df30205 Gerrit-Change-Number: 69534 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com> Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Sun, 13 Nov 2022 19:29:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in coreboot[master]: soc/intel/tigerlake: Drop superfluous HyperThreadingDisable option
by Sean Rhodes (Code Review) 13 Nov '22

13 Nov '22

Sean Rhodes has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/69533 ) Change subject: soc/intel/tigerlake: Drop superfluous HyperThreadingDisable option ...................................................................... Abandoned Angel won -- To view, visit https://review.coreboot.org/c/coreboot/+/69533 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I76c36ea5c40221521eb9b79068baedc78dd34d90 Gerrit-Change-Number: 69533 Gerrit-PatchSet: 1 Gerrit-Owner: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com> Gerrit-MessageType: abandon

1 0

[S] Change in coreboot[master]: soc/intel/tigerlake: Drop superfluous HyperThreadingDisable option
by Sean Rhodes (Code Review) 13 Nov '22

13 Nov '22

Attention is currently required from: Angel Pons. Sean Rhodes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/69533 ) Change subject: soc/intel/tigerlake: Drop superfluous HyperThreadingDisable option ...................................................................... Patch Set 1: This change is ready for review. -- To view, visit https://review.coreboot.org/c/coreboot/+/69533 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I76c36ea5c40221521eb9b79068baedc78dd34d90 Gerrit-Change-Number: 69533 Gerrit-PatchSet: 1 Gerrit-Owner: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Sun, 13 Nov 2022 19:28:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in coreboot[master]: soc/intel/tigerlake: Fix setting `HyperThreading`
by Angel Pons (Code Review) 13 Nov '22

13 Nov '22

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69534 ) Change subject: soc/intel/tigerlake: Fix setting `HyperThreading` ...................................................................... soc/intel/tigerlake: Fix setting `HyperThreading` The `HyperThreading` FSP UPD is set according to the `hyper_threading` CMOS option using the value of the `FSP_HYPERTHREADING` Kconfig option as fallback in case options are disabled or otherwise unavailable. The `HyperThreadingDisable` devicetree setting isn't used by any mainboard but it overwrites the value of the FSP UPD. Remove it so that the CMOS and Kconfig options work as intended. Change-Id: Iea60b89f6f970eb9aee8c7bec026ab5c2df30205 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/soc/intel/tigerlake/chip.h M src/soc/intel/tigerlake/romstage/fsp_params.c 2 files changed, 17 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/69534/1 diff --git a/src/soc/intel/tigerlake/chip.h b/src/soc/intel/tigerlake/chip.h index 6e15d50..c34892a 100644 --- a/src/soc/intel/tigerlake/chip.h +++ b/src/soc/intel/tigerlake/chip.h @@ -432,9 +432,6 @@ */ uint8_t cpu_ratio_override; - /* HyperThreadingDisable : Yes (1) / No (0) */ - uint8_t HyperThreadingDisable; - /* * Enable(0)/Disable(1) DMI Power Optimizer on PCH side. * Default 0. Setting this to 1 disables the DMI Power Optimizer. diff --git a/src/soc/intel/tigerlake/romstage/fsp_params.c b/src/soc/intel/tigerlake/romstage/fsp_params.c index 399cb87..d4e694e 100644 --- a/src/soc/intel/tigerlake/romstage/fsp_params.c +++ b/src/soc/intel/tigerlake/romstage/fsp_params.c @@ -125,9 +125,6 @@ m_cfg->TcssItbtPcie2En = is_devfn_enabled(SA_DEVFN_TBT2); m_cfg->TcssItbtPcie3En = is_devfn_enabled(SA_DEVFN_TBT3); - /* Hyper Threading */ - m_cfg->HyperThreading = !config->HyperThreadingDisable; - /* Disable Lock PCU Thermal Management registers */ m_cfg->LockPTMregs = 0; /* Channel Hash Mask:0x0001=BIT6 set(Minimal), 0x3FFF=BIT[19:6] set(Maximum) */ -- To view, visit https://review.coreboot.org/c/coreboot/+/69534 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iea60b89f6f970eb9aee8c7bec026ab5c2df30205 Gerrit-Change-Number: 69534 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

1 0

[M] Change in coreboot[master]: [WIP] ACPI MADT: Use common IOAPIC IRQ override entries
by build bot (Jenkins) (Code Review) 13 Nov '22

13 Nov '22

Attention is currently required from: Lance Zhao, Jason Glenesk, Raul Rangel, Matt DeVillier, Tim Wawrzynczak, Fred Reitberger, Felix Held. build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/69529 ) Change subject: [WIP] ACPI MADT: Use common IOAPIC IRQ override entries ...................................................................... Patch Set 1: (2 comments) File src/arch/x86/ioapic_cfg.c: Robot Comment from checkpatch (run ID jenkins-coreboot-checkpatch-163538): https://review.coreboot.org/c/coreboot/+/69529/comment/de94a479_874f834c PS1, Line 28: #define DECLARE_IRQ_OVERRIDE_ARRAY(x) \ Macros with complex values should be enclosed in parentheses Robot Comment from checkpatch (run ID jenkins-coreboot-checkpatch-163538): https://review.coreboot.org/c/coreboot/+/69529/comment/67b6e2e2_9bdf9e7d PS1, Line 29: const x = { \ please, no space before tabs -- To view, visit https://review.coreboot.org/c/coreboot/+/69529 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I8bc51d91d0071eb03c50d57ef77d8c9b3d89d4b6 Gerrit-Change-Number: 69529 Gerrit-PatchSet: 1 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Lance Zhao Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Reviewer: Raul Rangel <rrangel(a)chromium.org> Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Lance Zhao Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Attention: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-Attention: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Comment-Date: Sun, 13 Nov 2022 19:25:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in coreboot[master]: ACPI: Use common code for MADT LAPIC NMIs
by build bot (Jenkins) (Code Review) 13 Nov '22

13 Nov '22

Attention is currently required from: Lance Zhao, Jason Glenesk, Raul Rangel, Matt DeVillier, Tim Wawrzynczak, Fred Reitberger, Felix Held. build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/69527 ) Change subject: ACPI: Use common code for MADT LAPIC NMIs ...................................................................... Patch Set 1: (1 comment) File src/include/acpi/acpi.h: Robot Comment from checkpatch (run ID jenkins-coreboot-checkpatch-163536): https://review.coreboot.org/c/coreboot/+/69527/comment/f5995001_7c1fd134 PS1, Line 627: #define ACPI_MADT_LAPIC_NMI_ALL_PROCESSORS 0xff please, no space before tabs -- To view, visit https://review.coreboot.org/c/coreboot/+/69527 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iaf714d8c2aabd16c59c3bcebc4a207406fc85ca9 Gerrit-Change-Number: 69527 Gerrit-PatchSet: 1 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Lance Zhao Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Reviewer: Raul Rangel <rrangel(a)chromium.org> Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Lance Zhao Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Attention: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-Attention: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Comment-Date: Sun, 13 Nov 2022 19:24:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in coreboot[master]: [WIP] ACPI MADT: Drop acpi_fill_madt() under platforms
by Kyösti Mälkki (Code Review) 13 Nov '22

13 Nov '22

Attention is currently required from: Jason Glenesk, Raul Rangel, Matt DeVillier, Fred Reitberger, Felix Held. Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69532 ) Change subject: [WIP] ACPI MADT: Drop acpi_fill_madt() under platforms ...................................................................... [WIP] ACPI MADT: Drop acpi_fill_madt() under platforms Change-Id: Ia0614d78da2ba6c1eba48e1877b50b45a5f3cb88 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- D src/mainboard/aopen/dxplplusu/acpi_tables.c D src/mainboard/emulation/qemu-i440fx/acpi_tables.c M src/northbridge/amd/pi/00730F01/Makefile.inc D src/northbridge/amd/pi/00730F01/acpi_tables.c M src/soc/amd/cezanne/acpi.c M src/soc/amd/glinda/acpi.c M src/soc/amd/mendocino/acpi.c M src/soc/amd/morgana/acpi.c M src/soc/amd/picasso/acpi.c M src/soc/amd/stoneyridge/acpi.c M src/soc/intel/baytrail/acpi.c M src/soc/intel/braswell/acpi.c D src/southbridge/intel/common/madt.c M src/southbridge/intel/i82801gx/lpc.c M src/southbridge/intel/i82801ix/Makefile.inc D src/southbridge/intel/i82801ix/madt.c M src/southbridge/intel/i82801jx/lpc.c M src/southbridge/intel/ibexpeak/Makefile.inc D src/southbridge/intel/ibexpeak/madt.c 19 files changed, 10 insertions(+), 218 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/69532/1 diff --git a/src/mainboard/aopen/dxplplusu/acpi_tables.c b/src/mainboard/aopen/dxplplusu/acpi_tables.c deleted file mode 100644 index d7827aa..0000000 --- a/src/mainboard/aopen/dxplplusu/acpi_tables.c +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <acpi/acpi.h> - -unsigned long acpi_fill_madt(unsigned long current) -{ - current = acpi_create_madt_lapics_with_nmis(current); - - /* Southbridge IOAPIC */ - current = acpi_create_madt_ioapics_from_list(current); - - return current; -} diff --git a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c deleted file mode 100644 index e2b5439..0000000 --- a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c +++ /dev/null @@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <acpi/acpi.h> -#include <arch/ioapic.h> -#include <arch/smp/mpspec.h> -#include <device/device.h> - -#include "fw_cfg.h" -#include "acpi.h" - -unsigned long acpi_fill_madt(unsigned long current) -{ - /* Local APICs */ - current = acpi_create_madt_lapics_with_nmis(current); - - /* IOAPIC */ - current = acpi_create_madt_ioapics_from_list(current); - - return current; -} diff --git a/src/northbridge/amd/pi/00730F01/Makefile.inc b/src/northbridge/amd/pi/00730F01/Makefile.inc index 8fc4ffc..b97b335 100644 --- a/src/northbridge/amd/pi/00730F01/Makefile.inc +++ b/src/northbridge/amd/pi/00730F01/Makefile.inc @@ -4,7 +4,6 @@ ramstage-y += northbridge.c ramstage-y += iommu.c -ramstage-y += acpi_tables.c romstage-y += state_machine.c ramstage-y += state_machine.c diff --git a/src/northbridge/amd/pi/00730F01/acpi_tables.c b/src/northbridge/amd/pi/00730F01/acpi_tables.c deleted file mode 100644 index 612d3f0..0000000 --- a/src/northbridge/amd/pi/00730F01/acpi_tables.c +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <acpi/acpi.h> -#include <arch/ioapic.h> - -unsigned long acpi_fill_madt(unsigned long current) -{ - /* create all subtables for processors */ - current = acpi_create_madt_lapics_with_nmis(current); - - /* all IOAPICs */ - current = acpi_create_madt_ioapics_from_list(current); - - return current; -} diff --git a/src/soc/amd/cezanne/acpi.c b/src/soc/amd/cezanne/acpi.c index b6c55ff..f99ef76 100644 --- a/src/soc/amd/cezanne/acpi.c +++ b/src/soc/amd/cezanne/acpi.c @@ -21,16 +21,6 @@ #include <types.h> #include "chip.h" -unsigned long acpi_fill_madt(unsigned long current) -{ - /* create all subtables for processors */ - current = acpi_create_madt_lapics_with_nmis(current); - - current = acpi_create_madt_ioapics_from_list(current); - - return current; -} - /* * Reference section 5.2.9 Fixed ACPI Description Table (FADT) * in the ACPI 3.0b specification. diff --git a/src/soc/amd/glinda/acpi.c b/src/soc/amd/glinda/acpi.c index edb1136..c52efb3 100644 --- a/src/soc/amd/glinda/acpi.c +++ b/src/soc/amd/glinda/acpi.c @@ -24,16 +24,6 @@ #include <types.h> #include "chip.h" -unsigned long acpi_fill_madt(unsigned long current) -{ - /* create all subtables for processors */ - current = acpi_create_madt_lapics_with_nmis(current); - - current = acpi_create_madt_ioapics_from_list(current); - - return current; -} - /* * Reference section 5.2.9 Fixed ACPI Description Table (FADT) * in the ACPI 3.0b specification. diff --git a/src/soc/amd/mendocino/acpi.c b/src/soc/amd/mendocino/acpi.c index 03d9e05..62769f14 100644 --- a/src/soc/amd/mendocino/acpi.c +++ b/src/soc/amd/mendocino/acpi.c @@ -23,16 +23,6 @@ #include <types.h> #include "chip.h" -unsigned long acpi_fill_madt(unsigned long current) -{ - /* create all subtables for processors */ - current = acpi_create_madt_lapics_with_nmis(current); - - current = acpi_create_madt_ioapics_from_list(current); - - return current; -} - /* * Reference section 5.2.9 Fixed ACPI Description Table (FADT) * in the ACPI 3.0b specification. diff --git a/src/soc/amd/morgana/acpi.c b/src/soc/amd/morgana/acpi.c index 246676f..7b61021 100644 --- a/src/soc/amd/morgana/acpi.c +++ b/src/soc/amd/morgana/acpi.c @@ -24,16 +24,6 @@ #include <types.h> #include "chip.h" -unsigned long acpi_fill_madt(unsigned long current) -{ - /* create all subtables for processors */ - current = acpi_create_madt_lapics_with_nmis(current); - - current = acpi_create_madt_ioapics_from_list(current); - - return current; -} - /* * Reference section 5.2.9 Fixed ACPI Description Table (FADT) * in the ACPI 3.0b specification. diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index da2ed74..bcd4171 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -28,16 +28,6 @@ #include <version.h> #include "chip.h" -unsigned long acpi_fill_madt(unsigned long current) -{ - /* create all subtables for processors */ - current = acpi_create_madt_lapics_with_nmis(current); - - current = acpi_create_madt_ioapics_from_list(current); - - return current; -} - /* * Reference section 5.2.9 Fixed ACPI Description Table (FADT) * in the ACPI 3.0b specification. diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c index 641c9c4..e8e782d 100644 --- a/src/soc/amd/stoneyridge/acpi.c +++ b/src/soc/amd/stoneyridge/acpi.c @@ -23,16 +23,6 @@ #include <soc/gpio.h> #include <version.h> -unsigned long acpi_fill_madt(unsigned long current) -{ - /* create all subtables for processors */ - current = acpi_create_madt_lapics_with_nmis(current); - - current = acpi_create_madt_ioapics_from_list(current); - - return current; -} - /* * Reference section 5.2.9 Fixed ACPI Description Table (FADT) * in the ACPI 3.0b specification. diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c index 053e6e3..081d5ed 100644 --- a/src/soc/intel/baytrail/acpi.c +++ b/src/soc/intel/baytrail/acpi.c @@ -98,23 +98,6 @@ override->flags = MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_HIGH; } -unsigned long acpi_fill_madt(unsigned long current) -{ - /* Local APICs */ - current = acpi_create_madt_lapics_with_nmis(current); - - /* IOAPIC */ - - _override[2]; - const irq_overrides_dyn = { &_override, ARRAY_SIZE(_override) }; - - fill_pit_override(&_override[0]); - fill_sci_override(&_override[1]); - current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_dyn); - - return current; -} - static acpi_tstate_t soc_tss_table[] = { { 100, 1000, 0, 0x00, 0 }, { 88, 875, 0, 0x1e, 0 }, diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c index 5b78539..05272f1 100644 --- a/src/soc/intel/braswell/acpi.c +++ b/src/soc/intel/braswell/acpi.c @@ -317,21 +317,6 @@ override->flags = MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_HIGH; } -unsigned long acpi_fill_madt(unsigned long current) -{ - /* Local APICs */ - current = acpi_create_madt_lapics_with_nmis(current); - - /* IOAPIC */ - _override[2]; - const irq_overrides_dyn = { &_override, ARRAY_SIZE(_override) }; - fill_pit_override(&_override[0]); - fill_sci_override(&_override[1]); - current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_dyn); - - return current; -} - unsigned long southcluster_write_acpi_tables(const struct device *device, unsigned long current, struct acpi_rsdp *rsdp) { diff --git a/src/southbridge/intel/common/madt.c b/src/southbridge/intel/common/madt.c deleted file mode 100644 index 90876aa..0000000 --- a/src/southbridge/intel/common/madt.c +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <acpi/acpi.h> -#include <arch/ioapic.h> -#include <arch/smp/mpspec.h> - -unsigned long acpi_fill_madt(unsigned long current) -{ - /* Local APICs */ - current = acpi_create_madt_lapics_with_nmis(current); - - /* IOAPIC */ - current = acpi_create_madt_ioapic_default_gsi0(current); - - return current; -} diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c index 1d79d2f..7d2c73f 100644 --- a/src/southbridge/intel/i82801gx/lpc.c +++ b/src/southbridge/intel/i82801gx/lpc.c @@ -349,17 +349,6 @@ i82801gx_fixups(dev); } -unsigned long acpi_fill_madt(unsigned long current) -{ - /* Local APICs */ - current = acpi_create_madt_lapics_with_nmis(current); - - /* IOAPIC */ - current = acpi_create_madt_ioapics_from_list(current); - - return current; -} - static void i82801gx_lpc_read_resources(struct device *dev) { struct resource *res; diff --git a/src/southbridge/intel/i82801ix/Makefile.inc b/src/southbridge/intel/i82801ix/Makefile.inc index 0000913..8db30ad 100644 --- a/src/southbridge/intel/i82801ix/Makefile.inc +++ b/src/southbridge/intel/i82801ix/Makefile.inc @@ -22,10 +22,6 @@ smm-y += smihandler.c -ifneq ($(CONFIG_BOARD_EMULATION_QEMU_X86_Q35),y) -ramstage-y += madt.c -endif - CPPFLAGS_common += -I$(src)/southbridge/intel/i82801ix/include endif diff --git a/src/southbridge/intel/i82801ix/madt.c b/src/southbridge/intel/i82801ix/madt.c deleted file mode 100644 index b7f3581..0000000 --- a/src/southbridge/intel/i82801ix/madt.c +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <acpi/acpi.h> -#include <arch/ioapic.h> -#include <arch/smp/mpspec.h> - -unsigned long acpi_fill_madt(unsigned long current) -{ - /* Local APICs */ - current = acpi_create_madt_lapics_with_nmis(current); - - /* IOAPIC */ - current = acpi_create_madt_ioapics_from_list(current); - - return current; -} diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c index 77cb139..9899474 100644 --- a/src/southbridge/intel/i82801jx/lpc.c +++ b/src/southbridge/intel/i82801jx/lpc.c @@ -364,17 +364,6 @@ i82801jx_set_acpi_mode(dev); } -unsigned long acpi_fill_madt(unsigned long current) -{ - /* Local APICs */ - current = acpi_create_madt_lapics_with_nmis(current); - - /* IOAPIC */ - current = acpi_create_madt_ioapics_from_list(current); - - return current; -} - static void i82801jx_lpc_read_resources(struct device *dev) { int i, io_index = 0; diff --git a/src/southbridge/intel/ibexpeak/Makefile.inc b/src/southbridge/intel/ibexpeak/Makefile.inc index 1cf3d1c..8b059e7 100644 --- a/src/southbridge/intel/ibexpeak/Makefile.inc +++ b/src/southbridge/intel/ibexpeak/Makefile.inc @@ -20,7 +20,6 @@ ramstage-y += ../bd82x6x/me_status.c ramstage-$(CONFIG_ELOG) += ../bd82x6x/elog.c -ramstage-y += madt.c smm-y += smihandler.c diff --git a/src/southbridge/intel/ibexpeak/madt.c b/src/southbridge/intel/ibexpeak/madt.c deleted file mode 100644 index 8e2211a..0000000 --- a/src/southbridge/intel/ibexpeak/madt.c +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <arch/ioapic.h> -#include <acpi/acpi.h> -#include <arch/smp/mpspec.h> -#include <device/device.h> -#include <device/pci.h> - -unsigned long acpi_fill_madt(unsigned long current) -{ - /* Local APICs */ - current = acpi_create_madt_lapics_with_nmis(current); - - /* IOAPIC */ - current = acpi_create_madt_ioapics_from_list(current); - - return current; -} -- To view, visit https://review.coreboot.org/c/coreboot/+/69532 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia0614d78da2ba6c1eba48e1877b50b45a5f3cb88 Gerrit-Change-Number: 69532 Gerrit-PatchSet: 1 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Reviewer: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Attention: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: newchange

1 0

[M] Change in coreboot[master]: [WIP] ACPI MADT: Iterate IOAPIC entries
by Kyösti Mälkki (Code Review) 13 Nov '22

13 Nov '22

Attention is currently required from: Jason Glenesk, Raul Rangel, Matt DeVillier, Fred Reitberger, Felix Held. Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69531 ) Change subject: [WIP] ACPI MADT: Iterate IOAPIC entries ...................................................................... [WIP] ACPI MADT: Iterate IOAPIC entries Change-Id: Ia3cf1841ae17c1fe91937eb85a98865892b992b7 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- M src/arch/x86/ioapic.c M src/mainboard/aopen/dxplplusu/acpi_tables.c M src/mainboard/emulation/qemu-i440fx/acpi_tables.c M src/northbridge/amd/pi/00730F01/acpi_tables.c M src/soc/amd/cezanne/acpi.c M src/soc/amd/glinda/acpi.c M src/soc/amd/mendocino/acpi.c M src/soc/amd/morgana/acpi.c M src/soc/amd/picasso/acpi.c M src/soc/amd/stoneyridge/acpi.c M src/southbridge/intel/i82801gx/lpc.c M src/southbridge/intel/i82801ix/madt.c M src/southbridge/intel/i82801jx/lpc.c M src/southbridge/intel/ibexpeak/madt.c 14 files changed, 27 insertions(+), 56 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/69531/1 diff --git a/src/arch/x86/ioapic.c b/src/arch/x86/ioapic.c index 28bbcb1..e01f28a 100644 --- a/src/arch/x86/ioapic.c +++ b/src/arch/x86/ioapic.c @@ -164,6 +164,9 @@ route_i8259_irq0(ioapic_base); } +/* FIXME: Need to add the IOAPIC bases and overrides as a linked list. + * Consider adding them runtime into devicetree. */ + void register_new_ioapic_gsi0(void *ioapic_base) { setup_ioapic(ioapic_base, 0); diff --git a/src/mainboard/aopen/dxplplusu/acpi_tables.c b/src/mainboard/aopen/dxplplusu/acpi_tables.c index ab3e35d..d7827aa 100644 --- a/src/mainboard/aopen/dxplplusu/acpi_tables.c +++ b/src/mainboard/aopen/dxplplusu/acpi_tables.c @@ -1,34 +1,13 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <acpi/acpi.h> -#include <device/pci_def.h> unsigned long acpi_fill_madt(unsigned long current) { - struct device *bdev, *dev = NULL; - struct resource *res = NULL; - current = acpi_create_madt_lapics_with_nmis(current); /* Southbridge IOAPIC */ - current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_01); - - bdev = pcidev_on_root(2, 0); - /* P64H2 Bus B IOAPIC */ - if (bdev) - dev = pcidev_path_behind(bdev->link_list, PCI_DEVFN(28, 0)); - if (dev) { - res = find_resource(dev, PCI_BASE_ADDRESS_0); - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, res->base); - } - - /* P64H2 Bus A IOAPIC */ - if (bdev) - dev = pcidev_path_behind(bdev->link_list, PCI_DEVFN(30, 0)); - if (dev) { - res = find_resource(dev, PCI_BASE_ADDRESS_0); - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, res->base); - } + current = acpi_create_madt_ioapics_from_list(current); return current; } diff --git a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c index f279703..e2b5439 100644 --- a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c +++ b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c @@ -14,7 +14,7 @@ current = acpi_create_madt_lapics_with_nmis(current); /* IOAPIC */ - current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_02); + current = acpi_create_madt_ioapics_from_list(current); return current; } diff --git a/src/northbridge/amd/pi/00730F01/acpi_tables.c b/src/northbridge/amd/pi/00730F01/acpi_tables.c index f8677a6..612d3f0 100644 --- a/src/northbridge/amd/pi/00730F01/acpi_tables.c +++ b/src/northbridge/amd/pi/00730F01/acpi_tables.c @@ -8,11 +8,8 @@ /* create all subtables for processors */ current = acpi_create_madt_lapics_with_nmis(current); - /* Write IOAPIC, only one */ - current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_03); - - /* TODO: Remove the hardcode */ - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, 0xFEC20000); + /* all IOAPICs */ + current = acpi_create_madt_ioapics_from_list(current); return current; } diff --git a/src/soc/amd/cezanne/acpi.c b/src/soc/amd/cezanne/acpi.c index 2341943..b6c55ff 100644 --- a/src/soc/amd/cezanne/acpi.c +++ b/src/soc/amd/cezanne/acpi.c @@ -26,10 +26,7 @@ /* create all subtables for processors */ current = acpi_create_madt_lapics_with_nmis(current); - current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_03); - - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, - GNB_IO_APIC_ADDR); + current = acpi_create_madt_ioapics_from_list(current); return current; } diff --git a/src/soc/amd/glinda/acpi.c b/src/soc/amd/glinda/acpi.c index 121b42f..edb1136 100644 --- a/src/soc/amd/glinda/acpi.c +++ b/src/soc/amd/glinda/acpi.c @@ -29,10 +29,7 @@ /* create all subtables for processors */ current = acpi_create_madt_lapics_with_nmis(current); - current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_03); - - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, - GNB_IO_APIC_ADDR); + current = acpi_create_madt_ioapics_from_list(current); return current; } diff --git a/src/soc/amd/mendocino/acpi.c b/src/soc/amd/mendocino/acpi.c index 2432d9d..03d9e05 100644 --- a/src/soc/amd/mendocino/acpi.c +++ b/src/soc/amd/mendocino/acpi.c @@ -28,10 +28,7 @@ /* create all subtables for processors */ current = acpi_create_madt_lapics_with_nmis(current); - current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_03); - - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, - GNB_IO_APIC_ADDR); + current = acpi_create_madt_ioapics_from_list(current); return current; } diff --git a/src/soc/amd/morgana/acpi.c b/src/soc/amd/morgana/acpi.c index 662146a..246676f 100644 --- a/src/soc/amd/morgana/acpi.c +++ b/src/soc/amd/morgana/acpi.c @@ -29,10 +29,7 @@ /* create all subtables for processors */ current = acpi_create_madt_lapics_with_nmis(current); - current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_03); - - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, - GNB_IO_APIC_ADDR); + current = acpi_create_madt_ioapics_from_list(current); return current; } diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index ec3475f..da2ed74 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -33,10 +33,7 @@ /* create all subtables for processors */ current = acpi_create_madt_lapics_with_nmis(current); - current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_03); - - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, - GNB_IO_APIC_ADDR); + current = acpi_create_madt_ioapics_from_list(current); return current; } diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c index f56ab0a..641c9c4 100644 --- a/src/soc/amd/stoneyridge/acpi.c +++ b/src/soc/amd/stoneyridge/acpi.c @@ -28,10 +28,7 @@ /* create all subtables for processors */ current = acpi_create_madt_lapics_with_nmis(current); - /* Write Kern IOAPIC, only one */ - current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_03); - - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC2_ADDR); + current = acpi_create_madt_ioapics_from_list(current); return current; } diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c index 0dfaec8..1d79d2f 100644 --- a/src/southbridge/intel/i82801gx/lpc.c +++ b/src/southbridge/intel/i82801gx/lpc.c @@ -355,7 +355,7 @@ current = acpi_create_madt_lapics_with_nmis(current); /* IOAPIC */ - current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_00); + current = acpi_create_madt_ioapics_from_list(current); return current; } diff --git a/src/southbridge/intel/i82801ix/madt.c b/src/southbridge/intel/i82801ix/madt.c index d1f7640..b7f3581 100644 --- a/src/southbridge/intel/i82801ix/madt.c +++ b/src/southbridge/intel/i82801ix/madt.c @@ -10,7 +10,7 @@ current = acpi_create_madt_lapics_with_nmis(current); /* IOAPIC */ - current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_00); + current = acpi_create_madt_ioapics_from_list(current); return current; } diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c index a1eb0a0..77cb139 100644 --- a/src/southbridge/intel/i82801jx/lpc.c +++ b/src/southbridge/intel/i82801jx/lpc.c @@ -370,7 +370,7 @@ current = acpi_create_madt_lapics_with_nmis(current); /* IOAPIC */ - current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_00); + current = acpi_create_madt_ioapics_from_list(current); return current; } diff --git a/src/southbridge/intel/ibexpeak/madt.c b/src/southbridge/intel/ibexpeak/madt.c index 1cb40dd..8e2211a 100644 --- a/src/southbridge/intel/ibexpeak/madt.c +++ b/src/southbridge/intel/ibexpeak/madt.c @@ -12,7 +12,7 @@ current = acpi_create_madt_lapics_with_nmis(current); /* IOAPIC */ - current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_02); + current = acpi_create_madt_ioapics_from_list(current); return current; } -- To view, visit https://review.coreboot.org/c/coreboot/+/69531 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia3cf1841ae17c1fe91937eb85a98865892b992b7 Gerrit-Change-Number: 69531 Gerrit-PatchSet: 1 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Reviewer: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Attention: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: newchange

1 0

[M] Change in coreboot[master]: [WIP] soc/intel/baytrail,braswell,common: Handle IOAPIC IRQ overrides
by Kyösti Mälkki (Code Review) 13 Nov '22

13 Nov '22

Attention is currently required from: Jeff Daly, Vanessa Eusebio. Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69530 ) Change subject: [WIP] soc/intel/baytrail,braswell,common: Handle IOAPIC IRQ overrides ...................................................................... [WIP] soc/intel/baytrail,braswell,common: Handle IOAPIC IRQ overrides There are differences with SCI pin and polarity, so the IRQ entries need to be created dynamically. Change-Id: I919433dfef907dd9008b79eaec5f53e824dcd292 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- M src/soc/intel/baytrail/acpi.c M src/soc/intel/baytrail/include/soc/acpi.h M src/soc/intel/braswell/acpi.c M src/soc/intel/common/block/acpi/acpi.c M src/soc/intel/denverton_ns/include/soc/acpi.h 5 files changed, 58 insertions(+), 61 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/69530/1 diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c index 4406188..053e6e3 100644 --- a/src/soc/intel/baytrail/acpi.c +++ b/src/soc/intel/baytrail/acpi.c @@ -86,15 +86,31 @@ return sci_irq; } +static void fill_sci_override(*override) +{ + int sci = acpi_sci_irq(); + override->bus = MP_BUS_ISA; + override->srcpin = sci; + override->dstirq = sci; + if (sci >= 20) + override->flags = MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_LOW; + else + override->flags = MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_HIGH; +} + unsigned long acpi_fill_madt(unsigned long current) { /* Local APICs */ current = acpi_create_madt_lapics_with_nmis(current); /* IOAPIC */ - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDR); - current = acpi_madt_irq_overrides(current); + _override[2]; + const irq_overrides_dyn = { &_override, ARRAY_SIZE(_override) }; + + fill_pit_override(&_override[0]); + fill_sci_override(&_override[1]); + current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_dyn); return current; } @@ -289,24 +305,3 @@ /* Add a method to notify processor nodes */ acpigen_write_processor_cnot(pattrs->num_cpus); } - -unsigned long acpi_madt_irq_overrides(unsigned long current) -{ - int sci_irq = acpi_sci_irq(); - acpi_madt_irqoverride_t *irqovr; - uint16_t sci_flags = MP_IRQ_TRIGGER_LEVEL; - - /* INT_SRC_OVR */ - irqovr = (void *)current; - current += acpi_create_madt_irqoverride(irqovr, 0, 0, 2, 0); - - if (sci_irq >= 20) - sci_flags |= MP_IRQ_POLARITY_LOW; - else - sci_flags |= MP_IRQ_POLARITY_HIGH; - - irqovr = (void *)current; - current += acpi_create_madt_irqoverride(irqovr, 0, sci_irq, sci_irq, sci_flags); - - return current; -} diff --git a/src/soc/intel/baytrail/include/soc/acpi.h b/src/soc/intel/baytrail/include/soc/acpi.h index d629b24..57af044 100644 --- a/src/soc/intel/baytrail/include/soc/acpi.h +++ b/src/soc/intel/baytrail/include/soc/acpi.h @@ -6,6 +6,4 @@ #include <acpi/acpi.h> int acpi_sci_irq(void); -unsigned long acpi_madt_irq_overrides(unsigned long current); - #endif /* _BAYTRAIL_ACPI_H_ */ diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c index 46a8771..5b78539 100644 --- a/src/soc/intel/braswell/acpi.c +++ b/src/soc/intel/braswell/acpi.c @@ -305,25 +305,16 @@ acpigen_write_processor_cnot(pattrs->num_cpus); } -static unsigned long acpi_madt_irq_overrides(unsigned long current) +static void fill_sci_override(*override) { - int sci_irq = acpi_sci_irq(); - acpi_madt_irqoverride_t *irqovr; - uint16_t sci_flags = MP_IRQ_TRIGGER_LEVEL; - - /* INT_SRC_OVR */ - irqovr = (void *)current; - current += acpi_create_madt_irqoverride(irqovr, 0, 0, 2, 0); - - if (sci_irq >= 20) - sci_flags |= MP_IRQ_POLARITY_LOW; + int sci = acpi_sci_irq(); + override->bus = MP_BUS_ISA; + override->srcpin = sci; + override->dstirq = sci; + if (sci >= 20) + override->flags = MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_LOW; else - sci_flags |= MP_IRQ_POLARITY_HIGH; - - irqovr = (void *)current; - current += acpi_create_madt_irqoverride(irqovr, 0, sci_irq, sci_irq, sci_flags); - - return current; + override->flags = MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_HIGH; } unsigned long acpi_fill_madt(unsigned long current) @@ -332,9 +323,11 @@ current = acpi_create_madt_lapics_with_nmis(current); /* IOAPIC */ - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDR); - - current = acpi_madt_irq_overrides(current); + _override[2]; + const irq_overrides_dyn = { &_override, ARRAY_SIZE(_override) }; + fill_pit_override(&_override[0]); + fill_sci_override(&_override[1]); + current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_dyn); return current; } diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c index 860c868..b120727 100644 --- a/src/soc/intel/common/block/acpi/acpi.c +++ b/src/soc/intel/common/block/acpi/acpi.c @@ -55,22 +55,15 @@ return sci_irq; } -static unsigned long acpi_madt_irq_overrides(unsigned long current) +static void fill_sci_override(*override) { - int sci = acpi_sci_irq(); uint16_t flags = MP_IRQ_TRIGGER_LEVEL; + int sci = acpi_sci_irq(); - /* INT_SRC_OVR */ - current += acpi_create_madt_irqoverride((void *)current, 0, 0, 2, 0); - - flags |= soc_madt_sci_irq_polarity(sci); - - /* SCI */ - current += - acpi_create_madt_irqoverride((void *)current, 0, sci, sci, flags); - - - return current; + override->bus = MP_BUS_ISA; + override->srcpin = sci; + override->dstirq = sci; + override->flags |= soc_madt_sci_irq_polarity(sci); } __weak const struct madt_ioapic_info *soc_get_ioapic_info(size_t *entries) @@ -97,12 +90,18 @@ ioapic_table[i].addr, ioapic_table[i].gsi_base); } + /* FIXME: Path is missing override entries. */ } else { + _override[2]; + const irq_overrides_dyn = { &_override, ARRAY_SIZE(_override) }; + /* Default SOC IOAPIC entry */ - current += acpi_create_madt_ioapic_from_hw((void *)current, IO_APIC_ADDR); + fill_pit_override(&_override[0]); + fill_sci_override(&_override[1]); + current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_dyn); } - return acpi_madt_irq_overrides(current); + return current; } void acpi_fill_fadt(acpi_fadt_t *fadt) diff --git a/src/soc/intel/denverton_ns/include/soc/acpi.h b/src/soc/intel/denverton_ns/include/soc/acpi.h index 41a60d0..a789db2 100644 --- a/src/soc/intel/denverton_ns/include/soc/acpi.h +++ b/src/soc/intel/denverton_ns/include/soc/acpi.h @@ -6,7 +6,6 @@ #include <acpi/acpi.h> void acpi_create_serialio_ssdt(acpi_header_t *ssdt); -unsigned long acpi_madt_irq_overrides(unsigned long current); unsigned long southcluster_write_acpi_tables(const struct device *device, unsigned long current, struct acpi_rsdp *rsdp); -- To view, visit https://review.coreboot.org/c/coreboot/+/69530 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I919433dfef907dd9008b79eaec5f53e824dcd292 Gerrit-Change-Number: 69530 Gerrit-PatchSet: 1 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Jeff Daly <jeffd(a)silicom-usa.com> Gerrit-Reviewer: Vanessa Eusebio <vanessa.f.eusebio(a)intel.com> Gerrit-Attention: Jeff Daly <jeffd(a)silicom-usa.com> Gerrit-Attention: Vanessa Eusebio <vanessa.f.eusebio(a)intel.com> Gerrit-MessageType: newchange

1 0

[M] Change in coreboot[master]: [WIP] ACPI MADT: Use common IOAPIC IRQ override entries
by Kyösti Mälkki (Code Review) 13 Nov '22

13 Nov '22

Attention is currently required from: Lance Zhao, Jason Glenesk, Raul Rangel, Matt DeVillier, Tim Wawrzynczak, Fred Reitberger, Felix Held. Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69529 ) Change subject: [WIP] ACPI MADT: Use common IOAPIC IRQ override entries ...................................................................... [WIP] ACPI MADT: Use common IOAPIC IRQ override entries This commit adds couple variants of statically defined IOAPIC overrides, in their current state. Some of these are likely incorrect. The commit changes the order items appear in MADT table. Change-Id: I8bc51d91d0071eb03c50d57ef77d8c9b3d89d4b6 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- M src/acpi/acpi.c A src/arch/x86/ioapic_cfg.c M src/mainboard/aopen/dxplplusu/acpi_tables.c M src/mainboard/emulation/qemu-i440fx/acpi_tables.c M src/northbridge/amd/pi/00730F01/acpi_tables.c M src/soc/amd/cezanne/acpi.c M src/soc/amd/common/block/acpi/tables.c M src/soc/amd/common/block/include/amdblocks/acpi.h M src/soc/amd/glinda/acpi.c M src/soc/amd/mendocino/acpi.c M src/soc/amd/morgana/acpi.c M src/soc/amd/picasso/acpi.c M src/soc/amd/stoneyridge/acpi.c M src/southbridge/intel/common/madt.c M src/southbridge/intel/i82801gx/lpc.c M src/southbridge/intel/i82801ix/madt.c M src/southbridge/intel/i82801jx/lpc.c M src/southbridge/intel/ibexpeak/madt.c 18 files changed, 96 insertions(+), 152 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/69529/1 diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c index 1bc3a04..d869fbf 100644 --- a/src/acpi/acpi.c +++ b/src/acpi/acpi.c @@ -213,6 +213,23 @@ return irqoverride->length; } +unsigned long acpi_create_madt_ioapic_gsi0(unsigned long current, const overrides) +{ + unsigned int i; + uint8_t irq, flags; + + current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDRESS); + + for (i = 0; i < entries; ++i) { + irq = irq_override[i].irq; + flags = irq_override[i].flags; + current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, 0, + irq, irq, flags); + } + + return current; +} + int acpi_create_madt_lapic_nmi(acpi_madt_lapic_nmi_t *lapic_nmi, u8 cpu, u16 flags, u8 lint) { diff --git a/src/arch/x86/ioapic_cfg.c b/src/arch/x86/ioapic_cfg.c new file mode 100644 index 0000000..745746c --- /dev/null +++ b/src/arch/x86/ioapic_cfg.c @@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#define ACPI_SCI_IRQ 9 + +/* PIT is connected to legacy IRQ 0, but IOAPIC GSI 2 */ +#define PIT_TE_PH \ + { MP_BUS_ISA, 0, 2, MP_IRQ_TRIGGER_EDGE | MP_IRQ_POLARITY_HIGH } + +#define PIT_TD_PD \ + { MP_BUS_ISA, 0, 2, MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT } + +/* Possibly EISA by mistake. */ +#define PIT_TD_PD_EISA \ + { MP_BUS_EISA, 0, 2, MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT } + +/* IRQ9 differs from ISA standard - ours is active high, level-triggered */ +#define SCI_TL_PH \ + { MP_BUS_ISA, ACPI_SCI_IRQ, ACPI_SCI_IRQ, MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_HIGH } + +#define SCI_TL_PL \ + { MP_BUS_ISA, ACPI_SCI_IRQ, ACPI_SCI_IRQ, MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_LOW } + +static const _irq_overrides_00 = { PIT_TE_PH, SCI_TL_PH, }; +static const _irq_overrides_01 = { PIT_TD_PD_EISA, SCI_TL_PH, }; +static const _irq_overrides_02 = { PIT_TD_PD, SCI_TL_PH, }; +static const _irq_overrides_03 = { PIT_TD_PD, SCI_TL_PL, }; + +#define DECLARE_IRQ_OVERRIDE_ARRAY(x) \ + const x = { \ + .num_entries = ARRAY_SIZE(_ ## x), \ + .irq_override = _ ## x, \ + } + +DECLARE_IRQ_OVERRIDE_ARRAY(irq_overrides_00); +DECLARE_IRQ_OVERRIDE_ARRAY(irq_overrides_01); +DECLARE_IRQ_OVERRIDE_ARRAY(irq_overrides_02); + +void fill_pit_override(*override) +{ + const pit_default_override = PIT_TD_PD; + *override = pit_default_override; +} + +extern const irq_overrides_00; +extern const irq_overrides_01; +extern const irq_overrides_02; + +void fill_pit_override(*override); diff --git a/src/mainboard/aopen/dxplplusu/acpi_tables.c b/src/mainboard/aopen/dxplplusu/acpi_tables.c index 13ddb3e..ab3e35d 100644 --- a/src/mainboard/aopen/dxplplusu/acpi_tables.c +++ b/src/mainboard/aopen/dxplplusu/acpi_tables.c @@ -11,7 +11,7 @@ current = acpi_create_madt_lapics_with_nmis(current); /* Southbridge IOAPIC */ - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, 0xfec00000); + current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_01); bdev = pcidev_on_root(2, 0); /* P64H2 Bus B IOAPIC */ @@ -30,11 +30,5 @@ current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, res->base); } - /* Map ISA IRQ 0 to IRQ 2 */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, 1, 0, 2, 0); - - /* IRQ9 differs from ISA standard - ours is active high, level-triggered */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, 0, 9, 9, 0xD); - return current; } diff --git a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c index e6262d1..f279703 100644 --- a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c +++ b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c @@ -14,13 +14,7 @@ current = acpi_create_madt_lapics_with_nmis(current); /* IOAPIC */ - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDR); - - /* 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); + current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_02); return current; } diff --git a/src/northbridge/amd/pi/00730F01/acpi_tables.c b/src/northbridge/amd/pi/00730F01/acpi_tables.c index 26636ea..f8677a6 100644 --- a/src/northbridge/amd/pi/00730F01/acpi_tables.c +++ b/src/northbridge/amd/pi/00730F01/acpi_tables.c @@ -8,20 +8,11 @@ /* create all subtables for processors */ current = acpi_create_madt_lapics_with_nmis(current); - /* Write SB800 IOAPIC, only one */ - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDR); + /* Write IOAPIC, only one */ + current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_03); /* TODO: Remove the hardcode */ current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, 0xFEC20000); - 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, 0xF); - /* 0: mean bus 0--->ISA */ - /* 0: PIC 0 */ - /* 2: APIC 2 */ - /* 5 mean: 0101 --> Edge-triggered, Active high */ - return current; } diff --git a/src/soc/amd/cezanne/acpi.c b/src/soc/amd/cezanne/acpi.c index 802476e..2341943 100644 --- a/src/soc/amd/cezanne/acpi.c +++ b/src/soc/amd/cezanne/acpi.c @@ -26,21 +26,11 @@ /* create all subtables for processors */ current = acpi_create_madt_lapics_with_nmis(current); - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDR); + current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_03); current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, GNB_IO_APIC_ADDR); - /* PIT is connected to legacy IRQ 0, but IOAPIC GSI 2 */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, - MP_BUS_ISA, 0, 2, - MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT); - /* SCI IRQ type override */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, - MP_BUS_ISA, ACPI_SCI_IRQ, ACPI_SCI_IRQ, - MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_LOW); - current = acpi_fill_madt_irqoverride(current); - return current; } diff --git a/src/soc/amd/common/block/acpi/tables.c b/src/soc/amd/common/block/acpi/tables.c index ec484a9..fa32777 100644 --- a/src/soc/amd/common/block/acpi/tables.c +++ b/src/soc/amd/common/block/acpi/tables.c @@ -17,27 +17,6 @@ return acpi_write_hpet(device, current, rsdp); } -unsigned long acpi_fill_madt_irqoverride(unsigned long current) -{ - const struct soc_amd_common_config *cfg = soc_get_common_config(); - unsigned int i; - uint8_t irq; - uint8_t flags; - - 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); - } - - return current; -} - /* Used by \_SB.PCI0._CRS */ void acpi_fill_root_complex_tom(const struct device *device) { diff --git a/src/soc/amd/common/block/include/amdblocks/acpi.h b/src/soc/amd/common/block/include/amdblocks/acpi.h index 3dd8418..bd3fead 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpi.h +++ b/src/soc/amd/common/block/include/amdblocks/acpi.h @@ -55,7 +55,6 @@ unsigned long southbridge_write_acpi_tables(const struct device *device, unsigned long current, struct acpi_rsdp *rsdp); -unsigned long acpi_fill_madt_irqoverride(unsigned long current); void acpi_fill_root_complex_tom(const struct device *device); uintptr_t add_agesa_fsp_acpi_table(guid_t guid, const char *name, acpi_rsdp_t *rsdp, diff --git a/src/soc/amd/glinda/acpi.c b/src/soc/amd/glinda/acpi.c index 0c95494..121b42f 100644 --- a/src/soc/amd/glinda/acpi.c +++ b/src/soc/amd/glinda/acpi.c @@ -29,21 +29,11 @@ /* create all subtables for processors */ current = acpi_create_madt_lapics_with_nmis(current); - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDR); + current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_03); current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, GNB_IO_APIC_ADDR); - /* PIT is connected to legacy IRQ 0, but IOAPIC GSI 2 */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, - MP_BUS_ISA, 0, 2, - MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT); - /* SCI IRQ type override */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, - MP_BUS_ISA, ACPI_SCI_IRQ, ACPI_SCI_IRQ, - MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_LOW); - current = acpi_fill_madt_irqoverride(current); - return current; } diff --git a/src/soc/amd/mendocino/acpi.c b/src/soc/amd/mendocino/acpi.c index d30fb85..2432d9d 100644 --- a/src/soc/amd/mendocino/acpi.c +++ b/src/soc/amd/mendocino/acpi.c @@ -28,21 +28,11 @@ /* create all subtables for processors */ current = acpi_create_madt_lapics_with_nmis(current); - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDR); + current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_03); current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, GNB_IO_APIC_ADDR); - /* PIT is connected to legacy IRQ 0, but IOAPIC GSI 2 */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, - MP_BUS_ISA, 0, 2, - MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT); - /* SCI IRQ type override */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, - MP_BUS_ISA, ACPI_SCI_IRQ, ACPI_SCI_IRQ, - MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_LOW); - current = acpi_fill_madt_irqoverride(current); - return current; } diff --git a/src/soc/amd/morgana/acpi.c b/src/soc/amd/morgana/acpi.c index 15b64c5..662146a 100644 --- a/src/soc/amd/morgana/acpi.c +++ b/src/soc/amd/morgana/acpi.c @@ -29,21 +29,11 @@ /* create all subtables for processors */ current = acpi_create_madt_lapics_with_nmis(current); - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDR); + current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_03); current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, GNB_IO_APIC_ADDR); - /* PIT is connected to legacy IRQ 0, but IOAPIC GSI 2 */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, - MP_BUS_ISA, 0, 2, - MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT); - /* SCI IRQ type override */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, - MP_BUS_ISA, ACPI_SCI_IRQ, ACPI_SCI_IRQ, - MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_LOW); - current = acpi_fill_madt_irqoverride(current); - return current; } diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index 6d46698..ec3475f 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -33,22 +33,11 @@ /* create all subtables for processors */ current = acpi_create_madt_lapics_with_nmis(current); - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDR); + current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_03); current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, GNB_IO_APIC_ADDR); - /* PIT is connected to legacy IRQ 0, but IOAPIC GSI 2 */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, - MP_BUS_ISA, 0, 2, - MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT); - /* SCI IRQ type override */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, - MP_BUS_ISA, 9, 9, - MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_LOW); - - current = acpi_fill_madt_irqoverride(current); - return current; } diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c index cc0194b..f56ab0a 100644 --- a/src/soc/amd/stoneyridge/acpi.c +++ b/src/soc/amd/stoneyridge/acpi.c @@ -29,19 +29,10 @@ current = acpi_create_madt_lapics_with_nmis(current); /* Write Kern IOAPIC, only one */ - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDR); + current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_03); current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC2_ADDR); - /* PIT is connected to legacy IRQ 0, but IOAPIC GSI 2 */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, - MP_BUS_ISA, 0, 2, - MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT); - /* SCI IRQ type override */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)current, - MP_BUS_ISA, 9, 9, - MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_LOW); - return current; } diff --git a/src/southbridge/intel/common/madt.c b/src/southbridge/intel/common/madt.c index b85e110..90876aa 100644 --- a/src/southbridge/intel/common/madt.c +++ b/src/southbridge/intel/common/madt.c @@ -10,13 +10,7 @@ current = acpi_create_madt_lapics_with_nmis(current); /* IOAPIC */ - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDR); - - /* 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); + current = acpi_create_madt_ioapic_default_gsi0(current); return current; } diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c index 362e5cf..0dfaec8 100644 --- a/src/southbridge/intel/i82801gx/lpc.c +++ b/src/southbridge/intel/i82801gx/lpc.c @@ -355,13 +355,7 @@ current = acpi_create_madt_lapics_with_nmis(current); /* IOAPIC */ - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDR); - - /* 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); + current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_00); return current; } diff --git a/src/southbridge/intel/i82801ix/madt.c b/src/southbridge/intel/i82801ix/madt.c index 009c9ea..d1f7640 100644 --- a/src/southbridge/intel/i82801ix/madt.c +++ b/src/southbridge/intel/i82801ix/madt.c @@ -10,13 +10,7 @@ current = acpi_create_madt_lapics_with_nmis(current); /* IOAPIC */ - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDR); - - /* 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); + current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_00); return current; } diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c index 39b662a..a1eb0a0 100644 --- a/src/southbridge/intel/i82801jx/lpc.c +++ b/src/southbridge/intel/i82801jx/lpc.c @@ -370,13 +370,7 @@ current = acpi_create_madt_lapics_with_nmis(current); /* IOAPIC */ - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDR); - - /* 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); + current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_00); return current; } diff --git a/src/southbridge/intel/ibexpeak/madt.c b/src/southbridge/intel/ibexpeak/madt.c index 26b1630..1cb40dd 100644 --- a/src/southbridge/intel/ibexpeak/madt.c +++ b/src/southbridge/intel/ibexpeak/madt.c @@ -12,17 +12,7 @@ current = acpi_create_madt_lapics_with_nmis(current); /* IOAPIC */ - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDR); - - /* INT_SRC_OVR */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *) - current, 0, 0, 2, - MP_IRQ_POLARITY_DEFAULT | - MP_IRQ_TRIGGER_DEFAULT); - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *) - current, 0, 9, 9, - MP_IRQ_POLARITY_HIGH | - MP_IRQ_TRIGGER_LEVEL); + current = acpi_create_madt_ioapic_gsi0(current, &irq_overrides_02); return current; } -- To view, visit https://review.coreboot.org/c/coreboot/+/69529 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I8bc51d91d0071eb03c50d57ef77d8c9b3d89d4b6 Gerrit-Change-Number: 69529 Gerrit-PatchSet: 1 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Lance Zhao Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Reviewer: Raul Rangel <rrangel(a)chromium.org> Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-Attention: Lance Zhao Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Attention: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-Attention: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: newchange

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit November 2022