coreboot-gerrit February 2024

coreboot-gerrit@coreboot.org

1 participants
3067 discussions

[L] Change in coreboot[main]: mb/google/brya/var/xol: Update Kconfig and devicetree
by Eric Lai (Code Review) 05 Feb '24

05 Feb '24

Attention is currently required from: Kapil Porwal, Nick Vaccaro, SH Kim. Eric Lai has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80324?usp=email ) Change subject: mb/google/brya/var/xol: Update Kconfig and devicetree ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/80324?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I411932eb4872d77993394a290e8afdd1a0038faf Gerrit-Change-Number: 80324 Gerrit-PatchSet: 6 Gerrit-Owner: SH Kim <sh_.kim(a)samsung.corp-partner.google.com> Gerrit-Reviewer: Eric Lai <ericllai(a)google.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: SH Kim <sh_.kim(a)samsung.corp-partner.google.com> Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Attention: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Comment-Date: Tue, 06 Feb 2024 06:43:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in coreboot[main]: mb/google/brya/var/xol: Update GPIO configurations
by Eric Lai (Code Review) 05 Feb '24

05 Feb '24

Attention is currently required from: Kapil Porwal, Nick Vaccaro, SH Kim. Eric Lai has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80325?usp=email ) Change subject: mb/google/brya/var/xol: Update GPIO configurations ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/80325?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I224e58628e44571c07ce034136d690587e62be08 Gerrit-Change-Number: 80325 Gerrit-PatchSet: 4 Gerrit-Owner: SH Kim <sh_.kim(a)samsung.corp-partner.google.com> Gerrit-Reviewer: Eric Lai <ericllai(a)google.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: SH Kim <sh_.kim(a)samsung.corp-partner.google.com> Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Attention: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Comment-Date: Tue, 06 Feb 2024 06:41:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[XS] Change in coreboot[main]: Update arm-trusted-firmware submodule to upstream master
by Yidi Lin (Code Review) 05 Feb '24

05 Feb '24

Yidi Lin has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/80352?usp=email ) Change subject: Update arm-trusted-firmware submodule to upstream master ...................................................................... Update arm-trusted-firmware submodule to upstream master Updating from commit id 23d6774ab: 2024-01-16 09:47:43 +0100 - (Merge "feat(qemu-sbsa): mpidr needs to be present" into integration) to commit id 17bef2248: 2024-02-05 23:33:50 +0100 - (Merge "feat(fvp): delegate FFH RAS handling to SP" into integration) This brings in 142 new commits. Change-Id: If89a3f0d32180ff7ae0a6b447687b9749dfab2ea Signed-off-by: Yidi Lin <yidilin(a)chromium.org> --- M 3rdparty/arm-trusted-firmware 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/80352/1 diff --git a/3rdparty/arm-trusted-firmware b/3rdparty/arm-trusted-firmware index 23d6774..17bef22 160000 --- a/3rdparty/arm-trusted-firmware +++ b/3rdparty/arm-trusted-firmware @@ -1 +1 @@ -Subproject commit 23d6774ab53ded09d8065a184b4763504e9c8d9e +Subproject commit 17bef2248d4547242463e27cfe48ec96029626b4 -- To view, visit https://review.coreboot.org/c/coreboot/+/80352?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: If89a3f0d32180ff7ae0a6b447687b9749dfab2ea Gerrit-Change-Number: 80352 Gerrit-PatchSet: 1 Gerrit-Owner: Yidi Lin <yidilin(a)google.com> Gerrit-MessageType: newchange

1 0

[M] Change in coreboot[main]: mainboard/amd/birman: Add Birmanplus board variant support for Phoeni...
by Anand Vaikar (Code Review) 05 Feb '24

05 Feb '24

Anand Vaikar has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/79283?usp=email ) Change subject: mainboard/amd/birman: Add Birmanplus board variant support for Phoenix SOC ...................................................................... Abandoned Will split the changes into multiple PRs for more clarity. -- To view, visit https://review.coreboot.org/c/coreboot/+/79283?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I40f196d8a662d19e424511febca24edb88d686dd Gerrit-Change-Number: 79283 Gerrit-PatchSet: 8 Gerrit-Owner: Anand Vaikar <a.vaikar2021(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-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: ritul guru <ritul.bits(a)gmail.com> Gerrit-MessageType: abandon

