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-5.15-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

Pull more RISC-V updates from Palmer Dabbelt:

- A pair of defconfig additions, for NVMe and the EFI filesystem
localization options.

- A larger address space for stack randomization.

- A cleanup to our install rules.

- A DTS update for the Microchip Icicle board, to fix the serial
console.

- Support for build-time table sorting, which allows us to have
__ex_table read-only.

* tag 'riscv-for-linus-5.15-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
riscv: Move EXCEPTION_TABLE to RO_DATA segment
riscv: Enable BUILDTIME_TABLE_SORT
riscv: dts: microchip: mpfs-icicle: Fix serial console
riscv: move the (z)install rules to arch/riscv/Makefile
riscv: Improve stack randomisation on RV64
riscv: defconfig: enable NLS_CODEPAGE_437, NLS_ISO8859_1
riscv: defconfig: enable BLK_DEV_NVME

Linus Torvalds b79bd0d5 4e1c7544

+22 -15
+1 -1
Documentation/features/vm/ELF-ASLR/arch-support.txt
··· 22 22 | openrisc: | TODO | 23 23 | parisc: | ok | 24 24 | powerpc: | ok | 25 - | riscv: | TODO | 25 + | riscv: | ok | 26 26 | s390: | ok | 27 27 | sh: | TODO | 28 28 | sparc: | TODO |
+1
arch/riscv/Kconfig
··· 41 41 select ARCH_WANT_FRAME_POINTERS 42 42 select ARCH_WANT_HUGE_PMD_SHARE if 64BIT 43 43 select BINFMT_FLAT_NO_DATA_START_OFFSET if !MMU 44 + select BUILDTIME_TABLE_SORT if MMU 44 45 select CLONE_BACKWARDS 45 46 select CLINT_TIMER if !MMU 46 47 select COMMON_CLK
+5 -2
arch/riscv/Makefile
··· 132 132 Image.%: Image 133 133 $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ 134 134 135 - zinstall install: 136 - $(Q)$(MAKE) $(build)=$(boot) $@ 135 + install: install-image = Image 136 + zinstall: install-image = Image.gz 137 + install zinstall: 138 + $(CONFIG_SHELL) $(srctree)/$(boot)/install.sh $(KERNELRELEASE) \ 139 + $(boot)/$(install-image) System.map "$(INSTALL_PATH)" 137 140 138 141 archclean: 139 142 $(Q)$(MAKE) $(clean)=$(boot)
-8
arch/riscv/boot/Makefile
··· 58 58 59 59 $(obj)/loader.bin: $(obj)/loader FORCE 60 60 $(call if_changed,objcopy) 61 - 62 - install: 63 - $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ 64 - $(obj)/Image System.map "$(INSTALL_PATH)" 65 - 66 - zinstall: 67 - $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ 68 - $(obj)/Image.gz System.map "$(INSTALL_PATH)"
+5 -1
arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
··· 16 16 17 17 aliases { 18 18 ethernet0 = &emac1; 19 + serial0 = &serial0; 20 + serial1 = &serial1; 21 + serial2 = &serial2; 22 + serial3 = &serial3; 19 23 }; 20 24 21 25 chosen { 22 - stdout-path = &serial0; 26 + stdout-path = "serial0:115200n8"; 23 27 }; 24 28 25 29 cpus {
+4
arch/riscv/configs/defconfig
··· 39 39 CONFIG_PCIEPORTBUS=y 40 40 CONFIG_PCI_HOST_GENERIC=y 41 41 CONFIG_PCIE_XILINX=y 42 + CONFIG_PCIE_FU740=y 42 43 CONFIG_DEVTMPFS=y 43 44 CONFIG_DEVTMPFS_MOUNT=y 44 45 CONFIG_BLK_DEV_LOOP=y 45 46 CONFIG_VIRTIO_BLK=y 47 + CONFIG_BLK_DEV_NVME=m 46 48 CONFIG_BLK_DEV_SD=y 47 49 CONFIG_BLK_DEV_SR=y 48 50 CONFIG_SCSI_VIRTIO=y ··· 110 108 CONFIG_NFS_V4_2=y 111 109 CONFIG_ROOT_NFS=y 112 110 CONFIG_9P_FS=y 111 + CONFIG_NLS_CODEPAGE_437=y 112 + CONFIG_NLS_ISO8859_1=m 113 113 CONFIG_CRYPTO_USER_API_HASH=y 114 114 CONFIG_CRYPTO_DEV_VIRTIO=y 115 115 CONFIG_PRINTK_TIME=y
+3
arch/riscv/include/asm/elf.h
··· 42 42 */ 43 43 #define ELF_ET_DYN_BASE ((TASK_SIZE / 3) * 2) 44 44 45 + #ifdef CONFIG_64BIT 46 + #define STACK_RND_MASK (0x3ffff >> (PAGE_SHIFT - 12)) 47 + #endif 45 48 /* 46 49 * This yields a mask that user programs can use to figure out what 47 50 * instruction set this CPU supports. This could be done in user space,
-1
arch/riscv/kernel/vmlinux-xip.lds.S
··· 121 121 } 122 122 123 123 BSS_SECTION(PAGE_SIZE, PAGE_SIZE, 0) 124 - EXCEPTION_TABLE(0x10) 125 124 126 125 .rel.dyn : AT(ADDR(.rel.dyn) - LOAD_OFFSET) { 127 126 *(.rel.dyn*)
+2 -2
arch/riscv/kernel/vmlinux.lds.S
··· 4 4 * Copyright (C) 2017 SiFive 5 5 */ 6 6 7 + #define RO_EXCEPTION_TABLE_ALIGN 16 8 + 7 9 #ifdef CONFIG_XIP_KERNEL 8 10 #include "vmlinux-xip.lds.S" 9 11 #else ··· 113 111 .srodata : { 114 112 *(.srodata*) 115 113 } 116 - 117 - EXCEPTION_TABLE(0x10) 118 114 119 115 . = ALIGN(SECTION_ALIGN); 120 116 _data = .;
+1
scripts/sorttable.c
··· 349 349 case EM_ARM: 350 350 case EM_MICROBLAZE: 351 351 case EM_MIPS: 352 + case EM_RISCV: 352 353 case EM_XTENSA: 353 354 break; 354 355 default: