[PATCH wireless-drivers-next 0/5] wilc1000: udpated MAINTAINERS & minor pending patches

[PATCH wireless-drivers-next 0/5] wilc1000: udpated MAINTAINERS & minor pending patches

[Ajay.Kathat]

From: Ajay Singh <ajay.kathat@microchip.com>

The patch series contains below changes:
 1. Updated MAINTAINERS file for WILC1000 driver.
 2. Fixes for gcc warnings found by kernel test build with different configuration.
 3. Use of single FW file for different WILC1000 revisions.
 4. Added API version number along with WILC1000 FW filename.

Ajay Singh (4):
  wilc1000: use strlcpy to avoid 'stringop-truncation' warning
  wilc1000: fix compiler warning for 'wowlan_support' unused variable
  wilc1000: use unified single wilc1000 FW binary
  wilc1000: use API version number info along with firmware filename

Nicolas Ferre (1):
  MAINTAINERS: net: wilc1000: Update entry

 MAINTAINERS                                   |  2 +-
 .../net/wireless/microchip/wilc1000/Makefile  |  3 --
 .../wireless/microchip/wilc1000/cfg80211.c    |  2 ++
 drivers/net/wireless/microchip/wilc1000/mon.c |  3 +-
 .../net/wireless/microchip/wilc1000/netdev.c  | 29 ++++++++++++-------
 5 files changed, 22 insertions(+), 17 deletions(-)

-- 
2.24.0

[PATCH wireless-drivers-next 1/5] MAINTAINERS: net: wilc1000: Update entry

[Ajay.Kathat]

From: Nicolas Ferre <nicolas.ferre@microchip.com>

As Adham's email address is bouncing, remove him from wilc1000 entry and
add Claudiu as a new co-maintainer. Claudiu follows wilc1000 driver
development for a long time and contributed to it already.

Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 7dae51e32254..099e672ec6e6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11363,8 +11363,8 @@ S:	Supported
 F:	drivers/usb/gadget/udc/atmel_usba_udc.*
 
 MICROCHIP WILC1000 WIFI DRIVER
-M:	Adham Abozaeid <adham.abozaeid@microchip.com>
 M:	Ajay Singh <ajay.kathat@microchip.com>
+M:	Claudiu Beznea <claudiu.beznea@microchip.com>
 L:	linux-wireless@vger.kernel.org
 S:	Supported
 F:	drivers/net/wireless/microchip/wilc1000/
-- 
2.24.0

Re: [PATCH wireless-drivers-next 1/5] MAINTAINERS: net: wilc1000: Update entry

[Kalle Valo]

<Ajay.Kathat@microchip.com> wrote:

> From: Nicolas Ferre <nicolas.ferre@microchip.com>
> 
> As Adham's email address is bouncing, remove him from wilc1000 entry and
> add Claudiu as a new co-maintainer. Claudiu follows wilc1000 driver
> development for a long time and contributed to it already.
> 
> Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
> Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>

5 patches applied to wireless-drivers-next.git, thanks.

4f5479e2ee1f MAINTAINERS: net: wilc1000: Update entry
1b3dd7743041 wilc1000: use strlcpy to avoid 'stringop-truncation' warning
9bdcbdafc659 wilc1000: fix compiler warning for 'wowlan_support' unused variable
0b3dd675ed59 wilc1000: use unified single wilc1000 FW binary
b52b331a8978 wilc1000: use API version number info along with firmware filename

-- 
https://patchwork.kernel.org/patch/11655667/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

[PATCH wireless-drivers-next 2/5] wilc1000: use strlcpy to avoid 'stringop-truncation' warning

[Ajay.Kathat]

From: Ajay Singh <ajay.kathat@microchip.com>

