From patchwork Thu Feb 27 13:12:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping-Ke Shih X-Patchwork-Id: 13994413 X-Patchwork-Delegate: pkshih@realtek.com Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E00621ABBE for ; Thu, 27 Feb 2025 13:12:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740661973; cv=none; b=RxJTv5/kaf1VWCWXjTKI8DYIpz/E+EjHAHOQSc582wuogaLp+EA/lzAe4NVdPLbJ6sMUP50iselfO8ilEXfM51JPEwVIkGOI+ZhK9qAjiu32W+Y0nZSsFEvGswXvoffIsk3E69dNpG07FLcwMfc7Fm7EhW/wIuNaqQKXC3K0Fvc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740661973; c=relaxed/simple; bh=5a5NPTuiOFu0aJ7PebTGy6VAR2RAKkZ4ULD/pJkU4h4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jyUnm479FWlEbe0uZPGuEs+zX1D/IETwWf7tQzFD75zGwgfoQQOvU9WhVIkQyhFA78HwC1LDx40f/qj+wluOjThM9o9M1I1nWZhMZwS56iKRiLC5FMYpHgYQuPjzeDPJnCTU3g2Y7igR7cPCZD6gJaTQmlSt4GAKTFDJMpBlH6Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com; spf=pass smtp.mailfrom=realtek.com; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b=PN5no1NX; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realtek.com Authentication-Results: smtp.subspace.kernel.org; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b="PN5no1NX" X-SpamFilter-By: ArmorX SpamTrap 5.78 with qID 51RDCmTK22008950, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=realtek.com; s=dkim; t=1740661968; bh=5a5NPTuiOFu0aJ7PebTGy6VAR2RAKkZ4ULD/pJkU4h4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=PN5no1NX+9hfxvuFu8Pscx2Cbfi6g0YEQANqrFVtEsy7zEpl3JYG3DIMAt0xPrNrs 2+W34KszuDAu33M5dp7C0qsCcxjcPeAgxaEAAsy9nJUQhs11/xnAa2IObExPkTxGyd YTkZoIL9/wW5QblFfDfIX3TZkE/Tp430e6LcLAYfoL7mdaX5ValHyQ/drQuZ1HUv3q EdCVWKzh/YMwZ2hMsjk91ynhuNeiIdQdR9C9T8H1b7ALGLLOdJZCQN5P28/c1e2oci RagKTZIP7lPEC3ozEhTCKQoQXARi/muTy1ddXBU/tqNC+NOaC+3rozYhytJIHbhWBK qzPnsWA/Bm2RA== Received: from mail.realtek.com (rtexh36506.realtek.com.tw[172.21.6.27]) by rtits2.realtek.com.tw (8.15.2/3.06/5.92) with ESMTPS id 51RDCmTK22008950 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 27 Feb 2025 21:12:48 +0800 Received: from RTEXMBS04.realtek.com.tw (172.21.6.97) by RTEXH36506.realtek.com.tw (172.21.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Thu, 27 Feb 2025 21:12:49 +0800 Received: from [127.0.1.1] (172.16.24.143) by RTEXMBS04.realtek.com.tw (172.21.6.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 27 Feb 2025 21:12:47 +0800 From: Ping-Ke Shih To: CC: Subject: [PATCH rtw-next v2 1/4] wifi: rtw89: fw: use struct to fill role_maintain H2C command Date: Thu, 27 Feb 2025 21:12:25 +0800 Message-ID: <20250227131228.8457-2-pkshih@realtek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250227131228.8457-1-pkshih@realtek.com> References: <20250227131228.8457-1-pkshih@realtek.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: RTEXMBS02.realtek.com.tw (172.21.6.95) To RTEXMBS04.realtek.com.tw (172.21.6.97) From: Po-Hao Huang The role_maintain H2C command is to align operating mode of WiFi role, such as STA or AP modes, between driver and firmware. Use a struct to fill fields of this H2C command. Don't change logic at all. Signed-off-by: Po-Hao Huang Signed-off-by: Ping-Ke Shih --- v2: no change --- drivers/net/wireless/realtek/rtw89/fw.c | 22 +++++++++++-------- drivers/net/wireless/realtek/rtw89/fw.h | 28 +++++++++---------------- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c index b843d259fbfa..3e4a3200358a 100644 --- a/drivers/net/wireless/realtek/rtw89/fw.c +++ b/drivers/net/wireless/realtek/rtw89/fw.c @@ -3901,14 +3901,15 @@ int rtw89_fw_h2c_update_beacon_be(struct rtw89_dev *rtwdev, } EXPORT_SYMBOL(rtw89_fw_h2c_update_beacon_be); -#define H2C_ROLE_MAINTAIN_LEN 4 int rtw89_fw_h2c_role_maintain(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_link, struct rtw89_sta_link *rtwsta_link, enum rtw89_upd_mode upd_mode) { - struct sk_buff *skb; u8 mac_id = rtwsta_link ? rtwsta_link->mac_id : rtwvif_link->mac_id; + struct rtw89_h2c_role_maintain *h2c; + u32 len = sizeof(*h2c); + struct sk_buff *skb; u8 self_role; int ret; @@ -3921,21 +3922,24 @@ int rtw89_fw_h2c_role_maintain(struct rtw89_dev *rtwdev, self_role = rtwvif_link->self_role; } - skb = rtw89_fw_h2c_alloc_skb_with_hdr(rtwdev, H2C_ROLE_MAINTAIN_LEN); + skb = rtw89_fw_h2c_alloc_skb_with_hdr(rtwdev, len); if (!skb) { rtw89_err(rtwdev, "failed to alloc skb for h2c join\n"); return -ENOMEM; } - skb_put(skb, H2C_ROLE_MAINTAIN_LEN); - SET_FWROLE_MAINTAIN_MACID(skb->data, mac_id); - SET_FWROLE_MAINTAIN_SELF_ROLE(skb->data, self_role); - SET_FWROLE_MAINTAIN_UPD_MODE(skb->data, upd_mode); - SET_FWROLE_MAINTAIN_WIFI_ROLE(skb->data, rtwvif_link->wifi_role); + skb_put(skb, len); + h2c = (struct rtw89_h2c_role_maintain *)skb->data; + + h2c->w0 = le32_encode_bits(mac_id, RTW89_H2C_ROLE_MAINTAIN_W0_MACID) | + le32_encode_bits(self_role, RTW89_H2C_ROLE_MAINTAIN_W0_SELF_ROLE) | + le32_encode_bits(upd_mode, RTW89_H2C_ROLE_MAINTAIN_W0_UPD_MODE) | + le32_encode_bits(rtwvif_link->wifi_role, + RTW89_H2C_ROLE_MAINTAIN_W0_WIFI_ROLE); rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C, H2C_CAT_MAC, H2C_CL_MAC_MEDIA_RPT, H2C_FUNC_MAC_FWROLE_MAINTAIN, 0, 1, - H2C_ROLE_MAINTAIN_LEN); + len); ret = rtw89_h2c_tx(rtwdev, skb, false); if (ret) { diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h index 1c53c1e22439..e0faed076150 100644 --- a/drivers/net/wireless/realtek/rtw89/fw.h +++ b/drivers/net/wireless/realtek/rtw89/fw.h @@ -1591,25 +1591,17 @@ struct rtw89_h2c_bcn_upd_be { #define RTW89_H2C_BCN_UPD_BE_W7_ECSA_OFST GENMASK(30, 16) #define RTW89_H2C_BCN_UPD_BE_W7_PROTECTION_KEY_ID BIT(31) -static inline void SET_FWROLE_MAINTAIN_MACID(void *h2c, u32 val) -{ - le32p_replace_bits((__le32 *)h2c, val, GENMASK(7, 0)); -} - -static inline void SET_FWROLE_MAINTAIN_SELF_ROLE(void *h2c, u32 val) -{ - le32p_replace_bits((__le32 *)h2c, val, GENMASK(9, 8)); -} - -static inline void SET_FWROLE_MAINTAIN_UPD_MODE(void *h2c, u32 val) -{ - le32p_replace_bits((__le32 *)h2c, val, GENMASK(12, 10)); -} +struct rtw89_h2c_role_maintain { + __le32 w0; +}; -static inline void SET_FWROLE_MAINTAIN_WIFI_ROLE(void *h2c, u32 val) -{ - le32p_replace_bits((__le32 *)h2c, val, GENMASK(16, 13)); -} +#define RTW89_H2C_ROLE_MAINTAIN_W0_MACID GENMASK(7, 0) +#define RTW89_H2C_ROLE_MAINTAIN_W0_SELF_ROLE GENMASK(9, 8) +#define RTW89_H2C_ROLE_MAINTAIN_W0_UPD_MODE GENMASK(12, 10) +#define RTW89_H2C_ROLE_MAINTAIN_W0_WIFI_ROLE GENMASK(16, 13) +#define RTW89_H2C_ROLE_MAINTAIN_W0_BAND GENMASK(18, 17) +#define RTW89_H2C_ROLE_MAINTAIN_W0_PORT GENMASK(21, 19) +#define RTW89_H2C_ROLE_MAINTAIN_W0_MACID_EXT GENMASK(31, 24) enum rtw89_fw_sta_type { /* value of RTW89_H2C_JOININFO_W1_STA_TYPE */ RTW89_FW_N_AC_STA = 0, From patchwork Thu Feb 27 13:12:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping-Ke Shih X-Patchwork-Id: 13994414 X-Patchwork-Delegate: pkshih@realtek.com Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E117522F38C for ; Thu, 27 Feb 2025 13:12:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740661976; cv=none; b=Cn9UqfxsIkfAoQobTRp8rJ1mK0UVaGvHHAlpr8Yblv6qDAWKPk/7hXE6l/S9v30I80DtAfAyY4zEBgVV2zySNvKpRwDtuuIrSKMzUXbFN75hGNTiTD2cUs40fcB37JU2k8ht0JW+2Jt6OE7/90GC5zCCLr1wxqfPuGFit34eDHw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740661976; c=relaxed/simple; bh=GKu7FpmwQLAZIh0bUUEbvaheSJGXBQ9F3RJkXGAVEis=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hAodSwN/zr4kMWWIjZ1xhk550EL9GEf33XTfzMRLb1hGz3fJPBUutxI4N44nlqlg5bgtBqlBrIoq2PewkHLSRyvlcbFt/7lDSGJ7qOSPn9TUZgavFT8uxnt3dRneCWe5P20tW3Zz99NpyV/umJI9MikhsB3qmS8RrdPEkG0UXQQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com; spf=pass smtp.mailfrom=realtek.com; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b=wiPCOQ2K; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realtek.com Authentication-Results: smtp.subspace.kernel.org; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b="wiPCOQ2K" X-SpamFilter-By: ArmorX SpamTrap 5.78 with qID 51RDCov362008953, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=realtek.com; s=dkim; t=1740661970; bh=GKu7FpmwQLAZIh0bUUEbvaheSJGXBQ9F3RJkXGAVEis=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=wiPCOQ2K3lXjoexqJ9C6veKRfrcMFtFSZDjG63wcskcHEhRL6wDwoQmnkg/VEz/DX KvW/JBkcRQyQ9T8SLX6MiR2cpaRT0aMjajTmrOQNedNtm6t9bRUQ62pjAedaNcBV29 0c3AbwGlQtrDoZjq5lbsIQv2rL6mul9DLtf/HcpIzL8yg1cxXc0XFluw+nA4d4FlCa hnCYdtSrp1hJS/CJbFPqZoWrz17cCk8bfmCN/I9NIKWzBKm1uW1g+szxoJ0cB/LGE3 +jjbfFURxOTCXyNhrNXiNlzlZutz/2Q/epJqrmBubVGau2YeUbCv9ksIeoaYwLogux wNb+hrnfxrXMw== Received: from mail.realtek.com (rtexh36505.realtek.com.tw[172.21.6.25]) by rtits2.realtek.com.tw (8.15.2/3.06/5.92) with ESMTPS id 51RDCov362008953 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 27 Feb 2025 21:12:50 +0800 Received: from RTEXMBS04.realtek.com.tw (172.21.6.97) by RTEXH36505.realtek.com.tw (172.21.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Thu, 27 Feb 2025 21:12:51 +0800 Received: from [127.0.1.1] (172.16.24.143) by RTEXMBS04.realtek.com.tw (172.21.6.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 27 Feb 2025 21:12:50 +0800 From: Ping-Ke Shih To: CC: Subject: [PATCH rtw-next v2 2/4] wifi: rtw89: fw: update role_maintain H2C command for roles operating on band 1 Date: Thu, 27 Feb 2025 21:12:26 +0800 Message-ID: <20250227131228.8457-3-pkshih@realtek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250227131228.8457-1-pkshih@realtek.com> References: <20250227131228.8457-1-pkshih@realtek.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: RTEXMBS02.realtek.com.tw (172.21.6.95) To RTEXMBS04.realtek.com.tw (172.21.6.97) From: Po-Hao Huang Add new fields band and port ID to make chips operating on the band and port ID other than 0, so that multiple vif(s) can be working at the same time. Signed-off-by: Po-Hao Huang Signed-off-by: Ping-Ke Shih --- v2: no change --- drivers/net/wireless/realtek/rtw89/fw.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c index 3e4a3200358a..1965a62746c2 100644 --- a/drivers/net/wireless/realtek/rtw89/fw.c +++ b/drivers/net/wireless/realtek/rtw89/fw.c @@ -3934,7 +3934,10 @@ int rtw89_fw_h2c_role_maintain(struct rtw89_dev *rtwdev, le32_encode_bits(self_role, RTW89_H2C_ROLE_MAINTAIN_W0_SELF_ROLE) | le32_encode_bits(upd_mode, RTW89_H2C_ROLE_MAINTAIN_W0_UPD_MODE) | le32_encode_bits(rtwvif_link->wifi_role, - RTW89_H2C_ROLE_MAINTAIN_W0_WIFI_ROLE); + RTW89_H2C_ROLE_MAINTAIN_W0_WIFI_ROLE) | + le32_encode_bits(rtwvif_link->mac_idx, + RTW89_H2C_ROLE_MAINTAIN_W0_BAND) | + le32_encode_bits(rtwvif_link->port, RTW89_H2C_ROLE_MAINTAIN_W0_PORT); rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C, H2C_CAT_MAC, H2C_CL_MAC_MEDIA_RPT, From patchwork Thu Feb 27 13:12:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping-Ke Shih X-Patchwork-Id: 13994415 X-Patchwork-Delegate: pkshih@realtek.com Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 98A1122F38C for ; Thu, 27 Feb 2025 13:12:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740661980; cv=none; b=A1+PCVjO3STIv+2yzoewi5i16xylPGasAuBPmlXHwEFLg94qYGF43TlDxVVPyMuE5Ctn5J1RPW74LKI6kmn97KWtXhICoak63verRFEQHcYkqYgmN6hioiMWPgYMUpPuWMGh/1ExiCQHBEJfGE9q/W60YcX0Gtn+hT3uCf2VcGg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740661980; c=relaxed/simple; bh=MMZhUFE1+XtMYgoOLegOV9XNdpPbTTETSrSwEbU8dMg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IgUpTosYYqySy/gWHDyY8QhasR+0To4Oo9H8zL7YqLOMXvhU/sNHhjuAjdGbKAQKzuwPTdoE/I+5AkB++dO5We5xs9J9blk9RxKClQlqHkaqIjWvdJHcyuZBfW12hom2FIIKbB+oHY+5C32BuNDSg51+9AGws0mehaUWAOWPfZA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com; spf=pass smtp.mailfrom=realtek.com; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b=azbLaBDY; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realtek.com Authentication-Results: smtp.subspace.kernel.org; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b="azbLaBDY" X-SpamFilter-By: ArmorX SpamTrap 5.78 with qID 51RDCs5Y22008957, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=realtek.com; s=dkim; t=1740661974; bh=MMZhUFE1+XtMYgoOLegOV9XNdpPbTTETSrSwEbU8dMg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=azbLaBDYn4gFMzpLD6QMteCKW0XtFF3dTAAaXF33b9AOcXULdNwF2umKpMSn/CLCJ 8FoxjPaxyrHKkYxsQYq5Y20skVO3mt0jgHTqcbUodnBcs31buczDqNL1aTqdpSJRim DsDAVTWgGBj6jl3ok7rz1ytL4Y13H2qytFgaO8ESbL1s2380fjIKlBOL6IgB0u+Twb ed/XRhwy6igD6abtH8ESWIR34i+lmscRmTzotmgYv+GMQqPdvmwDVm7Ttz4ihplm48 9d7KSDlCSIeYwPHvnUWiwT4wk25bdSnldGAPWpwiAv7+Bg6b7kZ0tUnAYu2hBIAw5H Yl70wKSGzJKSQ== Received: from mail.realtek.com (rtexh36506.realtek.com.tw[172.21.6.27]) by rtits2.realtek.com.tw (8.15.2/3.06/5.92) with ESMTPS id 51RDCs5Y22008957 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 27 Feb 2025 21:12:54 +0800 Received: from RTEXMBS04.realtek.com.tw (172.21.6.97) by RTEXH36506.realtek.com.tw (172.21.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Thu, 27 Feb 2025 21:12:54 +0800 Received: from [127.0.1.1] (172.16.24.143) by RTEXMBS04.realtek.com.tw (172.21.6.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 27 Feb 2025 21:12:54 +0800 From: Ping-Ke Shih To: CC: Subject: [PATCH rtw-next v2 3/4] wifi: rtw89: fw: correct debug message format in rtw89_build_txpwr_trk_tbl_from_elm() Date: Thu, 27 Feb 2025 21:12:27 +0800 Message-ID: <20250227131228.8457-4-pkshih@realtek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250227131228.8457-1-pkshih@realtek.com> References: <20250227131228.8457-1-pkshih@realtek.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: RTEXMBS02.realtek.com.tw (172.21.6.95) To RTEXMBS04.realtek.com.tw (172.21.6.97) The format should be "%08x". Fix the mistakes. Fixes: d60e73e5dd70 ("wifi: rtw89: fw: load TX power track tables from fw_element") Signed-off-by: Ping-Ke Shih --- v2: no change --- drivers/net/wireless/realtek/rtw89/fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c index 1965a62746c2..15d6bda1fcf0 100644 --- a/drivers/net/wireless/realtek/rtw89/fw.c +++ b/drivers/net/wireless/realtek/rtw89/fw.c @@ -1099,7 +1099,7 @@ int rtw89_build_txpwr_trk_tbl_from_elm(struct rtw89_dev *rtwdev, bitmap = le32_to_cpu(elm->u.txpwr_trk.bitmap); if ((bitmap & needed_bitmap) != needed_bitmap) { - rtw89_warn(rtwdev, "needed txpwr trk bitmap %08x but %0x8x\n", + rtw89_warn(rtwdev, "needed txpwr trk bitmap %08x but %08x\n", needed_bitmap, bitmap); return -ENOENT; } From patchwork Thu Feb 27 13:12:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping-Ke Shih X-Patchwork-Id: 13994416 X-Patchwork-Delegate: pkshih@realtek.com Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC10E22FDF7 for ; Thu, 27 Feb 2025 13:13:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740661982; cv=none; b=nCliP2KMnyl8YNlfeBK2jX44Le3Fb7g5Yv7BnHJSrJBER95zu7aspBNyWh1rXjgqpExrJn6/3ykDpIxkSLs9sCH0Y6XVRSid2DgQWF1Gm0GWeHtVIV4g2VSr/GPAgamylmT50F8a0pEj+HkRfdtbghYR2tKF0HkmakKgx5odN1M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740661982; c=relaxed/simple; bh=mQl79HBGcBsG5mBWkYwPI7UIpF8NCNdfT6rOM0HTbTc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LQ8C7U7Sm2fKJ5rdXTulrjUgU6JhECDNENyxnmp5Rdxq8JZiLMf/D5X916ON3GwjmBx+pGTQ/cibBaVnNjOYQfUHqL6NjJ0tPenUt7KY8K5+pM1Xo0OJXYPk+bH0bwAyjh/mJcabHkBLl4AR8r8MitOgdnDA4bcYzPeeOd7aQSk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com; spf=pass smtp.mailfrom=realtek.com; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b=ZlI88Hw6; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realtek.com Authentication-Results: smtp.subspace.kernel.org; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b="ZlI88Hw6" X-SpamFilter-By: ArmorX SpamTrap 5.78 with qID 51RDCvpeE2008960, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=realtek.com; s=dkim; t=1740661978; bh=mQl79HBGcBsG5mBWkYwPI7UIpF8NCNdfT6rOM0HTbTc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=ZlI88Hw6htATZC9BIr3Y/2RfeFaAkc6VGSHqheTwIUP7gaiGI6rKAN6i/BoHkxPAI O8og+gq24wJn+H+/ZYBmGonOZCHKg5nM4hNk84+QMdzWhr3qEtl6c5ELwkto217K8k mChbZjhSd+Rt+kiGO2hNWd2W1L4A96C+GLCqzyWP72w0iw0OwbAcv81GANRV9Sna33 lMINatGsXXDczJurTQhKf0tFmQ3cpoMRSPUHuS9qGnbUUEZ8jy2ccAntkGOizdL0I6 aSduce15ydrjlV8qJmSV6ZiEh/ftN1exeJ1ZOb8rh4n9IRf58aU5g0xmwcM60f7V/F 769IF0AQ6+6og== Received: from mail.realtek.com (rtexh36505.realtek.com.tw[172.21.6.25]) by rtits2.realtek.com.tw (8.15.2/3.06/5.92) with ESMTPS id 51RDCvpeE2008960 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 27 Feb 2025 21:12:58 +0800 Received: from RTEXMBS04.realtek.com.tw (172.21.6.97) by RTEXH36505.realtek.com.tw (172.21.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Thu, 27 Feb 2025 21:12:58 +0800 Received: from [127.0.1.1] (172.16.24.143) by RTEXMBS04.realtek.com.tw (172.21.6.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 27 Feb 2025 21:12:58 +0800 From: Ping-Ke Shih To: CC: Subject: [PATCH rtw-next v2 4/4] wifi: rtw89: fw: don't reject firmware in blacklist to prevent breaking users Date: Thu, 27 Feb 2025 21:12:28 +0800 Message-ID: <20250227131228.8457-5-pkshih@realtek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250227131228.8457-1-pkshih@realtek.com> References: <20250227131228.8457-1-pkshih@realtek.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: RTEXMBS02.realtek.com.tw (172.21.6.95) To RTEXMBS04.realtek.com.tw (172.21.6.97) Once update driver blacklist of firmware, users' firmware might be in the list, and then driver stops working. Since breaking users is not expected, report a significant message instead of stopping. Signed-off-by: Ping-Ke Shih --- v2: added by v2 --- drivers/net/wireless/realtek/rtw89/fw.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c index 15d6bda1fcf0..d0a246f415ff 100644 --- a/drivers/net/wireless/realtek/rtw89/fw.c +++ b/drivers/net/wireless/realtek/rtw89/fw.c @@ -372,7 +372,7 @@ static int __check_secure_blacklist(struct rtw89_dev *rtwdev, return 0; if (!chip_blacklist) { - rtw89_err(rtwdev, "chip no blacklist for secure firmware\n"); + rtw89_warn(rtwdev, "chip no blacklist for secure firmware\n"); return -ENOENT; } @@ -380,14 +380,14 @@ static int __check_secure_blacklist(struct rtw89_dev *rtwdev, bit_mask = BIT(section_content->blacklist.bit_in_chip_list & 0x7); if (section_content->blacklist.ver > chip_blacklist->ver) { - rtw89_err(rtwdev, "chip blacklist out of date (%u, %u)\n", - section_content->blacklist.ver, chip_blacklist->ver); + rtw89_warn(rtwdev, "chip blacklist out of date (%u, %u)\n", + section_content->blacklist.ver, chip_blacklist->ver); return -EINVAL; } if (chip_blacklist->list[byte_idx] & bit_mask) { - rtw89_err(rtwdev, "firmware %u in chip blacklist\n", - section_content->blacklist.ver); + rtw89_warn(rtwdev, "firmware %u in chip blacklist\n", + section_content->blacklist.ver); return -EPERM; } @@ -427,7 +427,10 @@ static int __parse_security_section(struct rtw89_dev *rtwdev, info->secure_section_exist = true; } - return __check_secure_blacklist(rtwdev, info, section_info, content); + ret = __check_secure_blacklist(rtwdev, info, section_info, content); + WARN_ONCE(ret, "Current firmware in blacklist. Please update firmware.\n"); + + return 0; } static int rtw89_fw_hdr_parser_v1(struct rtw89_dev *rtwdev, const u8 *fw, u32 len,