From fcb4f2d77e4d0c09bf8e433d724ef0ea272df815 Mon Sep 17 00:00:00 2001 From: Sugnan Prabhu S Date: Fri, 30 Jul 2021 20:12:22 +0530 Subject: wifi: Add support for new revisions of SAR table entries Existing SAR infrastructure supports only revision 0 of the SAR tables. This patch modifies it to extend support for intel wifi 6 and wifi 6e configurations as per the connectivity document: 559910_Intel_Connectivity_Platforms_BIOS_Guidelines_Rev6_4.pdf The SAR table and WGDS configuration block sizes were static in the legacy SAR file format. Following is the format of the new binary file. +------------------------------------------------------------+ | Field | Size | Description | +------------------------------------------------------------+ | Marker | 4 bytes | "$SAR" | +------------------------------------------------------------+ | Version | 1 byte | Current version = 1 | +------------------------------------------------------------+ | SAR table | 2 bytes | Offset of SAR table from start of | | offset | | the header | +------------------------------------------------------------+ | WGDS | 2 bytes | Offset of WGDS table from start of | | offset | | the header | +------------------------------------------------------------+ | Data | n bytes | Data for the different tables | +------------------------------------------------------------+ This change supports both the legacy and the new format of SAR file BUG=b:193665559 TEST=Checked the SSDT entries for WRDS, EWRD and WGDS with different binaries generated by setting different versions in the config.star Change-Id: I08c3f321938eba04e8bcff4d87cb215422715bb2 Signed-off-by: Sugnan Prabhu S Reviewed-on: https://review.coreboot.org/c/coreboot/+/56750 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak --- src/include/sar.h | 64 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 26 deletions(-) (limited to 'src/include/sar.h') diff --git a/src/include/sar.h b/src/include/sar.h index 78a1b09f2b..625fd51648 100644 --- a/src/include/sar.h +++ b/src/include/sar.h @@ -4,42 +4,54 @@ #include -#define NUM_SAR_LIMITS 4 -#define BYTES_PER_SAR_LIMIT 10 -enum { - SAR_FCC, - SAR_EUROPE_JAPAN, - SAR_REST_OF_WORLD, - SAR_NUM_WGDS_GROUPS -}; +#define MAX_DSAR_SET_COUNT 3 +#define MAX_GEO_OFFSET_REVISION 3 +#define MAX_PROFILE_COUNT 2 +#define MAX_SAR_REVISION 2 +#define REVISION_SIZE 1 +#define SAR_REV0_CHAINS_COUNT 2 +#define SAR_REV0_SUBBANDS_COUNT 5 +#define SAR_FILE_REVISION 1 +#define SAR_STR_PREFIX "$SAR" +#define SAR_STR_PREFIX_SIZE 4 + +struct geo_profile { + uint8_t revision; + uint8_t chains_count; + uint8_t bands_count; + uint8_t wgds_table[0]; +} __packed; + +struct sar_profile { + uint8_t revision; + uint8_t dsar_set_count; + uint8_t chains_count; + uint8_t subbands_count; + uint8_t sar_table[0]; +} __packed; -struct wifi_sar_delta_table { +struct sar_header { + char marker[SAR_STR_PREFIX_SIZE]; uint8_t version; - struct { - uint8_t power_max_2400mhz; - uint8_t power_chain_a_2400mhz; - uint8_t power_chain_b_2400mhz; - uint8_t power_max_5200mhz; - uint8_t power_chain_a_5200mhz; - uint8_t power_chain_b_5200mhz; - } __packed group[SAR_NUM_WGDS_GROUPS]; + uint16_t offsets[0]; } __packed; /* Wifi SAR limit table structure */ -struct wifi_sar_limits { - /* Total 4 SAR limit sets, each has 10 bytes */ - uint8_t sar_limit[NUM_SAR_LIMITS][BYTES_PER_SAR_LIMIT]; - struct wifi_sar_delta_table wgds; -} __packed; +union wifi_sar_limits { + struct { + struct sar_profile *sar; + struct geo_profile *wgds; + }; + void *profile[MAX_PROFILE_COUNT]; +}; /* - * Retrieve the SAR limits data from VPD and decode it. + * Retrieve the wifi ACPI configuration data from CBFS and decode it * sar_limits: Pointer to wifi_sar_limits where the resulted data is stored * - * Returns: 0 on success, -1 on errors (The VPD entry doesn't exist, or the - * VPD entry contains non-heximal value.) + * Returns: 0 on success, -1 on errors (The .hex file doesn't exist, or the decode failed) */ -int get_wifi_sar_limits(struct wifi_sar_limits *sar_limits); +int get_wifi_sar_limits(union wifi_sar_limits *sar_limits); #define WIFI_SAR_CBFS_DEFAULT_FILENAME "wifi_sar_defaults.hex" -- cgit v1.2.3