coreboot-gerrit July 2023

coreboot-gerrit@coreboot.org

1 participants
4441 discussions

[M] Change in coreboot[master]: mb/google: Move tis_plat_irq_status to cr50 driver
by Eric Lai (Code Review) 04 Jul '23

04 Jul '23

Attention is currently required from: Christian Walter, Grzegorz Bernacki, Jason Nien, Martin Roth, Vadim Bendebury, Vadim Bendebury, Yidi Lin, Yu-Ping Wu. Eric Lai has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/75917?usp=email ) Change subject: mb/google: Move tis_plat_irq_status to cr50 driver ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://review.coreboot.org/c/coreboot/+/75917?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I78dc39f2c7b44232b06947d3dfe6afa52807ced8 Gerrit-Change-Number: 75917 Gerrit-PatchSet: 3 Gerrit-Owner: Grzegorz Bernacki Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com> Gerrit-Reviewer: Eric Lai <eric_lai(a)quanta.corp-partner.google.com> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Jason Nien <jason.nien(a)amd.corp-partner.google.com> Gerrit-Reviewer: Martin Roth <martin.roth(a)amd.corp-partner.google.com> Gerrit-Reviewer: Vadim Bendebury <vbendeb(a)chromium.org> Gerrit-Reviewer: Vadim Bendebury <vbendeb(a)google.com> Gerrit-Reviewer: Yidi Lin <yidilin(a)google.com> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Vadim Bendebury <vbendeb(a)chromium.org> Gerrit-Attention: Jason Nien <jason.nien(a)amd.corp-partner.google.com> Gerrit-Attention: Vadim Bendebury <vbendeb(a)google.com> Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com> Gerrit-Attention: Grzegorz Bernacki Gerrit-Attention: Martin Roth <martin.roth(a)amd.corp-partner.google.com> Gerrit-Attention: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Attention: Yidi Lin <yidilin(a)google.com> Gerrit-Comment-Date: Tue, 04 Jul 2023 00:11:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[XS] Change in coreboot[master]: intelblocks/cpu/mp_init: Add missing ADL-S SKUs to CPU match table
by Eric Lai (Code Review) 04 Jul '23

04 Jul '23

Attention is currently required from: Kapil Porwal, Michał Żygowski, Subrata Banik, Tarun Tuli. Eric Lai has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/76204?usp=email ) Change subject: intelblocks/cpu/mp_init: Add missing ADL-S SKUs to CPU match table ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: maybe we can add ops cpu_dev_ops under chipset.cb CPU node? Like this CL https://review.coreboot.org/c/coreboot/+/75713. -- To view, visit https://review.coreboot.org/c/coreboot/+/76204?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I3692a3f089ca23af860bd1c8e3c29fee9d9234c9 Gerrit-Change-Number: 76204 Gerrit-PatchSet: 2 Gerrit-Owner: Michał Żygowski <michal.zygowski(a)3mdeb.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Eric Lai <eric_lai(a)quanta.corp-partner.google.com> Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com> Gerrit-Attention: Michał Żygowski <michal.zygowski(a)3mdeb.com> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Comment-Date: Mon, 03 Jul 2023 23:59:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in coreboot[master]: soc/amd/common/block/iommu: factor out PCI register definitions
by Eric Lai (Code Review) 04 Jul '23

04 Jul '23

Attention is currently required from: Felix Held, Jason Glenesk, Matt DeVillier, Raul Rangel. Eric Lai has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/76222?usp=email ) Change subject: soc/amd/common/block/iommu: factor out PCI register definitions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/76222?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ie155cab1f659e9f7b64cd87ba8a77260056656d8 Gerrit-Change-Number: 76222 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Eric Lai <eric_lai(a)quanta.corp-partner.google.com> 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-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.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: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Comment-Date: Mon, 03 Jul 2023 23:51:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[XS] Change in coreboot[master]: soc/amd/common/block/acpi/ivrs: use IOMMU PCI register definitions
by Eric Lai (Code Review) 04 Jul '23

04 Jul '23

Attention is currently required from: Felix Held, Jason Glenesk, Matt DeVillier, Raul Rangel. Eric Lai has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/76223?usp=email ) Change subject: soc/amd/common/block/acpi/ivrs: use IOMMU PCI register definitions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/76223?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I7032d9f032a22649951ef1535f39b918eb8bd539 Gerrit-Change-Number: 76223 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Eric Lai <eric_lai(a)quanta.corp-partner.google.com> 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-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.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: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Comment-Date: Mon, 03 Jul 2023 23:51:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[XS] Change in coreboot[master]: drivers/spi_flash: Always exit 4-byte address mode when memory-mapped
by 9elements QA (Code Review) 04 Jul '23

04 Jul '23

9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/76093?usp=email ) Change subject: drivers/spi_flash: Always exit 4-byte address mode when memory-mapped ...................................................................... Patch Set 3: Automatic boot test returned (PASS/FAIL/TOTAL): 8 / 8 / 16 FAIL: x86_32 "Hermes CFL" , build config PRODRIVE_HERMES_ and payload TianoCore_UefiPayloadPkg : https://lava.9esec.io/r/171757 FAIL: x86_32 "Hermes CFL" , build config PRODRIVE_HERMES and payload TianoCore_UefiPayloadPkg : https://lava.9esec.io/r/171755 FAIL: x86_32 "ThinkPad T500" , build config LENOVO_T500 and payload SeaBIOS : https://lava.9esec.io/r/171754 FAIL: x86_32 "HP Z220 SFF Workstation" , build config HP_Z220_SFF_WORKSTATION and payload LinuxBoot_BB_kexec : https://lava.9esec.io/r/171753 FAIL: x86_64 "HP Compaq 8200 Elite SFF PC" , build config HP_COMPAQ_8200_ELITE_SFF_PC.X86_64 and payload TianoCore : https://lava.9esec.io/r/171752 FAIL: x86_64 "HP Compaq 8200 Elite SFF PC" , build config HP_COMPAQ_8200_ELITE_SFF_PC.X86_64 and payload SeaBIOS : https://lava.9esec.io/r/171751 FAIL: x86_32 "HP Compaq 8200 Elite SFF PC" , build config HP_COMPAQ_8200_ELITE_SFF_PC and payload TianoCore : https://lava.9esec.io/r/171750 FAIL: x86_32 "HP Compaq 8200 Elite SFF PC" , build config HP_COMPAQ_8200_ELITE_SFF_PC and payload SeaBIOS : https://lava.9esec.io/r/171749 PASS: x86_32 "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35_SMM_TSEG and payload TianoCore : https://lava.9esec.io/r/171748 PASS: x86_32 "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35_SMM_TSEG and payload SeaBIOS : https://lava.9esec.io/r/171747 PASS: x86_32 "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35 and payload TianoCore : https://lava.9esec.io/r/171746 PASS: x86_32 "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35 and payload SeaBIOS : https://lava.9esec.io/r/171745 PASS: x86_64 "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX_X86_64 and payload SeaBIOS : https://lava.9esec.io/r/171744 PASS: x86_32 "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX_ASAN and payload SeaBIOS : https://lava.9esec.io/r/171743 PASS: x86_32 "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX_ and payload SeaBIOS : https://lava.9esec.io/r/171742 PASS: x86_32 "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX and payload SeaBIOS : https://lava.9esec.io/r/171741 Please note: This test is under development and might not be accurate at all! -- To view, visit https://review.coreboot.org/c/coreboot/+/76093?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I3a62bfa44a0a5645c1bb80b32d0b9f92075c66bf Gerrit-Change-Number: 76093 Gerrit-PatchSet: 3 Gerrit-Owner: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: 9elements QA <hardwaretestrobot(a)gmail.com> Gerrit-Comment-Date: Mon, 03 Jul 2023 22:19:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[L] Change in coreboot[master]: acpi/acpi.c: Move ACPI header creation to a function
by Felix Held (Code Review) 04 Jul '23

