Commit d5a3a76a authored by Mark Rutland's avatar Mark Rutland Committed by Kalle Valo

ath9k: ar9002_mac: kill off ACCESS_ONCE()

For several reasons, it is desirable to use {READ,WRITE}_ONCE() in
preference to ACCESS_ONCE(), and new code is expected to use one of the
former. So far, there's been no reason to change most existing uses of
ACCESS_ONCE(), as these aren't currently harmful.

However, for some new features (e.g. KTSAN / Kernel Thread Sanitizer),
it is necessary to instrument reads and writes separately, which is not
possible with ACCESS_ONCE(). This distinction is critical to correct
operation.

It's possible to transform the bulk of kernel code using the Coccinelle
script below. However, for some files (including the ath9k ar9002 mac
driver), this mangles the formatting. As a preparatory step, this patch
converts the driver to use {READ,WRITE}_ONCE() without said mangling.

----
virtual patch

@ depends on patch @
expression E1, E2;
@@

- ACCESS_ONCE(E1) = E2
+ WRITE_ONCE(E1, E2)

@ depends on patch @
expression E;
@@

- ACCESS_ONCE(E)
+ READ_ONCE(E)
----
Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: ath9k-devel@qca.qualcomm.com
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless@vger.kernel.org
Cc: ath9k-devel@lists.ath9k.org
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent a70e1d6f
...@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i) ...@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
ads->ds_txstatus6 = ads->ds_txstatus7 = 0; ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
ads->ds_txstatus8 = ads->ds_txstatus9 = 0; ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
ACCESS_ONCE(ads->ds_link) = i->link; WRITE_ONCE(ads->ds_link, i->link);
ACCESS_ONCE(ads->ds_data) = i->buf_addr[0]; WRITE_ONCE(ads->ds_data, i->buf_addr[0]);
ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore); ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
ctl6 = SM(i->keytype, AR_EncrType); ctl6 = SM(i->keytype, AR_EncrType);
...@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i) ...@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
if ((i->is_first || i->is_last) && if ((i->is_first || i->is_last) &&
i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) { i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0) WRITE_ONCE(ads->ds_ctl2, set11nTries(i->rates, 0)
| set11nTries(i->rates, 1) | set11nTries(i->rates, 1)
| set11nTries(i->rates, 2) | set11nTries(i->rates, 2)
| set11nTries(i->rates, 3) | set11nTries(i->rates, 3)
| (i->dur_update ? AR_DurUpdateEna : 0) | (i->dur_update ? AR_DurUpdateEna : 0)
| SM(0, AR_BurstDur); | SM(0, AR_BurstDur));
ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0) WRITE_ONCE(ads->ds_ctl3, set11nRate(i->rates, 0)
| set11nRate(i->rates, 1) | set11nRate(i->rates, 1)
| set11nRate(i->rates, 2) | set11nRate(i->rates, 2)
| set11nRate(i->rates, 3); | set11nRate(i->rates, 3));
} else { } else {
ACCESS_ONCE(ads->ds_ctl2) = 0; WRITE_ONCE(ads->ds_ctl2, 0);
ACCESS_ONCE(ads->ds_ctl3) = 0; WRITE_ONCE(ads->ds_ctl3, 0);
} }
if (!i->is_first) { if (!i->is_first) {
ACCESS_ONCE(ads->ds_ctl0) = 0; WRITE_ONCE(ads->ds_ctl0, 0);
ACCESS_ONCE(ads->ds_ctl1) = ctl1; WRITE_ONCE(ads->ds_ctl1, ctl1);
ACCESS_ONCE(ads->ds_ctl6) = ctl6; WRITE_ONCE(ads->ds_ctl6, ctl6);
return; return;
} }
...@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i) ...@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
break; break;
} }
ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen) WRITE_ONCE(ads->ds_ctl0, (i->pkt_len & AR_FrameLen)
| (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0) | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
| SM(i->txpower[0], AR_XmitPower0) | SM(i->txpower[0], AR_XmitPower0)
| (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0) | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
...@@ -287,29 +287,29 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i) ...@@ -287,29 +287,29 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
| (i->keyix != ATH9K_TXKEYIX_INVALID ? AR_DestIdxValid : 0) | (i->keyix != ATH9K_TXKEYIX_INVALID ? AR_DestIdxValid : 0)
| (i->flags & ATH9K_TXDESC_CLRDMASK ? AR_ClrDestMask : 0) | (i->flags & ATH9K_TXDESC_CLRDMASK ? AR_ClrDestMask : 0)
| (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable : | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
(i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0)); (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0)));
ACCESS_ONCE(ads->ds_ctl1) = ctl1; WRITE_ONCE(ads->ds_ctl1, ctl1);
ACCESS_ONCE(ads->ds_ctl6) = ctl6; WRITE_ONCE(ads->ds_ctl6, ctl6);
if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST) if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
return; return;
ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0) WRITE_ONCE(ads->ds_ctl4, set11nPktDurRTSCTS(i->rates, 0)
| set11nPktDurRTSCTS(i->rates, 1); | set11nPktDurRTSCTS(i->rates, 1));
ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2) WRITE_ONCE(ads->ds_ctl5, set11nPktDurRTSCTS(i->rates, 2)
| set11nPktDurRTSCTS(i->rates, 3); | set11nPktDurRTSCTS(i->rates, 3));
ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0) WRITE_ONCE(ads->ds_ctl7, set11nRateFlags(i->rates, 0)
| set11nRateFlags(i->rates, 1) | set11nRateFlags(i->rates, 1)
| set11nRateFlags(i->rates, 2) | set11nRateFlags(i->rates, 2)
| set11nRateFlags(i->rates, 3) | set11nRateFlags(i->rates, 3)
| SM(i->rtscts_rate, AR_RTSCTSRate); | SM(i->rtscts_rate, AR_RTSCTSRate));
ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1); WRITE_ONCE(ads->ds_ctl9, SM(i->txpower[1], AR_XmitPower1));
ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2); WRITE_ONCE(ads->ds_ctl10, SM(i->txpower[2], AR_XmitPower2));
ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3); WRITE_ONCE(ads->ds_ctl11, SM(i->txpower[3], AR_XmitPower3));
} }
static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds, static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
...@@ -318,7 +318,7 @@ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds, ...@@ -318,7 +318,7 @@ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
struct ar5416_desc *ads = AR5416DESC(ds); struct ar5416_desc *ads = AR5416DESC(ds);
u32 status; u32 status;
status = ACCESS_ONCE(ads->ds_txstatus9); status = READ_ONCE(ads->ds_txstatus9);
if ((status & AR_TxDone) == 0) if ((status & AR_TxDone) == 0)
return -EINPROGRESS; return -EINPROGRESS;
...@@ -332,7 +332,7 @@ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds, ...@@ -332,7 +332,7 @@ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
ts->ts_rateindex = MS(status, AR_FinalTxIdx); ts->ts_rateindex = MS(status, AR_FinalTxIdx);
ts->ts_seqnum = MS(status, AR_SeqNum); ts->ts_seqnum = MS(status, AR_SeqNum);
status = ACCESS_ONCE(ads->ds_txstatus0); status = READ_ONCE(ads->ds_txstatus0);
ts->ts_rssi_ctl0 = MS(status, AR_TxRSSIAnt00); ts->ts_rssi_ctl0 = MS(status, AR_TxRSSIAnt00);
ts->ts_rssi_ctl1 = MS(status, AR_TxRSSIAnt01); ts->ts_rssi_ctl1 = MS(status, AR_TxRSSIAnt01);
ts->ts_rssi_ctl2 = MS(status, AR_TxRSSIAnt02); ts->ts_rssi_ctl2 = MS(status, AR_TxRSSIAnt02);
...@@ -342,7 +342,7 @@ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds, ...@@ -342,7 +342,7 @@ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
ts->ba_high = ads->AR_BaBitmapHigh; ts->ba_high = ads->AR_BaBitmapHigh;
} }
status = ACCESS_ONCE(ads->ds_txstatus1); status = READ_ONCE(ads->ds_txstatus1);
if (status & AR_FrmXmitOK) if (status & AR_FrmXmitOK)
ts->ts_status |= ATH9K_TX_ACKED; ts->ts_status |= ATH9K_TX_ACKED;
else { else {
...@@ -371,7 +371,7 @@ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds, ...@@ -371,7 +371,7 @@ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
ts->ts_longretry = MS(status, AR_DataFailCnt); ts->ts_longretry = MS(status, AR_DataFailCnt);
ts->ts_virtcol = MS(status, AR_VirtRetryCnt); ts->ts_virtcol = MS(status, AR_VirtRetryCnt);
status = ACCESS_ONCE(ads->ds_txstatus5); status = READ_ONCE(ads->ds_txstatus5);
ts->ts_rssi = MS(status, AR_TxRSSICombined); ts->ts_rssi = MS(status, AR_TxRSSICombined);
ts->ts_rssi_ext0 = MS(status, AR_TxRSSIAnt10); ts->ts_rssi_ext0 = MS(status, AR_TxRSSIAnt10);
ts->ts_rssi_ext1 = MS(status, AR_TxRSSIAnt11); ts->ts_rssi_ext1 = MS(status, AR_TxRSSIAnt11);
...@@ -390,13 +390,13 @@ static int ar9002_hw_get_duration(struct ath_hw *ah, const void *ds, int index) ...@@ -390,13 +390,13 @@ static int ar9002_hw_get_duration(struct ath_hw *ah, const void *ds, int index)
switch (index) { switch (index) {
case 0: case 0:
return MS(ACCESS_ONCE(ads->ds_ctl4), AR_PacketDur0); return MS(READ_ONCE(ads->ds_ctl4), AR_PacketDur0);
case 1: case 1:
return MS(ACCESS_ONCE(ads->ds_ctl4), AR_PacketDur1); return MS(READ_ONCE(ads->ds_ctl4), AR_PacketDur1);
case 2: case 2:
return MS(ACCESS_ONCE(ads->ds_ctl5), AR_PacketDur2); return MS(READ_ONCE(ads->ds_ctl5), AR_PacketDur2);
case 3: case 3:
return MS(ACCESS_ONCE(ads->ds_ctl5), AR_PacketDur3); return MS(READ_ONCE(ads->ds_ctl5), AR_PacketDur3);
default: default:
return -1; return -1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment