Commit 92b41928 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-4.20-rc4' of... 

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

Pull RISC-V fixes from Palmer Dabbelt:
 "This week is a bit bigger than I expected. That's my fault, as I
  missed a few patches while I was at Plumbers last week. We have:

   - A fix to a quite embarassing issue where raw_copy_to_user() was
     implemented with asm_copy_from_user() (and vice versa).

   - Improvements to our makefile to allow flat binaries to be
     generated.

   - A build fix that predeclares "struct module" at the top of
     <asm/module.h>, which triggers warnings later in that header.

   - The addition of our own <uapi/asm/unistd> header, which is
     necessary to align our stat ABI on 32-bit systems.

   - A fix to avoid printing a warning when the S or U bits are set in
     print_isa().

  I already have one patch in the queue for next week"

* tag 'riscv-for-linus-4.20-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
  RISC-V: recognize S/U mode bits in print_isa
  riscv: add asm/unistd.h UAPI header
  riscv: fix warning in arch/riscv/include/asm/module.h
  RISC-V: Build flat and compressed kernel images
  RISC-V: Fix raw_copy_{to,from}_user()
parents c8ce94b8 5d8f81ba

arch/riscv/Makefile

+14 −1
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ KBUILD_CFLAGS += $(call cc-option,-mstrict-align) 
# arch specific predefines for sparse

CHECKFLAGS += -D__riscv -D__riscv_xlen=$(BITS)



# Default target when executing plain make

boot		:= arch/riscv/boot

KBUILD_IMAGE	:= $(boot)/Image.gz



head-y := arch/riscv/kernel/head.o



core-y += arch/riscv/kernel/ arch/riscv/mm/
@@ -81,4 +85,13 @@ PHONY += vdso_install 
vdso_install:

	$(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso $@



all: vmlinux
 
all: Image.gz



Image: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



Image.%: Image

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



zinstall install:

	$(Q)$(MAKE) $(build)=$(boot) $@

arch/riscv/boot/.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Image

Image.gz

arch/riscv/boot/Makefile

0 → 100644
+33 −0
Original line number Diff line number Diff line 
#

# arch/riscv/boot/Makefile

#

# This file is included by the global makefile so that you can add your own

# architecture-specific flags and dependencies.

#

# This file is subject to the terms and conditions of the GNU General Public

# License.  See the file "COPYING" in the main directory of this archive

# for more details.

#

# Copyright (C) 2018, Anup Patel.

# Author: Anup Patel <anup@brainfault.org>

#

# Based on the ia64 and arm64 boot/Makefile.

#



OBJCOPYFLAGS_Image :=-O binary -R .note -R .note.gnu.build-id -R .comment -S



targets := Image



$(obj)/Image: vmlinux FORCE

	$(call if_changed,objcopy)



$(obj)/Image.gz: $(obj)/Image FORCE

	$(call if_changed,gzip)



install:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(obj)/Image System.map "$(INSTALL_PATH)"



zinstall:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(obj)/Image.gz System.map "$(INSTALL_PATH)"

arch/riscv/boot/install.sh

0 → 100644
+60 −0
Original line number Diff line number Diff line 
#!/bin/sh

#

# arch/riscv/boot/install.sh

#

# This file is subject to the terms and conditions of the GNU General Public

# License.  See the file "COPYING" in the main directory of this archive

# for more details.

#

# Copyright (C) 1995 by Linus Torvalds

#

# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin

# Adapted from code in arch/i386/boot/install.sh by Russell King

#

# "make install" script for the RISC-V Linux port

#

# Arguments:

#   $1 - kernel version

#   $2 - kernel image file

#   $3 - kernel map file

#   $4 - default install path (blank if root directory)

#



verify () {

	if [ ! -f "$1" ]; then

		echo ""                                                   1>&2

		echo " *** Missing file: $1"                              1>&2

		echo ' *** You need to run "make" before "make install".' 1>&2

		echo ""                                                   1>&2

		exit 1

	fi

}



# Make sure the files actually exist

verify "$2"

verify "$3"



# User may have a custom install script

if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi

if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi



if [ "$(basename $2)" = "Image.gz" ]; then

# Compressed install

  echo "Installing compressed kernel"

  base=vmlinuz

else

# Normal install

  echo "Installing normal kernel"

  base=vmlinux

fi



if [ -f $4/$base-$1 ]; then

  mv $4/$base-$1 $4/$base-$1.old

fi

cat $2 > $4/$base-$1



# Install system map file

if [ -f $4/System.map-$1 ]; then

  mv $4/System.map-$1 $4/System.map-$1.old

fi

cp $3 $4/System.map-$1

arch/riscv/include/asm/module.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#define MODULE_ARCH_VERMAGIC    "riscv"



struct module;

u64 module_emit_got_entry(struct module *mod, u64 val);

u64 module_emit_plt_entry(struct module *mod, u64 val);

CRA Git | Maintained and supported by SUSTech CRA and CCSE