1 0

[S] Change in coreboot[main]: mb/amd/birman: Add Birmanplus board variant related configs
by Anand Vaikar (Code Review) 05 Feb '24

05 Feb '24

Anand Vaikar has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/80351?usp=email ) Change subject: mb/amd/birman: Add Birmanplus board variant related configs ...................................................................... mb/amd/birman: Add Birmanplus board variant related configs Initial commit for upstreaming Birmanplus mainboard changes. Change-Id: I075dcf0214f8dc8b33b0e429d83d270b2f0952e1 Signed-off-by: Anand Vaikar <a.vaikar2021(a)gmail.com> --- M src/mainboard/amd/birman/Kconfig M src/mainboard/amd/birman/Kconfig.name 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/80351/1 diff --git a/src/mainboard/amd/birman/Kconfig b/src/mainboard/amd/birman/Kconfig index 9fafae1..d47f9a5 100644 --- a/src/mainboard/amd/birman/Kconfig +++ b/src/mainboard/amd/birman/Kconfig @@ -27,6 +27,10 @@ select BOARD_AMD_BIRMAN_COMMON select SOC_AMD_GLINDA +config BOARD_AMD_BIRMANPLUS_PHOENIX + select BOARD_AMD_BIRMAN_COMMON + select SOC_AMD_PHOENIX_BASE + if BOARD_AMD_BIRMAN_COMMON config FMDFILE @@ -38,10 +42,14 @@ config MAINBOARD_DIR default "amd/birman" +config VARIANT_DIR + default "birmanplus" if BOARD_AMD_BIRMANPLUS_PHOENIX + config MAINBOARD_PART_NUMBER default "Birman_Glinda" if BOARD_AMD_BIRMAN_GLINDA default "Birman_Phoenix_FSP" if BOARD_AMD_BIRMAN_PHOENIX_FSP default "Birman_Phoenix_openSIL" if BOARD_AMD_BIRMAN_PHOENIX_OPENSIL + default "Birmanplus_Phoenix" if BOARD_AMD_BIRMANPLUS_PHOENIX config DEVICETREE default "devicetree_glinda.cb" if BOARD_AMD_BIRMAN_GLINDA diff --git a/src/mainboard/amd/birman/Kconfig.name b/src/mainboard/amd/birman/Kconfig.name index 6daea88..ef50099 100644 --- a/src/mainboard/amd/birman/Kconfig.name +++ b/src/mainboard/amd/birman/Kconfig.name @@ -6,5 +6,8 @@ config BOARD_AMD_BIRMAN_PHOENIX_OPENSIL bool "-> Birman for Phoenix SoC using openSIL" +config BOARD_AMD_BIRMANPLUS_PHOENIX + bool "-> BirmanPlus for Phoenix SoC" + config BOARD_AMD_BIRMAN_GLINDA bool "-> Birman for Glinda SoC" -- To view, visit https://review.coreboot.org/c/coreboot/+/80351?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I075dcf0214f8dc8b33b0e429d83d270b2f0952e1 Gerrit-Change-Number: 80351 Gerrit-PatchSet: 1 Gerrit-Owner: Anand Vaikar <a.vaikar2021(a)gmail.com> Gerrit-MessageType: newchange

1 0

[S] Change in coreboot[main]: mb/amd/birman: Add Birmanplus board variant related configs
by Anand Vaikar (Code Review) 05 Feb '24

05 Feb '24

Anand Vaikar has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/80350?usp=email ) Change subject: mb/amd/birman: Add Birmanplus board variant related configs ...................................................................... Abandoned -- To view, visit https://review.coreboot.org/c/coreboot/+/80350?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Idabacba5d774dd33774879258bc2f171a3efdc98 Gerrit-Change-Number: 80350 Gerrit-PatchSet: 1 Gerrit-Owner: Anand Vaikar <a.vaikar2021(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-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: abandon

1 0

[S] Change in coreboot[main]: mb/amd/birman: Add Birmanplus board variant related configs
by Anand Vaikar (Code Review) 05 Feb '24

