Re: [PATCH v3 3/3] wifi: ath10k: only load compatible DT cal data
Hi,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on helgaas-pci/next]
[also build test ERROR on helgaas-pci/for-linus wireless-next/main
wireless/main linus/master v6.2-rc6 next-20230203]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url:
https://github.com/intel-lab-lkp/linux/commits/equu-openmail-cc/wifi-ath9k-stop-loading-incompatible-DT-cal-data/20230202-165536
base: https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git next
patch link:
https://lore.kernel.org/r/20230202075524.2911058-4-equu%40openmail.cc
patch subject: [PATCH v3 3/3] wifi: ath10k: only load compatible DT cal data
config: i386-randconfig-a005
(https://download.01.org/0day-ci/archive/20230203/202302031943.alvt61nb-...@intel.com/config)
compiler: gcc-11 (Debian 11.3.0-8) 11.3.0
reproduce (this is a W=1 build):
#
https://github.com/intel-lab-lkp/linux/commit/d2ef9bc195ade55c010e64762b135a46a62f3fdd
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review
equu-openmail-cc/wifi-ath9k-stop-loading-incompatible-DT-cal-data/20230202-165536
git checkout d2ef9bc195ade55c010e64762b135a46a62f3fdd
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=i386 olddefconfig
make W=1 O=build_dir ARCH=i386 SHELL=/bin/bash
drivers/net/wireless/ath/ath10k/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot
All errors (new ones prefixed by >>):
In file included from drivers/net/wireless/ath/ath10k/core.c:16:
include/linux/of_pci.h:23:33: warning: 'struct pci_driver' declared inside
parameter list will not be visible outside of this definition or declaration
23 | struct pci_driver *drv);
| ^~
drivers/net/wireless/ath/ath10k/core.c: In function
'ath10k_download_cal_nvmem':
>> drivers/net/wireless/ath/ath10k/core.c:1987:40: error: passing argument 2 of
>> 'of_pci_node_match_driver' from incompatible pointer type
>> [-Werror=incompatible-pointer-types]
1987 |_pci_driver)))
|^~
||
|struct pci_driver *
In file included from drivers/net/wireless/ath/ath10k/core.c:16:
include/linux/of_pci.h:23:45: note: expected 'struct pci_driver *' but
argument is of type 'struct pci_driver *'
23 | struct pci_driver *drv);
| ~~~^~~
cc1: some warnings being treated as errors
vim +/of_pci_node_match_driver +1987 drivers/net/wireless/ath/ath10k/core.c
1955
1956 static int ath10k_download_cal_nvmem(struct ath10k *ar, const char
*cell_name)
1957 {
1958 struct nvmem_cell *cell;
1959 void *buf;
1960 size_t len;
1961 int ret;
1962
1963 /* devm_nvmem_cell_get() will get a cell first from the OF
1964 * DT node representing the given device with nvmem-cell-name
1965 * "calibration", and from the global lookup table as a
fallback,
1966 * and an ath10k device could be either a pci one or a platform
one.
1967 *
1968 * If the OF DT node is not compatible with the real device, the
1969 * calibration data got from the node should not be applied.
1970 *
1971 * dev_is_pci(ar->dev) && ( no OF node || caldata not from node
1972 * || not compatible ) -> do not use caldata .
1973 *
1974 * !dev_is_pci(ar->dev) -> always use caldata .
1975 *
1976 * The judgement for compatibility differs with ath9k for many
1977 * DT using "qcom,ath10k" as compatibility string.
1978 */
1979 if (dev_is_pci(ar->dev) &&
1980 (!ar->dev->of_node ||
1981 (of_property_match_string(ar->dev->of_node,
1982 "nvmem-cell-names",
1983 cell_name) < 0) ||
1984 !of_device_is_compatible(ar->dev->of_node,
1985"qcom,ath10k") ||
1986 !of_pci_node_match_driver(ar->dev->of_node,
> 1987 _pci_driver)))
1988 return -ENOENT;
1989
1990 cell = devm_nvmem_cell_get(ar->dev, cell_name);
1991
[PATCH v3 3/3] wifi: ath10k: only load compatible DT cal data
From: Edward Chow
ath10k might also be sensitive to the issue reported on
https://github.com/openwrt/openwrt/pull/11345 , loading calibration
data from a device tree node declared incompatible.
ath10k will first check whether the device tree node is compatible
with it, using the functionality introduced with the first patch of
this series, ("PCI: of: Match pci devices or drivers against OF DT
nodes") and only proceed loading calibration data from compatible node.
Signed-off-by: Edward Chow
Reported-by: kernel test robot
---
drivers/net/wireless/ath/ath10k/core.c | 29 ++
drivers/net/wireless/ath/ath10k/pci.c | 2 +-
drivers/net/wireless/ath/ath10k/pci.h | 2 ++
3 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath10k/core.c
b/drivers/net/wireless/ath/ath10k/core.c
index 5eb131ab916f..a1cf65679046 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -13,6 +13,7 @@
#include
#include
#include
+#include
#include
#include "core.h"
@@ -26,6 +27,7 @@
#include "testmode.h"
#include "wmi-ops.h"
#include "coredump.h"
+#include "pci.h"
unsigned int ath10k_debug_mask;
EXPORT_SYMBOL(ath10k_debug_mask);
@@ -1958,6 +1960,33 @@ static int ath10k_download_cal_nvmem(struct ath10k *ar,
const char *cell_name)
size_t len;
int ret;
+ /* devm_nvmem_cell_get() will get a cell first from the OF
+* DT node representing the given device with nvmem-cell-name
+* "calibration", and from the global lookup table as a fallback,
+* and an ath10k device could be either a pci one or a platform one.
+*
+* If the OF DT node is not compatible with the real device, the
+* calibration data got from the node should not be applied.
+*
+* dev_is_pci(ar->dev) && ( no OF node || caldata not from node
+* || not compatible ) -> do not use caldata .
+*
+* !dev_is_pci(ar->dev) -> always use caldata .
+*
+* The judgement for compatibility differs with ath9k for many
+* DT using "qcom,ath10k" as compatibility string.
+*/
+ if (dev_is_pci(ar->dev) &&
+ (!ar->dev->of_node ||
+(of_property_match_string(ar->dev->of_node,
+ "nvmem-cell-names",
+ cell_name) < 0) ||
+!of_device_is_compatible(ar->dev->of_node,
+ "qcom,ath10k") ||
+!of_pci_node_match_driver(ar->dev->of_node,
+ _pci_driver)))
+ return -ENOENT;
+
cell = devm_nvmem_cell_get(ar->dev, cell_name);
if (IS_ERR(cell)) {
ret = PTR_ERR(cell);
diff --git a/drivers/net/wireless/ath/ath10k/pci.c
b/drivers/net/wireless/ath/ath10k/pci.c
index 728d607289c3..5d9f6046f8cf 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -3780,7 +3780,7 @@ static SIMPLE_DEV_PM_OPS(ath10k_pci_pm_ops,
ath10k_pci_pm_suspend,
ath10k_pci_pm_resume);
-static struct pci_driver ath10k_pci_driver = {
+struct pci_driver ath10k_pci_driver = {
.name = "ath10k_pci",
.id_table = ath10k_pci_id_table,
.probe = ath10k_pci_probe,
diff --git a/drivers/net/wireless/ath/ath10k/pci.h
b/drivers/net/wireless/ath/ath10k/pci.h
index 480cd97ab739..de676797b736 100644
--- a/drivers/net/wireless/ath/ath10k/pci.h
+++ b/drivers/net/wireless/ath/ath10k/pci.h
@@ -209,6 +209,8 @@ static inline struct ath10k_pci *ath10k_pci_priv(struct
ath10k *ar)
#define DIAG_ACCESS_CE_TIMEOUT_US 1 /* 10 ms */
#define DIAG_ACCESS_CE_WAIT_US 50
+extern struct pci_driver ath10k_pci_driver;
+
void ath10k_pci_write32(struct ath10k *ar, u32 offset, u32 value);
void ath10k_pci_soc_write32(struct ath10k *ar, u32 addr, u32 val);
void ath10k_pci_reg_write32(struct ath10k *ar, u32 addr, u32 val);
--
2.39.1
___
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
