Skip to content

Commit 2f4596c

Browse files
committed
wifi: rtw89: 8852bx: Accept USB devices and load their MAC address
JIRA: https://issues.redhat.com/browse/RHEL-114889 commit 5e9184a Author: Bitterblue Smith <rtl8821cerfe2@gmail.com> Date: Sat Jul 5 22:36:59 2025 +0300 wifi: rtw89: 8852bx: Accept USB devices and load their MAC address Make __rtw8852bx_read_efuse() accept USB devices and load the MAC address from the correct offset. Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com> Acked-by: Ping-Ke Shih <pkshih@realtek.com> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> Link: https://patch.msgid.link/1f58d168-67a9-4d86-9e6a-73789c7a59f4@gmail.com Signed-off-by: Jose Ignacio Tornos Martinez <jtornosm@redhat.com>
1 parent 06baab3 commit 2f4596c

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

drivers/net/wireless/realtek/rtw89/rtw8852b_common.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,6 @@ static const struct rtw89_reg3_def rtw8852bx_btc_preagc_dis_defs[] = {
172172

173173
static DECLARE_PHY_REG3_TBL(rtw8852bx_btc_preagc_dis_defs);
174174

175-
static void rtw8852be_efuse_parsing(struct rtw89_efuse *efuse,
176-
struct rtw8852bx_efuse *map)
177-
{
178-
ether_addr_copy(efuse->addr, map->e.mac_addr);
179-
efuse->rfe_type = map->rfe_type;
180-
efuse->xtal_cap = map->xtal_k;
181-
}
182-
183175
static void rtw8852bx_efuse_parsing_tssi(struct rtw89_dev *rtwdev,
184176
struct rtw8852bx_efuse *map)
185177
{
@@ -261,12 +253,18 @@ static int __rtw8852bx_read_efuse(struct rtw89_dev *rtwdev, u8 *log_map,
261253

262254
switch (rtwdev->hci.type) {
263255
case RTW89_HCI_TYPE_PCIE:
264-
rtw8852be_efuse_parsing(efuse, map);
256+
ether_addr_copy(efuse->addr, map->e.mac_addr);
257+
break;
258+
case RTW89_HCI_TYPE_USB:
259+
ether_addr_copy(efuse->addr, map->u.mac_addr);
265260
break;
266261
default:
267262
return -EOPNOTSUPP;
268263
}
269264

265+
efuse->rfe_type = map->rfe_type;
266+
efuse->xtal_cap = map->xtal_k;
267+
270268
rtw89_info(rtwdev, "chip rfe_type is %d\n", efuse->rfe_type);
271269

272270
return 0;

0 commit comments

Comments
 (0)