diff options
| -rw-r--r-- | src/drivers/wifi/generic/acpi.c | 42 | ||||
| -rw-r--r-- | src/include/sar.h | 9 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/sar.c | 9 |
3 files changed, 57 insertions, 3 deletions
diff --git a/src/drivers/wifi/generic/acpi.c b/src/drivers/wifi/generic/acpi.c index d3277cc1e0..44705535ef 100644 --- a/src/drivers/wifi/generic/acpi.c +++ b/src/drivers/wifi/generic/acpi.c @@ -16,8 +16,10 @@ #include "wifi_private.h" /* Domain type */ -#define DOMAIN_TYPE_WIFI 0x7 -#define DOMAIN_TYPE_BLUETOOTH 0x12 +enum sar_domain { + DOMAIN_TYPE_WIFI = 0x7, + DOMAIN_TYPE_BLUETOOTH = 0x12 +}; /* Maximum number DSM UUID bifurcations in _DSM */ #define MAX_DSM_FUNCS 2 @@ -967,6 +969,40 @@ static void sar_emit_wpfc(const struct wpfc_profile *wpfc) acpigen_write_package_end(); } +static void sar_emit_dsbr(const struct dsbr_profile *dsbr, enum sar_domain domain) +{ + if (dsbr == NULL) + return; + + /* + * Name ("DSBR", Package() { + * { + * Revision, + * Package() + * { + * DomainType, // 0x7:WiFi + * BRI Resistor Value // in Ohm + * } + } }) + */ + if (dsbr->revision != DSBR_REVISION) { + printk(BIOS_ERR, "Unsupported DSBR table revision: %d\n", + dsbr->revision); + return; + } + + acpigen_write_name("DSBR"); + acpigen_write_package(2); + acpigen_write_dword(dsbr->revision); + + acpigen_write_package(2); + acpigen_write_dword(domain); + acpigen_write_dword(dsbr->bri_resistor_value); + + acpigen_write_package_end(); + acpigen_write_package_end(); +} + static void emit_wifi_sar_acpi_structures(const struct device *dev, union wifi_sar_limits *sar_limits) { @@ -984,6 +1020,7 @@ static void emit_wifi_sar_acpi_structures(const struct device *dev, sar_emit_wtas(sar_limits->wtas); sar_emit_wbem(sar_limits->wbem); sar_emit_wpfc(sar_limits->wpfc); + sar_emit_dsbr(sar_limits->dsbr, DOMAIN_TYPE_WIFI); } static void wifi_ssdt_write_device(const struct device *dev, const char *path) @@ -1107,6 +1144,7 @@ static void wifi_ssdt_write_properties(const struct device *dev, const char *sco sar_emit_bucs(sar_limits.bucs); sar_emit_bdmm(sar_limits.bdmm); sar_emit_ebrd(sar_limits.ebrd); + sar_emit_dsbr(sar_limits.dsbr, DOMAIN_TYPE_BLUETOOTH); acpigen_write_scope_end(); } else { printk(BIOS_ERR, "Failed to get %s Bluetooth companion ACPI path\n", diff --git a/src/include/sar.h b/src/include/sar.h index d0d312ebd9..94763b4d60 100644 --- a/src/include/sar.h +++ b/src/include/sar.h @@ -9,7 +9,7 @@ #define MAX_DENYLIST_ENTRY 16 #define MAX_DSAR_SET_COUNT 3 #define MAX_GEO_OFFSET_REVISION 3 -#define MAX_PROFILE_COUNT 15 +#define MAX_PROFILE_COUNT 16 #define MAX_SAR_REVISION 2 #define MAX_BSAR_REVISION 2 #define WBEM_REVISION 0 @@ -21,6 +21,7 @@ #define BDMM_REVISION 1 #define EBRD_REVISION 1 #define WPFC_REVISION 0 +#define DSBR_REVISION 0 #define REVISION_SIZE 1 #define SAR_REV0_CHAINS_COUNT 2 #define SAR_REV0_SUBBANDS_COUNT 5 @@ -153,6 +154,11 @@ struct wpfc_profile { uint8_t filter_cfg_chain_d; } __packed; +struct dsbr_profile { + uint8_t revision; + uint32_t bri_resistor_value; +} __packed; + struct sar_header { char marker[SAR_STR_PREFIX_SIZE]; uint8_t version; @@ -177,6 +183,7 @@ union wifi_sar_limits { struct bdmm_profile *bdmm; struct ebrd_profile *ebrd; struct wpfc_profile *wpfc; + struct dsbr_profile *dsbr; }; void *profile[MAX_PROFILE_COUNT]; }; diff --git a/src/vendorcode/google/chromeos/sar.c b/src/vendorcode/google/chromeos/sar.c index 1a7497518c..eef3bb3df5 100644 --- a/src/vendorcode/google/chromeos/sar.c +++ b/src/vendorcode/google/chromeos/sar.c @@ -178,6 +178,14 @@ static size_t wpfc_table_size(const struct wpfc_profile *wpfc) return sizeof(struct wpfc_profile); } +static size_t dsbr_table_size(const struct dsbr_profile *dsbr) +{ + if (dsbr == NULL) + return 0; + + return sizeof(struct dsbr_profile); +} + static bool valid_legacy_length(size_t bin_len) { if (bin_len == LEGACY_SAR_WGDS_BIN_SIZE) @@ -239,6 +247,7 @@ static int fill_wifi_sar_limits(union wifi_sar_limits *sar_limits, const uint8_t expected_sar_bin_size += bdmm_table_size(sar_limits->bdmm); expected_sar_bin_size += ebrd_table_size(sar_limits->ebrd); expected_sar_bin_size += wpfc_table_size(sar_limits->wpfc); + expected_sar_bin_size += dsbr_table_size(sar_limits->dsbr); if (sar_bin_size != expected_sar_bin_size) { printk(BIOS_ERR, "Invalid SAR size, expected: %zu, obtained: %zu\n", |