diff options
| author | Guodong Xu <guodong.xu@linaro.org> | 2014-12-29 10:46:21 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2015-10-17 07:11:17 +0800 |
| commit | f4b54ddd8fc0627a1b9af0620351f40fd71a9c4f (patch) | |
| tree | e756425f0af563f9a75fdcfc4cc178bb3915c354 | |
| parent | b7bbc85f798a328c6b1639a5cea19c3230e76e71 (diff) | |
wlcore: make reg_ch_conf_last and _pending 64bit alignedworking-v4.2-rc6-hikey
In struct wl1271, make fields reg_ch_conf_last and
reg_ch_conf_pending 64bit aligned.
Without this, on 64bit ARM, wlcore_set_pending_regdomain_ch() will fail at
the point it calls set_bit(ch_bit_idx, (long*)wl->reg_ch_conf_pending);
Here is the error message while doing iw wlan0 scan or connect:
[ 760.644782] wlcore: WL1271_ACX_INTR_DATA
[ 760.648734] Unhandled fault: alignment fault (0x96000021) at 0xffffffc01bdc1b54
[ 760.656048] Internal error: : 96000021 [#1] PREEMPT SMP
[ 760.661267] Modules linked in: arc4 wl18xx wlcore mac80211 cfg80211 wlcore_sdio ti_conf_wl18xx btwilink st_drv bluetooth rfkill
[ 760.672824] CPU: 0 PID: 1514 Comm: irq/198-wl18xx Tainted: G W 3.10.52-wl-00204-gf704232-dirty #8
[ 760.682558] task: ffffffc01d956040 ti: ffffffc01bea4000 task.ti: ffffffc01bea4000
[ 760.690043] PC is at set_bit+0x14/0x30
[ 760.693806] LR is at wlcore_set_pending_regdomain_ch+0x38/0x44 [wlcore]
Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/wlcore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h index 7f363fa566a3..6234bd622d4d 100644 --- a/drivers/net/wireless/ti/wlcore/wlcore.h +++ b/drivers/net/wireless/ti/wlcore/wlcore.h @@ -318,7 +318,7 @@ struct wl1271 { bool watchdog_recovery; /* Reg domain last configuration */ - u32 reg_ch_conf_last[2]; + u32 reg_ch_conf_last[2] __aligned(8); /* Reg domain pending configuration */ u32 reg_ch_conf_pending[2]; |