04 Jul '23

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/76143?usp=email ) Change subject: acpi/acpi.c: Move ACPI header creation to a function ...................................................................... acpi/acpi.c: Move ACPI header creation to a function This reduces boilerplate. One functional difference is that SSDT no longer has oem_revision set to 42. Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> Change-Id: Id2e54d61970294e028a61ba86c07c5482784e307 Reviewed-on: https://review.coreboot.org/c/coreboot/+/76143 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- M src/acpi/acpi.c 1 file changed, 49 insertions(+), 246 deletions(-) Approvals: build bot (Jenkins): Verified Kyösti Mälkki: Looks good to me, approved diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c index 36556af..61e6c50 100644 --- a/src/acpi/acpi.c +++ b/src/acpi/acpi.c @@ -110,6 +110,25 @@ i + 1, entries_num, rsdt->header.length); } +static enum cb_err acpi_fill_header(acpi_header_t *header, const char name[4], + enum acpi_tables table, uint32_t size) +{ + if (!header) + return CB_ERR; + + /* Fill out header fields. */ + memcpy(header->signature, name, 4); + memcpy(header->oem_id, OEM_ID, 6); + memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); + memcpy(header->asl_compiler_id, ASLC, 4); + + header->asl_compiler_revision = asl_revision; + header->revision = get_acpi_table_revision(table); + header->length = size; + + return CB_SUCCESS; +} + static int acpi_create_mcfg_mmconfig(acpi_mcfg_mmconfig_t *mmconfig, u32 base, u16 seg_nr, u8 start, u8 end) { @@ -343,19 +362,9 @@ acpi_madt_t *madt = (acpi_madt_t *)header; unsigned long current = (unsigned long)madt + sizeof(acpi_madt_t); - if (!header) + if (acpi_fill_header(header, "APIC", MADT, sizeof(acpi_madt_t)) != CB_SUCCESS) return; - /* Fill out header fields. */ - memcpy(header->signature, "APIC", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->length = sizeof(acpi_madt_t); - header->revision = get_acpi_table_revision(MADT); - madt->lapic_addr = cpu_get_lapic_addr(); if (CONFIG(ACPI_HAVE_PCAT_8259)) madt->flags |= 1; @@ -387,19 +396,10 @@ acpi_mcfg_t *mcfg = (acpi_mcfg_t *)header; unsigned long current = (unsigned long)mcfg + sizeof(acpi_mcfg_t); - if (!header) + + if (acpi_fill_header(header, "MCFG", MCFG, sizeof(acpi_mcfg_t)) != CB_SUCCESS) return; - /* Fill out header fields. */ - memcpy(header->signature, "MCFG", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->length = sizeof(acpi_mcfg_t); - header->revision = get_acpi_table_revision(MCFG); - if (CONFIG(ECAM_MMCONF_SUPPORT)) current = acpi_fill_mcfg(current); @@ -445,19 +445,9 @@ if (!lasa) return; - if (!header) + if (acpi_fill_header(header, "TCPA", TCPA, sizeof(acpi_tcpa_t)) != CB_SUCCESS) return; - /* Fill out header fields. */ - memcpy(header->signature, "TCPA", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->length = sizeof(acpi_tcpa_t); - header->revision = get_acpi_table_revision(TCPA); - tcpa->platform_class = 0; tcpa->laml = tcpa_log_len; tcpa->lasa = (uintptr_t)lasa; @@ -505,19 +495,9 @@ if (!lasa) tpm2_log_len = 0; - if (!header) + if (acpi_fill_header(header, "TPM2", TPM2, sizeof(acpi_tpm2_t)) != CB_SUCCESS) return; - /* Fill out header fields. */ - memcpy(header->signature, "TPM2", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->length = sizeof(acpi_tpm2_t); - header->revision = get_acpi_table_revision(TPM2); - /* Hard to detect for coreboot. Just set it to 0 */ tpm2->platform_class = 0; if (CONFIG(CRB_TPM)) { @@ -563,16 +543,8 @@ { unsigned long current = (unsigned long)ssdt + sizeof(acpi_header_t); - memset((void *)ssdt, 0, sizeof(acpi_header_t)); - - memcpy(&ssdt->signature, "SSDT", 4); - ssdt->revision = get_acpi_table_revision(SSDT); - memcpy(&ssdt->oem_id, OEM_ID, 6); - memcpy(&ssdt->oem_table_id, ACPI_TABLE_CREATOR, 8); - ssdt->oem_revision = 42; - memcpy(&ssdt->asl_compiler_id, ASLC, 4); - ssdt->asl_compiler_revision = asl_revision; - ssdt->length = sizeof(acpi_header_t); + if (acpi_fill_header(ssdt, "SSDT", SSDT, sizeof(acpi_header_t)) != CB_SUCCESS) + return; acpigen_set_current((char *)current); @@ -659,19 +631,9 @@ memset((void *)srat, 0, sizeof(acpi_srat_t)); - if (!header) + if (acpi_fill_header(header, "SRAT", SRAT, sizeof(acpi_srat_t)) != CB_SUCCESS) return; - /* Fill out header fields. */ - memcpy(header->signature, "SRAT", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->length = sizeof(acpi_srat_t); - header->revision = get_acpi_table_revision(SRAT); - srat->resv = 1; /* Spec: Reserved to 1 for backwards compatibility. */ current = acpi_fill_srat(current); @@ -745,19 +707,9 @@ memset((void *)cedt, 0, sizeof(acpi_cedt_t)); - if (!header) + if (acpi_fill_header(header, "CEDT", CEDT, sizeof(acpi_cedt_t)) != CB_SUCCESS) return; - /* Fill out header fields. */ - memcpy(header->signature, "CEDT", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->length = sizeof(acpi_cedt_t); - header->revision = get_acpi_table_revision(CEDT); - current = acpi_fill_cedt(current); /* (Re)calculate length and checksum. */ @@ -790,19 +742,9 @@ memset((void *)hmat, 0, sizeof(acpi_hmat_t)); - if (!header) + if (acpi_fill_header(header, "HMAT", HMAT, sizeof(acpi_hmat_t)) != CB_SUCCESS) return; - /* Fill out header fields. */ - memcpy(header->signature, "HMAT", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->length = sizeof(acpi_hmat_t); - header->revision = get_acpi_table_revision(HMAT); - current = acpi_fill_hmat(current); /* (Re)calculate length and checksum. */ @@ -818,19 +760,9 @@ memset((void *)dmar, 0, sizeof(acpi_dmar_t)); - if (!header) + if (acpi_fill_header(header, "DMAR", DMAR, sizeof(acpi_dmar_t)) != CB_SUCCESS) return; - /* Fill out header fields. */ - memcpy(header->signature, "DMAR", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->length = sizeof(acpi_dmar_t); - header->revision = get_acpi_table_revision(DMAR); - dmar->host_address_width = cpu_phys_address_size() - 1; dmar->flags = flags; @@ -1009,19 +941,9 @@ memset((void *)slit, 0, sizeof(acpi_slit_t)); - if (!header) + if (acpi_fill_header(header, "SLIT", SLIT, sizeof(acpi_slit_t)) != CB_SUCCESS) return; - /* Fill out header fields. */ - memcpy(header->signature, "SLIT", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->length = sizeof(acpi_slit_t); - header->revision = get_acpi_table_revision(SLIT); - current = acpi_fill_slit(current); /* (Re)calculate length and checksum. */ @@ -1037,19 +959,9 @@ memset((void *)hpet, 0, sizeof(acpi_hpet_t)); - if (!header) + if (acpi_fill_header(header, "HPET", HPET, sizeof(acpi_hpet_t)) != CB_SUCCESS) return; - /* Fill out header fields. */ - memcpy(header->signature, "HPET", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->length = sizeof(acpi_hpet_t); - header->revision = get_acpi_table_revision(HPET); - /* Fill out HPET address. */ addr->space_id = ACPI_ADDRESS_SPACE_MEMORY; addr->bit_width = 64; @@ -1192,15 +1104,9 @@ memset((void *)einj, 0, sizeof(*einj)); - /* Fill out header fields. */ - memcpy(header->signature, "EINJ", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); + if (acpi_fill_header(header, "EINJ", EINJ, sizeof(acpi_einj_t)) != CB_SUCCESS) + return; - header->asl_compiler_revision = asl_revision; - header->length = sizeof(acpi_einj_t); - header->revision = 1; inj_header->einj_header_size = sizeof(acpi_injection_header_t); inj_header->entry_count = ACTION_COUNT; @@ -1220,18 +1126,9 @@ memset((void *)vfct, 0, sizeof(acpi_vfct_t)); - if (!header) + if (acpi_fill_header(header, "VFCT", VFCT, sizeof(acpi_vfct_t)) != CB_SUCCESS) return; - /* Fill out header fields. */ - memcpy(header->signature, "VFCT", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->revision = get_acpi_table_revision(VFCT); - current = acpi_fill_vfct(device, vfct, current); /* If no BIOS image, return with header->length == 0. */ @@ -1255,15 +1152,8 @@ acpi_header_t *header = &(spmi->header); memset((void *)spmi, 0, sizeof(struct acpi_spmi)); - /* Fill out header fields. */ - memcpy(header->signature, "SPMI", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->length = sizeof(struct acpi_spmi); - header->revision = get_acpi_table_revision(SPMI); + if (acpi_fill_header(header, "SPMI", SPMI, sizeof(struct acpi_spmi)) != CB_SUCCESS) + return; spmi->reserved = 1; @@ -1303,19 +1193,9 @@ memset((void *)ivrs, 0, sizeof(acpi_ivrs_t)); - if (!header) + if (acpi_fill_header(header, "IVRS", IVRS, sizeof(acpi_ivrs_t)) != CB_SUCCESS) return; - /* Fill out header fields. */ - memcpy(header->signature, "IVRS", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->length = sizeof(acpi_ivrs_t); - header->revision = get_acpi_table_revision(IVRS); - current = acpi_fill_ivrs(ivrs, current); /* (Re)calculate length and checksum. */ @@ -1332,19 +1212,9 @@ memset((void *)crat, 0, sizeof(struct acpi_crat_header)); - if (!header) + if (acpi_fill_header(header, "CRAT", CRAT, sizeof(struct acpi_crat_header)) != CB_SUCCESS) return; - /* Fill out header fields. */ - memcpy(header->signature, "CRAT", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->length = sizeof(struct acpi_crat_header); - header->revision = get_acpi_table_revision(CRAT); - current = acpi_fill_crat(crat, current); /* (Re)calculate length and checksum. */ @@ -1389,16 +1259,9 @@ memset(dbg2, 0, sizeof(acpi_dbg2_header_t)); header = &(dbg2->header); - if (!header) + if (acpi_fill_header(header, "DBG2", DBG2, sizeof(acpi_dbg2_header_t)) != CB_SUCCESS) return; - header->revision = get_acpi_table_revision(DBG2); - memcpy(header->signature, "DBG2", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = asl_revision; - /* One debug device defined */ dbg2->devices_offset = sizeof(acpi_dbg2_header_t); dbg2->devices_count = 1; @@ -1511,19 +1374,9 @@ { acpi_header_t *header = &(rsdt->header); - if (!header) + if (acpi_fill_header(header, "RSDT", RSDT, sizeof(acpi_rsdt_t)) != CB_SUCCESS) return; - /* Fill out header fields. */ - memcpy(header->signature, "RSDT", 4); - memcpy(header->oem_id, oem_id, 6); - memcpy(header->oem_table_id, oem_table_id, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->length = sizeof(acpi_rsdt_t); - header->revision = get_acpi_table_revision(RSDT); - /* Entries are filled in later, we come with an empty set. */ /* Fix checksum. */ @@ -1534,19 +1387,9 @@ { acpi_header_t *header = &(xsdt->header); - if (!header) + if (acpi_fill_header(header, "XSDT", XSDT, sizeof(acpi_xsdt_t)) != CB_SUCCESS) return; - /* Fill out header fields. */ - memcpy(header->signature, "XSDT", 4); - memcpy(header->oem_id, oem_id, 6); - memcpy(header->oem_table_id, oem_table_id, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->length = sizeof(acpi_xsdt_t); - header->revision = get_acpi_table_revision(XSDT); - /* Entries are filled in later, we come with an empty set. */ /* Fix checksum. */ @@ -1651,17 +1494,9 @@ memset(hest, 0, sizeof(acpi_hest_t)); - if (!header) + if (acpi_fill_header(header, "HEST", HEST, sizeof(acpi_hest_t)) != CB_SUCCESS) return; - memcpy(header->signature, "HEST", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = asl_revision; - header->length += sizeof(acpi_hest_t); - header->revision = get_acpi_table_revision(HEST); - acpi_fill_hest(hest); /* Calculate checksums. */ @@ -1676,21 +1511,13 @@ acpi_bert_t *bert = (acpi_bert_t *)header; - if (!header) - return; - void *region; size_t size; if (acpi_soc_get_bert_region(&region, &size) != CB_SUCCESS) return; - memcpy(header->signature, "BERT", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = asl_revision; - header->length += sizeof(acpi_bert_t); - header->revision = get_acpi_table_revision(BERT); + if (acpi_fill_header(header, "BERT", BERT, sizeof(acpi_bert_t)) != CB_SUCCESS) + return; bert->error_region = (uintptr_t)region; bert->region_length = (size_t)size; @@ -1706,17 +1533,9 @@ acpi_fadt_t *fadt = (acpi_fadt_t *)header; acpi_facs_t *facs = (acpi_facs_t *)(*(acpi_facs_t **)arg1); - if (!header) + if (acpi_fill_header(header, "FACP", FADT, sizeof(acpi_fadt_t)) != CB_SUCCESS) return; - memcpy(header->signature, "FACP", 4); - header->length = sizeof(acpi_fadt_t); - header->revision = get_acpi_table_revision(FADT); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = asl_revision; - fadt->FADT_MinorVersion = get_acpi_fadt_minor_version(); fadt->firmware_ctrl = (unsigned long)facs; fadt->x_firmware_ctl_l = (unsigned long)facs; @@ -1757,20 +1576,9 @@ acpi_lpit_t *lpit = (acpi_lpit_t *)header; unsigned long current = (unsigned long)lpit + sizeof(acpi_lpit_t); - if (!header) + if (acpi_fill_header(header, "LPIT", LPIT, sizeof(acpi_lpit_t)) != CB_SUCCESS) return; - /* Fill out header fields. */ - memcpy(header->signature, "LPIT", 4); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - - header->asl_compiler_revision = asl_revision; - header->revision = get_acpi_table_revision(LPIT); - header->oem_revision = 42; - header->length = sizeof(acpi_lpit_t); - current = acpi_fill_lpit(current); /* (Re)calculate length. */ @@ -1810,13 +1618,8 @@ if (fill_lb_serial(&serial) != CB_SUCCESS) return; - memcpy(header->signature, "SPCR", 4); - header->length = sizeof(acpi_spcr_t); - header->revision = get_acpi_table_revision(SPCR); - memcpy(header->oem_id, OEM_ID, 6); - memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); - memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = asl_revision; + if (acpi_fill_header(header, "SPCR", SPCR, sizeof(acpi_spcr_t)) != CB_SUCCESS) + return; spcr->interface_type = acpi_spcr_type(); assert(serial.type == LB_SERIAL_TYPE_IO_MAPPED -- To view, visit https://review.coreboot.org/c/coreboot/+/76143?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id2e54d61970294e028a61ba86c07c5482784e307 Gerrit-Change-Number: 76143 Gerrit-PatchSet: 4 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Elyes Haouas <ehaouas(a)noos.fr> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Lance Zhao <lance.zhao(a)gmail.com> Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[L] Change in coreboot[master]: acpi/acpi.c: Reduce boilerplate
by Felix Held (Code Review) 04 Jul '23

