Commit e3396b8b authored by Carl Huang's avatar Carl Huang Committed by Kalle Valo
Browse files

ath11k: ce: support different CE configurations 



QCA6390 uses only 9 Copy Engines while IPQ8074 may use 12, make it possible to
change CE configuration dynamically via hw_params.

The defines for host_ce_config_wlan and CE_COUNT are temporary solutions, they
will be removed in the following patches to keep things simple.

Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2

Signed-off-by: default avatarCarl Huang <cjhuang@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1597576599-8857-4-git-send-email-kvalo@codeaurora.org
parent 2b5e665b

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

+6 −6
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static void ath11k_ahb_kill_tasklets(struct ath11k_base *ab) 
	for (i = 0; i < CE_COUNT; i++) {

		struct ath11k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i];



		if (ath11k_ce_get_attr_flags(i) & CE_ATTR_DIS_INTR)

		if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)

			continue;



		tasklet_kill(&ce_pipe->intr_tq);
@@ -476,7 +476,7 @@ static void ath11k_ahb_sync_ce_irqs(struct ath11k_base *ab) 
	int irq_idx;



	for (i = 0; i < CE_COUNT; i++) {

		if (ath11k_ce_get_attr_flags(i) & CE_ATTR_DIS_INTR)

		if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)

			continue;



		irq_idx = ATH11K_IRQ_CE0_OFFSET + i;
@@ -504,7 +504,7 @@ static void ath11k_ahb_ce_irqs_enable(struct ath11k_base *ab) 
	int i;



	for (i = 0; i < CE_COUNT; i++) {

		if (ath11k_ce_get_attr_flags(i) & CE_ATTR_DIS_INTR)

		if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)

			continue;

		ath11k_ahb_ce_irq_enable(ab, i);

	}
@@ -515,7 +515,7 @@ static void ath11k_ahb_ce_irqs_disable(struct ath11k_base *ab) 
	int i;



	for (i = 0; i < CE_COUNT; i++) {

		if (ath11k_ce_get_attr_flags(i) & CE_ATTR_DIS_INTR)

		if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)

			continue;

		ath11k_ahb_ce_irq_disable(ab, i);

	}
@@ -602,7 +602,7 @@ static void ath11k_ahb_free_irq(struct ath11k_base *ab) 
	int i;



	for (i = 0; i < CE_COUNT; i++) {

		if (ath11k_ce_get_attr_flags(i) & CE_ATTR_DIS_INTR)

		if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)

			continue;

		irq_idx = ATH11K_IRQ_CE0_OFFSET + i;

		free_irq(ab->irq_num[irq_idx], &ab->ce.ce_pipe[i]);
@@ -759,7 +759,7 @@ static int ath11k_ahb_config_irq(struct ath11k_base *ab) 
	for (i = 0; i < CE_COUNT; i++) {

		struct ath11k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i];



		if (ath11k_ce_get_attr_flags(i) & CE_ATTR_DIS_INTR)

		if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)

			continue;



		irq_idx = ATH11K_IRQ_CE0_OFFSET + i;

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

+82 −2
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ 
#include "debug.h"

#include "hif.h"



