Linux-Amlogic Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Marc Gonzalez <marc.w.gonzalez@free.fr>
To: Arend van Spriel <aspriel@gmail.com>,
	Franky Lin <franky.lin@broadcom.com>,
	Hante Meuleman <hante.meuleman@broadcom.com>,
	Kalle Valo <kvalo@kernel.org>, Eric Dumazet <edumazet@google.com>,
	Ulf Hansson <ulf.hansson@linaro.org>,
	Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>,
	Alexander Prutskov <alep@cypress.com>,
	Wright Feng <wright.feng@cypress.com>,
	Joseph chuang <jiac@cypress.com>,
	Chi-Hsien Lin <chi-hsien.lin@cypress.com>,
	Neil Armstrong <neil.armstrong@linaro.org>,
	Kevin Hilman <khilman@baylibre.com>,
	Jerome Brunet <jbrunet@baylibre.com>,
	Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
	Angus Ainslie <angus@akkea.ca>
Cc: linux-wireless@vger.kernel.org, linux-mmc@vger.kernel.org,
	linux-amlogic@lists.infradead.org
Subject: Unsupported WiFi adapter on S905X2 board
Date: Fri, 3 Mar 2023 19:19:00 +0100	[thread overview]
Message-ID: <05977cbb-8a8f-0a67-b4bd-b265dbb83280@free.fr> (raw)

Hello,

I think there's an unsupported device in this system:

# cat /sys/bus/sdio/devices/mmc2:0001:1/uevent
OF_NAME=wifi
OF_FULLNAME=/soc/sd@ffe03000/wifi@1
OF_COMPATIBLE_0=brcm,bcm4329-fmac
OF_COMPATIBLE_N=1
SDIO_CLASS=00
SDIO_ID=02D0:AAE7
SDIO_REVISION=0.0
MODALIAS=sdio:c00v02D0dAAE7

0xaae7 = 43751

Isn't there some overlap between
include/linux/mmc/sdio_ids.h
and
drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
?

(Relevant commit: d2587c57ffd8dc)

Looking at all the occurrences of 43752 to insert a 43751,
could someone comment whether this looks reasonable?

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
index 1967160f211eb..89bbad598782e 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
@@ -987,6 +987,7 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = {
  	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373, CYW),
  	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012, CYW),
  	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43439, CYW),
+	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43751, CYW),
  	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43752, CYW),
  	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359, CYW),
  	{ /* end: all zeroes */ }
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
index 121893bbaa1d7..cab9257272dd4 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
@@ -731,6 +731,7 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci)
  	case BRCM_CC_4364_CHIP_ID:
  	case CY_CC_4373_CHIP_ID:
  		return 0x160000;
+	case CY_CC_43751_CHIP_ID:
  	case CY_CC_43752_CHIP_ID:
  		return 0x170000;
  	case BRCM_CC_4378_CHIP_ID:
@@ -1433,6 +1434,7 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub)
  		reg = chip->ops->read32(chip->ctx, addr);
  		return (reg & CC_SR_CTL0_ENABLE_MASK) != 0;
  	case BRCM_CC_4359_CHIP_ID:
+	case CY_CC_43751_CHIP_ID:
  	case CY_CC_43752_CHIP_ID:
  	case CY_CC_43012_CHIP_ID:
  		addr = CORE_CC_REG(pmu->base, retention_ctl);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 6b38d9de71af6..55cc7b65081fd 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -624,6 +624,7 @@ BRCMF_FW_CLM_DEF(4356, "brcmfmac4356-sdio");
  BRCMF_FW_DEF(4359, "brcmfmac4359-sdio");
  BRCMF_FW_CLM_DEF(4373, "brcmfmac4373-sdio");
  BRCMF_FW_CLM_DEF(43012, "brcmfmac43012-sdio");
+BRCMF_FW_CLM_DEF(43751, "brcmfmac43751-sdio");
  BRCMF_FW_CLM_DEF(43752, "brcmfmac43752-sdio");
  
  /* firmware config files */
@@ -657,6 +658,7 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
  	BRCMF_FW_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373),
  	BRCMF_FW_ENTRY(CY_CC_43012_CHIP_ID, 0xFFFFFFFF, 43012),
  	BRCMF_FW_ENTRY(CY_CC_43439_CHIP_ID, 0xFFFFFFFF, 43439),
+	BRCMF_FW_ENTRY(CY_CC_43751_CHIP_ID, 0xFFFFFFFF, 43751),
  	BRCMF_FW_ENTRY(CY_CC_43752_CHIP_ID, 0xFFFFFFFF, 43752)
  };
  