04 Jul '23

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/76127?usp=email ) Change subject: acpi/acpi.c: Reduce boilerplate ...................................................................... acpi/acpi.c: Reduce boilerplate Adding tables to R/XSDT, aligning current pointer, computing checksum is a lot of boilerplate that needs to be done for each table. TESTED on foxconn/g41. Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> Change-Id: If4915b8cdfcfdbb34284ea75fa8a0fd23554152d Reviewed-on: https://review.coreboot.org/c/coreboot/+/76127 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- M src/acpi/acpi.c 1 file changed, 118 insertions(+), 201 deletions(-) Approvals: Kyösti Mälkki: Looks good to me, approved build bot (Jenkins): Verified diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c index 267a989..36556af 100644 --- a/src/acpi/acpi.c +++ b/src/acpi/acpi.c @@ -338,13 +338,11 @@ return current; } -static void acpi_create_madt(acpi_madt_t *madt) +static void acpi_create_madt(acpi_header_t *header, void *unused) { - acpi_header_t *header = &(madt->header); + acpi_madt_t *madt = (acpi_madt_t *)header; unsigned long current = (unsigned long)madt + sizeof(acpi_madt_t); - memset((void *)madt, 0, sizeof(acpi_madt_t)); - if (!header) return; @@ -371,10 +369,8 @@ if (CONFIG(ACPI_CUSTOM_MADT)) current = acpi_fill_madt(current); - /* (Re)calculate length and checksum. */ + /* (Re)calculate length . */ header->length = current - (unsigned long)madt; - - header->checksum = acpi_checksum((void *)madt, header->length); } static unsigned long acpi_fill_mcfg(unsigned long current) @@ -386,13 +382,11 @@ } /* MCFG is defined in the PCI Firmware Specification 3.0. */ -static void acpi_create_mcfg(acpi_mcfg_t *mcfg) +static void acpi_create_mcfg(acpi_header_t *header, void *unused) { - acpi_header_t *header = &(mcfg->header); + acpi_mcfg_t *mcfg = (acpi_mcfg_t *)header; unsigned long current = (unsigned long)mcfg + sizeof(acpi_mcfg_t); - memset((void *)mcfg, 0, sizeof(acpi_mcfg_t)); - if (!header) return; @@ -409,9 +403,8 @@ if (CONFIG(ECAM_MMCONF_SUPPORT)) current = acpi_fill_mcfg(current); - /* (Re)calculate length and checksum. */ + /* (Re)calculate length */ header->length = current - (unsigned long)mcfg; - header->checksum = acpi_checksum((void *)mcfg, header->length); } static void *get_tcpa_log(u32 *size) @@ -439,14 +432,15 @@ return lasa; } -static void acpi_create_tcpa(acpi_tcpa_t *tcpa) +static void acpi_create_tcpa(acpi_header_t *header, void *unused) { - acpi_header_t *header = &(tcpa->header); + if (!CONFIG(TPM1)) + return; + + acpi_tcpa_t *tcpa = (acpi_tcpa_t *)header; u32 tcpa_log_len; void *lasa; - memset((void *)tcpa, 0, sizeof(acpi_tcpa_t)); - lasa = get_tcpa_log(&tcpa_log_len); if (!lasa) return; @@ -467,9 +461,6 @@ tcpa->platform_class = 0; tcpa->laml = tcpa_log_len; tcpa->lasa = (uintptr_t)lasa; - - /* Calculate checksum. */ - header->checksum = acpi_checksum((void *)tcpa, header->length); } static void *get_tpm2_log(u32 *size) @@ -497,14 +488,15 @@ return lasa; } -static void acpi_create_tpm2(acpi_tpm2_t *tpm2) +static void acpi_create_tpm2(acpi_header_t *header, void *unused) { - acpi_header_t *header = &(tpm2->header); + if (!CONFIG(TPM2)) + return; + + acpi_tpm2_t *tpm2 = (acpi_tpm2_t *)header; u32 tpm2_log_len; void *lasa; - memset((void *)tpm2, 0, sizeof(acpi_tpm2_t)); - /* * Some payloads like SeaBIOS depend on log area to use TPM2. * Get the memory size and address of TPM2 log area or initialize it. @@ -542,9 +534,6 @@ /* Fill the log area size and start address fields. */ tpm2->laml = tpm2_log_len; tpm2->lasa = (uintptr_t)lasa; - - /* Calculate checksum. */ - header->checksum = acpi_checksum((void *)tpm2, header->length); } static void acpi_ssdt_write_cbtable(void) @@ -570,7 +559,7 @@ acpigen_pop_len(); } -static void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id) +static void acpi_create_ssdt_generator(acpi_header_t *ssdt, void *unused) { unsigned long current = (unsigned long)ssdt + sizeof(acpi_header_t); @@ -579,7 +568,7 @@ memcpy(&ssdt->signature, "SSDT", 4); ssdt->revision = get_acpi_table_revision(SSDT); memcpy(&ssdt->oem_id, OEM_ID, 6); - memcpy(&ssdt->oem_table_id, oem_table_id, 8); + memcpy(&ssdt->oem_table_id, ACPI_TABLE_CREATOR, 8); ssdt->oem_revision = 42; memcpy(&ssdt->asl_compiler_id, ASLC, 4); ssdt->asl_compiler_revision = asl_revision; @@ -600,7 +589,6 @@ /* (Re)calculate length and checksum. */ ssdt->length = current - (unsigned long)ssdt; - ssdt->checksum = acpi_checksum((void *)ssdt, ssdt->length); } int acpi_create_srat_lapic(acpi_srat_lapic_t *lapic, u8 node, u8 apic) @@ -1504,9 +1492,9 @@ return current; } -static void acpi_create_facs(acpi_facs_t *facs) +static void acpi_create_facs(void *header) { - memset((void *)facs, 0, sizeof(acpi_facs_t)); + acpi_facs_t *facs = header; memcpy(facs->signature, "FACS", 4); facs->length = sizeof(acpi_facs_t); @@ -1681,15 +1669,21 @@ } /* ACPI 3.0b */ -static void acpi_write_bert(acpi_bert_t *bert, uintptr_t region, size_t length) +static void acpi_create_bert(acpi_header_t *header, void *unused) { - acpi_header_t *header = &(bert->header); + if (!CONFIG(ACPI_BERT)) + return; - memset(bert, 0, sizeof(acpi_bert_t)); + acpi_bert_t *bert = (acpi_bert_t *)header; if (!header) return; + void *region; + size_t size; + if (acpi_soc_get_bert_region(&region, &size) != CB_SUCCESS) + return; + memcpy(header->signature, "BERT", 4); memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); @@ -1698,22 +1692,19 @@ header->length += sizeof(acpi_bert_t); header->revision = get_acpi_table_revision(BERT); - bert->error_region = region; - bert->region_length = length; - - /* Calculate checksums. */ - header->checksum = acpi_checksum((void *)bert, header->length); + bert->error_region = (uintptr_t)region; + bert->region_length = (size_t)size; } __weak void arch_fill_fadt(acpi_fadt_t *fadt) { } __weak void soc_fill_fadt(acpi_fadt_t *fadt) { } __weak void mainboard_fill_fadt(acpi_fadt_t *fadt) { } -static void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) +static acpi_header_t *dsdt; +static void acpi_create_fadt(acpi_header_t *header, void *arg1) { - acpi_header_t *header = &(fadt->header); - - memset((void *)fadt, 0, sizeof(acpi_fadt_t)); + acpi_fadt_t *fadt = (acpi_fadt_t *)header; + acpi_facs_t *facs = (acpi_facs_t *)(*(acpi_facs_t **)arg1); if (!header) return; @@ -1756,17 +1747,15 @@ soc_fill_fadt(fadt); mainboard_fill_fadt(fadt); - - header->checksum = - acpi_checksum((void *)fadt, header->length); } -static void acpi_create_lpit(acpi_lpit_t *lpit) +static void acpi_create_lpit(acpi_header_t *header, void *unused) { - acpi_header_t *header = &(lpit->header); - unsigned long current = (unsigned long)lpit + sizeof(acpi_lpit_t); + if (!CONFIG(ACPI_LPIT)) + return; - memset((void *)lpit, 0, sizeof(acpi_lpit_t)); + acpi_lpit_t *lpit = (acpi_lpit_t *)header; + unsigned long current = (unsigned long)lpit + sizeof(acpi_lpit_t); if (!header) return; @@ -1784,9 +1773,8 @@ current = acpi_fill_lpit(current); - /* (Re)calculate length and checksum. */ + /* (Re)calculate length. */ header->length = current - (unsigned long)lpit; - header->checksum = acpi_checksum((void *)lpit, header->length); } unsigned long acpi_create_lpi_desc_ncst(acpi_lpi_desc_ncst_t *lpi_desc, uint16_t uid) @@ -1811,14 +1799,11 @@ return 0xff; } -static void acpi_create_spcr(acpi_spcr_t *spcr) +static void acpi_create_spcr(acpi_header_t *header, void *unused) { - acpi_header_t *header = &(spcr->header); + acpi_spcr_t *spcr = (acpi_spcr_t *)header; struct lb_serial serial; - /* The caller checks the header size, so call this first */ - memset((void *)spcr, 0, sizeof(acpi_spcr_t)); - if (!CONFIG(CONSOLE_SERIAL)) return; @@ -1886,6 +1871,46 @@ cbfs_preload(file); } +static void acpi_create_dsdt(acpi_header_t *header, void *dsdt_file_arg) +{ + dsdt = header; + acpi_header_t *dsdt_file = *(acpi_header_t **)dsdt_file_arg; + unsigned long current = (unsigned long)header; + + dsdt = (acpi_header_t *)current; + memcpy(dsdt, dsdt_file, sizeof(acpi_header_t)); + if (dsdt->length >= sizeof(acpi_header_t)) { + current += sizeof(acpi_header_t); + + acpigen_set_current((char *)current); + + if (CONFIG(ACPI_SOC_NVS)) + acpi_fill_gnvs(); + if (CONFIG(CHROMEOS_NVS)) + acpi_fill_cnvs(); + + for (const struct device *dev = all_devices; dev; dev = dev->next) + if (dev->ops && dev->ops->acpi_inject_dsdt) + dev->ops->acpi_inject_dsdt(dev); + current = (unsigned long)acpigen_get_current(); + memcpy((char *)current, + (char *)dsdt_file + sizeof(acpi_header_t), + dsdt->length - sizeof(acpi_header_t)); + current += dsdt->length - sizeof(acpi_header_t); + + /* (Re)calculate length. */ + dsdt->length = current - (unsigned long)dsdt; + } +} + +static void acpi_create_slic(acpi_header_t *header, void *slic_file_arg) +{ + acpi_header_t *slic_file = *(acpi_header_t **)slic_file_arg; + acpi_header_t *slic = header; + if (slic_file) + memcpy(slic, slic_file, slic_file->length); +} + static uintptr_t coreboot_rsdp; uintptr_t get_coreboot_rsdp(void) @@ -1931,22 +1956,33 @@ acpi_rsdp_t *rsdp; acpi_rsdt_t *rsdt = NULL; acpi_xsdt_t *xsdt = NULL; - acpi_fadt_t *fadt = NULL; acpi_facs_t *facs = NULL; - acpi_header_t *slic_file, *slic = NULL; + acpi_header_t *slic_file; acpi_header_t *ssdt = NULL; - acpi_header_t *dsdt_file, *dsdt = NULL; - acpi_mcfg_t *mcfg = NULL; - acpi_tcpa_t *tcpa = NULL; - acpi_tpm2_t *tpm2 = NULL; - acpi_madt_t *madt = NULL; - acpi_lpit_t *lpit = NULL; - acpi_bert_t *bert = NULL; + acpi_header_t *dsdt_file; struct device *dev; unsigned long fw; size_t slic_size, dsdt_size; char oem_id[6], oem_table_id[8]; + const struct acpi_table_generator { + void (*create_table)(acpi_header_t *table, void *arg); + void *args; + size_t min_size; + } tables[] = { + { acpi_create_dsdt, &dsdt_file, sizeof(acpi_header_t) }, + { acpi_create_fadt, &facs, sizeof(acpi_fadt_t) }, + { acpi_create_slic, &slic_file, sizeof(acpi_header_t) }, + { acpi_create_ssdt_generator, NULL, sizeof(acpi_header_t) }, + { acpi_create_mcfg, NULL, sizeof(acpi_mcfg_t) }, + { acpi_create_tcpa, NULL, sizeof(acpi_tcpa_t) }, + { acpi_create_tpm2, NULL, sizeof(acpi_tpm2_t) }, + { acpi_create_lpit, NULL, sizeof(acpi_lpit_t) }, + { acpi_create_madt, NULL, sizeof(acpi_header_t) }, + { acpi_create_bert, NULL, sizeof(acpi_bert_t) }, + { acpi_create_spcr, NULL, sizeof(acpi_spcr_t) }, + }; + current = start; /* Align ACPI tables to 16byte */ @@ -1992,7 +2028,7 @@ ssdt->length = current - (unsigned long)ssdt; ssdt->checksum = acpi_checksum((void *)ssdt, ssdt->length); - acpi_create_ssdt_generator(ssdt, ACPI_TABLE_CREATOR); + acpi_create_ssdt_generator(ssdt, NULL); acpi_add_table(rsdp, ssdt); @@ -2052,59 +2088,26 @@ acpi_write_rsdt(rsdt, oem_id, oem_table_id); acpi_write_xsdt(xsdt, oem_id, oem_table_id); - printk(BIOS_DEBUG, "ACPI: * FACS\n"); current = ALIGN_UP(current, 64); + + printk(BIOS_DEBUG, "ACPI: * FACS\n"); facs = (acpi_facs_t *)current; current += sizeof(acpi_facs_t); current = acpi_align_current(current); acpi_create_facs(facs); - printk(BIOS_DEBUG, "ACPI: * DSDT\n"); - dsdt = (acpi_header_t *)current; - memcpy(dsdt, dsdt_file, sizeof(acpi_header_t)); - if (dsdt->length >= sizeof(acpi_header_t)) { - current += sizeof(acpi_header_t); - - acpigen_set_current((char *)current); - - if (CONFIG(ACPI_SOC_NVS)) - acpi_fill_gnvs(); - if (CONFIG(CHROMEOS_NVS)) - acpi_fill_cnvs(); - - for (dev = all_devices; dev; dev = dev->next) - if (dev->ops && dev->ops->acpi_inject_dsdt) - dev->ops->acpi_inject_dsdt(dev); - current = (unsigned long)acpigen_get_current(); - memcpy((char *)current, - (char *)dsdt_file + sizeof(acpi_header_t), - dsdt->length - sizeof(acpi_header_t)); - current += dsdt->length - sizeof(acpi_header_t); - - /* (Re)calculate length and checksum. */ - dsdt->length = current - (unsigned long)dsdt; - dsdt->checksum = 0; - dsdt->checksum = acpi_checksum((void *)dsdt, dsdt->length); - } - - current = acpi_align_current(current); - - printk(BIOS_DEBUG, "ACPI: * FADT\n"); - fadt = (acpi_fadt_t *)current; - current += sizeof(acpi_fadt_t); - current = acpi_align_current(current); - - acpi_create_fadt(fadt, facs, dsdt); - acpi_add_table(rsdp, fadt); - - if (slic_file) { - printk(BIOS_DEBUG, "ACPI: * SLIC\n"); - slic = (acpi_header_t *)current; - memcpy(slic, slic_file, slic_file->length); - current += slic_file->length; + for (size_t i = 0; i < ARRAY_SIZE(tables); i++) { + acpi_header_t *header = (acpi_header_t *)current; + memset(header, 0, tables[i].min_size); + tables[i].create_table(header, tables[i].args); + if (header->length < tables[i].min_size) + continue; + header->checksum = 0; + header->checksum = acpi_checksum((void *)header, header->length); + current += header->length; current = acpi_align_current(current); - acpi_add_table(rsdp, slic); - cbfs_unmap(slic_file); + printk(BIOS_DEBUG, "ACPI: * %.4s\n", header->signature); + acpi_add_table(rsdp, header); } /* @@ -2113,95 +2116,9 @@ * This is why unmapping of dsdt_file must be done after * unmapping slic file. */ + cbfs_unmap(slic_file); cbfs_unmap(dsdt_file); - printk(BIOS_DEBUG, "ACPI: * SSDT\n"); - ssdt = (acpi_header_t *)current; - acpi_create_ssdt_generator(ssdt, ACPI_TABLE_CREATOR); - if (ssdt->length > sizeof(acpi_header_t)) { - current += ssdt->length; - acpi_add_table(rsdp, ssdt); - current = acpi_align_current(current); - } - - printk(BIOS_DEBUG, "ACPI: * MCFG\n"); - mcfg = (acpi_mcfg_t *)current; - acpi_create_mcfg(mcfg); - if (mcfg->header.length > sizeof(acpi_mcfg_t)) { - current += mcfg->header.length; - current = acpi_align_current(current); - acpi_add_table(rsdp, mcfg); - } - - if (CONFIG(TPM1)) { - printk(BIOS_DEBUG, "ACPI: * TCPA\n"); - tcpa = (acpi_tcpa_t *)current; - acpi_create_tcpa(tcpa); - if (tcpa->header.length >= sizeof(acpi_tcpa_t)) { - current += tcpa->header.length; - current = acpi_align_current(current); - acpi_add_table(rsdp, tcpa); - } - } - - if (CONFIG(TPM2)) { - printk(BIOS_DEBUG, "ACPI: * TPM2\n"); - tpm2 = (acpi_tpm2_t *)current; - acpi_create_tpm2(tpm2); - if (tpm2->header.length >= sizeof(acpi_tpm2_t)) { - current += tpm2->header.length; - current = acpi_align_current(current); - acpi_add_table(rsdp, tpm2); - } - } - - if (CONFIG(ACPI_LPIT)) { - printk(BIOS_DEBUG, "ACPI: * LPIT\n"); - - lpit = (acpi_lpit_t *)current; - acpi_create_lpit(lpit); - if (lpit->header.length >= sizeof(acpi_lpit_t)) { - current += lpit->header.length; - current = acpi_align_current(current); - acpi_add_table(rsdp, lpit); - } - } - - printk(BIOS_DEBUG, "ACPI: * MADT\n"); - - madt = (acpi_madt_t *)current; - acpi_create_madt(madt); - if (madt->header.length > sizeof(acpi_madt_t)) { - current += madt->header.length; - acpi_add_table(rsdp, madt); - } - - current = acpi_align_current(current); - - if (CONFIG(ACPI_BERT)) { - void *region; - size_t size; - bert = (acpi_bert_t *)current; - if (acpi_soc_get_bert_region(&region, &size) == CB_SUCCESS) { - printk(BIOS_DEBUG, "ACPI: * BERT\n"); - acpi_write_bert(bert, (uintptr_t)region, size); - if (bert->header.length >= sizeof(acpi_bert_t)) { - current += bert->header.length; - acpi_add_table(rsdp, bert); - } - current = acpi_align_current(current); - } - } - - printk(BIOS_DEBUG, "ACPI: * SPCR\n"); - acpi_spcr_t * const spcr = (acpi_spcr_t *)current; - acpi_create_spcr(spcr); - if (spcr->header.length >= sizeof(acpi_spcr_t)) { - current += spcr->header.length; - acpi_add_table(rsdp, spcr); - } - current = acpi_align_current(current); - printk(BIOS_DEBUG, "current = %lx\n", current); for (dev = all_devices; dev; dev = dev->next) { -- To view, visit https://review.coreboot.org/c/coreboot/+/76127?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If4915b8cdfcfdbb34284ea75fa8a0fd23554152d Gerrit-Change-Number: 76127 Gerrit-PatchSet: 5 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Elyes Haouas <ehaouas(a)noos.fr> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Lance Zhao <lance.zhao(a)gmail.com> Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in coreboot[master]: util/sconfig: Improve usage and long options
by 9elements QA (Code Review) 03 Jul '23

