Commit 293bccc5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* tag 'nds32-for-linus-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux:
  nds32: fix build error "relocation truncated to fit: R_NDS32_25_PCREL_RELA" when make allyesconfig
  nds32: To simplify the implementation of update_mmu_cache()
  nds32: Fix the dts pointer is not passed correctly issue.
  nds32: To implement these icache invalidation APIs since nds32 cores don't snoop data cache. This issue is found by Guo Ren. Based on the Documentation/core-api/cachetlb.rst and it says:
  nds32: Fix build error caused by configuration flag rename
  nds32: define __NDS32_E[BL]__ for sparse
parents bfa54a3a 98755389

arch/nds32/Kconfig

+6 −6
Original line number Diff line number Diff line
@@ -12,17 +12,17 @@ config NDS32 
	select CLONE_BACKWARDS

	select COMMON_CLK

	select DMA_NONCOHERENT_OPS

	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

	select GENERIC_IRQ_CHIP

	select GENERIC_IRQ_SHOW

	select GENERIC_LIB_ASHLDI3

	select GENERIC_LIB_ASHRDI3

	select GENERIC_LIB_CMPDI2

	select GENERIC_LIB_LSHRDI3

	select GENERIC_LIB_MULDI3

	select GENERIC_LIB_UCMPDI2

	select GENERIC_STRNCPY_FROM_USER

	select GENERIC_STRNLEN_USER

	select GENERIC_TIME_VSYSCALL

arch/nds32/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -34,10 +34,12 @@ ifdef CONFIG_CPU_LITTLE_ENDIAN 
KBUILD_CFLAGS   += $(call cc-option, -EL)

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

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

CHECKFLAGS      += -D__NDS32_EL__

else

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

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

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

CHECKFLAGS      += -D__NDS32_EB__

endif



boot := arch/nds32/boot

arch/nds32/include/asm/cacheflush.h

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


#define PG_dcache_dirty PG_arch_1



void flush_icache_range(unsigned long start, unsigned long end);

void flush_icache_page(struct vm_area_struct *vma, struct page *page);

#ifdef CONFIG_CPU_CACHE_ALIASING

void flush_cache_mm(struct mm_struct *mm);

void flush_cache_dup_mm(struct mm_struct *mm);
@@ -34,13 +36,16 @@ void flush_anon_page(struct vm_area_struct *vma, 
void flush_kernel_dcache_page(struct page *page);

void flush_kernel_vmap_range(void *addr, int size);

void invalidate_kernel_vmap_range(void *addr, int size);

void flush_icache_range(unsigned long start, unsigned long end);

void flush_icache_page(struct vm_area_struct *vma, struct page *page);

#define flush_dcache_mmap_lock(mapping)   xa_lock_irq(&(mapping)->i_pages)

#define flush_dcache_mmap_unlock(mapping) xa_unlock_irq(&(mapping)->i_pages)



#else

#include <asm-generic/cacheflush.h>

#undef flush_icache_range

#undef flush_icache_page

#undef flush_icache_user_range

void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,

	                     unsigned long addr, int len);

#endif



#endif /* __NDS32_CACHEFLUSH_H__ */

arch/nds32/include/asm/futex.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
	"	.popsection\n"					\

	"	.pushsection .fixup,\"ax\"\n"			\

	"4:	move	%0, " err_reg "\n"			\

	"	j	3b\n"					\

	"	b	3b\n"					\

	"	.popsection"



#define __futex_atomic_op(insn, ret, oldval, tmp, uaddr, oparg)	\

arch/nds32/kernel/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ static void __init setup_memory(void) 


void __init setup_arch(char **cmdline_p)

{

	early_init_devtree( __dtb_start);

	early_init_devtree(__atags_pointer ? \

		phys_to_virt(__atags_pointer) : __dtb_start);



	setup_cpuinfo();

CRA Git | Maintained and supported by SUSTech CRA and CCSE