Re: [PATCH v3 2/3] wifi: ath9k: stop loading incompatible 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-3-equu%40openmail.cc
patch subject: [PATCH v3 2/3] wifi: ath9k: stop loading incompatible DT cal data
config: i386-randconfig-a005
(https://download.01.org/0day-ci/archive/20230203/202302031700.zxbfzurh-...@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/b8656d7cf0ddf9edc732511d6d959c1b3a8b4ea8
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 b8656d7cf0ddf9edc732511d6d959c1b3a8b4ea8
# 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/ drivers/net/wireless/ath/ath9k/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot
All error/warnings (new ones prefixed by >>):
In file included from drivers/net/wireless/ath/ath9k/init.c:25:
>> 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/ath9k/init.c: In function
'ath9k_nvmem_request_eeprom':
>> drivers/net/wireless/ath/ath9k/init.c:594:13: error: implicit declaration of
>> function 'dev_is_pci' [-Werror=implicit-function-declaration]
594 | if (dev_is_pci(sc->dev) &&
| ^~
>> drivers/net/wireless/ath/ath9k/init.c:600:40: error: passing argument 2 of
>> 'of_pci_node_match_driver' from incompatible pointer type
>> [-Werror=incompatible-pointer-types]
600 |&ath_pci_driver)))
|^~~
||
|struct pci_driver *
In file included from drivers/net/wireless/ath/ath9k/init.c:25:
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 +/dev_is_pci +594 drivers/net/wireless/ath/ath9k/init.c
572
573 static int ath9k_nvmem_request_eeprom(struct ath_softc *sc)
574 {
575 struct ath_hw *ah = sc->sc_ah;
576 struct nvmem_cell *cell;
577 void *buf;
578 size_t len;
579 int err;
580
581 /* devm_nvmem_cell_get() will get a cell first from the OF
582 * DT node representing the given device with nvmem-cell-name
583 * "calibration", and from the global lookup table as a
fallback,
584 * and an ath9k device could be either a pci one or a platform
one.
585 *
586 * If the OF DT node is not compatible with the real device, the
587 * calibration data got from the node should not be applied.
588 *
589 * dev_is_pci(sc->dev) && ( no OF node || caldata not from node
590 * || not compatible ) -> do not use caldata .
591 *
592 * !dev_is_pci(sc->dev) -> always use caldata .
593 */
> 594 if (dev_is_pci(sc->dev) &&
595 (!sc->dev->of_node ||
596 !of_property_match_string(sc->dev->of_node,
597 "nvmem-cell-names",
598 "calibration") ||
599 !of_pci_node_match_driver(sc->dev->of_node,
> 600 &ath_pci_driver)))
601 /* follow the "ju
[PATCH v3 2/3] wifi: ath9k: stop loading incompatible DT cal data
From: Edward Chow
As reported in https://github.com/openwrt/openwrt/pull/11345 , ath9k
would load calibration data from a device tree node declared
incompatible.
Now, ath9k 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
---
drivers/net/wireless/ath/ath9k/ath9k.h | 1 +
drivers/net/wireless/ath/ath9k/init.c | 26 ++
drivers/net/wireless/ath/ath9k/pci.c | 2 +-
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h
b/drivers/net/wireless/ath/ath9k/ath9k.h
index 2cc23605c9fc..4f6f0383a5f8 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -35,6 +35,7 @@ struct ath_node;
struct ath_vif;
extern struct ieee80211_ops ath9k_ops;
+extern struct pci_driver ath_pci_driver;
extern int ath9k_modparam_nohwcrypt;
extern int ath9k_led_blink;
extern bool is_ath9k_unloaded;
diff --git a/drivers/net/wireless/ath/ath9k/init.c
b/drivers/net/wireless/ath/ath9k/init.c
index 4f00400c7ffb..6c0296b4d366 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -577,6 +578,31 @@ static int ath9k_nvmem_request_eeprom(struct ath_softc *sc)
size_t len;
int err;
+ /* 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 ath9k 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(sc->dev) && ( no OF node || caldata not from node
+* || not compatible ) -> do not use caldata .
+*
+* !dev_is_pci(sc->dev) -> always use caldata .
+*/
+ if (dev_is_pci(sc->dev) &&
+ (!sc->dev->of_node ||
+!of_property_match_string(sc->dev->of_node,
+ "nvmem-cell-names",
+ "calibration") ||
+!of_pci_node_match_driver(sc->dev->of_node,
+ &ath_pci_driver)))
+ /* follow the "just return 0;" convention as
+* noted below.
+*/
+ return 0;
+
cell = devm_nvmem_cell_get(sc->dev, "calibration");
if (IS_ERR(cell)) {
err = PTR_ERR(cell);
diff --git a/drivers/net/wireless/ath/ath9k/pci.c
b/drivers/net/wireless/ath/ath9k/pci.c
index a074e23013c5..fcb19761e60d 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -1074,7 +1074,7 @@ static SIMPLE_DEV_PM_OPS(ath9k_pm_ops, ath_pci_suspend,
ath_pci_resume);
MODULE_DEVICE_TABLE(pci, ath_pci_id_table);
-static struct pci_driver ath_pci_driver = {
+struct pci_driver ath_pci_driver = {
.name = "ath9k",
.id_table = ath_pci_id_table,
.probe = ath_pci_probe,
--
2.39.1
___
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
