Commit 444fe991 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-5.1-rc6' of... 

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

Pull RISC-V fixes from Palmer Dabbelt:
 "This contains an assortment of RISC-V-related fixups that we found
  after rc4. They're all really unrelated:

   - The addition of a 32-bit defconfig, to emphasize testing the 32-bit
     port.

   - A device tree bindings patch, which is pre-work for some patches
     that target 5.2.

   - A fix to support booting on systems with more physical memory than
     the maximum supported by the kernel"

* tag 'riscv-for-linus-5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
  RISC-V: Fix Maximum Physical Memory 2GiB option for 64bit systems
  dt-bindings: clock: sifive: add FU540-C000 PRCI clock constants
  RISC-V: Add separate defconfig for 32bit systems
parents b5de3c50 f05badde

arch/riscv/configs/rv32_defconfig

0 → 100644
+84 −0
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CGROUPS=y

CONFIG_CGROUP_SCHED=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_CGROUP_BPF=y

CONFIG_NAMESPACES=y

CONFIG_USER_NS=y

CONFIG_CHECKPOINT_RESTORE=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_BPF_SYSCALL=y

CONFIG_ARCH_RV32I=y

CONFIG_SMP=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_PNP=y

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

CONFIG_BLK_DEV_SD=y

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

CONFIG_MICROSEMI_PHY=y

CONFIG_INPUT_MOUSEDEV=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_EARLYCON_RISCV_SBI=y

CONFIG_HVC_RISCV_SBI=y

# CONFIG_PTP_1588_CLOCK is not set

CONFIG_DRM=y

CONFIG_DRM_RADEON=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_USB=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_XHCI_PLATFORM=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_PLATFORM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_UAS=y

CONFIG_VIRTIO_MMIO=y

CONFIG_SIFIVE_PLIC=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_AUTOFS4_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_NFS_FS=y

CONFIG_NFS_V4=y

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/mm/init.c

+8 −0
Original line number Diff line number Diff line
@@ -121,6 +121,14 @@ void __init setup_bootmem(void) 
			 */

			memblock_reserve(reg->base, vmlinux_end - reg->base);

			mem_size = min(reg->size, (phys_addr_t)-PAGE_OFFSET);



			/*

			 * Remove memblock from the end of usable area to the

			 * end of region

			 */

			if (reg->base + mem_size < end)

				memblock_remove(reg->base + mem_size,

						end - reg->base - mem_size);

		}

	}

	BUG_ON(mem_size == 0);

include/dt-bindings/clock/sifive-fu540-prci.h

0 → 100644
+18 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (C) 2018-2019 SiFive, Inc.

 * Wesley Terpstra

 * Paul Walmsley

 */



#ifndef __DT_BINDINGS_CLOCK_SIFIVE_FU540_PRCI_H

#define __DT_BINDINGS_CLOCK_SIFIVE_FU540_PRCI_H



/* Clock indexes for use by Device Tree data and the PRCI driver */



#define PRCI_CLK_COREPLL	       0

#define PRCI_CLK_DDRPLL		       1

#define PRCI_CLK_GEMGXLPLL	       2

#define PRCI_CLK_TLCLK		       3



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE