Commit 6289ac2b authored by Karthikeyan Periyasamy's avatar Karthikeyan Periyasamy Committed by Kalle Valo
Browse files

ath11k: add CE interrupt support for QCN9074 



Define host CE configuration for QCN9074 since the max CE count is six.
Available MSI interrupt is five so cannot able to map the ce_id directly
for the msi_data_idx. Added get_ce_msi_idx ops in ath11k_hif_ops to get
the CE MSI idx which is used to initialize the CE ring.

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

Signed-off-by: default avatarKarthikeyan Periyasamy <periyasa@codeaurora.org>
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-10-git-send-email-akolli@codeaurora.org
parent e678fbd4

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

+56 −2
Original line number Diff line number Diff line
@@ -187,6 +187,59 @@ const struct ce_attr ath11k_host_ce_config_qca6390[] = { 


};



const struct ce_attr ath11k_host_ce_config_qcn9074[] = {

	/* CE0: host->target HTC control and raw streams */

	{

		.flags = CE_ATTR_FLAGS,

		.src_nentries = 16,

		.src_sz_max = 2048,

		.dest_nentries = 0,

	},



	/* CE1: target->host HTT + HTC control */

	{

		.flags = CE_ATTR_FLAGS,

		.src_nentries = 0,

		.src_sz_max = 2048,

		.dest_nentries = 512,

		.recv_cb = ath11k_htc_rx_completion_handler,

	},



	/* CE2: target->host WMI */

	{

		.flags = CE_ATTR_FLAGS,

		.src_nentries = 0,

		.src_sz_max = 2048,

		.dest_nentries = 32,

		.recv_cb = ath11k_htc_rx_completion_handler,

	},



	/* CE3: host->target WMI (mac0) */

	{

		.flags = CE_ATTR_FLAGS,

		.src_nentries = 32,

		.src_sz_max = 2048,

		.dest_nentries = 0,

	},



	/* CE4: host->target HTT */

	{

		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,

		.src_nentries = 2048,

		.src_sz_max = 256,

		.dest_nentries = 0,

	},



	/* CE5: target->host pktlog */

	{

		.flags = CE_ATTR_FLAGS,

		.src_nentries = 0,

		.src_sz_max = 2048,

		.dest_nentries = 512,

		.recv_cb = ath11k_dp_htt_htc_t2h_msg_handler,

	},

};



static bool ath11k_ce_need_shadow_fix(int ce_id)

{

	/* only ce4 needs shadow workaroud*/
@@ -455,7 +508,7 @@ static void ath11k_ce_srng_msi_ring_params_setup(struct ath11k_base *ab, u32 ce_ 
						 struct hal_srng_params *ring_params)

{

	u32 msi_data_start;

	u32 msi_data_count;

	u32 msi_data_count, msi_data_idx;

	u32 msi_irq_start;

	u32 addr_lo;

	u32 addr_hi;
@@ -469,10 +522,11 @@ static void ath11k_ce_srng_msi_ring_params_setup(struct ath11k_base *ab, u32 ce_ 
		return;



	ath11k_get_msi_address(ab, &addr_lo, &addr_hi);

	ath11k_get_ce_msi_idx(ab, ce_id, &msi_data_idx);



	ring_params->msi_addr = addr_lo;

	ring_params->msi_addr |= (dma_addr_t)(((uint64_t)addr_hi) << 32);

	ring_params->msi_data = (ce_id % msi_data_count) + msi_data_start;

	ring_params->msi_data = (msi_data_idx % msi_data_count) + msi_data_start;

	ring_params->flags |= HAL_SRNG_FLAGS_MSI_INTR;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ struct ath11k_ce { 


extern const struct ce_attr ath11k_host_ce_config_ipq8074[];

extern const struct ce_attr ath11k_host_ce_config_qca6390[];

extern const struct ce_attr ath11k_host_ce_config_qcn9074[];



void ath11k_ce_cleanup_pipes(struct ath11k_base *ab);

void ath11k_ce_rx_replenish_retry(struct timer_list *t);

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

+6 −0
Original line number Diff line number Diff line
@@ -164,6 +164,12 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.hw_ops = &qcn9074_ops,

		.internal_sleep_clock = false,

		.regs = &qcn9074_regs,

		.host_ce_config = ath11k_host_ce_config_qcn9074,

		.ce_count = 6,

		.target_ce_config = ath11k_target_ce_config_wlan_qcn9074,

		.target_ce_count = 9,

		.svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_qcn9074,

		.svc_to_ce_map_len = 18,

		.rxdma1_enable = true,

		.num_rxmda_per_pdev = 1,

		.rx_mac_buf_ring = false,

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

+2 −0
Original line number Diff line number Diff line
@@ -878,6 +878,8 @@ extern const struct service_to_pipe ath11k_target_service_to_ce_map_wlan_ipq6018 
extern const struct ce_pipe_config ath11k_target_ce_config_wlan_qca6390[];

extern const struct service_to_pipe ath11k_target_service_to_ce_map_wlan_qca6390[];



extern const struct ce_pipe_config ath11k_target_ce_config_wlan_qcn9074[];

extern const struct service_to_pipe ath11k_target_service_to_ce_map_wlan_qcn9074[];

int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab);

int ath11k_core_pre_init(struct ath11k_base *ab);

int ath11k_core_init(struct ath11k_base *ath11k);

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

+10 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ struct ath11k_hif_ops { 
				u32 *msi_addr_hi);

	void (*ce_irq_enable)(struct ath11k_base *ab);

	void (*ce_irq_disable)(struct ath11k_base *ab);

	void (*get_ce_msi_idx)(struct ath11k_base *ab, u32 ce_id, u32 *msi_idx);

};



static inline void ath11k_hif_ce_irq_enable(struct ath11k_base *ab)
@@ -124,4 +125,13 @@ static inline void ath11k_get_msi_address(struct ath11k_base *ab, u32 *msi_addr_ 


	ab->hif.ops->get_msi_address(ab, msi_addr_lo, msi_addr_hi);

}



static inline void ath11k_get_ce_msi_idx(struct ath11k_base *ab, u32 ce_id,

					 u32 *msi_data_idx)

{

	if (ab->hif.ops->get_ce_msi_idx)

		ab->hif.ops->get_ce_msi_idx(ab, ce_id, msi_data_idx);

	else

		*msi_data_idx = ce_id;

}

#endif /* _HIF_H_ */