wifi: mt76: mt792x: add the illegal value check for mtcl table of acpi

The mtcl table provided regulatory information for 5.9/6Ghz channels and
configured by platform venders. So, sometimes vendors may write illegal
values, and therefore it is necessary to check and add corresponding
handling for such cases.

Signed-off-by: Leon Yen <leon.yen@mediatek.com>
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.c b/drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.c
index e7afea87e82e2b42c41bdea32b6015679909222d..c64562216caa20f86ebcf83f3a62cf22f618a34e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.c
+++ b/drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.c
@@ -353,11 +353,15 @@ static u8
 mt792x_acpi_get_mtcl_map(int row, int column, struct mt792x_asar_cl *cl)
 {
        u8 config = 0;
+       u8 mode_6g, mode_5g9;
 
-       if (cl->cl6g[row] & BIT(column))
-               config |= (cl->mode_6g & 0x3) << 2;
+       mode_6g = (cl->mode_6g > 0x02) ? 0 : cl->mode_6g;
+       mode_5g9 = (cl->mode_5g9 > 0x01) ? 0 : cl->mode_5g9;
+
+       if ((cl->cl6g[row] & BIT(column)) || cl->mode_6g == 0x02)
+               config |= (mode_6g & 0x3) << 2;
        if (cl->version > 1 && cl->cl5g9[row] & BIT(column))
-               config |= (cl->mode_5g9 & 0x3);
+               config |= (mode_5g9 & 0x3);
 
        return config;
 }