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

Commit db1a052b authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: split out access to tx status information 



This patch passes in a pointer to the ath_tx_status data structure for
functions that need it, instead of letting them grab it directly from
the ath_desc struct. This is useful for making it possible to allocate
the intermediate tx status data separately.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e65054b6

drivers/net/wireless/ath/ath9k/ath9k.h

+0 −3
Original line number Diff line number Diff line
@@ -178,9 +178,6 @@ void ath_descdma_cleanup(struct ath_softc *sc, struct ath_descdma *dd, 
#define BAW_WITHIN(_start, _bawsz, _seqno) \

	((((_seqno) - (_start)) & 4095) < (_bawsz))



#define ATH_DS_BA_SEQ(_ds)         ((_ds)->ds_us.tx.ts_seqnum)

#define ATH_DS_BA_BITMAP(_ds)      (&(_ds)->ds_us.tx.ba_low)

#define ATH_DS_TX_BA(_ds)          ((_ds)->ds_us.tx.ts_flags & ATH9K_TX_BA)

#define ATH_AN_2_TID(_an, _tidno)  (&(_an)->tid[(_tidno)])



#define ATH_TX_COMPLETE_POLL_INT	1000

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

+7 −9
Original line number Diff line number Diff line
@@ -556,10 +556,8 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf, 
}



void ath_debug_stat_tx(struct ath_softc *sc, struct ath_txq *txq,

		       struct ath_buf *bf)

		       struct ath_buf *bf, struct ath_tx_status *ts)

{

	struct ath_desc *ds = bf->bf_desc;



	if (bf_isampdu(bf)) {

		if (bf_isxretried(bf))

			TX_STAT_INC(txq->axq_qnum, a_xretries);
@@ -569,17 +567,17 @@ void ath_debug_stat_tx(struct ath_softc *sc, struct ath_txq *txq, 
		TX_STAT_INC(txq->axq_qnum, completed);

	}



	if (ds->ds_txstat.ts_status & ATH9K_TXERR_FIFO)

	if (ts->ts_status & ATH9K_TXERR_FIFO)

		TX_STAT_INC(txq->axq_qnum, fifo_underrun);

	if (ds->ds_txstat.ts_status & ATH9K_TXERR_XTXOP)

	if (ts->ts_status & ATH9K_TXERR_XTXOP)

		TX_STAT_INC(txq->axq_qnum, xtxop);

	if (ds->ds_txstat.ts_status & ATH9K_TXERR_TIMER_EXPIRED)

	if (ts->ts_status & ATH9K_TXERR_TIMER_EXPIRED)

		TX_STAT_INC(txq->axq_qnum, timer_exp);

	if (ds->ds_txstat.ts_flags & ATH9K_TX_DESC_CFG_ERR)

	if (ts->ts_flags & ATH9K_TX_DESC_CFG_ERR)

		TX_STAT_INC(txq->axq_qnum, desc_cfg_err);

	if (ds->ds_txstat.ts_flags & ATH9K_TX_DATA_UNDERRUN)

	if (ts->ts_flags & ATH9K_TX_DATA_UNDERRUN)

		TX_STAT_INC(txq->axq_qnum, data_underrun);

	if (ds->ds_txstat.ts_flags & ATH9K_TX_DELIM_UNDERRUN)

	if (ts->ts_flags & ATH9K_TX_DELIM_UNDERRUN)

		TX_STAT_INC(txq->axq_qnum, delim_underrun);

}

drivers/net/wireless/ath/ath9k/debug.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ void ath9k_debug_remove_root(void); 
void ath_debug_stat_interrupt(struct ath_softc *sc, enum ath9k_int status);

void ath_debug_stat_rc(struct ath_softc *sc, int final_rate);

void ath_debug_stat_tx(struct ath_softc *sc, struct ath_txq *txq,

		       struct ath_buf *bf);

		       struct ath_buf *bf, struct ath_tx_status *ts);

void ath_debug_stat_rx(struct ath_softc *sc, struct ath_buf *bf);

void ath_debug_stat_retries(struct ath_softc *sc, int rix,

			    int xretries, int retries, u8 per);

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

+38 −37
Original line number Diff line number Diff line
@@ -246,79 +246,80 @@ void ath9k_hw_cleartxdesc(struct ath_hw *ah, struct ath_desc *ds) 
}

EXPORT_SYMBOL(ath9k_hw_cleartxdesc);



int ath9k_hw_txprocdesc(struct ath_hw *ah, struct ath_desc *ds)

