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

Linus Torvalds committed 7 years ago

Commit 74b13e72 parents c8864cb ae662ee10 files · +38 −19Browse files

Unified · Split

10 files

arch/riscv/Kconfig +1 −1
arch/riscv/configs/defconfig +5 −3
arch/riscv/include/asm/page.h +1 −1
arch/riscv/include/asm/processor.h +1 −1
arch/riscv/kernel/asm-offsets.c +1 −0
arch/riscv/kernel/entry.S +17 −1
arch/riscv/kernel/setup.c +1 −1
arch/riscv/kernel/smpboot.c +1 −5
arch/riscv/mm/init.c +2 −1
drivers/tty/serial/earlycon-riscv-sbi.c +8 −5

arch/riscv/Kconfig+1−1

@@ -103,7 +103,7 @@ choice · 102 unmodified lines
103	prompt "Base ISA"	103	prompt "Base ISA"
104	default ARCH_RV64I	104	default ARCH_RV64I
105	help	105	help
106	This selects the base ISA that this kernel will traget and must match	106	This selects the base ISA that this kernel will target and must match
107	the target platform.	107	the target platform.
108		108
109	config ARCH_RV32I	109	config ARCH_RV32I

arch/riscv/configs/defconfig+5−3

 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
 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
 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
 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

@@ -80,7 +80,7 @@ typedef struct page *pgtable_t; · 79 unmodified lines
80	#define __pgd(x) ((pgd_t) { (x) })	80	#define __pgd(x) ((pgd_t) { (x) })
81	#define __pgprot(x) ((pgprot_t) { (x) })	81	#define __pgprot(x) ((pgprot_t) { (x) })
82		82
83	#ifdef CONFIG_64BITS	83	#ifdef CONFIG_64BIT
84	#define PTE_FMT "%016lx"	84	#define PTE_FMT "%016lx"
85	#else	85	#else
86	#define PTE_FMT "%08lx"	86	#define PTE_FMT "%08lx"

arch/riscv/include/asm/processor.h+1−1

@@ -22,7 +22,7 @@ · 21 unmodified lines
22	* This decides where the kernel will search for a free chunk of vm	22	* This decides where the kernel will search for a free chunk of vm
23	* space during mmap's.	23	* space during mmap's.
24	*/	24	*/
25	#define TASK_UNMAPPED_BASE PAGE_ALIGN(TASK_SIZE >> 1)	25	#define TASK_UNMAPPED_BASE PAGE_ALIGN(TASK_SIZE / 3)
26		26
27	#define STACK_TOP TASK_SIZE	27	#define STACK_TOP TASK_SIZE
28	#define STACK_TOP_MAX STACK_TOP	28	#define STACK_TOP_MAX STACK_TOP

arch/riscv/kernel/asm-offsets.c+1−0

@@ -39,6 +39,7 @@ void asm_offsets(void) · 38 unmodified lines
39	OFFSET(TASK_STACK, task_struct, stack);	39	OFFSET(TASK_STACK, task_struct, stack);
40	OFFSET(TASK_TI, task_struct, thread_info);	40	OFFSET(TASK_TI, task_struct, thread_info);
41	OFFSET(TASK_TI_FLAGS, task_struct, thread_info.flags);	41	OFFSET(TASK_TI_FLAGS, task_struct, thread_info.flags);
		42	OFFSET(TASK_TI_PREEMPT_COUNT, task_struct, thread_info.preempt_count);
42	OFFSET(TASK_TI_KERNEL_SP, task_struct, thread_info.kernel_sp);	43	OFFSET(TASK_TI_KERNEL_SP, task_struct, thread_info.kernel_sp);
43	OFFSET(TASK_TI_USER_SP, task_struct, thread_info.user_sp);	44	OFFSET(TASK_TI_USER_SP, task_struct, thread_info.user_sp);
44	OFFSET(TASK_TI_CPU, task_struct, thread_info.cpu);	45	OFFSET(TASK_TI_CPU, task_struct, thread_info.cpu);

arch/riscv/kernel/entry.S+17−1

 	REG_L x2,  PT_SP(sp)
 	.endm