03 Jul '23

9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/70524?usp=email ) Change subject: util/sconfig: Improve usage and long options ...................................................................... Patch Set 6: Automatic boot test returned (PASS/FAIL/TOTAL): 8 / 8 / 16 FAIL: x86_32 "Hermes CFL" , build config PRODRIVE_HERMES_ and payload TianoCore_UefiPayloadPkg : https://lava.9esec.io/r/171739 FAIL: x86_32 "Hermes CFL" , build config PRODRIVE_HERMES and payload TianoCore_UefiPayloadPkg : https://lava.9esec.io/r/171737 FAIL: x86_32 "ThinkPad T500" , build config LENOVO_T500 and payload SeaBIOS : https://lava.9esec.io/r/171736 FAIL: x86_32 "HP Z220 SFF Workstation" , build config HP_Z220_SFF_WORKSTATION and payload LinuxBoot_BB_kexec : https://lava.9esec.io/r/171735 FAIL: x86_64 "HP Compaq 8200 Elite SFF PC" , build config HP_COMPAQ_8200_ELITE_SFF_PC.X86_64 and payload TianoCore : https://lava.9esec.io/r/171734 FAIL: x86_64 "HP Compaq 8200 Elite SFF PC" , build config HP_COMPAQ_8200_ELITE_SFF_PC.X86_64 and payload SeaBIOS : https://lava.9esec.io/r/171733 FAIL: x86_32 "HP Compaq 8200 Elite SFF PC" , build config HP_COMPAQ_8200_ELITE_SFF_PC and payload TianoCore : https://lava.9esec.io/r/171732 FAIL: x86_32 "HP Compaq 8200 Elite SFF PC" , build config HP_COMPAQ_8200_ELITE_SFF_PC and payload SeaBIOS : https://lava.9esec.io/r/171731 PASS: x86_32 "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35_SMM_TSEG and payload TianoCore : https://lava.9esec.io/r/171730 PASS: x86_32 "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35_SMM_TSEG and payload SeaBIOS : https://lava.9esec.io/r/171729 PASS: x86_32 "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35 and payload TianoCore : https://lava.9esec.io/r/171728 PASS: x86_32 "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35 and payload SeaBIOS : https://lava.9esec.io/r/171727 PASS: x86_64 "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX_X86_64 and payload SeaBIOS : https://lava.9esec.io/r/171726 PASS: x86_32 "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX_ASAN and payload SeaBIOS : https://lava.9esec.io/r/171725 PASS: x86_32 "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX_ and payload SeaBIOS : https://lava.9esec.io/r/171724 PASS: x86_32 "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX and payload SeaBIOS : https://lava.9esec.io/r/171723 Please note: This test is under development and might not be accurate at all! -- To view, visit https://review.coreboot.org/c/coreboot/+/70524?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If5252de63692c5e43bfbde4d7d93e1d7a84e8dff Gerrit-Change-Number: 70524 Gerrit-PatchSet: 6 Gerrit-Owner: Jakub Czapiga <jacz(a)semihalf.com> Gerrit-Reviewer: Elyes Haouas <ehaouas(a)noos.fr> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: 9elements QA <hardwaretestrobot(a)gmail.com> Gerrit-CC: Jan Dabros <jsd(a)semihalf.com> Gerrit-Comment-Date: Mon, 03 Jul 2023 21:57:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[XS] Change in coreboot[master]: soc/amd/phoenix/Kconfig: Select VBOOT_X86_SHA256_ACCELERATION
by 9elements QA (Code Review) 03 Jul '23

