Skip to content

Commit e5e487a

Browse files
kuba-mookuba-moo
committed
Merge tag 'wireless-drivers-2021-08-17' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says: ==================== wireless-drivers fixes for v5.14 First set of fixes for v5.14 and nothing major this time. New devices for iwlwifi and one fix for a compiler warning. iwlwifi * support for new devices mt76 * fix compiler warning about MT_CIPHER_NONE * tag 'wireless-drivers-2021-08-17' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers: mt76: fix enum type mismatch iwlwifi: add new so-jf devices iwlwifi: add new SoF with JF devices iwlwifi: pnvm: accept multiple HW-type TLVs ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 0a298d1 + abf3d98 commit e5e487a

File tree

6 files changed

+91
-14
lines changed

6 files changed

+91
-14
lines changed

‎drivers/net/wireless/intel/iwlwifi/fw/pnvm.c

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data,
3737
u32 sha1 = 0;
3838
u16 mac_type = 0, rf_id = 0;
3939
u8 *pnvm_data = NULL, *tmp;
40+
bool hw_match = false;
4041
u32 size = 0;
4142
int ret;
4243

@@ -83,22 +84,19 @@ static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data,
8384
break;
8485
}
8586

87+
if (hw_match)
88+
break;
89+
8690
mac_type = le16_to_cpup((__le16 *)data);
8791
rf_id = le16_to_cpup((__le16 *)(data + sizeof(__le16)));
8892

8993
IWL_DEBUG_FW(trans,
9094
"Got IWL_UCODE_TLV_HW_TYPE mac_type 0x%0x rf_id 0x%0x\n",
9195
mac_type, rf_id);
9296

93-
if (mac_type != CSR_HW_REV_TYPE(trans->hw_rev) ||
94-
rf_id != CSR_HW_RFID_TYPE(trans->hw_rf_id)) {
95-
IWL_DEBUG_FW(trans,
96-
"HW mismatch, skipping PNVM section, mac_type 0x%0x, rf_id 0x%0x.\n",
97-
CSR_HW_REV_TYPE(trans->hw_rev), trans->hw_rf_id);
98-
ret = -ENOENT;
99-
goto out;
100-
}
101-
97+
if (mac_type == CSR_HW_REV_TYPE(trans->hw_rev) &&
98+
rf_id == CSR_HW_RFID_TYPE(trans->hw_rf_id))
99+
hw_match = true;
102100
break;
103101
case IWL_UCODE_TLV_SEC_RT: {
104102
struct iwl_pnvm_section *section = (void *)data;
@@ -149,6 +147,15 @@ static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data,
149147
}
150148

151149
done:
150+
if (!hw_match) {
151+
IWL_DEBUG_FW(trans,
152+
"HW mismatch, skipping PNVM section (need mac_type 0x%x rf_id 0x%x)\n",
153+
CSR_HW_REV_TYPE(trans->hw_rev),
154+
CSR_HW_RFID_TYPE(trans->hw_rf_id));
155+
ret = -ENOENT;
156+
goto out;
157+
}
158+
152159
if (!size) {
153160
IWL_DEBUG_FW(trans, "Empty PNVM, skipping.\n");
154161
ret = -ENOENT;

‎drivers/net/wireless/intel/iwlwifi/pcie/drv.c

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1110,12 +1110,80 @@ static const struct iwl_dev_info iwl_dev_info_table[] = {
11101110
IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,
11111111
iwl_cfg_bz_a0_mr_a0, iwl_ax211_name),
11121112

1113+
/* SoF with JF2 */
1114+
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
1115+
IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,
1116+
IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,
1117+
IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,
1118+
iwlax210_2ax_cfg_so_jf_b0, iwl9560_160_name),
1119+
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
1120+
IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,
1121+
IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,
1122+
IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,
1123+
iwlax210_2ax_cfg_so_jf_b0, iwl9560_name),
1124+
1125+
/* SoF with JF */
1126+
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
1127+
IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,
1128+
IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,
1129+
IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,
1130+
iwlax210_2ax_cfg_so_jf_b0, iwl9461_160_name),
1131+
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
1132+
IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,
1133+
IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,
1134+
IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,
1135+
iwlax210_2ax_cfg_so_jf_b0, iwl9462_160_name),
1136+
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
1137+
IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,
1138+
IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,
1139+
IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,
1140+
iwlax210_2ax_cfg_so_jf_b0, iwl9461_name),
1141+
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
1142+
IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,
1143+
IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,
1144+
IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,
1145+
iwlax210_2ax_cfg_so_jf_b0, iwl9462_name),
1146+
11131147
/* So with GF */
11141148
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
11151149
IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,
11161150
IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY,
11171151
IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,
1118-
iwlax211_2ax_cfg_so_gf_a0, iwl_ax211_name)
1152+
iwlax211_2ax_cfg_so_gf_a0, iwl_ax211_name),
1153+
1154+
/* So with JF2 */
1155+
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
1156+
IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,
1157+
IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,
1158+
IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,
1159+
iwlax210_2ax_cfg_so_jf_b0, iwl9560_160_name),
1160+
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
1161+
IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,
1162+
IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,
1163+
IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,
1164+
iwlax210_2ax_cfg_so_jf_b0, iwl9560_name),
1165+
1166+
/* So with JF */
1167+
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
1168+
IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,
1169+
IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,
1170+
IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,
1171+
iwlax210_2ax_cfg_so_jf_b0, iwl9461_160_name),
1172+
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
1173+
IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,
1174+
IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,
1175+
IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,
1176+
iwlax210_2ax_cfg_so_jf_b0, iwl9462_160_name),
1177+
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
1178+
IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,
1179+
IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,
1180+
IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,
1181+
iwlax210_2ax_cfg_so_jf_b0, iwl9461_name),
1182+
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
1183+
IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,
1184+
IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,
1185+
IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,
1186+
iwlax210_2ax_cfg_so_jf_b0, iwl9462_name)
11191187

11201188
#endif /* CONFIG_IWLMVM */
11211189
};

‎drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ mt7915_mcu_get_cipher(int cipher)
111111
case WLAN_CIPHER_SUITE_SMS4:
112112
return MCU_CIPHER_WAPI;
113113
default:
114-
return MT_CIPHER_NONE;
114+
return MCU_CIPHER_NONE;
115115
}
116116
}
117117

‎drivers/net/wireless/mediatek/mt76/mt7915/mcu.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,8 @@ enum {
10731073
};
10741074

10751075
enum mcu_cipher_type {
1076-
MCU_CIPHER_WEP40 = 1,
1076+
MCU_CIPHER_NONE = 0,
1077+
MCU_CIPHER_WEP40,
10771078
MCU_CIPHER_WEP104,
10781079
MCU_CIPHER_WEP128,
10791080
MCU_CIPHER_TKIP,

‎drivers/net/wireless/mediatek/mt76/mt7921/mcu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ mt7921_mcu_get_cipher(int cipher)
111111
case WLAN_CIPHER_SUITE_SMS4:
112112
return MCU_CIPHER_WAPI;
113113
default:
114-
return MT_CIPHER_NONE;
114+
return MCU_CIPHER_NONE;
115115
}
116116
}
117117

‎drivers/net/wireless/mediatek/mt76/mt7921/mcu.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ struct sta_rec_sec {
199199
} __packed;
200200

201201
enum mcu_cipher_type {
202-
MCU_CIPHER_WEP40 = 1,
202+
MCU_CIPHER_NONE = 0,
203+
MCU_CIPHER_WEP40,
203204
MCU_CIPHER_WEP104,
204205
MCU_CIPHER_WEP128,
205206
MCU_CIPHER_TKIP,

0 commit comments

Comments
 (0)