+#if !IS_ENABLED(CONFIG_PREEMPT)
+.set resume_kernel, restore_all
+#endif
 ENTRY(handle_exception)
 	SAVE_ALL
 	REG_L s0, PT_SSTATUS(sp)
 	csrc sstatus, SR_SIE
 	andi s0, s0, SR_SPP
-	bnez s0, restore_all
+	bnez s0, resume_kernel
 resume_userspace:
 	/* Interrupts must be disabled here so flags are checked atomically */
 	RESTORE_ALL
 	sret
+#if IS_ENABLED(CONFIG_PREEMPT)
+resume_kernel:
+	REG_L s0, TASK_TI_PREEMPT_COUNT(tp)
+	bnez s0, restore_all
+need_resched:
+	REG_L s0, TASK_TI_FLAGS(tp)
+	andi s0, s0, _TIF_NEED_RESCHED
+	beqz s0, restore_all
+	call preempt_schedule_irq
+	j need_resched
+#endif
 work_pending:
 	/* Enter slow path for supplementary processing */
 	la ra, ret_from_exception

arch/riscv/kernel/setup.c+1−1

@@ -181,7 +181,7 @@ static void __init setup_bootmem(void) · 180 unmodified lines
181	BUG_ON(mem_size == 0);	181	BUG_ON(mem_size == 0);
182		182
183	set_max_mapnr(PFN_DOWN(mem_size));	183	set_max_mapnr(PFN_DOWN(mem_size));
184	max_low_pfn = memblock_end_of_DRAM();	184	max_low_pfn = PFN_DOWN(memblock_end_of_DRAM());
185		185
186	#ifdef CONFIG_BLK_DEV_INITRD	186	#ifdef CONFIG_BLK_DEV_INITRD
187	setup_initrd();	187	setup_initrd();

arch/riscv/kernel/smpboot.c+1−5

 	while ((dn = of_find_node_by_type(dn, "cpu"))) {
 		hart = riscv_of_processor_hartid(dn);
-		if (hart < 0) {
+		if (hart < 0)
-			of_node_put(dn);
 			continue;
-		}
 		if (hart == cpuid_to_hartid_map(0)) {
 			BUG_ON(found_boot_cpu);
 			found_boot_cpu = 1;
-			of_node_put(dn);
 			continue;
 		}
 		set_cpu_possible(cpuid, true);
 		set_cpu_present(cpuid, true);
 		cpuid++;
-		of_node_put(dn);
 	}
 	BUG_ON(!found_boot_cpu);

arch/riscv/mm/init.c+2−1

@@ -28,7 +28,8 @@ static void __init zone_sizes_init(void) · 27 unmodified lines
28	unsigned long max_zone_pfns[MAX_NR_ZONES] = { 0, };	28	unsigned long max_zone_pfns[MAX_NR_ZONES] = { 0, };
29		29
30	#ifdef CONFIG_ZONE_DMA32	30	#ifdef CONFIG_ZONE_DMA32
31	max_zone_pfns[ZONE_DMA32] = PFN_DOWN(min(4UL * SZ_1G, max_low_pfn));	31	max_zone_pfns[ZONE_DMA32] = PFN_DOWN(min(4UL * SZ_1G,
		32	(unsigned long) PFN_PHYS(max_low_pfn)));
32	#endif	33	#endif
33	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;	34	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
34		35

drivers/tty/serial/earlycon-riscv-sbi.c+8−5

 #include <linux/serial_core.h>
 #include <asm/sbi.h>
-static void sbi_console_write(struct console *con,
+static void sbi_putc(struct uart_port *port, int c)
-			      const char *s, unsigned int n)
 {
-	int i;
+	sbi_console_putchar(c);
+}
-	for (i = 0; i < n; ++i)
+static void sbi_console_write(struct console *con,
-		sbi_console_putchar(s[i]);
+			      const char *s, unsigned n)
+{
+	struct earlycon_device *dev = con->data;
+	uart_console_write(&dev->port, s, n, sbi_putc);
 }
 static int __init early_sbi_setup(struct earlycon_device *device,