static const struct ce_attr host_ce_config_wlan[] = {

#define host_ce_config_wlan ab->hw_params.host_ce_config



const struct ce_attr ath11k_host_ce_config_ipq8074[] = {

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

	{

		.flags = CE_ATTR_FLAGS,
@@ -109,6 +111,84 @@ static const struct ce_attr host_ce_config_wlan[] = { 
	},

};



const struct ce_attr ath11k_host_ce_config_qca6390[] = {

	/* 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 = 512,

		.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,

	},



	/* CE6: target autonomous hif_memcpy */

	{

		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,

		.src_nentries = 0,

		.src_sz_max = 0,

		.dest_nentries = 0,

	},



	/* CE7: host->target WMI (mac1) */

	{

		.flags = CE_ATTR_FLAGS,

		.src_nentries = 32,

		.src_sz_max = 2048,

		.dest_nentries = 0,

	},



	/* CE8: target autonomous hif_memcpy */

	{

		.flags = CE_ATTR_FLAGS,

		.src_nentries = 0,

		.src_sz_max = 0,

		.dest_nentries = 0,

	},



};



static int ath11k_ce_rx_buf_enqueue_pipe(struct ath11k_ce_pipe *pipe,

					 struct sk_buff *skb, dma_addr_t paddr)

{
@@ -834,7 +914,7 @@ void ath11k_ce_byte_swap(void *mem, u32 len) 
	}

}



int ath11k_ce_get_attr_flags(int ce_id)

int ath11k_ce_get_attr_flags(struct ath11k_base *ab, int ce_id)

{

	if (ce_id >= CE_COUNT)

		return -EINVAL;

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

+8 −3
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ 
#ifndef ATH11K_CE_H

#define ATH11K_CE_H



#define CE_COUNT 12

#define CE_COUNT (ab->hw_params.ce_count)

#define CE_COUNT_MAX 12



/* Byte swap data words */

#define CE_ATTR_BYTE_SWAP_DATA 2
@@ -165,11 +166,14 @@ struct ath11k_ce_pipe { 
};



struct ath11k_ce {

	struct ath11k_ce_pipe ce_pipe[CE_COUNT];

	struct ath11k_ce_pipe ce_pipe[CE_COUNT_MAX];

	/* Protects rings of all ce pipes */

	spinlock_t ce_lock;

};



extern const struct ce_attr ath11k_host_ce_config_ipq8074[];

extern const struct ce_attr ath11k_host_ce_config_qca6390[];



void ath11k_ce_cleanup_pipes(struct ath11k_base *ab);

void ath11k_ce_rx_replenish_retry(struct timer_list *t);

void ath11k_ce_per_engine_service(struct ath11k_base *ab, u16 ce_id);
@@ -179,8 +183,9 @@ void ath11k_ce_rx_post_buf(struct ath11k_base *ab); 
int ath11k_ce_init_pipes(struct ath11k_base *ab);

int ath11k_ce_alloc_pipes(struct ath11k_base *ab);

void ath11k_ce_free_pipes(struct ath11k_base *ab);

int ath11k_ce_get_attr_flags(int ce_id);

int ath11k_ce_get_attr_flags(struct ath11k_base *ab, int ce_id);

void ath11k_ce_poll_send_completed(struct ath11k_base *ab, u8 pipe_id);

int ath11k_ce_map_service_to_pipe(struct ath11k_base *ab, u16 service_id,

				  u8 *ul_pipe, u8 *dl_pipe);

int ath11k_ce_attr_attach(struct ath11k_base *ab);

#endif

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

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.ring_mask = &ath11k_hw_ring_mask_ipq8074,

		.internal_sleep_clock = false,

		.regs = &ipq8074_regs,

		.host_ce_config = ath11k_host_ce_config_ipq8074,

		.ce_count = 12,

	},

	{

		.name = "qca6390 hw2.0",
@@ -48,6 +50,8 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.ring_mask = &ath11k_hw_ring_mask_ipq8074,

		.internal_sleep_clock = true,

		.regs = &qca6390_regs,

		.host_ce_config = ath11k_host_ce_config_qca6390,

		.ce_count = 9,

	},

};

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

+1 −1
Original line number Diff line number Diff line
@@ -1160,7 +1160,7 @@ void ath11k_hal_dump_srng_stats(struct ath11k_base *ab) 
	for (i = 0; i < CE_COUNT; i++) {

		ce_pipe = &ab->ce.ce_pipe[i];



		if (ath11k_ce_get_attr_flags(i) & CE_ATTR_DIS_INTR)

		if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)

			continue;



		ath11k_err(ab, "CE_id %d pipe_num %d %ums before\n",