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

Commit 92b94417 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:
 "These are primarily bug fixes with a performance improvement patch for
  the GHASH crypto algorithm (which went in during this merging window)
  and dts/defconfig/Kconfig updates.

   - ftrace_return_addr() macro fix for arm (introduced earlier via the
     arm64 tree)
   - stack alignment exception entry code fix
   - GHASH crypto algorithm fix and performance improvement
   - CMA buffer limited to 32-bit (until a better way to describe the
     system topology in DT)
   - UAPI sigcontext.h build fix
   - __kernel_old_{gid,uid}_t definitions fix (affecting 32-bit LTP)
   - ptrace fixes (kernel fault and 32-bit arm core dump)
   - pte_mknotpresent() fix
   - dts updates (APM SoC)
   - defconfig and Kconfig update"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: mm: remove broken &= operator from pmd_mknotpresent
  arm64: fix build error in sigcontext.h
  arm64: dts: Add more serial port nodes in APM X-Gene device tree
  arm64/dma: Removing ARCH_HAS_DMA_GET_REQUIRED_MASK macro
  arm64: ptrace: fix empty registers set in prstatus of aarch32 process core
  arm64: uid16: fix __kernel_old_{gid,uid}_t definitions
  arm64: ptrace: change fs when passing kernel pointer to regset code
  arm64: Limit the CMA buffer to 32-bit if ZONE_DMA
  arm/ftrace: fix ftrace_return_addr() to ftrace_return_address()
  arm64/crypto: improve performance of GHASH algorithm
  arm64/crypto: fix data corruption bug in GHASH algorithm
  arm64: defconfig update for LTP
  arm64: ftrace: Fix comment typo 'CONFIG_FUNCTION_GRAPH_FP_TEST'
  arm64: add ARCH_HAS_OPP to allow enabling OPP library
  arm64: restore alphabetic order in Kconfig
  arm64: Bug fix in stack alignment exception
parents c4222e46 e3a920af

arch/arm/include/asm/ftrace.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ extern inline void *return_address(unsigned int level) 




#endif

#endif





#define ftrace_return_addr(n) return_address(n)

#define ftrace_return_address(n) return_address(n)





#endif /* ifndef __ASSEMBLY__ */

#endif /* ifndef __ASSEMBLY__ */

arch/arm64/Kconfig

+2 −1
Original line number Original line Diff line number Diff line 
config ARM64

config ARM64

	def_bool y

	def_bool y

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_HAS_OPP

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION

	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION

	select ARCH_WANT_FRAME_POINTERS

	select ARCH_WANT_FRAME_POINTERS

arch/arm64/boot/dts/apm-mustang.dts

+4 −0
Original line number Original line Diff line number Diff line
@@ -24,3 +24,7 @@ 
		reg = < 0x1 0x00000000 0x0 0x80000000 >; /* Updated by bootloader */

		reg = < 0x1 0x00000000 0x0 0x80000000 >; /* Updated by bootloader */

	};

	};

};

};



&serial0 {

	status = "ok";

};

arch/arm64/boot/dts/apm-storm.dtsi

