tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'riscv-for-linus-4.16-rc3-riscv_cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux

Pull RISC-V cleanups from Palmer Dabbelt:
"This contains a handful of small cleanups.

The only functional change is that IRQs are now enabled during
exception handling, which was found when some warnings triggered with
`CONFIG_DEBUG_ATOMIC_SLEEP=y`.

The remaining fixes should have no functional change: `sbi_save()` has
been renamed to `parse_dtb()` reflect what it actually does, and a
handful of unused Kconfig entries have been removed"

* tag 'riscv-for-linus-4.16-rc3-riscv_cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
Rename sbi_save to parse_dtb to improve code readability
RISC-V: Enable IRQ during exception handling
riscv: Remove ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select
riscv: kconfig: Remove RISCV_IRQ_INTC select
riscv: Remove ARCH_WANT_OPTIONAL_GPIOLIB select

Linus Torvalds 24180a60 238ca357

+5 -7
-3
arch/riscv/Kconfig
··· 8 8 select OF 9 9 select OF_EARLY_FLATTREE 10 10 select OF_IRQ 11 - select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE 12 11 select ARCH_WANT_FRAME_POINTERS 13 12 select CLONE_BACKWARDS 14 13 select COMMON_CLK ··· 19 20 select GENERIC_STRNLEN_USER 20 21 select GENERIC_SMP_IDLE_THREAD 21 22 select GENERIC_ATOMIC64 if !64BIT || !RISCV_ISA_A 22 - select ARCH_WANT_OPTIONAL_GPIOLIB 23 23 select HAVE_MEMBLOCK 24 24 select HAVE_MEMBLOCK_NODE_MAP 25 25 select HAVE_DMA_API_DEBUG ··· 32 34 select HAVE_ARCH_TRACEHOOK 33 35 select MODULES_USE_ELF_RELA if MODULES 34 36 select THREAD_INFO_IN_TASK 35 - select RISCV_IRQ_INTC 36 37 select RISCV_TIMER 37 38 38 39 config MMU
+3 -2
arch/riscv/kernel/entry.S
··· 172 172 move a1, sp /* pt_regs */ 173 173 tail do_IRQ 174 174 1: 175 + /* Exceptions run with interrupts enabled */ 176 + csrs sstatus, SR_SIE 177 + 175 178 /* Handle syscalls */ 176 179 li t0, EXC_SYSCALL 177 180 beq s4, t0, handle_syscall ··· 201 198 */ 202 199 addi s2, s2, 0x4 203 200 REG_S s2, PT_SEPC(sp) 204 - /* System calls run with interrupts enabled */ 205 - csrs sstatus, SR_SIE 206 201 /* Trace syscalls, but only if requested by the user. */ 207 202 REG_L t0, TASK_TI_FLAGS(tp) 208 203 andi t0, t0, _TIF_SYSCALL_TRACE
+1 -1
arch/riscv/kernel/head.S
··· 64 64 /* Start the kernel */ 65 65 mv a0, s0 66 66 mv a1, s1 67 - call sbi_save 67 + call parse_dtb 68 68 tail start_kernel 69 69 70 70 relocate:
+1 -1
arch/riscv/kernel/setup.c
··· 144 144 #endif 145 145 } 146 146 147 - void __init sbi_save(unsigned int hartid, void *dtb) 147 + void __init parse_dtb(unsigned int hartid, void *dtb) 148 148 { 149 149 early_init_dt_scan(__va(dtb)); 150 150 }