03 Jul '23

9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/76166?usp=email ) Change subject: soc/amd/phoenix/Kconfig: Select VBOOT_X86_SHA256_ACCELERATION ...................................................................... Patch Set 3: Automatic boot test returned (PASS/FAIL/TOTAL): 8 / 8 / 16 FAIL: x86_32 "Hermes CFL" , build config PRODRIVE_HERMES_ and payload TianoCore_UefiPayloadPkg : https://lava.9esec.io/r/171722 FAIL: x86_32 "Hermes CFL" , build config PRODRIVE_HERMES and payload TianoCore_UefiPayloadPkg : https://lava.9esec.io/r/171720 FAIL: x86_32 "ThinkPad T500" , build config LENOVO_T500 and payload SeaBIOS : https://lava.9esec.io/r/171719 FAIL: x86_32 "HP Z220 SFF Workstation" , build config HP_Z220_SFF_WORKSTATION and payload LinuxBoot_BB_kexec : https://lava.9esec.io/r/171718 FAIL: x86_64 "HP Compaq 8200 Elite SFF PC" , build config HP_COMPAQ_8200_ELITE_SFF_PC.X86_64 and payload TianoCore : https://lava.9esec.io/r/171717 FAIL: x86_64 "HP Compaq 8200 Elite SFF PC" , build config HP_COMPAQ_8200_ELITE_SFF_PC.X86_64 and payload SeaBIOS : https://lava.9esec.io/r/171716 FAIL: x86_32 "HP Compaq 8200 Elite SFF PC" , build config HP_COMPAQ_8200_ELITE_SFF_PC and payload TianoCore : https://lava.9esec.io/r/171715 FAIL: x86_32 "HP Compaq 8200 Elite SFF PC" , build config HP_COMPAQ_8200_ELITE_SFF_PC and payload SeaBIOS : https://lava.9esec.io/r/171714 PASS: x86_32 "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35_SMM_TSEG and payload TianoCore : https://lava.9esec.io/r/171713 PASS: x86_32 "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35_SMM_TSEG and payload SeaBIOS : https://lava.9esec.io/r/171712 PASS: x86_32 "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35 and payload TianoCore : https://lava.9esec.io/r/171711 PASS: x86_32 "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35 and payload SeaBIOS : https://lava.9esec.io/r/171710 PASS: x86_64 "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX_X86_64 and payload SeaBIOS : https://lava.9esec.io/r/171709 PASS: x86_32 "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX_ASAN and payload SeaBIOS : https://lava.9esec.io/r/171708 PASS: x86_32 "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX_ and payload SeaBIOS : https://lava.9esec.io/r/171707 PASS: x86_32 "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX and payload SeaBIOS : https://lava.9esec.io/r/171706 Please note: This test is under development and might not be accurate at all! -- To view, visit https://review.coreboot.org/c/coreboot/+/76166?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id228399ba02708b97110d524ce12c2626588762d Gerrit-Change-Number: 76166 Gerrit-PatchSet: 3 Gerrit-Owner: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Reviewer: Eric Lai <eric_lai(a)quanta.corp-partner.google.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: 9elements QA <hardwaretestrobot(a)gmail.com> Gerrit-Comment-Date: Mon, 03 Jul 2023 21:35:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in coreboot[master]: soc/amd/phoenix: Remove TODO after review
by 9elements QA (Code Review) 03 Jul '23

