d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix shift overflow problem in sys/dev/ath/ath_hal/ar5210/ar5210_power.c

Browse Source 
and sys/dev/ath/ath_hal/ar5211/ar5211_power.c:

sys/dev/ath/ath_hal/ar5210/ar5210_power.c:36:3: warning: signed shift result (0x200000000) requires 35 bits to represent, but 'int' only has 32 bits [-Wshift-overflow]
                OS_REG_RMW_FIELD(ah, AR_SCR, AR_SCR_SLE, AR_SCR_SLE_ALLOW);
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sys/dev/ath/ath_hal/ah_internal.h:472:42: note: expanded from:
                (OS_REG_READ(_a, _r) &~ (_f)) | (((_v) << _f##_S) & (_f)))
                                                       ^
sys/dev/ath/ah_osdep.h:127:49: note: expanded from:
            (bus_space_handle_t)(_ah)->ah_sh, (_reg), (_val))
                                                       ^~~~

The AR_SCR_SLE_{WAKE,SLP,NORM} values are pre-shifted in ar5210reg.h and
ar5211reg.h, while they should be unshifted, like in ar5212reg.h.  Then,
when the OS_REG_RMW_FIELD() macro shifts them again, the values will
overflow, becoming effectively zero.

MFC after: 1 week
This commit is contained in:
Dimitry Andric 2011-12-21 17:16:43 +00:00
parent c5a0813d43
commit 46fb42dc9d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/ath/ath_hal/ar5210/ar5210reg.h
View File

@ -245,9 +245,9 @@
#define AR_SCR_SLDUR 0x0000ffff /* sleep duration */
#define AR_SCR_SLE 0x00030000 /* sleep enable */
#define AR_SCR_SLE_S 16
#define AR_SCR_SLE_WAKE 0x00000000 /* force wake */
#define AR_SCR_SLE_SLP 0x00010000 /* force sleep */
#define AR_SCR_SLE_ALLOW 0x00020000 /* allow to control sleep */
#define AR_SCR_SLE_WAKE 0 /* force wake */
#define AR_SCR_SLE_SLP 1 /* force sleep */
#define AR_SCR_SLE_ALLOW 2 /* allow to control sleep */
#define AR_SCR_BITS "\20\20SLE_SLP\21SLE_ALLOW"
#define AR_INTPEND_IP 0x00000001 /* interrupt pending */

6
sys/dev/ath/ath_hal/ar5211/ar5211reg.h
View File

@ -618,9 +618,9 @@
#define AR_SCR_SLDUR_S 0
#define AR_SCR_SLE 0x00030000 /* sleep enable mask */
#define AR_SCR_SLE_S 16 /* sleep enable bits shift */
#define AR_SCR_SLE_WAKE 0x00000000 /* force wake */
#define AR_SCR_SLE_SLP 0x00010000 /* force sleep */
#define AR_SCR_SLE_NORM 0x00020000 /* sleep logic normal operation */
#define AR_SCR_SLE_WAKE 0 /* force wake */
#define AR_SCR_SLE_SLP 1 /* force sleep */
#define AR_SCR_SLE_NORM 2 /* sleep logic normal operation */
#define AR_SCR_SLE_UNITS 0x00000008 /* SCR units/TU */
#define AR_SCR_BITS "\20\20SLE_SLP\21SLE"