int ath9k_hw_txprocdesc(struct ath_hw *ah, struct ath_desc *ds,

			struct ath_tx_status *ts)

{

	struct ar5416_desc *ads = AR5416DESC(ds);



	if ((ads->ds_txstatus9 & AR_TxDone) == 0)

		return -EINPROGRESS;



	ds->ds_txstat.ts_seqnum = MS(ads->ds_txstatus9, AR_SeqNum);

	ds->ds_txstat.ts_tstamp = ads->AR_SendTimestamp;

	ds->ds_txstat.ts_status = 0;

	ds->ds_txstat.ts_flags = 0;

	ts->ts_seqnum = MS(ads->ds_txstatus9, AR_SeqNum);

	ts->ts_tstamp = ads->AR_SendTimestamp;

	ts->ts_status = 0;

	ts->ts_flags = 0;



	if (ads->ds_txstatus1 & AR_FrmXmitOK)

		ds->ds_txstat.ts_status |= ATH9K_TX_ACKED;

		ts->ts_status |= ATH9K_TX_ACKED;

	if (ads->ds_txstatus1 & AR_ExcessiveRetries)

		ds->ds_txstat.ts_status |= ATH9K_TXERR_XRETRY;

		ts->ts_status |= ATH9K_TXERR_XRETRY;

	if (ads->ds_txstatus1 & AR_Filtered)

		ds->ds_txstat.ts_status |= ATH9K_TXERR_FILT;

		ts->ts_status |= ATH9K_TXERR_FILT;

	if (ads->ds_txstatus1 & AR_FIFOUnderrun) {

		ds->ds_txstat.ts_status |= ATH9K_TXERR_FIFO;

		ts->ts_status |= ATH9K_TXERR_FIFO;

		ath9k_hw_updatetxtriglevel(ah, true);

	}

	if (ads->ds_txstatus9 & AR_TxOpExceeded)

		ds->ds_txstat.ts_status |= ATH9K_TXERR_XTXOP;

		ts->ts_status |= ATH9K_TXERR_XTXOP;

	if (ads->ds_txstatus1 & AR_TxTimerExpired)

		ds->ds_txstat.ts_status |= ATH9K_TXERR_TIMER_EXPIRED;

		ts->ts_status |= ATH9K_TXERR_TIMER_EXPIRED;



	if (ads->ds_txstatus1 & AR_DescCfgErr)

		ds->ds_txstat.ts_flags |= ATH9K_TX_DESC_CFG_ERR;

		ts->ts_flags |= ATH9K_TX_DESC_CFG_ERR;

	if (ads->ds_txstatus1 & AR_TxDataUnderrun) {

		ds->ds_txstat.ts_flags |= ATH9K_TX_DATA_UNDERRUN;

		ts->ts_flags |= ATH9K_TX_DATA_UNDERRUN;

		ath9k_hw_updatetxtriglevel(ah, true);

	}

	if (ads->ds_txstatus1 & AR_TxDelimUnderrun) {

		ds->ds_txstat.ts_flags |= ATH9K_TX_DELIM_UNDERRUN;

		ts->ts_flags |= ATH9K_TX_DELIM_UNDERRUN;

		ath9k_hw_updatetxtriglevel(ah, true);

	}

	if (ads->ds_txstatus0 & AR_TxBaStatus) {

		ds->ds_txstat.ts_flags |= ATH9K_TX_BA;

		ds->ds_txstat.ba_low = ads->AR_BaBitmapLow;

		ds->ds_txstat.ba_high = ads->AR_BaBitmapHigh;

		ts->ts_flags |= ATH9K_TX_BA;

		ts->ba_low = ads->AR_BaBitmapLow;

		ts->ba_high = ads->AR_BaBitmapHigh;

	}



	ds->ds_txstat.ts_rateindex = MS(ads->ds_txstatus9, AR_FinalTxIdx);