03 Jul '23

9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/76165?usp=email ) Change subject: soc/amd/phoenix: Remove TODO after review ...................................................................... Patch Set 3: Automatic boot test returned (PASS/FAIL/TOTAL): 8 / 8 / 16 FAIL: x86_32 "Hermes CFL" , build config PRODRIVE_HERMES_ and payload TianoCore_UefiPayloadPkg : https://lava.9esec.io/r/171705 FAIL: x86_32 "Hermes CFL" , build config PRODRIVE_HERMES and payload TianoCore_UefiPayloadPkg : https://lava.9esec.io/r/171703 FAIL: x86_32 "ThinkPad T500" , build config LENOVO_T500 and payload SeaBIOS : https://lava.9esec.io/r/171702 FAIL: x86_32 "HP Z220 SFF Workstation" , build config HP_Z220_SFF_WORKSTATION and payload LinuxBoot_BB_kexec : https://lava.9esec.io/r/171701 FAIL: x86_64 "HP Compaq 8200 Elite SFF PC" , build config HP_COMPAQ_8200_ELITE_SFF_PC.X86_64 and payload TianoCore : https://lava.9esec.io/r/171700 FAIL: x86_64 "HP Compaq 8200 Elite SFF PC" , build config HP_COMPAQ_8200_ELITE_SFF_PC.X86_64 and payload SeaBIOS : https://lava.9esec.io/r/171699 FAIL: x86_32 "HP Compaq 8200 Elite SFF PC" , build config HP_COMPAQ_8200_ELITE_SFF_PC and payload TianoCore : https://lava.9esec.io/r/171698 FAIL: x86_32 "HP Compaq 8200 Elite SFF PC" , build config HP_COMPAQ_8200_ELITE_SFF_PC and payload SeaBIOS : https://lava.9esec.io/r/171697 PASS: x86_32 "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35_SMM_TSEG and payload TianoCore : https://lava.9esec.io/r/171696 PASS: x86_32 "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35_SMM_TSEG and payload SeaBIOS : https://lava.9esec.io/r/171695 PASS: x86_32 "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35 and payload TianoCore : https://lava.9esec.io/r/171694 PASS: x86_32 "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35 and payload SeaBIOS : https://lava.9esec.io/r/171693 PASS: x86_64 "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX_X86_64 and payload SeaBIOS : https://lava.9esec.io/r/171692 PASS: x86_32 "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX_ASAN and payload SeaBIOS : https://lava.9esec.io/r/171691 PASS: x86_32 "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX_ and payload SeaBIOS : https://lava.9esec.io/r/171690 PASS: x86_32 "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX and payload SeaBIOS : https://lava.9esec.io/r/171689 Please note: This test is under development and might not be accurate at all! -- To view, visit https://review.coreboot.org/c/coreboot/+/76165?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ifd2b53ff24776238190eb946db7b12827fcfc804 Gerrit-Change-Number: 76165 Gerrit-PatchSet: 3 Gerrit-Owner: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: 9elements QA <hardwaretestrobot(a)gmail.com> Gerrit-Comment-Date: Mon, 03 Jul 2023 21:14:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2023