05 Feb '24

Anand Vaikar has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/80350?usp=email ) Change subject: mb/amd/birman: Add Birmanplus board variant related configs ...................................................................... mb/amd/birman: Add Birmanplus board variant related configs Initial step to upstream code for Birmanplus platform. Signed-off-by: Anand Vaikar <Anand.Vaikar(a)amd.com> Change-Id: Idabacba5d774dd33774879258bc2f171a3efdc98 Signed-off-by: Anand Vaikar <Anand.Vaikar(a)amd.com> --- M src/mainboard/amd/birman/Kconfig M src/mainboard/amd/birman/Kconfig.name 2 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/50/80350/1 diff --git a/src/mainboard/amd/birman/Kconfig b/src/mainboard/amd/birman/Kconfig index 9fafae1..e5ac68a 100644 --- a/src/mainboard/amd/birman/Kconfig +++ b/src/mainboard/amd/birman/Kconfig @@ -27,6 +27,10 @@ select BOARD_AMD_BIRMAN_COMMON select SOC_AMD_GLINDA +config BOARD_AMD_BIRMANPLUS_PHOENIX + select BOARD_AMD_BIRMAN_COMMON + select SOC_AMD_PHOENIX_BASE + if BOARD_AMD_BIRMAN_COMMON config FMDFILE @@ -38,10 +42,13 @@ config MAINBOARD_DIR default "amd/birman" +config VARIANT_DIR + default "birmanplus" if BOARD_AMD_BIRMANPLUS_PHOENIX config MAINBOARD_PART_NUMBER default "Birman_Glinda" if BOARD_AMD_BIRMAN_GLINDA default "Birman_Phoenix_FSP" if BOARD_AMD_BIRMAN_PHOENIX_FSP default "Birman_Phoenix_openSIL" if BOARD_AMD_BIRMAN_PHOENIX_OPENSIL + default "Birmanplus_Phoenix" if BOARD_AMD_BIRMANPLUS_PHOENIX config DEVICETREE default "devicetree_glinda.cb" if BOARD_AMD_BIRMAN_GLINDA diff --git a/src/mainboard/amd/birman/Kconfig.name b/src/mainboard/amd/birman/Kconfig.name index 6daea88..ef50099 100644 --- a/src/mainboard/amd/birman/Kconfig.name +++ b/src/mainboard/amd/birman/Kconfig.name @@ -6,5 +6,8 @@ config BOARD_AMD_BIRMAN_PHOENIX_OPENSIL bool "-> Birman for Phoenix SoC using openSIL" +config BOARD_AMD_BIRMANPLUS_PHOENIX + bool "-> BirmanPlus for Phoenix SoC" + config BOARD_AMD_BIRMAN_GLINDA bool "-> Birman for Glinda SoC" -- To view, visit https://review.coreboot.org/c/coreboot/+/80350?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Idabacba5d774dd33774879258bc2f171a3efdc98 Gerrit-Change-Number: 80350 Gerrit-PatchSet: 1 Gerrit-Owner: Anand Vaikar <a.vaikar2021(a)gmail.com> Gerrit-MessageType: newchange

1 0

[XS] Change in coreboot[main]: drivers/wifi: Use depends instead of if in Kconfig
by Subrata Banik (Code Review) 05 Feb '24