+35 −1
Original line number Original line Diff line number Diff line
@@ -273,8 +273,9 @@ 
		};

		};





		serial0: serial@1c020000 {

		serial0: serial@1c020000 {

			status = "disabled";

			device_type = "serial";

			device_type = "serial";

			compatible = "ns16550";

			compatible = "ns16550a";

			reg = <0 0x1c020000 0x0 0x1000>;

			reg = <0 0x1c020000 0x0 0x1000>;

			reg-shift = <2>;

			reg-shift = <2>;

			clock-frequency = <10000000>; /* Updated by bootloader */

			clock-frequency = <10000000>; /* Updated by bootloader */
@@ -282,6 +283,39 @@ 
			interrupts = <0x0 0x4c 0x4>;

			interrupts = <0x0 0x4c 0x4>;

		};

		};





		serial1: serial@1c021000 {

			status = "disabled";

			device_type = "serial";

			compatible = "ns16550a";

			reg = <0 0x1c021000 0x0 0x1000>;

			reg-shift = <2>;

			clock-frequency = <10000000>; /* Updated by bootloader */

			interrupt-parent = <&gic>;

			interrupts = <0x0 0x4d 0x4>;

		};



		serial2: serial@1c022000 {

			status = "disabled";

			device_type = "serial";

			compatible = "ns16550a";

			reg = <0 0x1c022000 0x0 0x1000>;

			reg-shift = <2>;

			clock-frequency = <10000000>; /* Updated by bootloader */

			interrupt-parent = <&gic>;

			interrupts = <0x0 0x4e 0x4>;

		};



		serial3: serial@1c023000 {

			status = "disabled";

			device_type = "serial";

			compatible = "ns16550a";

			reg = <0 0x1c023000 0x0 0x1000>;

			reg-shift = <2>;

			clock-frequency = <10000000>; /* Updated by bootloader */

			interrupt-parent = <&gic>;

			interrupts = <0x0 0x4f 0x4>;

		};



		phy1: phy@1f21a000 {

		phy1: phy@1f21a000 {

			compatible = "apm,xgene-phy";

			compatible = "apm,xgene-phy";

			reg = <0x0 0x1f21a000 0x0 0x100>;

			reg = <0x0 0x1f21a000 0x0 0x100>;

arch/arm64/configs/defconfig

+15 −0
Original line number Original line Diff line number Diff line
@@ -6,9 +6,18 @@ CONFIG_NO_HZ_IDLE=y 
CONFIG_HIGH_RES_TIMERS=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_TASKSTATS=y

CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_LOG_BUF_SHIFT=14

CONFIG_RESOURCE_COUNTERS=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_MEMCG_KMEM=y

CONFIG_CGROUP_HUGETLB=y

# CONFIG_UTS_NS is not set

# CONFIG_UTS_NS is not set

# CONFIG_IPC_NS is not set

# CONFIG_IPC_NS is not set

# CONFIG_PID_NS is not set

# CONFIG_PID_NS is not set
@@ -27,6 +36,7 @@ CONFIG_ARCH_VEXPRESS=y 
CONFIG_ARCH_XGENE=y

CONFIG_ARCH_XGENE=y

CONFIG_SMP=y

CONFIG_SMP=y

CONFIG_PREEMPT=y

CONFIG_PREEMPT=y

CONFIG_KSM=y

CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_CMA=y

CONFIG_CMA=y

CONFIG_CMDLINE="console=ttyAMA0"

CONFIG_CMDLINE="console=ttyAMA0"
@@ -45,6 +55,7 @@ CONFIG_IP_PNP_BOOTP=y 
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS=y

CONFIG_DMA_CMA=y

CONFIG_DMA_CMA=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_VIRTIO_BLK=y

CONFIG_VIRTIO_BLK=y

# CONFIG_SCSI_PROC_FS is not set

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SD=y
@@ -53,6 +64,7 @@ CONFIG_ATA=y 
CONFIG_PATA_PLATFORM=y

CONFIG_PATA_PLATFORM=y

CONFIG_PATA_OF_PLATFORM=y

CONFIG_PATA_OF_PLATFORM=y

CONFIG_NETDEVICES=y

CONFIG_NETDEVICES=y

CONFIG_TUN=y

CONFIG_SMC91X=y

CONFIG_SMC91X=y

CONFIG_SMSC911X=y

CONFIG_SMSC911X=y

# CONFIG_WLAN is not set

# CONFIG_WLAN is not set
@@ -85,6 +97,8 @@ CONFIG_EXT3_FS=y 
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

# CONFIG_EXT3_FS_XATTR is not set

# CONFIG_EXT3_FS_XATTR is not set

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS=y

CONFIG_FANOTIFY=y

CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y

CONFIG_FUSE_FS=y

CONFIG_FUSE_FS=y

CONFIG_CUSE=y

CONFIG_CUSE=y

CONFIG_VFAT_FS=y

CONFIG_VFAT_FS=y
@@ -104,6 +118,7 @@ CONFIG_DEBUG_KERNEL=y 
CONFIG_LOCKUP_DETECTOR=y

CONFIG_LOCKUP_DETECTOR=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_SCHED_DEBUG is not set

# CONFIG_FTRACE is not set

# CONFIG_FTRACE is not set

CONFIG_SECURITY=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_ARM64_CRYPTO=y

CONFIG_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y