Skip to content
This repository was archived by the owner on Oct 5, 2018. It is now read-only.

Commit a4bbfe2

Browse files
Guodong Xujohnstultz-work
authored andcommitted
wlcore: make reg_ch_conf_last and _pending 64bit aligned
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>
1 parent 501d91c commit a4bbfe2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/net/wireless/ti/wlcore/wlcore.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ struct wl1271 {
318318
bool watchdog_recovery;
319319

320320
/* Reg domain last configuration */
321-
u32 reg_ch_conf_last[2];
321+
u32 reg_ch_conf_last[2] __aligned(8);
322322
/* Reg domain pending configuration */
323323
u32 reg_ch_conf_pending[2];
324324

0 commit comments

Comments
 (0)