Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf1fb158 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-4.15-rc8_cleanups' of... 

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

Pull RISC-V updates from Palmer Dabbelt:
 "This contains what I hope are the last RISC-V changes to go into 4.15.
  I know it's a bit last minute, but I think they're all fairly small
  changes:

   - SR_* constants have been renamed to match the latest ISA
     specification.

   - Some CONFIG_MMU #ifdef cruft has been removed. We've never
     supported !CONFIG_MMU.

   - __NR_riscv_flush_icache is now visible to userspace. We were hoping
     to avoid making this public in order to force userspace to call the
     vDSO entry, but it looks like QEMU's user-mode emulation doesn't
     want to emulate a vDSO. In order to allow glibc to fall back to a
     system call when the vDSO entry doesn't exist we're just

   - Our defconfig is no long empty. This is another one that just
     slipped through the cracks. The defconfig isn't perfect, but it's
     at least close to what users will want for the first RISC-V
     development board. Getting closer is kind of splitting hairs here:
     none of the RISC-V specific drivers are in yet, so it's not like
     things will boot out of the box.

  The only one that's strictly necessary is the __NR_riscv_flush_icache
  change, as I want that to be part of the public API starting from our
  first kernel so nobody has to worry about it. The others are nice to
  haves, but they seem sane for 4.15 to me"

* tag 'riscv-for-linus-4.15-rc8_cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux:
  riscv: rename SR_* constants to match the spec
  riscv: remove CONFIG_MMU ifdefs
  RISC-V: Make __NR_riscv_flush_icache visible to userspace
  RISC-V: Add a basic defconfig
parents 44cae9b2 1125203c

arch/riscv/configs/defconfig

+75 −0
Original line number Diff line number Diff line 
CONFIG_SMP=y

CONFIG_PCI=y

CONFIG_PCIE_XILINX=y

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_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_CHECKPOINT_RESTORE=y

CONFIG_BPF_SYSCALL=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_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_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_RAS=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_RCU_TRACE is not set

CONFIG_CRYPTO_USER_API_HASH=y

arch/riscv/include/asm/csr.h

+4 −4
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
#include <linux/const.h>



/* Status register flags */

#define SR_IE   _AC(0x00000002, UL) /* Interrupt Enable */

#define SR_PIE  _AC(0x00000020, UL) /* Previous IE */

#define SR_PS   _AC(0x00000100, UL) /* Previously Supervisor */

#define SR_SIE	_AC(0x00000002, UL) /* Supervisor Interrupt Enable */

#define SR_SPIE	_AC(0x00000020, UL) /* Previous Supervisor IE */

#define SR_SPP	_AC(0x00000100, UL) /* Previously Supervisor */

#define SR_SUM	_AC(0x00040000, UL) /* Supervisor may access User Memory */



#define SR_FS           _AC(0x00006000, UL) /* Floating-point Status */

arch/riscv/include/asm/io.h

+0 −4
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 


#include <linux/types.h>



#ifdef CONFIG_MMU



extern void __iomem *ioremap(phys_addr_t offset, unsigned long size);



/*
@@ -36,8 +34,6 @@ extern void __iomem *ioremap(phys_addr_t offset, unsigned long size); 


extern void iounmap(volatile void __iomem *addr);



#endif /* CONFIG_MMU */



/* Generic IO read/write.  These perform native-endian accesses. */

#define __raw_writeb __raw_writeb

static inline void __raw_writeb(u8 val, volatile void __iomem *addr)

arch/riscv/include/asm/irqflags.h

+5 −5
Original line number Diff line number Diff line
@@ -27,25 +27,25 @@ static inline unsigned long arch_local_save_flags(void) 
/* unconditionally enable interrupts */

static inline void arch_local_irq_enable(void)

{

	csr_set(sstatus, SR_IE);

	csr_set(sstatus, SR_SIE);

}



/* unconditionally disable interrupts */

static inline void arch_local_irq_disable(void)

{

	csr_clear(sstatus, SR_IE);

	csr_clear(sstatus, SR_SIE);

}



/* get status and disable interrupts */

static inline unsigned long arch_local_irq_save(void)

{

	return csr_read_clear(sstatus, SR_IE);

	return csr_read_clear(sstatus, SR_SIE);

}



/* test flags */

static inline int arch_irqs_disabled_flags(unsigned long flags)

{

	return !(flags & SR_IE);

	return !(flags & SR_SIE);

}



/* test hardware interrupt enable bit */
@@ -57,7 +57,7 @@ static inline int arch_irqs_disabled(void) 
/* set interrupt enabled status */

static inline void arch_local_irq_restore(unsigned long flags)

{

	csr_set(sstatus, flags & SR_IE);

	csr_set(sstatus, flags & SR_SIE);

}



#endif /* _ASM_RISCV_IRQFLAGS_H */

arch/riscv/include/asm/pgtable.h

+0 −4
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 


#ifndef __ASSEMBLY__



#ifdef CONFIG_MMU



/* Page Upper Directory not used in RISC-V */

#include <asm-generic/pgtable-nopud.h>

#include <asm/page.h>
@@ -413,8 +411,6 @@ static inline void pgtable_cache_init(void) 
	/* No page table caches to initialize */

}



#endif /* CONFIG_MMU */



#define VMALLOC_SIZE     (KERN_VIRT_SIZE >> 1)

#define VMALLOC_END      (PAGE_OFFSET - 1)

#define VMALLOC_START    (PAGE_OFFSET - VMALLOC_SIZE)