Commit 7e6582ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RISC-V fixes from Palmer Dabbelt:
 "This contains a handful of fixes that I would like to target for 5.6:

   - A pair of fixes to module loading, which we hope solve the last of
     the issues with module text being loaded too sparsely for our call
     relocations.

   - A Kconfig fix that disallows selecting memory models not supported
     by NOMMU.

   - A series of Kconfig updates to ease selecting the drivers necessary
     to run on QEMU's virt platform.

   - DTS updates for SiFive's HiFive Unleashed.

   - A fix to our seccomp support that avoids mangling restartable
     syscalls"

* tag 'riscv-for-linus-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: fix seccomp reject syscall code path
  riscv: dts: Add GPIO reboot method to HiFive Unleashed DTS file
  RISC-V: Select Goldfish RTC driver for QEMU virt machine
  RISC-V: Select SYSCON Reboot and Poweroff for QEMU virt machine
  RISC-V: Enable QEMU virt machine support in defconfigs
  RISC-V: Add kconfig option for QEMU virt machine
  riscv: Fix range looking for kernel image memblock
  riscv: Force flat memory model with no-mmu
  riscv: Change code model of module to medany to improve data accessing
  riscv: avoid the PIC offset of static percpu data in module beyond 2G limits
parents 611d61f9 af33d243

arch/riscv/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ config ARCH_FLATMEM_ENABLE 


config ARCH_SPARSEMEM_ENABLE

	def_bool y

	depends on MMU

	select SPARSEMEM_VMEMMAP_ENABLE



config ARCH_SELECT_MEMORY_MODEL

arch/riscv/Kconfig.socs

+24 −0
Original line number Diff line number Diff line
@@ -10,4 +10,28 @@ config SOC_SIFIVE 
	help

	  This enables support for SiFive SoC platform hardware.



config SOC_VIRT

       bool "QEMU Virt Machine"

       select VIRTIO_PCI

       select VIRTIO_BALLOON

       select VIRTIO_MMIO

       select VIRTIO_CONSOLE

       select VIRTIO_NET

       select NET_9P_VIRTIO

       select VIRTIO_BLK

       select SCSI_VIRTIO

       select DRM_VIRTIO_GPU

       select HW_RANDOM_VIRTIO

       select RPMSG_CHAR

       select RPMSG_VIRTIO

       select CRYPTO_DEV_VIRTIO

       select VIRTIO_INPUT

       select POWER_RESET_SYSCON

       select POWER_RESET_SYSCON_POWEROFF

       select GOLDFISH

       select RTC_DRV_GOLDFISH

       select SIFIVE_PLIC

       help

         This enables support for QEMU Virt Machine.



endmenu

arch/riscv/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -13,8 +13,10 @@ LDFLAGS_vmlinux := 
ifeq ($(CONFIG_DYNAMIC_FTRACE),y)

	LDFLAGS_vmlinux := --no-relax

endif

KBUILD_AFLAGS_MODULE += -fPIC

KBUILD_CFLAGS_MODULE += -fPIC



ifeq ($(CONFIG_64BIT)$(CONFIG_CMODEL_MEDLOW),yy)

KBUILD_CFLAGS_MODULE += -mcmodel=medany

endif



export BITS

ifeq ($(CONFIG_ARCH_RV64I),y)

arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/* Copyright (c) 2018-2019 SiFive, Inc */



#include "fu540-c000.dtsi"

#include <dt-bindings/gpio/gpio.h>



/* Clock frequency (in Hz) of the PCB crystal for rtcclk */

#define RTCCLK_FREQ		1000000
@@ -41,6 +42,10 @@ 
		clock-frequency = <RTCCLK_FREQ>;

		clock-output-names = "rtcclk";

	};

	gpio-restart {

		compatible = "gpio-restart";

		gpios = <&gpio 10 GPIO_ACTIVE_LOW>;

	};

};



&uart0 {

arch/riscv/configs/defconfig

+3 −14
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_EXPERT=y

CONFIG_BPF_SYSCALL=y

CONFIG_SOC_SIFIVE=y

CONFIG_SOC_VIRT=y

CONFIG_SMP=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y
@@ -30,7 +31,6 @@ CONFIG_IP_PNP_BOOTP=y 
CONFIG_IP_PNP_RARP=y

CONFIG_NETLINK_DIAG=y

CONFIG_NET_9P=y

CONFIG_NET_9P_VIRTIO=y

CONFIG_PCI=y

CONFIG_PCIEPORTBUS=y

CONFIG_PCI_HOST_GENERIC=y
@@ -38,15 +38,12 @@ CONFIG_PCIE_XILINX=y 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_VIRTIO_BLK=y

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=y

CONFIG_SCSI_VIRTIO=y

CONFIG_ATA=y

CONFIG_SATA_AHCI=y

CONFIG_SATA_AHCI_PLATFORM=y

CONFIG_NETDEVICES=y

CONFIG_VIRTIO_NET=y

CONFIG_MACB=y

CONFIG_E1000E=y

CONFIG_R8169=y
@@ -57,15 +54,13 @@ CONFIG_SERIAL_8250_CONSOLE=y 
CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_EARLYCON_RISCV_SBI=y

CONFIG_HVC_RISCV_SBI=y

CONFIG_VIRTIO_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_VIRTIO=y

CONFIG_SPI=y

CONFIG_SPI_SIFIVE=y

# CONFIG_PTP_1588_CLOCK is not set

CONFIG_POWER_RESET=y

CONFIG_DRM=y

CONFIG_DRM_RADEON=y

CONFIG_DRM_VIRTIO_GPU=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_USB=y

CONFIG_USB_XHCI_HCD=y
@@ -78,12 +73,7 @@ CONFIG_USB_STORAGE=y 
CONFIG_USB_UAS=y

CONFIG_MMC=y

CONFIG_MMC_SPI=y

CONFIG_VIRTIO_PCI=y

CONFIG_VIRTIO_BALLOON=y

CONFIG_VIRTIO_INPUT=y

CONFIG_VIRTIO_MMIO=y

CONFIG_RPMSG_CHAR=y

CONFIG_RPMSG_VIRTIO=y

CONFIG_RTC_CLASS=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_AUTOFS4_FS=y
@@ -98,7 +88,6 @@ CONFIG_NFS_V4_2=y 
CONFIG_ROOT_NFS=y

CONFIG_9P_FS=y

CONFIG_CRYPTO_USER_API_HASH=y

CONFIG_CRYPTO_DEV_VIRTIO=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_PAGEALLOC=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE