From: Marek Vasut <marex@denx.de>
To: linux-wireless@vger.kernel.org
Cc: "Marek Vasut" <marex@denx.de>,
"David S. Miller" <davem@davemloft.net>,
"Adham Abozaeid" <adham.abozaeid@microchip.com>,
"Ajay Singh" <ajay.kathat@microchip.com>,
"Alexis Lothoré" <alexis.lothore@bootlin.com>,
"Claudiu Beznea" <claudiu.beznea@tuxon.dev>,
"Conor Dooley" <conor+dt@kernel.org>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Kalle Valo" <kvalo@kernel.org>,
"Krzysztof Kozlowski" <krzk+dt@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Rob Herring" <robh@kernel.org>,
devicetree@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH v7 6/7] wifi: wilc1000: Register wiphy after reading out chipid
Date: Thu, 3 Oct 2024 13:14:40 +0200 [thread overview]
Message-ID: <20241003111529.41232-6-marex@denx.de> (raw)
In-Reply-To: <20241003111529.41232-1-marex@denx.de>
Register wiphy after reading out chipid, so the chipid can be
used to determine chip features and not advertise WPA3/SAE
support to userspace on WILC3000. Note that wilc_netdev_cleanup()
will deregister the wiphy in fail path.
Signed-off-by: Marek Vasut <marex@denx.de>
---
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Adham Abozaeid <adham.abozaeid@microchip.com>
Cc: Ajay Singh <ajay.kathat@microchip.com>
Cc: Alexis Lothoré <alexis.lothore@bootlin.com>
Cc: Claudiu Beznea <claudiu.beznea@tuxon.dev>
Cc: Conor Dooley <conor+dt@kernel.org>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Kalle Valo <kvalo@kernel.org>
Cc: Krzysztof Kozlowski <krzk+dt@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Rob Herring <robh@kernel.org>
Cc: devicetree@vger.kernel.org
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
---
V5: New patch
V6: - Rebase on next-20240926
V7: - Rebase on next-20241003 / wireless-next/main 5a4d42c1688c
with v2 wifi: wilc1000: Keep slot powered on during suspend/resume
---
.../net/wireless/microchip/wilc1000/cfg80211.c | 15 ++++++++-------
.../net/wireless/microchip/wilc1000/cfg80211.h | 1 +
drivers/net/wireless/microchip/wilc1000/sdio.c | 4 ++++
drivers/net/wireless/microchip/wilc1000/spi.c | 4 ++++
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/net/wireless/microchip/wilc1000/cfg80211.c
index 11e0f8a473467..30015c5920467 100644
--- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c
+++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c
@@ -1761,7 +1761,6 @@ static struct wilc *wilc_create_wiphy(struct device *dev)
{
struct wiphy *wiphy;
struct wilc *wl;
- int ret;
wiphy = wiphy_new(&wilc_cfg80211_ops, sizeof(*wl));
if (!wiphy)
@@ -1804,14 +1803,8 @@ static struct wilc *wilc_create_wiphy(struct device *dev)
BIT(NL80211_IFTYPE_P2P_GO) |
BIT(NL80211_IFTYPE_P2P_CLIENT);
wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
- wiphy->features |= NL80211_FEATURE_SAE;
set_wiphy_dev(wiphy, dev);
wl->wiphy = wiphy;
- ret = wiphy_register(wiphy);
- if (ret) {
- wiphy_free(wiphy);
- return NULL;
- }
return wl;
}
@@ -1861,6 +1854,14 @@ int wilc_cfg80211_init(struct wilc **wilc, struct device *dev, int io_type,
}
EXPORT_SYMBOL_GPL(wilc_cfg80211_init);
+int wilc_cfg80211_register(struct wilc *wilc)
+{
+ wilc->wiphy->features |= NL80211_FEATURE_SAE;
+
+ return wiphy_register(wilc->wiphy);
+}
+EXPORT_SYMBOL_GPL(wilc_cfg80211_register);
+
int wilc_init_host_int(struct net_device *net)
{
int ret;
diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.h b/drivers/net/wireless/microchip/wilc1000/cfg80211.h
index fc04cc6615c1f..2dc9c1c42d609 100644
--- a/drivers/net/wireless/microchip/wilc1000/cfg80211.h
+++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.h
@@ -10,6 +10,7 @@
int wilc_cfg80211_init(struct wilc **wilc, struct device *dev, int io_type,
const struct wilc_hif_func *ops);
+int wilc_cfg80211_register(struct wilc *wilc);
void wilc_deinit_host_int(struct net_device *net);
int wilc_init_host_int(struct net_device *net);
void wilc_wfi_monitor_rx(struct net_device *mon_dev, u8 *buff, u32 size);
diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
index 9173f6f3beabf..56a929281d6a7 100644
--- a/drivers/net/wireless/microchip/wilc1000/sdio.c
+++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
@@ -186,6 +186,10 @@ static int wilc_sdio_probe(struct sdio_func *func,
if (ret)
goto dispose_irq;
+ ret = wilc_cfg80211_register(wilc);
+ if (ret)
+ goto dispose_irq;
+
ret = wilc_load_mac_from_nv(wilc);
if (ret) {
pr_err("Can not retrieve MAC address from chip\n");
diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wireless/microchip/wilc1000/spi.c
index 81cf82c9175ef..28d211ee60096 100644
--- a/drivers/net/wireless/microchip/wilc1000/spi.c
+++ b/drivers/net/wireless/microchip/wilc1000/spi.c
@@ -249,6 +249,10 @@ static int wilc_bus_probe(struct spi_device *spi)
if (ret)
goto power_down;
+ ret = wilc_cfg80211_register(wilc);
+ if (ret)
+ goto power_down;
+
ret = wilc_load_mac_from_nv(wilc);
if (ret) {
pr_err("Can not retrieve MAC address from chip\n");
--
2.45.2
next prev parent reply other threads:[~2024-10-03 11:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-03 11:14 [PATCH v7 1/7] dt-bindings: wireless: wilc1000: Document WILC3000 compatible string Marek Vasut
2024-10-03 11:14 ` [PATCH v7 2/7] wifi: wilc1000: Clean up usage of wilc_get_chipid() Marek Vasut
2024-10-03 17:33 ` Alexis Lothoré
2024-10-03 18:31 ` Marek Vasut
2024-10-03 11:14 ` [PATCH v7 3/7] wifi: wilc1000: Fold chip_allow_sleep()/chip_wakeup() into wlan.c Marek Vasut
2024-10-03 11:14 ` [PATCH v7 4/7] wifi: wilc1000: Fill in missing error handling Marek Vasut
2024-10-03 11:14 ` [PATCH v7 5/7] wifi: wilc1000: Fold wilc_create_wiphy() into cfg80211.c Marek Vasut
2024-10-03 11:14 ` Marek Vasut [this message]
2024-10-04 8:39 ` [PATCH v7 6/7] wifi: wilc1000: Register wiphy after reading out chipid Alexis Lothoré
2024-10-04 11:41 ` Marek Vasut
2024-10-03 11:14 ` [PATCH v7 7/7] wifi: wilc1000: Add WILC3000 support Marek Vasut
2024-10-04 8:46 ` Alexis Lothoré
2024-10-04 11:42 ` Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241003111529.41232-6-marex@denx.de \
--to=marex@denx.de \
--cc=adham.abozaeid@microchip.com \
--cc=ajay.kathat@microchip.com \
--cc=alexis.lothore@bootlin.com \
--cc=claudiu.beznea@tuxon.dev \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=krzk+dt@kernel.org \
--cc=kuba@kernel.org \
--cc=kvalo@kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).