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

ath11k: setup QCA6390 rings for both rxdmas 



For QCA6390, only one pdev is created and this pdev manages both lmacs, thus
both rxdmas. So host needs to initialize all rxdma related rings for one pdev.

Another difference is for QCA6390, host fills rxbuf to firmware and firmware
further fills the rxbuf to rxbuf ring for each rxdma.

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/1597555891-26112-4-git-send-email-kvalo@codeaurora.org
parent 7f6fc1eb

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

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.single_pdev_only = false,

		.needs_band_to_mac = true,

		.rxdma1_enable = true,

		.num_rxmda_per_pdev = 1,

		.rx_mac_buf_ring = false,

	},

	{

		.name = "qca6390 hw2.0",
@@ -58,6 +60,8 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.single_pdev_only = true,

		.needs_band_to_mac = false,

		.rxdma1_enable = false,

		.num_rxmda_per_pdev = 2,

		.rx_mac_buf_ring = true,

	},

};

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

+6 −0
Original line number Diff line number Diff line
@@ -901,6 +901,12 @@ static inline struct ath11k_vif *ath11k_vif_to_arvif(struct ieee80211_vif *vif) 
	return (struct ath11k_vif *)vif->drv_priv;

}



static inline struct ath11k *ath11k_ab_to_ar(struct ath11k_base *ab,

					     int mac_id)

{

	return ab->pdevs[ath11k_hw_mac_id_to_pdev_id(&ab->hw_params, mac_id)].ar;

}



static inline void ath11k_core_create_firmware_path(struct ath11k_base *ab,

						    const char *filename,

						    void *buf, size_t buf_len)

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

+25 −16
Original line number Diff line number Diff line
@@ -698,8 +698,10 @@ static ssize_t ath11k_write_extd_rx_stats(struct file *file, 
					  size_t count, loff_t *ppos)

{

	struct ath11k *ar = file->private_data;

	struct ath11k_base *ab = ar->ab;

	struct htt_rx_ring_tlv_filter tlv_filter = {0};

	u32 enable, rx_filter = 0, ring_id;

	int i;

	int ret;



	if (kstrtouint_from_user(ubuf, count, 0, &enable))
@@ -742,7 +744,8 @@ static ssize_t ath11k_write_extd_rx_stats(struct file *file, 


	ar->debug.rx_filter = tlv_filter.rx_filter;



	ring_id = ar->dp.rx_mon_status_refill_ring.refill_buf_ring.ring_id;

	for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {

		ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;

		ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, ar->dp.mac_id,

						       HAL_RXDMA_MONITOR_STATUS,

						       DP_RX_BUFFER_SIZE, &tlv_filter);
@@ -751,6 +754,7 @@ static ssize_t ath11k_write_extd_rx_stats(struct file *file, 
			ath11k_warn(ar->ab, "failed to set rx filter for monitor status ring\n");

			goto exit;

		}

	}



	ar->debug.extd_rx_stats = enable;

	ret = count;
@@ -1000,10 +1004,11 @@ static ssize_t ath11k_write_pktlog_filter(struct file *file, 
					  size_t count, loff_t *ppos)

{

	struct ath11k *ar = file->private_data;

	struct ath11k_base *ab = ar->ab;

	struct htt_rx_ring_tlv_filter tlv_filter = {0};

	u32 rx_filter = 0, ring_id, filter, mode;

	u8 buf[128] = {0};

	int ret;

	int i, ret;

	ssize_t rc;



	mutex_lock(&ar->conf_mutex);
@@ -1084,16 +1089,20 @@ static ssize_t ath11k_write_pktlog_filter(struct file *file, 
					       HTT_RX_FP_DATA_FILTER_FLASG3;

	}



	ring_id = ar->dp.rx_mon_status_refill_ring.refill_buf_ring.ring_id;

	ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, ar->dp.mac_id,

	for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) {

		ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id;

		ret = ath11k_dp_tx_htt_rx_filter_setup(ab, ring_id,

						       ar->dp.mac_id + i,

						       HAL_RXDMA_MONITOR_STATUS,

						       DP_RX_BUFFER_SIZE, &tlv_filter);



		if (ret) {

		ath11k_warn(ar->ab, "failed to set rx filter for monitor status ring\n");

			ath11k_warn(ab, "failed to set rx filter for moniter status ring\n");

			goto out;

		}

	}



	ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "pktlog filter %d mode %s\n",

	ath11k_dbg(ab, ATH11K_DBG_WMI, "pktlog filter %d mode %s\n",

		   filter, ((mode == ATH11K_PKTLOG_MODE_FULL) ? "full" : "lite"));



	ar->debug.pktlog_filter = filter;

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

+5 −2
Original line number Diff line number Diff line
@@ -831,6 +831,7 @@ void ath11k_dp_pdev_pre_alloc(struct ath11k_base *ab) 
	struct ath11k *ar;

	struct ath11k_pdev_dp *dp;

	int i;

	int j;



	for (i = 0; i <  ab->num_radios; i++) {

		ar = ab->pdevs[i].ar;
@@ -840,8 +841,10 @@ void ath11k_dp_pdev_pre_alloc(struct ath11k_base *ab) 
		spin_lock_init(&dp->rx_refill_buf_ring.idr_lock);

		atomic_set(&dp->num_tx_pending, 0);

		init_waitqueue_head(&dp->tx_empty_waitq);

		idr_init(&dp->rx_mon_status_refill_ring.bufs_idr);

		spin_lock_init(&dp->rx_mon_status_refill_ring.idr_lock);

		for (j = 0; j < ab->hw_params.num_rxmda_per_pdev; j++) {

			idr_init(&dp->rx_mon_status_refill_ring[j].bufs_idr);

			spin_lock_init(&dp->rx_mon_status_refill_ring[j].idr_lock);

		}

		idr_init(&dp->rxdma_mon_buf_ring.bufs_idr);

		spin_lock_init(&dp->rxdma_mon_buf_ring.idr_lock);

	}

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

+5 −2
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 


#include "hal_rx.h"



#define MAX_RXDMA_PER_PDEV     2



struct ath11k_base;

struct ath11k_peer;

struct ath11k_dp;
@@ -142,12 +144,13 @@ struct ath11k_pdev_dp { 
	atomic_t num_tx_pending;

	wait_queue_head_t tx_empty_waitq;

	struct dp_rxdma_ring rx_refill_buf_ring;

	struct dp_srng rxdma_err_dst_ring;

	struct dp_srng rx_mac_buf_ring[MAX_RXDMA_PER_PDEV];

	struct dp_srng rxdma_err_dst_ring[MAX_RXDMA_PER_PDEV];

	struct dp_srng rxdma_mon_dst_ring;

	struct dp_srng rxdma_mon_desc_ring;



	struct dp_rxdma_ring rxdma_mon_buf_ring;

	struct dp_rxdma_ring rx_mon_status_refill_ring;

	struct dp_rxdma_ring rx_mon_status_refill_ring[MAX_RXDMA_PER_PDEV];

	struct ieee80211_rx_status rx_status;

	struct ath11k_mon_data mon_data;

};