Skip to contentSkip to conversation

ARC: [arcompact] fix handling of unaligned access in delay slot

PATCH New Alexey Brodkin 1 participant 1 message Feb 7, 2017 Synopsys ARC architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARC: [arcompact] fix handling of unaligned access in delay slot

Commit 9aed02feae5 ("ARC: [arcompact] handle unaligned access delay slot corner case") was meant to fix one corner-case of unaligned access fixup. But for some reason real implementation has an important spello which prevents kernel to be built with enabled CONFIG_ARC_EMUL_UNALIGNED:
--------------------------------->8-------------------------------- arch/arc/kernel/unaligned.c: In function 'misaligned_fixup':
arch/arc/kernel/unaligned.c:246:25: error: expected ';' before '~ token

   regs->ret = regs->bta ~1U;
                         ^

--------------------------------->8--------------------------------

What needs to be done - LSB bit of regs->bta has to be cleared and now we do exactly this with "& ~1U".

While at it fix another spello in comments.

Signed-off-by Alexey Brodkin <abrodkin at synopsys.com>
Reported-by John Crispin <john at phrozen.org>
Cc Felix Fietkau <nbd at nbd.name>
Cc Vineet Gupta <vgupta at synopsys.com>
Cc Igor Guryanov <guryanov at synopsys.com>
---
 arch/arc/kernel/unaligned.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arc/kernel/unaligned.c +2 -2
index 91ebe382147f..39ee23d107cc 100644
@@ -241,9 +241,9 @@ int misaligned_fixup(unsigned long address, struct pt_regs *regs,
 	if (state.fault)
 		goto fault;
 
-	/* clear any remanants of delay slot */
+	/* clear any remnants of delay slot */
 	if (delay_mode(regs)) {
-		regs->ret = regs->bta ~1U;
+		regs->ret = regs->bta & ~1U;
 		regs->status32 &= ~STATUS_DE_MASK;
 	} else {
 		regs->ret += state.instr_len;
Signature · 1 line
2.7.4