Make use 'strlcpy' instead of 'strncpy' to overcome 'stringop-truncation'
compiler warning.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/net/wireless/microchip/wilc1000/mon.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/mon.c b/drivers/net/wireless/microchip/wilc1000/mon.c
index 60331417bd98..358ac8601333 100644
--- a/drivers/net/wireless/microchip/wilc1000/mon.c
+++ b/drivers/net/wireless/microchip/wilc1000/mon.c
@@ -229,8 +229,7 @@ struct net_device *wilc_wfi_init_mon_interface(struct wilc *wl,
 		return NULL;
 
 	wl->monitor_dev->type = ARPHRD_IEEE80211_RADIOTAP;
-	strncpy(wl->monitor_dev->name, name, IFNAMSIZ);
-	wl->monitor_dev->name[IFNAMSIZ - 1] = 0;
+	strlcpy(wl->monitor_dev->name, name, IFNAMSIZ);
 	wl->monitor_dev->netdev_ops = &wilc_wfi_netdev_ops;
 	wl->monitor_dev->needs_free_netdev = true;
 
-- 
2.24.0

[PATCH wireless-drivers-next 3/5] wilc1000: fix compiler warning for 'wowlan_support' unused variable

[Ajay.Kathat]

From: Ajay Singh <ajay.kathat@microchip.com>

Avoid below reported warning found when 'CONFIG_PM' config is
undefined.

'warning: unused variable 'wowlan_support' [-Wunused-const-variable]'

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/net/wireless/microchip/wilc1000/cfg80211.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/net/wireless/microchip/wilc1000/cfg80211.c
index b6065a0d660f..c1ac1d84790f 100644
--- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c
+++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c
@@ -46,9 +46,11 @@ static const struct ieee80211_txrx_stypes
 	}
 };
 
+#ifdef CONFIG_PM
 static const struct wiphy_wowlan_support wowlan_support = {
 	.flags = WIPHY_WOWLAN_ANY
 };
+#endif
 
 struct wilc_p2p_mgmt_data {
 	int size;
-- 
2.24.0

[PATCH wireless-drivers-next 5/5] wilc1000: use API version number info along with firmware filename

[Ajay.Kathat]

From: Ajay Singh <ajay.kathat@microchip.com>

Added version number info along with firmware name so driver can pick
the correct revision of FW file. Moved FW filename macro as part of
driver code & added MODULE_FIRMWARE to specify FW needed by module.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 .../net/wireless/microchip/wilc1000/Makefile    |  2 --
 .../net/wireless/microchip/wilc1000/netdev.c    | 17 ++++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/Makefile b/drivers/net/wireless/microchip/wilc1000/Makefile
index 7d1ed5f40cbb..c3c9e34c1eaa 100644
--- a/drivers/net/wireless/microchip/wilc1000/Makefile
+++ b/drivers/net/wireless/microchip/wilc1000/Makefile
@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_WILC1000) += wilc1000.o
 
-ccflags-y += -DFIRMWARE_WILC1000=\"atmel/wilc1000_wifi_firmware.bin\"
-
 wilc1000-objs := cfg80211.o netdev.o mon.o \
 			hif.o wlan_cfg.o wlan.o
 
diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c
index 1005526ae896..198354670fe1 100644
--- a/drivers/net/wireless/microchip/wilc1000/netdev.c
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.c
@@ -15,6 +15,13 @@
 
 #define WILC_MULTICAST_TABLE_SIZE	8
 
+/* latest API version supported */
+#define WILC1000_API_VER		1
+
+#define WILC1000_FW_PREFIX		"atmel/wilc1000_wifi_firmware-"
+#define __WILC1000_FW(api)		WILC1000_FW_PREFIX #api ".bin"
+#define WILC1000_FW(api)		__WILC1000_FW(api)
+
 static irqreturn_t isr_uh_routine(int irq, void *user_data)
 {
 	struct net_device *dev = user_data;
@@ -177,15 +184,18 @@ static int wilc_wlan_get_firmware(struct net_device *dev)
 	struct wilc *wilc = vif->wilc;
 	int chip_id;
 	const struct firmware *wilc_fw;
+	int ret;
 
 	chip_id = wilc_get_chipid(wilc, false);
 
 	netdev_info(dev, "ChipID [%x] loading firmware [%s]\n", chip_id,
-		    FIRMWARE_WILC1000);
+		    WILC1000_FW(WILC1000_API_VER));
 
