diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-19 15:40:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-19 15:40:51 -0700 |
| commit | 3c9e66568ad40dc17518fa00e2b28c3b450040d4 (patch) | |
| tree | ef9dd7f5b4aa9dcb7c1c0b6b34c5d706c1d94672 /arch/arc/include | |
| parent | 03fb3acae4be8a6b680ffedb220a8b6c07260b40 (diff) | |
| parent | 7915502377c54c9f58f6ac537bde0c2c342a6742 (diff) | |
| download | linux-3c9e66568ad40dc17518fa00e2b28c3b450040d4.tar.gz linux-3c9e66568ad40dc17518fa00e2b28c3b450040d4.tar.bz2 linux-3c9e66568ad40dc17518fa00e2b28c3b450040d4.zip | |
Merge tag 'arc-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
- fix recent DSP code regression on ARC700 platforms
- fix thinkos in ICCM/DCCM size checks
- USB regression fix
- other small fixes here and there
* tag 'arc-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: show_regs: avoid extra line of output
ARC: guard dsp early init against non ARCv2
ARC: [plat-eznps]: Restrict to CONFIG_ISA_ARCOMPACT
ARC: entry: comment
arc: remove #ifndef CONFIG_AS_CFI_SIGNAL_FRAME
arc: ptrace: hard-code "arc" instead of UTS_MACHINE
ARC: [plat-hsdk]: fix USB regression
ARC: Fix ICCM & DCCM runtime size checks
Diffstat (limited to 'arch/arc/include')
| -rw-r--r-- | arch/arc/include/asm/dsp-impl.h | 2 | ||||
| -rw-r--r-- | arch/arc/include/asm/entry-arcv2.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arc/include/asm/dsp-impl.h b/arch/arc/include/asm/dsp-impl.h index e1aa212ca6eb..cd5636dfeb6f 100644 --- a/arch/arc/include/asm/dsp-impl.h +++ b/arch/arc/include/asm/dsp-impl.h @@ -15,12 +15,14 @@ /* clobbers r5 register */ .macro DSP_EARLY_INIT +#ifdef CONFIG_ISA_ARCV2 lr r5, [ARC_AUX_DSP_BUILD] bmsk r5, r5, 7 breq r5, 0, 1f mov r5, DSP_CTRL_DISABLED_ALL sr r5, [ARC_AUX_DSP_CTRL] 1: +#endif .endm /* clobbers r10, r11 registers pair */ diff --git a/arch/arc/include/asm/entry-arcv2.h b/arch/arc/include/asm/entry-arcv2.h index ae0aa5323be1..0ff4c0610561 100644 --- a/arch/arc/include/asm/entry-arcv2.h +++ b/arch/arc/include/asm/entry-arcv2.h @@ -233,6 +233,8 @@ #ifdef CONFIG_ARC_IRQ_NO_AUTOSAVE __RESTORE_REGFILE_HARD + + ; SP points to PC/STAT32: hw restores them despite NO_AUTOSAVE add sp, sp, SZ_PT_REGS - 8 #else add sp, sp, PT_r0 |