]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: rtw89: fw: move v1 MSSC out of __parse_security_section() to share with v0
authorPing-Ke Shih <pkshih@realtek.com>
Wed, 30 Oct 2024 02:21:33 +0000 (10:21 +0800)
committerPing-Ke Shih <pkshih@realtek.com>
Wed, 6 Nov 2024 06:00:32 +0000 (14:00 +0800)
The security section can be a common parser for v0 and v1 format of
firmware header, so move retrieval code of v1 MSSC from the function, and
then sharing becomes possible.

Not logic change at all.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20241030022135.11688-7-pkshih@realtek.com
drivers/net/wireless/realtek/rtw89/fw.c

index 08e95c780982d23c3ce296b6f4bc303827736e3f..5849579a628ef3de5f5dbac4613b6706eb7f6df4 100644 (file)
@@ -241,7 +241,6 @@ static int __get_mssc_key_idx(struct rtw89_dev *rtwdev,
 static int __parse_formatted_mssc(struct rtw89_dev *rtwdev,
                                  struct rtw89_fw_bin_info *info,
                                  struct rtw89_fw_hdr_section_info *section_info,
-                                 const struct rtw89_fw_hdr_section_v1 *section,
                                  const void *content,
                                  u32 *mssc_len)
 {
@@ -324,18 +323,14 @@ ignore:
 static int __parse_security_section(struct rtw89_dev *rtwdev,
                                    struct rtw89_fw_bin_info *info,
                                    struct rtw89_fw_hdr_section_info *section_info,
-                                   const struct rtw89_fw_hdr_section_v1 *section,
                                    const void *content,
                                    u32 *mssc_len)
 {
        int ret;
 
-       section_info->mssc =
-               le32_get_bits(section->w2, FWSECTION_HDR_V1_W2_MSSC);
-
        if (section_info->mssc == FORMATTED_MSSC) {
                ret = __parse_formatted_mssc(rtwdev, info, section_info,
-                                            section, content, mssc_len);
+                                            content, mssc_len);
                if (ret)
                        return -EINVAL;
        } else {
@@ -401,8 +396,11 @@ static int rtw89_fw_hdr_parser_v1(struct rtw89_dev *rtwdev, const u8 *fw, u32 le
                section_info->addr = bin;
 
                if (section_info->type == FWDL_SECURITY_SECTION_TYPE) {
+                       section_info->mssc =
+                               le32_get_bits(section->w2, FWSECTION_HDR_V1_W2_MSSC);
+
                        ret = __parse_security_section(rtwdev, info, section_info,
-                                                      section, bin, &mssc_len);
+                                                      bin, &mssc_len);
                        if (ret)
                                return ret;
                } else {