[PATCH v3 2/2] platform/x86/amd: send WBRF DSM payload as buffer
From: Mario Limonciello
Date: Fri Nov 20 2026 - 12:53:13 EST
From: Mario Limonciello <superm1@xxxxxxxxxx>
Spec defines the WBRF record _DSM argument as a single buffer that packs
the header and frequency ranges. The driver instead built a package of
integers, so firmware on some systems abort \WBRF with AE_AML_OPERAND_TYPE
when dereferencing Arg2[0].
Encode the payload into a little-endian buffer and hand it as the lone
package element.
Fixes: 58e82a62669d ("platform/x86/amd: Add support for AMD ACPI based Wifi band RFI mitigation feature")
Signed-off-by: Mario Limonciello <superm1@xxxxxxxxxx>
---
drivers/platform/x86/amd/wbrf.c | 62 ++++++++++++++++++++++-------------------
1 file changed, 34 insertions(+), 28 deletions(-)
diff --git a/drivers/platform/x86/amd/wbrf.c b/drivers/platform/x86/amd/wbrf.c
index e3795f8a9ad84..191eb5d30083c 100644
--- a/drivers/platform/x86/amd/wbrf.c
+++ b/drivers/platform/x86/amd/wbrf.c
@@ -13,11 +13,14 @@
#include <linux/errno.h>
#include <linux/export.h>
#include <linux/notifier.h>
+#include <linux/overflow.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/types.h>
#include <linux/uuid.h>
+#include <asm/byteorder.h>
+
/*
* Functions bit vector for WBRF method
*
@@ -40,6 +43,17 @@ struct amd_wbrf_ranges_out {
struct freq_band_range band_list[MAX_NUM_OF_WBRF_RANGES];
} __packed;
+struct wbrf_record_entry {
+ __le64 start;
+ __le64 end;
+};
+
+struct wbrf_record_payload {
+ __le32 num_of_ranges;
+ __le32 action;
+ struct wbrf_record_entry ranges[];
+};
+
static const guid_t wifi_acpi_dsm_guid =
GUID_INIT(0x7b7656cf, 0xdc3d, 0x4c1c,
0x83, 0xe9, 0x66, 0xe7, 0x21, 0xde, 0x30, 0x70);
@@ -53,8 +67,9 @@ static BLOCKING_NOTIFIER_HEAD(wbrf_chain_head);
static int wbrf_record(struct acpi_device *adev, uint8_t action, struct wbrf_ranges_in_out *in)
{
union acpi_object argv4;
+ union acpi_object args[1];
u32 num_of_ranges = 0;
- u32 num_of_elements;
+ size_t payload_len;
u32 arg_idx = 0;
int ret;
u32 i;
@@ -75,42 +90,33 @@ static int wbrf_record(struct acpi_device *adev, uint8_t action, struct wbrf_ran
if (num_of_ranges != in->num_of_ranges)
return -EINVAL;
- /*
- * Every input frequency band comes with two end points(start/end)
- * and each is accounted as an element. Meanwhile the range count
- * and action type are accounted as an element each.
- * So, the total element count = 2 * num_of_ranges + 1 + 1.
- */
- num_of_elements = 2 * num_of_ranges + 2;
-
- union acpi_object *tmp __free(kfree) = kzalloc_objs(*tmp,
- num_of_elements);
- if (!tmp)
+ payload_len = struct_size_t(struct wbrf_record_payload, ranges, num_of_ranges);
+ struct wbrf_record_payload *payload __free(kfree) =
+ kzalloc(payload_len, GFP_KERNEL);
+ if (!payload)
return -ENOMEM;
- argv4.package.type = ACPI_TYPE_PACKAGE;
- argv4.package.count = num_of_elements;
- argv4.package.elements = tmp;
-
- /* save the number of ranges*/
- tmp[0].integer.type = ACPI_TYPE_INTEGER;
- tmp[0].integer.value = num_of_ranges;
-
- /* save the action(WBRF_RECORD_ADD/REMOVE/RETRIEVE) */
- tmp[1].integer.type = ACPI_TYPE_INTEGER;
- tmp[1].integer.value = action;
+ payload->num_of_ranges = cpu_to_le32(num_of_ranges);
+ payload->action = cpu_to_le32(action);
- arg_idx = 2;
+ arg_idx = 0;
for (i = 0; i < ARRAY_SIZE(in->band_list); i++) {
if (!in->band_list[i].start || !in->band_list[i].end)
continue;
- tmp[arg_idx].integer.type = ACPI_TYPE_INTEGER;
- tmp[arg_idx++].integer.value = in->band_list[i].start;
- tmp[arg_idx].integer.type = ACPI_TYPE_INTEGER;
- tmp[arg_idx++].integer.value = in->band_list[i].end;
+ payload->ranges[arg_idx].start = cpu_to_le64(in->band_list[i].start);
+ payload->ranges[arg_idx].end = cpu_to_le64(in->band_list[i].end);
+ arg_idx++;
}
+ argv4.package.type = ACPI_TYPE_PACKAGE;
+ argv4.package.count = ARRAY_SIZE(args);
+ argv4.package.elements = args;
+
+ args[0].type = ACPI_TYPE_BUFFER;
+ args[0].buffer.length = payload_len;
+ args[0].buffer.pointer = (u8 *)payload;
+
union acpi_object *obj __free(kfree) =
acpi_evaluate_dsm(adev->handle, &wifi_acpi_dsm_guid,
WBRF_REVISION, WBRF_RECORD, &argv4);
--
2.43.0