Thread (7 messages) flat view 7 messages, 2 authors, 2023-02-15

RE: [PATCH v1 4/5] wifi: rtw88: rtw8822b: Implement RTL8822BS (SDIO) efuse parsing

From: Ping-Ke Shih <pkshih@realtek.com>
Date: 2023-02-15 01:22:45
Also in: linux-wireless, lkml

quoted hunk ↗ jump to hunk
-----Original Message-----
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Sent: Wednesday, February 15, 2023 5:14 AM
To: linux-wireless@vger.kernel.org
Cc: tony0620emma@gmail.com; kvalo@kernel.org; netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Neo
Jou [off-list ref]; Jernej Skrabec [off-list ref]; Ping-Ke Shih [off-list ref];
Martin Blumenstingl [off-list ref]
Subject: [PATCH v1 4/5] wifi: rtw88: rtw8822b: Implement RTL8822BS (SDIO) efuse parsing

The efuse of the SDIO RTL8822BS chip has only one known member: the mac
address is at offset 0x11a. Add a struct rtw8822bs_efuse describing this
and use it for copying the mac address when the SDIO bus is used.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
 drivers/net/wireless/realtek/rtw88/rtw8822b.c | 10 ++++++++++
 drivers/net/wireless/realtek/rtw88/rtw8822b.h |  6 ++++++
 2 files changed, 16 insertions(+)
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
index 74dfb89b2c94..4ed5b98fab23 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
@@ -26,10 +26,17 @@ static void rtw8822be_efuse_parsing(struct rtw_efuse *efuse,
        ether_addr_copy(efuse->addr, map->e.mac_addr);
 }

+static void rtw8822bs_efuse_parsing(struct rtw_efuse *efuse,
+                                   struct rtw8822b_efuse *map)
+{
+       ether_addr_copy(efuse->addr, map->s.mac_addr);
+}
+
 static void rtw8822bu_efuse_parsing(struct rtw_efuse *efuse,
                                    struct rtw8822b_efuse *map)
 {
        ether_addr_copy(efuse->addr, map->u.mac_addr);
+
Don't need to stir USB code.
quoted hunk ↗ jump to hunk
 }

 static int rtw8822b_read_efuse(struct rtw_dev *rtwdev, u8 *log_map)
@@ -62,6 +69,9 @@ static int rtw8822b_read_efuse(struct rtw_dev *rtwdev, u8 *log_map)
        case RTW_HCI_TYPE_PCIE:
                rtw8822be_efuse_parsing(efuse, map);
                break;
+       case RTW_HCI_TYPE_SDIO:
+               rtw8822bs_efuse_parsing(efuse, map);
+               break;
        case RTW_HCI_TYPE_USB:
                rtw8822bu_efuse_parsing(efuse, map);
                break;
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.h
b/drivers/net/wireless/realtek/rtw88/rtw8822b.h
index 01d3644e0c94..8d05805c046c 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.h
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.h
@@ -65,6 +65,11 @@ struct rtw8822be_efuse {
        u8 res7;
 };

+struct rtw8822bs_efuse {
+       u8 res4[0x4a];                  /* 0xd0 */
+       u8 mac_addr[ETH_ALEN];          /* 0x11a */
+} __packed;
+
 struct rtw8822b_efuse {
        __le16 rtl_id;
        u8 res0[0x0e];
@@ -94,6 +99,7 @@ struct rtw8822b_efuse {
        union {
                struct rtw8822bu_efuse u;
                struct rtw8822be_efuse e;
+               struct rtw8822bs_efuse s;
No obvious problem in whole patchset. Only a nit about the order of PCIE-USB-SDIO.
Can we have them in consistent order?

Here, the order is USB-PCIE-SDIO, but patch 3/5 and 5/5 in different order.
It seems like we messed up the order when adding USB, but we can correct them
along with this patch. My prefer order is PCIE-USB-SDIO after adding SDIO,
because the order of existing code of 'switch...case' is PCIE-USB.

Apply this rule not only here also 'switch...case' and 'efuse parser'.

Ping-Ke
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help