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

Commit 786b71f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nds32-for-linus-4.17-fixes' of... 

Merge tag 'nds32-for-linus-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux

Pull nds32 fixes from Greentime Hu:
 "Bug fixes and build error fixes for nds32"

* tag 'nds32-for-linus-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux:
  nds32: Fix compiler warning, Wstringop-overflow, in vdso.c
  nds32: Disable local irq before calling cpu_dcache_wb_page in copy_user_highpage
  nds32: Flush the cache of the page at vmaddr instead of kaddr in flush_anon_page
  nds32: Correct flush_dcache_page function
  nds32: Fix the unaligned access handler
  nds32: Renaming the file for unaligned access
  nds32: To fix a cache inconsistency issue by setting correct cacheability of NTC
  nds32: To refine readability of INT_MASK_INITAIAL_VAL
  nds32: Fix the virtual address may map too much range by tlbop issue.
  nds32: Fix the allmodconfig build. To make sure CONFIG_CPU_LITTLE_ENDIAN is default y
  nds32: Fix build failed because arch_trace_hardirqs_off is changed to trace_hardirqs_off.
  nds32: Fix the unknown type u8 issue.
  nds32: Fix the symbols undefined issue by exporting them.
  nds32: Fix xfs_buf built failed by export invalidate_kernel_vmap_range and flush_kernel_vmap_range
  nds32: Fix drivers/gpu/drm/udl/udl_fb.c building error by defining PAGE_SHARED
  nds32: Fix building error of crypto/xor.c by adding xor.h
  nds32: Fix building error when CONFIG_FREEZE is enabled.
  nds32: lib: To use generic lib instead of libgcc to prevent the symbol undefined issue.
parents b04e2177 a30e7d1e

arch/nds32/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,12 @@ config NDS32 
	select CLKSRC_MMIO

	select CLONE_BACKWARDS

	select COMMON_CLK

	select GENERIC_ASHLDI3

	select GENERIC_ASHRDI3

	select GENERIC_LSHRDI3

	select GENERIC_CMPDI2

	select GENERIC_MULDI3

	select GENERIC_UCMPDI2

	select GENERIC_ATOMIC64

	select GENERIC_CPU_DEVICES

	select GENERIC_CLOCKEVENTS
@@ -82,6 +88,7 @@ endmenu 


menu "Kernel Features"

source "kernel/Kconfig.preempt"

source "kernel/Kconfig.freezer"

source "mm/Kconfig"

source "kernel/Kconfig.hz"

endmenu

arch/nds32/Kconfig.cpu

+3 −2
Original line number Diff line number Diff line 
comment "Processor Features"



config CPU_BIG_ENDIAN

	bool "Big endian"

	def_bool !CPU_LITTLE_ENDIAN



config CPU_LITTLE_ENDIAN

        def_bool !CPU_BIG_ENDIAN

	bool "Little endian"

	default y



config HWZOL

	bool "hardware zero overhead loop support"

arch/nds32/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ export TEXTADDR 
# If we have a machine-specific directory, then include it in the build.

core-y				+= arch/nds32/kernel/ arch/nds32/mm/

libs-y				+= arch/nds32/lib/

LIBGCC_PATH     		:= \

  $(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name)

libs-y				+= $(LIBGCC_PATH)



ifneq '$(CONFIG_NDS32_BUILTIN_DTB)' '""'

BUILTIN_DTB := y
@@ -35,8 +32,12 @@ endif 


ifdef CONFIG_CPU_LITTLE_ENDIAN

KBUILD_CFLAGS   += $(call cc-option, -EL)

KBUILD_AFLAGS   += $(call cc-option, -EL)

LDFLAGS         += $(call cc-option, -EL)

else

KBUILD_CFLAGS   += $(call cc-option, -EB)

KBUILD_AFLAGS   += $(call cc-option, -EB)

LDFLAGS         += $(call cc-option, -EB)

endif



boot := arch/nds32/boot

arch/nds32/include/asm/Kbuild

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ generic-y += dma.h 
generic-y += emergency-restart.h

generic-y += errno.h

generic-y += exec.h

generic-y += export.h

generic-y += fb.h

generic-y += fcntl.h

generic-y += ftrace.h
@@ -49,6 +50,7 @@ generic-y += switch_to.h 
generic-y += timex.h

generic-y += topology.h

generic-y += trace_clock.h

generic-y += xor.h

generic-y += unaligned.h

generic-y += user.h

generic-y += vga.h

arch/nds32/include/asm/bitfield.h

+2 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ 
#define INT_MASK_mskIDIVZE	( 0x1  << INT_MASK_offIDIVZE )

#define INT_MASK_mskDSSIM	( 0x1  << INT_MASK_offDSSIM )



#define INT_MASK_INITAIAL_VAL	0x10003

#define INT_MASK_INITAIAL_VAL	(INT_MASK_mskDSSIM|INT_MASK_mskIDIVZE)



/******************************************************************************

 * ir15: INT_PEND (Interrupt Pending Register)
@@ -396,6 +396,7 @@ 
#define MMU_CTL_D8KB		1

#define MMU_CTL_UNA		( 0x1  << MMU_CTL_offUNA )



#define MMU_CTL_CACHEABLE_NON   0

#define MMU_CTL_CACHEABLE_WB	2

#define MMU_CTL_CACHEABLE_WT	3