Commit 74b13e7e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-5.0-rc5' of... 

Merge tag 'riscv-for-linus-5.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux

Pull RISC-V fixes from Palmer Dabbelt:
 "This contains a handful of mostly-independent patches:

   - make our port respect TIF_NEED_RESCHED, which fixes
     CONFIG_PREEMPT=y kernels

   - fix double-put of OF nodes

   - fix a misspelling of target in our Kconfig

   - generic PCIe is enabled in our defconfig

   - fix our SBI early console to properly handle line
     endings

   - fix max_low_pfn being counted in PFNs

   - a change to TASK_UNMAPPED_BASE to match what other
     arches do

  This has passed my standard 'boot Fedora' flow"

* tag 'riscv-for-linus-5.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
  riscv: Adjust mmap base address at a third of task size
  riscv: fixup max_low_pfn with PFN_DOWN.
  tty/serial: use uart_console_write in the RISC-V SBL early console
  RISC-V: defconfig: Add CRYPTO_DEV_VIRTIO=y
  RISC-V: defconfig: Enable Generic PCIE by default
  RISC-V: defconfig: Move CONFIG_PCI{,E_XILINX}
  RISC-V: Kconfig: fix spelling mistake "traget" -> "target"
  RISC-V: asm/page.h: fix spelling mistake "CONFIG_64BITS" -> "CONFIG_64BIT"
  RISC-V: fix bad use of of_node_put
  RISC-V: Add _TIF_NEED_RESCHED check for kernel thread when CONFIG_PREEMPT=y
parents c8864cb7 ae662eec

arch/riscv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ choice 
	prompt "Base ISA"

	default ARCH_RV64I

	help

	  This selects the base ISA that this kernel will traget and must match

	  This selects the base ISA that this kernel will target and must match

	  the target platform.



config ARCH_RV32I

arch/riscv/configs/defconfig

+5 −3
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_EXPERT=y

CONFIG_BPF_SYSCALL=y

CONFIG_SMP=y

CONFIG_PCI=y

CONFIG_PCIE_XILINX=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_NET=y
@@ -28,6 +26,10 @@ CONFIG_IP_PNP_DHCP=y 
CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

CONFIG_NETLINK_DIAG=y

CONFIG_PCI=y

CONFIG_PCIEPORTBUS=y

CONFIG_PCI_HOST_GENERIC=y

CONFIG_PCIE_XILINX=y

CONFIG_DEVTMPFS=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_VIRTIO_BLK=y
@@ -63,7 +65,6 @@ CONFIG_USB_STORAGE=y 
CONFIG_USB_UAS=y

CONFIG_VIRTIO_MMIO=y

CONFIG_SIFIVE_PLIC=y

CONFIG_RAS=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_AUTOFS4_FS=y
@@ -77,5 +78,6 @@ CONFIG_NFS_V4_1=y 
CONFIG_NFS_V4_2=y

CONFIG_ROOT_NFS=y

CONFIG_CRYPTO_USER_API_HASH=y

CONFIG_CRYPTO_DEV_VIRTIO=y

CONFIG_PRINTK_TIME=y

# CONFIG_RCU_TRACE is not set

arch/riscv/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ typedef struct page *pgtable_t; 
#define __pgd(x)	((pgd_t) { (x) })

#define __pgprot(x)	((pgprot_t) { (x) })



#ifdef CONFIG_64BITS

#ifdef CONFIG_64BIT

#define PTE_FMT "%016lx"

#else

#define PTE_FMT "%08lx"

arch/riscv/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * This decides where the kernel will search for a free chunk of vm

 * space during mmap's.

 */

#define TASK_UNMAPPED_BASE	PAGE_ALIGN(TASK_SIZE >> 1)

#define TASK_UNMAPPED_BASE	PAGE_ALIGN(TASK_SIZE / 3)



#define STACK_TOP		TASK_SIZE

#define STACK_TOP_MAX		STACK_TOP

arch/riscv/kernel/asm-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ void asm_offsets(void) 
	OFFSET(TASK_STACK, task_struct, stack);

	OFFSET(TASK_TI, task_struct, thread_info);

	OFFSET(TASK_TI_FLAGS, task_struct, thread_info.flags);

	OFFSET(TASK_TI_PREEMPT_COUNT, task_struct, thread_info.preempt_count);

	OFFSET(TASK_TI_KERNEL_SP, task_struct, thread_info.kernel_sp);

	OFFSET(TASK_TI_USER_SP, task_struct, thread_info.user_sp);

	OFFSET(TASK_TI_CPU, task_struct, thread_info.cpu);