-	if (request_firmware(&wilc_fw, FIRMWARE_WILC1000, wilc->dev) != 0) {
+	ret = request_firmware(&wilc_fw, WILC1000_FW(WILC1000_API_VER),
+			       wilc->dev);
+	if (ret != 0) {
 		netdev_err(dev, "%s - firmware not available\n",
-			   FIRMWARE_WILC1000);
+			   WILC1000_FW(WILC1000_API_VER));
 		return -EINVAL;
 	}
 	wilc->firmware = wilc_fw;
@@ -925,3 +935,4 @@ struct wilc_vif *wilc_netdev_ifc_init(struct wilc *wl, const char *name,
 }
 
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE(WILC1000_FW(WILC1000_API_VER));
-- 
2.24.0

[PATCH wireless-drivers-next 4/5] wilc1000: use unified single wilc1000 FW binary

[Ajay.Kathat]

From: Ajay Singh <ajay.kathat@microchip.com>

Modify WILC1000 binary filename to use single unified wilc1000 FW.
A single wilc1000 binary is used for different wilc1000 revisions.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 .../net/wireless/microchip/wilc1000/Makefile   |  3 +--
 .../net/wireless/microchip/wilc1000/netdev.c   | 18 +++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/Makefile b/drivers/net/wireless/microchip/wilc1000/Makefile
index a3305a0a888a..7d1ed5f40cbb 100644
--- a/drivers/net/wireless/microchip/wilc1000/Makefile
+++ b/drivers/net/wireless/microchip/wilc1000/Makefile
@@ -1,8 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_WILC1000) += wilc1000.o
 
-ccflags-y += -DFIRMWARE_1002=\"atmel/wilc1002_firmware.bin\" \
-		-DFIRMWARE_1003=\"atmel/wilc1003_firmware.bin\"
+ccflags-y += -DFIRMWARE_WILC1000=\"atmel/wilc1000_wifi_firmware.bin\"
 
 wilc1000-objs := cfg80211.o netdev.o mon.o \
 			hif.o wlan_cfg.o wlan.o
diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c
index fda0ab97b02c..1005526ae896 100644
--- a/drivers/net/wireless/microchip/wilc1000/netdev.c
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.c
@@ -176,23 +176,19 @@ static int wilc_wlan_get_firmware(struct net_device *dev)
 	struct wilc_vif *vif = netdev_priv(dev);
 	struct wilc *wilc = vif->wilc;
 	int chip_id;
-	const struct firmware *wilc_firmware;
-	char *firmware;
+	const struct firmware *wilc_fw;
 
 	chip_id = wilc_get_chipid(wilc, false);
 
-	if (chip_id < 0x1003a0)
-		firmware = FIRMWARE_1002;
-	else
-		firmware = FIRMWARE_1003;
-
-	netdev_info(dev, "loading firmware %s\n", firmware);
+	netdev_info(dev, "ChipID [%x] loading firmware [%s]\n", chip_id,
+		    FIRMWARE_WILC1000);
 
-	if (request_firmware(&wilc_firmware, firmware, wilc->dev) != 0) {
-		netdev_err(dev, "%s - firmware not available\n", firmware);
+	if (request_firmware(&wilc_fw, FIRMWARE_WILC1000, wilc->dev) != 0) {
+		netdev_err(dev, "%s - firmware not available\n",
+			   FIRMWARE_WILC1000);
 		return -EINVAL;
 	}
-	wilc->firmware = wilc_firmware;
+	wilc->firmware = wilc_fw;
 
 	return 0;
 }
-- 
2.24.0