Commit 16001e4b authored by Anilkumar Kolli's avatar Anilkumar Kolli Committed by Kalle Valo
Browse files

ath11k: Move qmi service_ins_id to hw_params 



qmi service_ins_id is unique for QCA6390 and QCN9074,
this is needed for adding QCN9074 support. No functional
changes.

Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.4.0.1.r2-00012-QCAHKSWPL_SILICONZ-1

Signed-off-by: default avatarAnilkumar Kolli <akolli@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1612946530-28504-3-git-send-email-akolli@codeaurora.org
parent 7a3aed0c

drivers/net/wireless/ath/ath11k/ahb.c

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static void ath11k_ahb_init_qmi_ce_config(struct ath11k_base *ab) 
	cfg->tgt_ce = ab->hw_params.target_ce_config;

	cfg->svc_to_ce_map_len = ab->hw_params.svc_to_ce_map_len;

	cfg->svc_to_ce_map = ab->hw_params.svc_to_ce_map;

	ab->qmi.service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_IPQ8074;

	ab->qmi.service_ins_id = ab->hw_params.qmi_service_ins_id;

}



static void ath11k_ahb_free_ext_irq(struct ath11k_base *ab)

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

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.ring_mask = &ath11k_hw_ring_mask_ipq8074,

		.internal_sleep_clock = false,

		.regs = &ipq8074_regs,

		.qmi_service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_IPQ8074,

		.host_ce_config = ath11k_host_ce_config_ipq8074,

		.ce_count = 12,

		.target_ce_config = ath11k_target_ce_config_wlan_ipq8074,
@@ -83,6 +84,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.ring_mask = &ath11k_hw_ring_mask_ipq8074,

		.internal_sleep_clock = false,

		.regs = &ipq8074_regs,

		.qmi_service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_IPQ8074,

		.host_ce_config = ath11k_host_ce_config_ipq8074,

		.ce_count = 12,

		.target_ce_config = ath11k_target_ce_config_wlan_ipq8074,
@@ -121,6 +123,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.ring_mask = &ath11k_hw_ring_mask_qca6390,

		.internal_sleep_clock = true,

		.regs = &qca6390_regs,

		.qmi_service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_QCA6390,

		.host_ce_config = ath11k_host_ce_config_qca6390,

		.ce_count = 9,

		.target_ce_config = ath11k_target_ce_config_wlan_qca6390,

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

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ struct ath11k_hw_params { 
	bool internal_sleep_clock;



	const struct ath11k_hw_regs *regs;

	u32 qmi_service_ins_id;

	const struct ce_attr *host_ce_config;

	u32 ce_count;

	const struct ce_pipe_config *target_ce_config;

drivers/net/wireless/ath/ath11k/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -743,7 +743,7 @@ static void ath11k_pci_init_qmi_ce_config(struct ath11k_base *ab) 


	cfg->svc_to_ce_map = ab->hw_params.svc_to_ce_map;

	cfg->svc_to_ce_map_len = ab->hw_params.svc_to_ce_map_len;

	ab->qmi.service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_QCA6390;

	ab->qmi.service_ins_id = ab->hw_params.qmi_service_ins_id;



	ath11k_ce_get_shadow_config(ab, &cfg->shadow_reg_v2,

				    &cfg->shadow_reg_v2_len);