wilc1000: udpated MAINTAINERS & minor pending patches
[email protected]
maintainercover wilc1000: udpated MAINTAINERS & minor pending patches
From: Ajay Singh <[email protected]>
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(-)
Signature · 1 line
2.24.0
[email protected]
maintainerPATCH 1/5 MAINTAINERS: net: wilc1000: Update entry
From: Nicolas Ferre <[email protected]>
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.
--- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
@@ -11363,8 +11363,8 @@ S: Supported F: drivers/usb/gadget/udc/atmel_usba_udc.* MICROCHIP WILC1000 WIFI DRIVER -M: Adham Abozaeid <[email protected]> M: Ajay Singh <[email protected]> +M: Claudiu Beznea <[email protected]> L: [email protected] S: Supported F: drivers/net/wireless/microchip/wilc1000/
Signature · 1 line
2.24.0
Re: [PATCH wireless-drivers-next 1/5] MAINTAINERS: net: wilc1000: Update entry
Quoted 8 lines · <[email protected]> wrote:
From: Nicolas Ferre <[email protected]>
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 <[email protected]>Signed-off-by Ajay Singh <[email protected]>
5 patches applied to wireless-drivers-next.git, thanks.
4f5479e2ee1f MAINTAINERS: net: wilc1000: Update entry1b3dd7743041 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
Signature · 3 lines
https://patchwork.kernel.org/patch/11655667/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
[email protected]
maintainerPATCH 2/5 wilc1000: use strlcpy to avoid 'stringop-truncation' warning
In reply to [email protected]From: Ajay Singh <[email protected]>
Make use 'strlcpy' instead of 'strncpy' to overcome 'stringop-truncation' compiler warning.
--- drivers/net/wireless/microchip/wilc1000/mon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/microchip/wilc1000/mon.c +1 -2
@@ -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;
Signature · 1 line
2.24.0
[email protected]
maintainerPATCH 3/5 wilc1000: fix compiler warning for 'wowlan_support' unused variable
In reply to [email protected]From: Ajay Singh <[email protected]>
Avoid below reported warning found when 'CONFIG_PM' config is undefined.
'warning: unused variable 'wowlan_support' [-Wunused-const-variable]'
--- drivers/net/wireless/microchip/wilc1000/cfg80211.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/microchip/wilc1000/cfg80211.c +2 -0
@@ -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;
Signature · 1 line
2.24.0
[email protected]
maintainerPATCH 4/5 wilc1000: use unified single wilc1000 FW binary
In reply to [email protected]From: Ajay Singh <[email protected]>
Modify WILC1000 binary filename to use single unified wilc1000 FW. A single wilc1000 binary is used for different wilc1000 revisions.
--- .../net/wireless/microchip/wilc1000/Makefile | 3 +-- .../net/wireless/microchip/wilc1000/netdev.c | 18 +++++++----------- 2 files changed, 8 insertions(+), 13 deletions(-)
drivers/net/wireless/microchip/wilc1000/Makefile +1 -2
@@ -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
drivers/net/wireless/microchip/wilc1000/netdev.c +7 -11
@@ -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 ; }
Signature · 1 line
2.24.0
[email protected]
maintainerPATCH 5/5 wilc1000: use API version number info along with firmware filename
In reply to [email protected]From: Ajay Singh <[email protected]>
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.
--- .../net/wireless/microchip/wilc1000/Makefile | 2 -- .../net/wireless/microchip/wilc1000/netdev.c | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-)
drivers/net/wireless/microchip/wilc1000/Makefile +0 -2
@@ -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
drivers/net/wireless/microchip/wilc1000/netdev.c +14 -3
@@ -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 ));
Signature · 1 line
2.24.0