Commit 35c55685 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Catalin Marinas:

 - Fix occasional page fault during boot due to memblock resizing before
   the linear map is up.

 - Define NET_IP_ALIGN to 0 to improve the DMA performance on some
   platforms.

 - lib/raid6 test build fix.

 - .mailmap update for Punit Agrawal

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: memblock: don't permit memblock resizing until linear mapping is up
  arm64: mm: define NET_IP_ALIGN to 0
  lib/raid6: Fix arm64 test build
  mailmap: Update email for Punit Agrawal
parents d5335b3d 24cc61d8

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ Peter Oruba <peter@oruba.de> 
Peter Oruba <peter.oruba@amd.com>

Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Praveen BP <praveenbp@ti.com>

Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>

Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

arch/arm64/include/asm/processor.h

+8 −0
Original line number Diff line number Diff line
@@ -24,6 +24,14 @@ 
#define KERNEL_DS	UL(-1)

#define USER_DS		(TASK_SIZE_64 - 1)



/*

 * On arm64 systems, unaligned accesses by the CPU are cheap, and so there is

 * no point in shifting all network buffers by 2 bytes just to make some IP

 * header fields appear aligned in memory, potentially sacrificing some DMA

 * performance on some platforms.

 */

#define NET_IP_ALIGN	0



#ifndef __ASSEMBLY__

#ifdef __KERNEL__

arch/arm64/mm/init.c

+0 −2
Original line number Diff line number Diff line
@@ -483,8 +483,6 @@ void __init arm64_memblock_init(void) 
	high_memory = __va(memblock_end_of_DRAM() - 1) + 1;



	dma_contiguous_reserve(arm64_dma_phys_limit);



	memblock_allow_resize();

}



void __init bootmem_init(void)

arch/arm64/mm/mmu.c

+2 −0
Original line number Diff line number Diff line
@@ -659,6 +659,8 @@ void __init paging_init(void) 


	memblock_free(__pa_symbol(init_pg_dir),

		      __pa_symbol(init_pg_end) - __pa_symbol(init_pg_dir));



	memblock_allow_resize();

}



/*

lib/raid6/test/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ ifeq ($(ARCH),arm) 
        CFLAGS += -I../../../arch/arm/include -mfpu=neon

        HAS_NEON = yes

endif

ifeq ($(ARCH),arm64)

ifeq ($(ARCH),aarch64)

        CFLAGS += -I../../../arch/arm64/include

        HAS_NEON = yes

endif
@@ -41,7 +41,7 @@ ifeq ($(IS_X86),yes) 
		    gcc -c -x assembler - >&/dev/null &&        \

		    rm ./-.o && echo -DCONFIG_AS_AVX512=1)

else ifeq ($(HAS_NEON),yes)

        OBJS   += neon.o neon1.o neon2.o neon4.o neon8.o

        OBJS   += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o

        CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1

else

        HAS_ALTIVEC := $(shell printf '\#include <altivec.h>\nvector int a;\n' |\

CRA Git | Maintained and supported by SUSTech CRA and CCSE