Commit 823846c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RISC-V fixes from Palmer Dabbelt:
 "Sorry for the last minute patches, but a few things fell through the
  cracks recently. I was on the fence about sending a late pull request
  just for the M-mode fixes, as we don't really have any users, but the
  last patch fixes the build for Fedora which I consider pretty
  important.

  Given that the M-mode fixes should be very low risk, I figured it's
  worth sending them along as well.

  Thhis passes my standard 'boot in QEMU' test"

* tag 'riscv-for-linus-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  RISC-V: Move all address space definition macros to one place
  RISC-V: Only select essential drivers for SOC_VIRT config
  riscv: fix the IPI missing issue in nommu mode
  riscv: uaccess should be used in nommu mode
parents bb36d37e 2191b4f2

arch/riscv/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ config RISCV 
	select PCI_DOMAINS_GENERIC if PCI

	select PCI_MSI if PCI

	select RISCV_TIMER

	select UACCESS_MEMCPY if !MMU

	select GENERIC_IRQ_MULTI_HANDLER

	select GENERIC_ARCH_TOPOLOGY if SMP

	select ARCH_HAS_PTE_SPECIAL

arch/riscv/Kconfig.socs

+0 −14
Original line number Diff line number Diff line
@@ -12,20 +12,6 @@ config SOC_SIFIVE 


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

arch/riscv/configs/defconfig

+15 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 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,12 +39,15 @@ 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
@@ -54,13 +58,16 @@ 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
@@ -74,6 +81,12 @@ CONFIG_USB_UAS=y 
CONFIG_MMC=y

CONFIG_MMC_SPI=y

CONFIG_RTC_CLASS=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_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_AUTOFS4_FS=y
@@ -88,16 +101,17 @@ 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

CONFIG_SCHED_STACK_END_CHECK=y

CONFIG_DEBUG_VM=y

CONFIG_DEBUG_VM_PGFLAGS=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_DEBUG_PER_CPU_MAPS=y

CONFIG_SOFTLOCKUP_DETECTOR=y

CONFIG_WQ_WATCHDOG=y

CONFIG_SCHED_STACK_END_CHECK=y

CONFIG_DEBUG_TIMEKEEPING=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_SPINLOCK=y

arch/riscv/configs/rv32_defconfig

+15 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 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,12 +39,15 @@ 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
@@ -54,11 +58,14 @@ 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_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
@@ -70,6 +77,12 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y 
CONFIG_USB_STORAGE=y

CONFIG_USB_UAS=y

CONFIG_RTC_CLASS=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_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_AUTOFS4_FS=y
@@ -84,16 +97,17 @@ 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

CONFIG_SCHED_STACK_END_CHECK=y

CONFIG_DEBUG_VM=y

CONFIG_DEBUG_VM_PGFLAGS=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_DEBUG_PER_CPU_MAPS=y

CONFIG_SOFTLOCKUP_DETECTOR=y

CONFIG_WQ_WATCHDOG=y

CONFIG_SCHED_STACK_END_CHECK=y

CONFIG_DEBUG_TIMEKEEPING=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_SPINLOCK=y

arch/riscv/include/asm/clint.h

+4 −4
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ static inline void clint_send_ipi_single(unsigned long hartid) 
	writel(1, clint_ipi_base + hartid);

}



static inline void clint_send_ipi_mask(const struct cpumask *hartid_mask)

static inline void clint_send_ipi_mask(const struct cpumask *mask)

{

	int hartid;

	int cpu;



	for_each_cpu(hartid, hartid_mask)

		clint_send_ipi_single(hartid);

	for_each_cpu(cpu, mask)

		clint_send_ipi_single(cpuid_to_hartid_map(cpu));

}



static inline void clint_clear_ipi(unsigned long hartid)

CRA Git | Maintained and supported by SUSTech CRA and CCSE