05 Feb '24

Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80307?usp=email ) Change subject: drivers/wifi: Use depends instead of if in Kconfig ...................................................................... drivers/wifi: Use depends instead of if in Kconfig Cleanup to make the file follow the same convention after USE_MTCL was added and the depends structure was requested instead of the if guards. Signed-off-by: David Ruth <druth(a)google.com> Change-Id: I3604b394f999b28de4723337b3b6b4e21139c83b Reviewed-on: https://review.coreboot.org/c/coreboot/+/80307 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Eric Lai <ericllai(a)google.com> Reviewed-by: Subrata Banik <subratabanik(a)google.com> Reviewed-by: Martin L Roth <gaumless(a)gmail.com> --- M src/drivers/wifi/generic/Kconfig 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: build bot (Jenkins): Verified Eric Lai: Looks good to me, approved Subrata Banik: Looks good to me, approved Martin L Roth: Looks good to me, approved diff --git a/src/drivers/wifi/generic/Kconfig b/src/drivers/wifi/generic/Kconfig index 814059e..5efd471 100644 --- a/src/drivers/wifi/generic/Kconfig +++ b/src/drivers/wifi/generic/Kconfig @@ -23,11 +23,10 @@ When enabled, add identifiers in ACPI tables to make OS drivers work with certain MediaTek PCI-e WiFi chipsets. -if DRIVERS_WIFI_GENERIC - config USE_SAR bool default n + depends on DRIVERS_WIFI_GENERIC help Enable it when wifi driver uses SAR configuration feature. @@ -58,8 +57,6 @@ help There can be up to 3 optional SAR table sets. -endif # DRIVERS_WIFI_GENERIC - config USE_MTCL bool default n -- To view, visit https://review.coreboot.org/c/coreboot/+/80307?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I3604b394f999b28de4723337b3b6b4e21139c83b Gerrit-Change-Number: 80307 Gerrit-PatchSet: 3 Gerrit-Owner: David Ruth <druth(a)chromium.org> Gerrit-Reviewer: David Ruth <druth(a)google.com> Gerrit-Reviewer: Eric Lai <ericllai(a)google.com> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: merged

1 0

[M] Change in coreboot[main]: drivers/wifi: Add MTCL function to ACPI SSDT
by Subrata Banik (Code Review) 05 Feb '24

