Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bd21322 authored by Raja Mani's avatar Raja Mani Committed by Kalle Valo
Browse files

ath10k: include new wmi op version for 10.4 fw 



qca99X0 chip uses firmware version 10.4. Define a new macro
ATH10K_FW_WMI_OP_VERSION_10_4 for 10.4 firmware and include
in switch cases where ATH10K_FW_WMI_OP_VERSION_* is used
to avoid compilation error.

Signed-off-by: default avatarRaja Mani <rmani@qti.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent d772703e

drivers/net/wireless/ath/ath10k/core.c

+2 −0
Original line number Diff line number Diff line
@@ -1115,6 +1115,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->fw_stats_req_mask = WMI_STAT_PDEV | WMI_STAT_VDEV |

			WMI_STAT_PEER;

		break;

	case ATH10K_FW_WMI_OP_VERSION_10_4:

	case ATH10K_FW_WMI_OP_VERSION_UNSET:

	case ATH10K_FW_WMI_OP_VERSION_MAX:

		WARN_ON(1);
@@ -1137,6 +1138,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		case ATH10K_FW_WMI_OP_VERSION_TLV:

			ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_TLV;

			break;

		case ATH10K_FW_WMI_OP_VERSION_10_4:

		case ATH10K_FW_WMI_OP_VERSION_UNSET:

		case ATH10K_FW_WMI_OP_VERSION_MAX:

			WARN_ON(1);

drivers/net/wireless/ath/ath10k/hw.h

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ enum ath10k_fw_wmi_op_version { 
	ATH10K_FW_WMI_OP_VERSION_10_2 = 3,

	ATH10K_FW_WMI_OP_VERSION_TLV = 4,

	ATH10K_FW_WMI_OP_VERSION_10_2_4 = 5,

	ATH10K_FW_WMI_OP_VERSION_10_4 = 6,



	/* keep last */

	ATH10K_FW_WMI_OP_VERSION_MAX,

drivers/net/wireless/ath/ath10k/mac.c

+2 −0
Original line number Diff line number Diff line
@@ -6943,6 +6943,8 @@ int ath10k_mac_register(struct ath10k *ar) 
		ar->hw->wiphy->n_iface_combinations =

			ARRAY_SIZE(ath10k_10x_if_comb);

		break;

	case ATH10K_FW_WMI_OP_VERSION_10_4:

		break;

	case ATH10K_FW_WMI_OP_VERSION_UNSET:

	case ATH10K_FW_WMI_OP_VERSION_MAX:

		WARN_ON(1);

drivers/net/wireless/ath/ath10k/wmi.c

+2 −0
Original line number Diff line number Diff line
@@ -5415,6 +5415,8 @@ static const struct wmi_ops wmi_10_2_4_ops = { 
int ath10k_wmi_attach(struct ath10k *ar)

{

	switch (ar->wmi.op_version) {

	case ATH10K_FW_WMI_OP_VERSION_10_4:

		break;

	case ATH10K_FW_WMI_OP_VERSION_10_2_4:

		ar->wmi.cmd = &wmi_10_2_4_cmd_map;

		ar->wmi.ops = &wmi_10_2_4_ops;