@@ -3425,6 +3427,7 @@ static int brcmf_sdio_download_firmware(struct brcmf_sdio *bus,
  static bool brcmf_sdio_aos_no_decode(struct brcmf_sdio *bus)
  {
  	if (bus->ci->chip == CY_CC_43012_CHIP_ID ||
+	    bus->ci->chip == CY_CC_43751_CHIP_ID ||
  	    bus->ci->chip == CY_CC_43752_CHIP_ID)
  		return true;
  	else
@@ -4274,6 +4277,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
  
  		switch (sdiod->func1->device) {
  		case SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373:
+		case SDIO_DEVICE_ID_BROADCOM_CYPRESS_43751:
  		case SDIO_DEVICE_ID_BROADCOM_CYPRESS_43752:
  			brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n",
  				  CY_4373_F2_WATERMARK);
diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
index f4939cf627672..8b21da3e66291 100644
--- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
+++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
@@ -55,6 +55,7 @@
  #define CY_CC_4373_CHIP_ID		0x4373
  #define CY_CC_43012_CHIP_ID		43012
  #define CY_CC_43439_CHIP_ID		43439
+#define CY_CC_43751_CHIP_ID		43751
  #define CY_CC_43752_CHIP_ID		43752
  #define CY_CC_89459_CHIP_ID		0x4355
  
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 74f9d9a6d3307..80e84958e570f 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -76,6 +76,7 @@
  #define SDIO_DEVICE_ID_BROADCOM_43430		0xa9a6
  #define SDIO_DEVICE_ID_BROADCOM_CYPRESS_43439	0xa9af
  #define SDIO_DEVICE_ID_BROADCOM_43455		0xa9bf
+#define SDIO_DEVICE_ID_BROADCOM_CYPRESS_43751	0xaae7
  #define SDIO_DEVICE_ID_BROADCOM_CYPRESS_43752	0xaae8
  
  #define SDIO_VENDOR_ID_MARVELL			0x02df


Regards.


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

             reply	other threads:[~2023-03-03 18:19 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-03 18:19 Marc Gonzalez [this message]
2023-03-06  9:17 ` Unsupported WiFi adapter on S905X2 board Neil Armstrong
2023-03-06 10:24   ` [RFC PATCH] brcmfmac: add 43751 SDIO ids and initialization Marc Gonzalez
2023-03-06 10:41     ` Marc Gonzalez
2023-03-07 14:40       ` Marc Gonzalez
2023-03-07 23:15         ` Franky Lin
2023-03-08 12:47           ` Marc Gonzalez
2023-03-08 17:21             ` Franky Lin
2023-03-08 17:37               ` Neil Armstrong
2023-03-22 17:40               ` Marc Gonzalez
2023-04-04 15:59                 ` Marc Gonzalez
2023-03-09 10:16     ` Marc Gonzalez
2023-03-09 12:13       ` Marc Gonzalez
2023-03-09 14:29         ` Ulf Hansson
2023-03-09 16:45           ` Marc Gonzalez
2023-03-09 17:51           ` Marc Gonzalez
2023-03-13 13:55             ` Marc Gonzalez
2023-03-13 14:41               ` Marc Gonzalez
2023-03-13 14:53                 ` Marc Gonzalez
2023-03-13 17:09               ` Marc Gonzalez
2023-03-13 20:04                 ` Martin Blumenstingl
2023-03-13 21:42                   ` Marc Gonzalez
2023-03-14  7:27                     ` Ulf Hansson
     [not found]                       ` <c7e48c6f-530b-7198-b8bb-fc927a2fdc66@free.fr>
2023-03-14 11:08                         ` Ulf Hansson
2023-03-14 16:37                           ` Marc Gonzalez
2023-03-15 20:55                             ` Ulf Hansson

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=05977cbb-8a8f-0a67-b4bd-b265dbb83280@free.fr \
    --to=marc.w.gonzalez@free.fr \
    --cc=alep@cypress.com \
    --cc=angus@akkea.ca \
    --cc=aspriel@gmail.com \
    --cc=chi-hsien.lin@cypress.com \
    --cc=edumazet@google.com \
    --cc=franky.lin@broadcom.com \
    --cc=hante.meuleman@broadcom.com \
    --cc=jbrunet@baylibre.com \
    --cc=jiac@cypress.com \
    --cc=khilman@baylibre.com \
    --cc=kvalo@kernel.org \
    --cc=linux-amlogic@lists.infradead.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=martin.blumenstingl@googlemail.com \
    --cc=neil.armstrong@linaro.org \
    --cc=pieter-paul.giesberts@broadcom.com \
    --cc=ulf.hansson@linaro.org \
    --cc=wright.feng@cypress.com \
    /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