wifi: iwlwifi: fw: remove RATE_MCS_NSS_POS

We can use u32_{get,encode}_bits() instead of manual shifts
and remove RATE_MCS_NSS_POS.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250504132447.b6da6048f8b8.Ib6d78ed6ffb7e99c42c2dd2ca4706a6bf73d3066@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h b/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h
index c2f806cbab59dac763078a8233467a43e769f92b..df176191d65972018e783c873293e0b5ca042adf 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
 /*
- * Copyright (C) 2012-2014, 2018-2022, 2024 Intel Corporation
+ * Copyright (C) 2012-2014, 2018-2022, 2024-2025 Intel Corporation
  * Copyright (C) 2017 Intel Deutschland GmbH
  */
 #ifndef __iwl_fw_api_rs_h__
@@ -588,11 +588,11 @@ enum {
 /*
  * HT, VHT, HE, EHT rate format for bits 3:0
  * 3-0: MCS
+ * 4: NSS==2 indicator
  *
  */
 #define RATE_HT_MCS_CODE_MSK           0x7
-#define RATE_MCS_NSS_POS               4
-#define RATE_MCS_NSS_MSK               (1 << RATE_MCS_NSS_POS)
+#define RATE_MCS_NSS_MSK               0x10
 #define RATE_MCS_CODE_MSK              0xf
 #define RATE_HT_MCS_INDEX(r)           ((((r) & RATE_MCS_NSS_MSK) >> 1) | \
                                         ((r) & RATE_HT_MCS_CODE_MSK))

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/rs.c b/drivers/net/wireless/intel/iwlwifi/fw/rs.c
index 8f99e501629ee6a5a70969a0d92fab77d70a4be8..9e5603774637f21ee919d334042c786c20e1dc71 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/rs.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/rs.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2022, 2025 Intel Corporation
  */
 
 #include <net/mac80211.h>
@@ -121,7 +121,7 @@ u32 iwl_new_rate_from_v1(u32 rate_v1)
                        rate_v1 & RATE_HT_MCS_RATE_CODE_MSK_V1;
                nss = (rate_v1 & RATE_HT_MCS_MIMO2_MSK) >>
                        RATE_HT_MCS_NSS_POS_V1;
-               rate_v2 |= nss << RATE_MCS_NSS_POS;
+               rate_v2 |= u32_encode_bits(nss, RATE_MCS_NSS_MSK);
        } else if (rate_v1 & RATE_MCS_VHT_MSK_V1 ||
                   rate_v1 & RATE_MCS_HE_MSK_V1) {
                rate_v2 |= rate_v1 & RATE_VHT_MCS_RATE_CODE_MSK;
@@ -225,8 +225,7 @@ int rs_pretty_print_rate(char *buf, int bufsz, const u32 rate)
        mcs = format == RATE_MCS_HT_MSK ?
                RATE_HT_MCS_INDEX(rate) :
                rate & RATE_MCS_CODE_MSK;
-       nss = ((rate & RATE_MCS_NSS_MSK)
-              >> RATE_MCS_NSS_POS) + 1;
+       nss = u32_get_bits(rate, RATE_MCS_NSS_MSK);
        sgi = format == RATE_MCS_HE_MSK ?
                iwl_he_is_sgi(rate) :
                rate & RATE_MCS_SGI_MSK;