On 14/11/2025 11:22, Manivannan Sadhasivam wrote:
> 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 <[email protected]>
> ---
> 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" },
Are these top-machine models? If so, you cannot use them. The value is
user-informative, not ABI. If you wanted to use them, you would need to
document the ABI.
Just use compatible, that's the entire point of compatible.
Best regards,
Krzysztof
