| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20251114-ath-variant-tbl-v1-1-a9adfc49e3f3@oss.qualcomm.com>
Date: Fri, 14 Nov 2025 15:52:19 +0530
From: Manivannan Sadhasivam <manivannan.sadhasivam@....qualcomm.com>
To: Jeff Johnson <jjohnson@...nel.org>,
Johannes Berg <johannes@...solutions.net>,
Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>
Cc: linux-wireless@...r.kernel.org, linux-kernel@...r.kernel.org,
ath10k@...ts.infradead.org, ath11k@...ts.infradead.org,
devicetree@...r.kernel.org, ath12k@...ts.infradead.org,
Miaoqing Pan <miaoqing.pan@....qualcomm.com>,
Manivannan Sadhasivam <manivannan.sadhasivam@....qualcomm.com>
Subject: [PATCH 1/2] wifi: ath: Use static calibration variant table for
devicetree platforms
On devicetree platforms, ath{10k/11k} drivers rely on the presence of the
'qcom,*calibration-variant' property to select the correct calibration data
for device variants with colliding IDs.
But this property based selection has its own downside that it needs to be
added to the devicetree node of the WLAN device, especially for PCI based
devices. Currently, the users/vendors are forced to hardcode this property
in the PCI device node. If a different device need to be attached to the
slot, then the devicetree node also has to be changed. This approach is not
scalable and creates a bad user experience.
To get rid of this requirement, this commit introduces a static calibration
variant table ath_calib_variant_table[], consisting of the platform model
and the calibration variant for all upstream supported devices. The entries
of this table are derived from the upstream DTS files.
The newly introduced helper, ath_get_calib_variant() will parse the model
name from devicetree and use it to do the variant lookup during runtime. If
the platform model name doesn't match, it will fallback to the devicetree
property based lookup.
Going forward, the devicetree based lookup will be deprecated and this
table will be used exclusively for devices connected to the devicetree
based host platforms.
Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.2.0.c2-00204-QCAMSLSWPLZ-1
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@....qualcomm.com>
---
drivers/net/wireless/ath/ath.h | 98 ++++++++++++++++++++++++++++++++++
drivers/net/wireless/ath/ath10k/core.c | 5 ++
drivers/net/wireless/ath/ath11k/core.c | 7 +++
3 files changed, 110 insertions(+)
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index 34654f710d8a1e63f65a47d4602e2035262a4d9e..d0a12151b7fc13355161c48ba1fb200e4617ed11 100644
--- a/drivers/net/wireless/ath/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -21,6 +21,7 @@
#include <linux/skbuff.h>
#include <linux/if_ether.h>
#include <linux/spinlock.h>
+#include <linux/of.h>
#include <net/mac80211.h>
/*
@@ -336,4 +337,101 @@ static inline const char *ath_bus_type_to_string(enum ath_bus_type bustype)
return ath_bus_type_strings[bustype];
}
+static const struct __ath_calib_variant_table {
+ const char *machine;
+ const char *variant;
+} ath_calib_variant_table[] = {
+ { "ALFA Network AP120C-AC", "ALFA-Network-AP120C-AC" },
+ { "8devices Jalapeno", "8devices-Jalapeno" },
+ { "Google cozmo board", "GO_COZMO" },
+ { "Google damu board", "GO_DAMU" },
+ { "Google fennel sku1 board", "GO_FENNEL" },
+ { "Google fennel sku6 board", "GO_FENNEL" },
+ { "Google fennel sku7 board", "GO_FENNEL" },
+ { "Google fennel14 sku2 board", "GO_FENNEL14" },
+ { "Google fennel14 sku0 board", "GO_FENNEL14" },
+ { "Google juniper sku16 board", "GO_JUNIPER" },
+ { "Google makomo sku0 board", "GO_FENNEL14" },
+ { "Google makomo sku1 board", "GO_FENNEL14" },
+ { "MediaTek kakadu board sku22", "GO_KAKADU" },
+ { "MediaTek kakadu board", "GO_KAKADU" },
+ { "Google katsu board", "GO_KATSU" },
+ { "Google katsu sku38 board", "GO_KATSU" },
+ { "MediaTek kodama sku16 board", "GO_KODAMA" },
+ { "MediaTek kodama sku272 board", "GO_KODAMA" },
+ { "MediaTek kodama sku288 board", "GO_KODAMA" },
+ { "MediaTek kodama sku32 board", "GO_KODAMA" },
+ { "MediaTek krane sku0 board", "LE_Krane" },
+ { "MediaTek krane sku176 board", "LE_Krane" },
+ { "Qualcomm Technologies, Inc. Lemans Ride Rev3", "QC_SA8775P_Ride" },
+ { "Qualcomm Technologies, Inc. Lemans Ride", "QC_SA8775P_Ride" },
+ { "Qualcomm SA8775P Ride Rev3", "QC_SA8775P_Ride" },
+ { "Qualcomm SA8775P Ride", "QC_SA8775P_Ride" },
+ { "Lenovo Miix 630", "Lenovo_Miix630" },
+ { "Fairphone 5", "Fairphone_5" },
+ { "Qualcomm Technologies, Inc. QCM6490 IDP", "Qualcomm_qcm6490idp" },
+ { "SHIFT SHIFTphone 8", "SHIFTphone_8" },
+ { "Qualcomm Technologies, Inc. QCS615 Ride", "QC_QCS615_Ride" },
+ { "Qualcomm Technologies, Inc. Robotics RB3gen2", "Qualcomm_rb3gen2" },
+ { "Qualcomm Technologies, Inc. Robotics RB1", "Thundercomm_RB1" },
+ { "Qualcomm Technologies, Inc. QRB4210 RB2", "Thundercomm_RB2" },
+ { "Google Homestar (rev2)", "GO_HOMESTAR" },
+ { "Google Homestar (rev3)", "GO_HOMESTAR" },
+ { "Google Homestar (rev4+)", "GO_HOMESTAR" },
+ { "Google Kingoftown", "GO_KINGOFTOWN" },
+ { "Google Lazor Limozeen without Touchscreen (rev10+)", "GO_LAZOR" },
+ { "Google Lazor Limozeen without Touchscreen (rev5 - rev8)", "GO_LAZOR" },
+ { "Google Lazor Limozeen without Touchscreen (rev9)", "GO_LAZOR" },
+ { "Google Lazor Limozeen (rev10+)", "GO_LAZOR" },
+ { "Google Lazor Limozeen (rev4 - rev8)", "GO_LAZOR" },
+ { "Google Lazor Limozeen (rev9)", "GO_LAZOR" },
+ { "Google Lazor (rev1 - 2)", "GO_LAZOR" },
+ { "Google Lazor (rev10+) with KB Backlight", "GO_LAZOR" },
+ { "Google Lazor (rev10+) with LTE", "GO_LAZOR" },
+ { "Google Lazor (rev10+)", "GO_LAZOR" },
+ { "Google Lazor (rev3 - 8) with KB Backlight", "GO_LAZOR" },
+ { "Google Lazor (rev3 - 8) with LTE", "GO_LAZOR" },
+ { "Google Lazor (rev3 - 8)", "GO_LAZOR" },
+ { "Google Lazor (rev9) with KB Backlight", "GO_LAZOR" },
+ { "Google Lazor (rev9) with LTE", "GO_LAZOR" },
+ { "Google Lazor (rev9)", "GO_LAZOR" },
+ { "Google Pazquel (Parade,LTE)", "GO_PAZQUEL360" },
+ { "Google Pazquel (Parade,WIFI-only)", "GO_PAZQUEL360" },
+ { "Google Pompom (rev1)", "GO_POMPOM" },
+ { "Google Pompom (rev2)", "GO_POMPOM" },
+ { "Google Pompom (rev3+)", "GO_POMPOM" },
+ { "Google Wormdingler rev1+ (BOE, rt5682s)", "GO_WORMDINGLER" },
+ { "Google Wormdingler rev1+ BOE panel board", "GO_WORMDINGLER" },
+ { "Google Wormdingler rev1+ (INX, rt5682s)", "GO_WORMDINGLER" },
+ { "Google Wormdingler rev1+ INX panel board", "GO_WORMDINGLER" },
+ { "Qualcomm SC8280XP CRD", "QC_8280XP_CRD" },
+ { "Lenovo ThinkPad X13s", "LE_X13S" },
+ { "Microsoft Surface Pro 9 5G", "MS_SP9_5G" },
+ { "Windows Dev Kit 2023", "MS_Volterra" },
+ { "Inforce 6560 Single Board Computer", "Inforce_IFC6560" },
+ { "Thundercomm Dragonboard 845c", "Thundercomm_DB845C" },
+ { "Qualcomm Technologies, Inc. SDM845 MTP", "Qualcomm_sdm845mtp" },
+ { "Lenovo Yoga C630", "Lenovo_C630" },
+ { "F(x)tec Pro1X (QX1050)", "Fxtec_QX1050" },
+ { "Lenovo Tab P11", "Lenovo_P11" },
+ { "Qualcomm Technologies, Inc. SM8150 HDK", "Qualcomm_sm8150hdk" },
+ { "Xiaomi Mi Pad 5 Pro (BOE)", "Xiaomi_Pad_5Pro" },
+ { "Xiaomi Mi Pad 5 Pro (CSOT)", "Xiaomi_Pad_5Pro" },
+ { "ASUS Zenbook A14 (UX3407QA)", "UX3407Q" },
+ { "Google Scarlet", "GO_DUMO" },
+ { /* Sentinel */ }
+};
+
+static inline const char *ath_get_calib_variant(void)
+{
+ const struct __ath_calib_variant_table *entry = ath_calib_variant_table;
+ struct device_node *root __free(device_node) = of_find_node_by_path("/");
+ const char *model = of_get_property(root, "model", NULL);
+
+ while ((entry->machine) && strcmp(entry->machine, model))
+ entry++;
+
+ return entry->machine ? entry->variant : NULL;
+}
+
#endif /* ATH_H */
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 6f78f1752cd6ffcf8eb56621ba0e4978ac23e696..099b8592d50bfac37c54dee7b0aa660ac126a410 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -1161,6 +1161,10 @@ int ath10k_core_check_dt(struct ath10k *ar)
struct device_node *node;
const char *variant = NULL;
+ variant = ath_get_calib_variant();
+ if (variant)
+ goto copy_variant;
+
node = ar->dev->of_node;
if (!node)
return -ENOENT;
@@ -1173,6 +1177,7 @@ int ath10k_core_check_dt(struct ath10k *ar)
if (!variant)
return -ENODATA;
+copy_variant:
if (strscpy(ar->id.bdf_ext, variant, sizeof(ar->id.bdf_ext)) < 0)
ath10k_dbg(ar, ATH10K_DBG_BOOT,
"bdf variant string is longer than the buffer can accommodate (variant: %s)\n",
diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index 2810752260f2f7eee226f88d5aea7cdabe7e9ed4..2db067d6357c8848ede7384ec4a615ca22282650 100644
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -20,6 +20,8 @@
#include "wow.h"
#include "fw.h"
+#include "../ath.h"
+
unsigned int ath11k_debug_mask;
EXPORT_SYMBOL(ath11k_debug_mask);
module_param_named(debug_mask, ath11k_debug_mask, uint, 0644);
@@ -1362,6 +1364,10 @@ int ath11k_core_check_dt(struct ath11k_base *ab)
const char *variant = NULL;
struct device_node *node;
+ variant = ath_get_calib_variant();
+ if (variant)
+ goto copy_variant;
+
node = ab->dev->of_node;
if (!node)
return -ENOENT;
@@ -1374,6 +1380,7 @@ int ath11k_core_check_dt(struct ath11k_base *ab)
if (!variant)
return -ENODATA;
+copy_variant:
if (strscpy(ab->qmi.target.bdf_ext, variant, max_len) < 0)
ath11k_dbg(ab, ATH11K_DBG_BOOT,
"bdf variant string is longer than the buffer can accommodate (variant: %s)\n",
--
2.48.1
Powered by blists - more mailing lists