	switch (ds->ds_txstat.ts_rateindex) {

	ts->ts_rateindex = MS(ads->ds_txstatus9, AR_FinalTxIdx);

	switch (ts->ts_rateindex) {

	case 0:

		ds->ds_txstat.ts_ratecode = MS(ads->ds_ctl3, AR_XmitRate0);

		ts->ts_ratecode = MS(ads->ds_ctl3, AR_XmitRate0);

		break;

	case 1:

		ds->ds_txstat.ts_ratecode = MS(ads->ds_ctl3, AR_XmitRate1);

		ts->ts_ratecode = MS(ads->ds_ctl3, AR_XmitRate1);

		break;

	case 2:

		ds->ds_txstat.ts_ratecode = MS(ads->ds_ctl3, AR_XmitRate2);

		ts->ts_ratecode = MS(ads->ds_ctl3, AR_XmitRate2);

		break;

	case 3:

		ds->ds_txstat.ts_ratecode = MS(ads->ds_ctl3, AR_XmitRate3);

		ts->ts_ratecode = MS(ads->ds_ctl3, AR_XmitRate3);

		break;

	}



	ds->ds_txstat.ts_rssi = MS(ads->ds_txstatus5, AR_TxRSSICombined);

	ds->ds_txstat.ts_rssi_ctl0 = MS(ads->ds_txstatus0, AR_TxRSSIAnt00);

	ds->ds_txstat.ts_rssi_ctl1 = MS(ads->ds_txstatus0, AR_TxRSSIAnt01);

	ds->ds_txstat.ts_rssi_ctl2 = MS(ads->ds_txstatus0, AR_TxRSSIAnt02);

	ds->ds_txstat.ts_rssi_ext0 = MS(ads->ds_txstatus5, AR_TxRSSIAnt10);

	ds->ds_txstat.ts_rssi_ext1 = MS(ads->ds_txstatus5, AR_TxRSSIAnt11);

	ds->ds_txstat.ts_rssi_ext2 = MS(ads->ds_txstatus5, AR_TxRSSIAnt12);

	ds->ds_txstat.evm0 = ads->AR_TxEVM0;

	ds->ds_txstat.evm1 = ads->AR_TxEVM1;

	ds->ds_txstat.evm2 = ads->AR_TxEVM2;

	ds->ds_txstat.ts_shortretry = MS(ads->ds_txstatus1, AR_RTSFailCnt);

	ds->ds_txstat.ts_longretry = MS(ads->ds_txstatus1, AR_DataFailCnt);

	ds->ds_txstat.ts_virtcol = MS(ads->ds_txstatus1, AR_VirtRetryCnt);

	ds->ds_txstat.ts_antenna = 0;

	ts->ts_rssi = MS(ads->ds_txstatus5, AR_TxRSSICombined);

	ts->ts_rssi_ctl0 = MS(ads->ds_txstatus0, AR_TxRSSIAnt00);

	ts->ts_rssi_ctl1 = MS(ads->ds_txstatus0, AR_TxRSSIAnt01);

	ts->ts_rssi_ctl2 = MS(ads->ds_txstatus0, AR_TxRSSIAnt02);

	ts->ts_rssi_ext0 = MS(ads->ds_txstatus5, AR_TxRSSIAnt10);

	ts->ts_rssi_ext1 = MS(ads->ds_txstatus5, AR_TxRSSIAnt11);

	ts->ts_rssi_ext2 = MS(ads->ds_txstatus5, AR_TxRSSIAnt12);

	ts->evm0 = ads->AR_TxEVM0;

	ts->evm1 = ads->AR_TxEVM1;

	ts->evm2 = ads->AR_TxEVM2;

	ts->ts_shortretry = MS(ads->ds_txstatus1, AR_RTSFailCnt);

	ts->ts_longretry = MS(ads->ds_txstatus1, AR_DataFailCnt);

	ts->ts_virtcol = MS(ads->ds_txstatus1, AR_VirtRetryCnt);

	ts->ts_antenna = 0;



	return 0;

}

drivers/net/wireless/ath/ath9k/mac.h

+2 −2
Original line number Diff line number Diff line
@@ -241,7 +241,6 @@ struct ath_desc { 
	void *ds_vdata;

} __packed;



#define	ds_txstat	ds_us.tx

#define	ds_rxstat	ds_us.rx

#define ds_stat		ds_us.stats
@@ -702,7 +701,8 @@ void ath9k_hw_filltxdesc(struct ath_hw *ah, struct ath_desc *ds, 
			 u32 segLen, bool firstSeg,

			 bool lastSeg, const struct ath_desc *ds0);

void ath9k_hw_cleartxdesc(struct ath_hw *ah, struct ath_desc *ds);

int ath9k_hw_txprocdesc(struct ath_hw *ah, struct ath_desc *ds);

int ath9k_hw_txprocdesc(struct ath_hw *ah, struct ath_desc *ds,

			struct ath_tx_status *ts);

void ath9k_hw_set11n_txdesc(struct ath_hw *ah, struct ath_desc *ds,

			    u32 pktLen, enum ath9k_pkt_type type, u32 txPower,

			    u32 keyIx, enum ath9k_key_type keyType, u32 flags);