05 Feb '24

Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80170?usp=email ) Change subject: drivers/wifi: Add MTCL function to ACPI SSDT ...................................................................... drivers/wifi: Add MTCL function to ACPI SSDT The MTCL function provides a country list to the Linux kernel via an ACPI function in SSDT for MediaTek WiFi chipsets that are capable of operating on the 6GHz band. The country list is used to selectively disable 6GHz and 5.9GHz operation based on the country the device is operating in. The function needs to read a binary file and send it as a package via the MTCL method in SSDT for PCIe WiFi with MediaTek chipsets. Change Summary: * Add src/drivers/wifi/generic/mtcl.c to abstract functionaltity related to MTCL * Add write_mtcl_aml function to convert the byte data into the format expected by the MTCL functionality in the Linux kernel. * Add validate_mtcl function to validate that the byte data read in from a file is in the expected format. * Add write_mtcl_function function to read a binary file called "wifi_mtcl".bin" from cbfs, then call validate_mtcl to verify that it is in an expected format, and if so write the aml via acpigen * Add config flag DRIVERS_MTK_WIFI to src/drivers/wifi/generic in order to include MediaTek WiFi specific functionality * Add config flag USE_MTCL which depends on DRIVERS_MTK_WIFI and enables including the specific ACPI function defined in SSDT * Add config flag CONFIG_MTCL_CBFS_FILEPATH which depends on DRIVERS_MTK_WIFI which enables configuring the file to add as "wifi_mtcl.bin" * Add a call to write_mtcl_function to src/drivers/wifi/generic/acpi.c to include the MTCL function in SSDT for MTK WiFi devices when USE_MTCL is enabled. * Add MediaTek VID to src/include/device/pci_ids.h. BUG=b:295544553 TEST=Add Kconfig entry USE_MTCL for pujjo TEST=Add wifi_mtcl_defaults.bin blob to cbfs TEST=Build coreboot for pujjo `emerge-nissa coreboot chromeos-bootimage` TEST=Verify that MTCL defined in the file is present: TEST=`acpidump -b` TEST=`iasl ssdt.dat` TEST=`less ssdt.dsl` TEST=Search for MTCL Signed-off-by: David Ruth <druth(a)chromium.org> Change-Id: I9b5e7312a44e114270e664b983626faa6cfee350 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80170 Reviewed-by: Subrata Banik <subratabanik(a)google.com> Reviewed-by: Martin L Roth <gaumless(a)gmail.com> Reviewed-by: Kapil Porwal <kapilporwal(a)google.com> Reviewed-by: Nico Huber <nico.h(a)gmx.de> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Eric Lai <ericllai(a)google.com> --- M src/drivers/wifi/generic/Kconfig M src/drivers/wifi/generic/Makefile.mk M src/drivers/wifi/generic/acpi.c A src/drivers/wifi/generic/mtcl.c M src/include/device/pci_ids.h A src/include/mtcl.h 6 files changed, 223 insertions(+), 1 deletion(-) Approvals: Nico Huber: Looks good to me, but someone else must approve Kapil Porwal: Looks good to me, approved Eric Lai: Looks good to me, approved build bot (Jenkins): Verified Subrata Banik: Looks good to me, approved Martin L Roth: Looks good to me, approved diff --git a/src/drivers/wifi/generic/Kconfig b/src/drivers/wifi/generic/Kconfig index 1d0e19f..814059e 100644 --- a/src/drivers/wifi/generic/Kconfig +++ b/src/drivers/wifi/generic/Kconfig @@ -14,6 +14,15 @@ When enabled, add identifiers in ACPI and SMBIOS tables to make OS drivers work with certain Intel PCI-e WiFi chipsets. +config DRIVERS_MTK_WIFI + bool "Support MediaTek PCI-e WiFi adapters" + depends on PCI + default y if PCIEXP_PLUGIN_SUPPORT + select DRIVERS_WIFI_GENERIC + help + When enabled, add identifiers in ACPI tables to make OS + drivers work with certain MediaTek PCI-e WiFi chipsets. + if DRIVERS_WIFI_GENERIC config USE_SAR @@ -50,3 +59,17 @@ There can be up to 3 optional SAR table sets. endif # DRIVERS_WIFI_GENERIC + +config USE_MTCL + bool + default n + depends on DRIVERS_MTK_WIFI + help + When enabled, adds the MTCL function for MediaTek WiFi chipsets. + This function supplies country list information used to enable or + disable operation on 5.9GHz and 6GHz bands. + +config WIFI_MTCL_CBFS_FILEPATH + string "The cbfs file which has WIFI MTCL defaults" + depends on USE_MTCL + default "" diff --git a/src/drivers/wifi/generic/Makefile.mk b/src/drivers/wifi/generic/Makefile.mk index 337b8fe..2231115 100644 --- a/src/drivers/wifi/generic/Makefile.mk +++ b/src/drivers/wifi/generic/Makefile.mk @@ -8,6 +8,7 @@ ramstage-y += generic.c ramstage-$(CONFIG_GENERATE_SMBIOS_TABLES) += smbios.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c +ramstage-$(CONFIG_USE_MTCL) += mtcl.c CONFIG_WIFI_SAR_CBFS_FILEPATH := $(call strip_quotes,$(CONFIG_WIFI_SAR_CBFS_FILEPATH)) @@ -19,4 +20,14 @@ endif +CONFIG_MTCL_CBFS_FILEPATH := $(call strip_quotes,$(CONFIG_MTCL_CBFS_FILEPATH)) + +ifneq ($(CONFIG_MTCL_CBFS_FILEPATH),) + +cbfs-files-$(CONFIG_USE_MTCL) += wifi_mtcl.bin +wifi_mtcl.bin-file := $(CONFIG_MTCL_CBFS_FILEPATH) +wifi_mtcl.bin-type := raw + +endif + endif diff --git a/src/drivers/wifi/generic/acpi.c b/src/drivers/wifi/generic/acpi.c index 6abad83..9e2936d 100644 --- a/src/drivers/wifi/generic/acpi.c +++ b/src/drivers/wifi/generic/acpi.c @@ -5,6 +5,7 @@ #include <acpi/acpigen_pci.h> #include <console/console.h> #include <device/pci_ids.h> +#include <mtcl.h> #include <sar.h> #include <stdlib.h> #include <wrdd.h> @@ -576,7 +577,18 @@ acpigen_write_dsm_uuid_arr(dsm_ids, dsm_count); - acpigen_pop_len(); /* Scope */ + /* + * Fill MediaTek MTCL related ACPI structure iff the device type is PCI, + * the device has the MediaTek vendor ID, and the MTCL feature is + * configured. + */ + if (CONFIG(USE_MTCL)) { + if (dev->path.type == DEVICE_PATH_PCI && + dev->vendor == PCI_VID_MEDIATEK) + write_mtcl_function(); + } + + acpigen_write_scope_end(); /* Scope */ printk(BIOS_INFO, "%s: %s %s\n", scope, dev->chip_ops ? dev->chip_ops->name : "", dev_path(dev)); diff --git a/src/drivers/wifi/generic/mtcl.c b/src/drivers/wifi/generic/mtcl.c new file mode 100644 index 0000000..4604f8d --- /dev/null +++ b/src/drivers/wifi/generic/mtcl.c @@ -0,0 +1,166 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <acpi/acpigen.h> +#include <cbfs.h> +#include <mtcl.h> +#include <stdint.h> +#include <string.h> + +#define WIFI_MTCL_CBFS_DEFAULT_FILENAME "wifi_mtcl.bin" +#define MAX_VERSION 2 +#define MAX_SUPPORT_STATE 2 +#define COUNTRY_LIST_SIZE 6 +#define NAME_SIZE 4 +#define MTCL_NAME "MTCL" + +/* + * Represent the structured MTCL data. + * This struct is used to cast from an array of uint8_t in order to help + * understand the semantic purpose of individual bytes. This struct is used in + * order to verify that the bytes included match the known MTCL data format. + * This struct is explicitly __packed because it is explicitly cast to from an + * array of uint8_t. + */ +struct wifi_mtcl { + uint8_t name[NAME_SIZE]; + uint8_t revision; + uint8_t support_6ghz; + uint8_t country_list_6ghz[COUNTRY_LIST_SIZE]; + uint8_t support_5p9ghz; + uint8_t country_list_5p9ghz[COUNTRY_LIST_SIZE]; +} __packed; + +void write_mtcl_aml(uint8_t *bytes, size_t count); +int validate_mtcl(uint8_t *mtcl_bytes, size_t count); + +/* + * Generate ACPI AML code for MTCL method. + * This function takes as input an array of bytes that correspond to the value + * map to be passed as a package, as well as the count of bytes to be written. + * + * AML code generate would look like: + * Method(MTCL, 0, Serialized) + * { + * Name (LIST, Package() + * { + * // data table + * }) + * Return (LIST) + * } + */ +void write_mtcl_aml(uint8_t *bytes, size_t count) +{ + /* Method (MTCL, 0, Serialized) */ + acpigen_write_method_serialized("MTCL", 0x0); + + /* Name (LIST */ + acpigen_write_name("LIST"); + + /* Package () */ + acpigen_write_package(count); + + /* Write the provided bytes. */ + for (int i = 0; i < count; ++i) + acpigen_write_byte(bytes[i]); + + acpigen_write_package_end(); /* Package */ + + /* Return MTCL */ + acpigen_write_return_namestr("LIST"); + acpigen_write_method_end(); /* Method MTCL */ +} + +/* + * Validate the WiFi MTCL data that is passed in from CBFS. + * + * Data is expected in the format: + * [Revision, + * 6GHz Support, + * 6GHz Country List, + * 5.9GHz Support, + * 5.9GHz Country List] + * + * The revision is expected to be "2". + * + * 6GHz support is a byte with the following states: + * - 0 - 6GHz operation disabled + * - 1 - 6GHz operation dictated by the country list and Operating System + * - 2 - 6GHz operation dictated by the Operating System + * + * 6GHz Country List is a set of 6 bytes that represent a bitmask of countries + * in which 6GHz operation is enabled. + * + * 5.9GHz Support is a byte with the following known states: + * - 0 - 5.9GHz operation disabled + * - 1 - 5.9GHz operation dictated by the country list and Operating System + * - 2 - 5.9GHz operation dictated by the Operating System + * + * 5.9GHz Country List is a set of 6 bytes that represent a bitmask of countries + * in which 5.9GHz operation is enabled + * + * Validation: + * - Verify that there are MTCL_SIZE bytes. + * - Verify that the name is MTCL_NAME. + * - Verify that the version is less than or equal to MAX_MTCL_VERSION. + * - Verify that the support bytes are less than or equal to the + * MAX_SUPPORT_STATE. + * + * Returns 0 for a valid file, -1 for an invalid file. + */ +int validate_mtcl(uint8_t *mtcl_bytes, size_t count) +{ + if (!mtcl_bytes) { + printk(BIOS_ERR, "Failed to get the %s file size!\n", + WIFI_MTCL_CBFS_DEFAULT_FILENAME); + return -1; + } + + if (count != sizeof(struct wifi_mtcl)) { + printk(BIOS_ERR, "Size of file read was: %zu, expected: %zu\n", + count, sizeof(struct wifi_mtcl)); + return -1; + } + + struct wifi_mtcl *mtcl = (struct wifi_mtcl *)mtcl_bytes; + + if (strncmp(((char *)mtcl->name), MTCL_NAME, NAME_SIZE)) { + printk(BIOS_ERR, "MTCL string not present but expected\n"); + return -1; + } + + if (mtcl->revision > MAX_VERSION) { + printk(BIOS_ERR, "MTCL version too high\n"); + return -1; + } + + if (mtcl->support_6ghz > MAX_SUPPORT_STATE) { + printk(BIOS_ERR, "MTCL 6GHz support state too high\n"); + return -1; + } + + if (mtcl->support_5p9ghz > MAX_SUPPORT_STATE) { + printk(BIOS_ERR, "MTCL 5.9GHz support state too high\n"); + return -1; + } + + return 0; +} + +/* + * Retrieve WiFi MTCL data from CBFS, decode it, validate it and write it to + * AML. + * + * Returns the number of bytes read. + */ +void write_mtcl_function(void) +{ + size_t mtcl_bin_len; + uint8_t *mtcl_bin; + + mtcl_bin = cbfs_map(WIFI_MTCL_CBFS_DEFAULT_FILENAME, &mtcl_bin_len); + + if (validate_mtcl(mtcl_bin, mtcl_bin_len) == 0) + write_mtcl_aml(mtcl_bin, mtcl_bin_len); + + cbfs_unmap(mtcl_bin); +} diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index 50285b9..d2f429c 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -4857,6 +4857,8 @@ #define PCI_DID_SIS_SIS968_PCIE 0x000a /* D6F0,D7F0 */ #define PCI_DID_SIS_SIS968_HD_AUDIO 0x7502 /* DfF0 */ +#define PCI_VID_MEDIATEK 0x14c3 + /* OLD USAGE FOR COREBOOT */ #define PCI_VID_ACER 0x10b9 #define PCI_DID_ACER_M1535D 0x1533 diff --git a/src/include/mtcl.h b/src/include/mtcl.h new file mode 100644 index 0000000..593c09c --- /dev/null +++ b/src/include/mtcl.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _MTCL_H_ +#define _MTCL_H_ + +void write_mtcl_function(void); + +#endif /* _MTCL_H_ */ -- To view, visit https://review.coreboot.org/c/coreboot/+/80170?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I9b5e7312a44e114270e664b983626faa6cfee350 Gerrit-Change-Number: 80170 Gerrit-PatchSet: 20 Gerrit-Owner: David Ruth <druth(a)chromium.org> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Cliff Huang <cliff.huang(a)intel.com> Gerrit-Reviewer: Eric Lai <ericllai(a)google.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Lance Zhao <lance.zhao(a)gmail.com> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Subrata Banik <subi.banik(a)gmail.com> Gerrit-MessageType: merged

1 0

[M] Change in coreboot[main]: mb/google/brya/var/xol: Update GPIO configurations
by Subrata Banik (Code Review) 05 Feb '24

05 Feb '24

Attention is currently required from: Eric Lai, Kapil Porwal, Nick Vaccaro, SH Kim. Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80325?usp=email ) Change subject: mb/google/brya/var/xol: Update GPIO configurations ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/80325?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I224e58628e44571c07ce034136d690587e62be08 Gerrit-Change-Number: 80325 Gerrit-PatchSet: 4 Gerrit-Owner: SH Kim <sh_.kim(a)samsung.corp-partner.google.com> Gerrit-Reviewer: Eric Lai <ericllai(a)google.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Eric Lai <ericllai(a)google.com> Gerrit-Attention: SH Kim <sh_.kim(a)samsung.corp-partner.google.com> Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Attention: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Comment-Date: Tue, 06 Feb 2024 02:54:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit February 2024