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

Commit 3ae351ab authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by John W. Linville
Browse files

ath9k: set up tx power into the MRR 



Set up tx power for each MRR segment in the tx descriptor

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi83@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d954cd77

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

+5 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i) 


	ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)

		| (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)

		| SM(i->txpower, AR_XmitPower)

		| SM(i->txpower, AR_XmitPower0)

		| (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)

		| (i->flags & ATH9K_TXDESC_INTREQ ? AR_TxIntrReq : 0)

		| (i->keyix != ATH9K_TXKEYIX_INVALID ? AR_DestIdxValid : 0)
@@ -306,6 +306,10 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i) 
		| set11nRateFlags(i->rates, 2)

		| set11nRateFlags(i->rates, 3)

		| SM(i->rtscts_rate, AR_RTSCTSRate);



	ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);

	ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);

	ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);

}



static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,

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

+5 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i) 


	ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)

		| (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)

		| SM(i->txpower, AR_XmitPower)

		| SM(i->txpower, AR_XmitPower0)

		| (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)

		| (i->keyix != ATH9K_TXKEYIX_INVALID ? AR_DestIdxValid : 0)

		| (i->flags & ATH9K_TXDESC_LOWRXCHAIN ? AR_LowRxChain : 0)
@@ -151,6 +151,10 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i) 
		| SM(i->rtscts_rate, AR_RTSCTSRate);



	ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;



	ACCESS_ONCE(ads->ctl20) = SM(i->txpower, AR_XmitPower1);

	ACCESS_ONCE(ads->ctl21) = SM(i->txpower, AR_XmitPower2);

	ACCESS_ONCE(ads->ctl22) = SM(i->txpower, AR_XmitPower3);

}



static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)

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

+8 −2
Original line number Diff line number Diff line
@@ -346,8 +346,14 @@ struct ar5416_desc { 
#define AR_FrameLen         0x00000fff

#define AR_VirtMoreFrag     0x00001000

#define AR_TxCtlRsvd00      0x0000e000

#define AR_XmitPower        0x003f0000

#define AR_XmitPower_S      16

#define AR_XmitPower0       0x003f0000

#define AR_XmitPower0_S     16

#define AR_XmitPower1	    0x3f000000

#define AR_XmitPower1_S     24

#define AR_XmitPower2	    0x3f000000

#define AR_XmitPower2_S     24

#define AR_XmitPower3	    0x3f000000

#define AR_XmitPower3_S     24

#define AR_RTSEnable        0x00400000

#define AR_VEOL             0x00800000

#define AR_ClrDestMask      0x01000000