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

Commit 1604f871 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 and clean-up from Catalin Marinas:
 - ACPI fix when checking the validity of the GICC MADT subtable
 - handle debug exceptions in the el*_inv exception entries
 - remove pointless register assignment in two compat syscall wrappers
 - unnecessary include path
 - defconfig update

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: entry32: remove pointless register assignment
  arm64: entry: handle debug exceptions in el*_inv
  arm64: Keep the ARM64 Kconfig selects sorted
  ACPI / ARM64 : use the new BAD_MADT_GICC_ENTRY macro
  ACPI / ARM64: add BAD_MADT_GICC_ENTRY() macro
  arm64: defconfig: Add Ceva ahci to the defconfig
  arm64: remove another unnecessary libfdt include path
parents 3cdeb9d1 ad2daa85

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ config ARM64 
	select BUILDTIME_EXTABLE_SORT

	select CLONE_BACKWARDS

	select COMMON_CLK

	select EDAC_SUPPORT

	select CPU_PM if (SUSPEND || CPU_IDLE)

	select DCACHE_WORD_ACCESS

	select EDAC_SUPPORT

	select GENERIC_ALLOCATOR

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS_BROADCAST if SMP

arch/arm64/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_ATA=y

CONFIG_SATA_AHCI=y

CONFIG_SATA_AHCI_PLATFORM=y

CONFIG_AHCI_CEVA=y

CONFIG_AHCI_XGENE=y

CONFIG_PATA_PLATFORM=y

CONFIG_PATA_OF_PLATFORM=y

arch/arm64/include/asm/acpi.h

+8 −0
Original line number Diff line number Diff line
@@ -19,6 +19,14 @@ 
#include <asm/psci.h>

#include <asm/smp_plat.h>



/* Macros for consistency checks of the GICC subtable of MADT */

#define ACPI_MADT_GICC_LENGTH	\

	(acpi_gbl_FADT.header.revision < 6 ? 76 : 80)



#define BAD_MADT_GICC_ENTRY(entry, end)						\

	(!(entry) || (unsigned long)(entry) + sizeof(*(entry)) > (end) ||	\

	 (entry)->header.length != ACPI_MADT_GICC_LENGTH)



/* Basic configuration for ACPI */

#ifdef	CONFIG_ACPI

/* ACPI table mapping after acpi_gbl_permanent_mmap is set */

arch/arm64/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -352,8 +352,8 @@ el1_inv: 
	// TODO: add support for undefined instructions in kernel mode

	enable_dbg

	mov	x0, sp

	mov	x2, x1

	mov	x1, #BAD_SYNC

	mrs	x2, esr_el1

	b	bad_mode

ENDPROC(el1_sync)
@@ -553,7 +553,7 @@ el0_inv: 
	ct_user_exit

	mov	x0, sp

	mov	x1, #BAD_SYNC

	mrs	x2, esr_el1

	mov	x2, x25

	bl	bad_mode

	b	ret_to_user

ENDPROC(el0_sync)

arch/arm64/kernel/entry32.S

+0 −2
Original line number Diff line number Diff line
@@ -32,13 +32,11 @@ 


ENTRY(compat_sys_sigreturn_wrapper)

	mov	x0, sp

	mov	x27, #0		// prevent syscall restart handling (why)

	b	compat_sys_sigreturn

ENDPROC(compat_sys_sigreturn_wrapper)



ENTRY(compat_sys_rt_sigreturn_wrapper)

	mov	x0, sp

	mov	x27, #0		// prevent syscall restart handling (why)

	b	compat_sys_rt_sigreturn

ENDPROC(compat_sys_rt_sigreturn_wrapper)