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

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

ath9k: add support for reporting per-chain signal strength 



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

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

+4 −4
Original line number Diff line number Diff line
@@ -724,14 +724,14 @@ void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs) 
	struct ath_ant_comb *antcomb = &sc->ant_comb;

	int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set;

	int curr_main_set;

	int main_rssi = rs->rs_rssi_ctl0;

	int alt_rssi = rs->rs_rssi_ctl1;

	int main_rssi = rs->rs_rssi_ctl[0];

	int alt_rssi = rs->rs_rssi_ctl[1];

	int rx_ant_conf,  main_ant_conf;

	bool short_scan = false, ret;



	rx_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_CURRENT_SHIFT) &

	rx_ant_conf = (rs->rs_rssi_ctl[2] >> ATH_ANT_RX_CURRENT_SHIFT) &

		       ATH_ANT_RX_MASK;

	main_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_MAIN_SHIFT) &

	main_ant_conf = (rs->rs_rssi_ctl[2] >> ATH_ANT_RX_MAIN_SHIFT) &

			 ATH_ANT_RX_MASK;



	if (alt_rssi >= antcomb->low_rssi_thresh) {

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

+6 −6
Original line number Diff line number Diff line
@@ -476,12 +476,12 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs, 


	/* XXX: Keycache */

	rxs->rs_rssi = MS(rxsp->status5, AR_RxRSSICombined);

	rxs->rs_rssi_ctl0 = MS(rxsp->status1, AR_RxRSSIAnt00);

	rxs->rs_rssi_ctl1 = MS(rxsp->status1, AR_RxRSSIAnt01);

	rxs->rs_rssi_ctl2 = MS(rxsp->status1, AR_RxRSSIAnt02);

	rxs->rs_rssi_ext0 = MS(rxsp->status5, AR_RxRSSIAnt10);

	rxs->rs_rssi_ext1 = MS(rxsp->status5, AR_RxRSSIAnt11);

	rxs->rs_rssi_ext2 = MS(rxsp->status5, AR_RxRSSIAnt12);

	rxs->rs_rssi_ctl[0] = MS(rxsp->status1, AR_RxRSSIAnt00);

	rxs->rs_rssi_ctl[1] = MS(rxsp->status1, AR_RxRSSIAnt01);

	rxs->rs_rssi_ctl[2] = MS(rxsp->status1, AR_RxRSSIAnt02);

	rxs->rs_rssi_ext[0] = MS(rxsp->status5, AR_RxRSSIAnt10);

	rxs->rs_rssi_ext[1] = MS(rxsp->status5, AR_RxRSSIAnt11);

	rxs->rs_rssi_ext[2] = MS(rxsp->status5, AR_RxRSSIAnt12);



	if (rxsp->status11 & AR_RxKeyIdxValid)

		rxs->rs_keyix = MS(rxsp->status11, AR_KeyIdx);

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

+2 −2
Original line number Diff line number Diff line
@@ -158,8 +158,8 @@ void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data, 
		return;

	}



	ard.rssi = rs->rs_rssi_ctl0;

	ard.ext_rssi = rs->rs_rssi_ext0;

	ard.rssi = rs->rs_rssi_ctl[0];

	ard.ext_rssi = rs->rs_rssi_ext[0];



	/*

	 * hardware stores this as 8 bit signed value.

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

+12 −12
Original line number Diff line number Diff line
@@ -550,25 +550,25 @@ int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds, 


	if (ads.ds_rxstatus8 & AR_PostDelimCRCErr) {

		rs->rs_rssi = ATH9K_RSSI_BAD;

		rs->rs_rssi_ctl0 = ATH9K_RSSI_BAD;

		rs->rs_rssi_ctl1 = ATH9K_RSSI_BAD;

		rs->rs_rssi_ctl2 = ATH9K_RSSI_BAD;

		rs->rs_rssi_ext0 = ATH9K_RSSI_BAD;

		rs->rs_rssi_ext1 = ATH9K_RSSI_BAD;

		rs->rs_rssi_ext2 = ATH9K_RSSI_BAD;

		rs->rs_rssi_ctl[0] = ATH9K_RSSI_BAD;

		rs->rs_rssi_ctl[1] = ATH9K_RSSI_BAD;

		rs->rs_rssi_ctl[2] = ATH9K_RSSI_BAD;

		rs->rs_rssi_ext[0] = ATH9K_RSSI_BAD;

		rs->rs_rssi_ext[1] = ATH9K_RSSI_BAD;

		rs->rs_rssi_ext[2] = ATH9K_RSSI_BAD;

	} else {

		rs->rs_rssi = MS(ads.ds_rxstatus4, AR_RxRSSICombined);

		rs->rs_rssi_ctl0 = MS(ads.ds_rxstatus0,

		rs->rs_rssi_ctl[0] = MS(ads.ds_rxstatus0,

						AR_RxRSSIAnt00);

		rs->rs_rssi_ctl1 = MS(ads.ds_rxstatus0,

		rs->rs_rssi_ctl[1] = MS(ads.ds_rxstatus0,

						AR_RxRSSIAnt01);

		rs->rs_rssi_ctl2 = MS(ads.ds_rxstatus0,

		rs->rs_rssi_ctl[2] = MS(ads.ds_rxstatus0,

						AR_RxRSSIAnt02);

		rs->rs_rssi_ext0 = MS(ads.ds_rxstatus4,

		rs->rs_rssi_ext[0] = MS(ads.ds_rxstatus4,

						AR_RxRSSIAnt10);

		rs->rs_rssi_ext1 = MS(ads.ds_rxstatus4,

		rs->rs_rssi_ext[1] = MS(ads.ds_rxstatus4,

						AR_RxRSSIAnt11);

		rs->rs_rssi_ext2 = MS(ads.ds_rxstatus4,

		rs->rs_rssi_ext[2] = MS(ads.ds_rxstatus4,

						AR_RxRSSIAnt12);

	}

	if (ads.ds_rxstatus8 & AR_RxKeyIdxValid)

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

+2 −6
Original line number Diff line number Diff line
@@ -133,12 +133,8 @@ struct ath_rx_status { 
	u8 rs_rate;

	u8 rs_antenna;

	u8 rs_more;

	int8_t rs_rssi_ctl0;

	int8_t rs_rssi_ctl1;

	int8_t rs_rssi_ctl2;

	int8_t rs_rssi_ext0;

	int8_t rs_rssi_ext1;

	int8_t rs_rssi_ext2;

	int8_t rs_rssi_ctl[3];

	int8_t rs_rssi_ext[3];

	u8 rs_isaggr;

	u8 rs_firstaggr;

	u8 rs_moreaggr;