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

Commit 0ed28866 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 Will Deacon:
 "There's more here than we usually have at this stage, but that's
  mainly down to the stacktrace changes which came in slightly too late
  for the merge window.

  Summary:

   - Big bad batch of MAINTAINERS updates

   - Fix handling of SP alignment fault exceptions

   - Fix PSTATE.SSBS handling on heterogeneous systems

   - Fix fallout from moving to the generic vDSO implementation

   - Fix stack unwinding in the face of frame corruption

   - Fix off-by-one in IORT code

   - Minor SVE cleanups"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  ACPI/IORT: Fix off-by-one check in iort_dev_find_its_id()
  arm64: entry: SP Alignment Fault doesn't write to FAR_EL1
  arm64: Force SSBS on context switch
  MAINTAINERS: Update my email address
  MAINTAINERS: Update my email address
  MAINTAINERS: Fix spelling mistake in my name
  MAINTAINERS: Update my email address to @kernel.org
  arm64: mm: Drop pte_huge()
  arm64/sve: Fix a couple of magic numbers for the Z-reg count
  arm64/sve: Factor out FPSIMD to SVE state conversion
  arm64: stacktrace: Better handle corrupted stacks
  arm64: stacktrace: Factor out backtrace initialisation
  arm64: stacktrace: Constify stacktrace.h functions
  arm64: vdso: Cleanup Makefiles
  arm64: vdso: fix flip/flop vdso build bug
  arm64: vdso: Fix population of AT_SYSINFO_EHDR for compat vdso
parents 4792ba1f 5a46d3f7

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com> 
Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>

<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>

Jean Tourrilhes <jt@hpl.hp.com>

<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>

Jeff Garzik <jgarzik@pretzel.yyz.us>

Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>

Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
@@ -116,6 +117,7 @@ John Stultz <johnstul@us.ibm.com> 
Juha Yrjola <at solidboot.com>

Juha Yrjola <juha.yrjola@nokia.com>

Juha Yrjola <juha.yrjola@solidboot.com>

Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>

Kay Sievers <kay.sievers@vrfy.org>

Kenneth W Chen <kenneth.w.chen@intel.com>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
@@ -132,6 +134,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch> 
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>

Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>

Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>

Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>

Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>

Mark Brown <broonie@sirena.org.uk>

Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>

MAINTAINERS

+7 −7
Original line number Diff line number Diff line
@@ -1194,7 +1194,7 @@ F: include/uapi/linux/if_arcnet.h 


ARM ARCHITECTED TIMER DRIVER

M:	Mark Rutland <mark.rutland@arm.com>

M:	Marc Zyngier <marc.zyngier@arm.com>

M:	Marc Zyngier <maz@kernel.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/include/asm/arch_timer.h
@@ -8490,7 +8490,7 @@ S: Obsolete 
F:	include/uapi/linux/ipx.h



IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)

M:	Marc Zyngier <marc.zyngier@arm.com>

M:	Marc Zyngier <maz@kernel.org>

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core

F:	Documentation/IRQ-domain.txt
@@ -8508,7 +8508,7 @@ F: kernel/irq/ 
IRQCHIP DRIVERS

M:	Thomas Gleixner <tglx@linutronix.de>

M:	Jason Cooper <jason@lakedaemon.net>

M:	Marc Zyngier <marc.zyngier@arm.com>

M:	Marc Zyngier <maz@kernel.org>

L:	linux-kernel@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
@@ -8828,10 +8828,10 @@ F: arch/x86/include/asm/svm.h 
F:	arch/x86/kvm/svm.c



KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)

M:	Marc Zyngier <marc.zyngier@arm.com>

M:	Marc Zyngier <maz@kernel.org>

R:	James Morse <james.morse@arm.com>

R:	Julien Thierry <julien.thierry@arm.com>

R:	Suzuki K Pouloze <suzuki.poulose@arm.com>

R:	Julien Thierry <julien.thierry.kdev@gmail.com>

R:	Suzuki K Poulose <suzuki.poulose@arm.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	kvmarm@lists.cs.columbia.edu

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
@@ -17124,7 +17124,7 @@ F: drivers/virtio/virtio_input.c 
F:	include/uapi/linux/virtio_input.h



VIRTIO IOMMU DRIVER

M:	Jean-Philippe Brucker <jean-philippe.brucker@arm.com>

M:	Jean-Philippe Brucker <jean-philippe@linaro.org>

L:	virtualization@lists.linux-foundation.org

S:	Maintained

F:	drivers/iommu/virtio-iommu.c

arch/arm64/include/asm/elf.h

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ typedef compat_elf_greg_t compat_elf_gregset_t[COMPAT_ELF_NGREG]; 
({									\

	set_thread_flag(TIF_32BIT);					\

 })

#ifdef CONFIG_GENERIC_COMPAT_VDSO

#ifdef CONFIG_COMPAT_VDSO

#define COMPAT_ARCH_DLINFO						\

do {									\

	/*								\

arch/arm64/include/asm/pgtable.h

+0 −1
Original line number Diff line number Diff line
@@ -301,7 +301,6 @@ static inline int pte_same(pte_t pte_a, pte_t pte_b) 
/*

 * Huge pte definitions.

 */

#define pte_huge(pte)		(!(pte_val(pte) & PTE_TABLE_BIT))

#define pte_mkhuge(pte)		(__pte(pte_val(pte) & ~PTE_TABLE_BIT))



/*

arch/arm64/include/asm/processor.h

+12 −2
Original line number Diff line number Diff line
@@ -193,6 +193,16 @@ static inline void start_thread_common(struct pt_regs *regs, unsigned long pc) 
		regs->pmr_save = GIC_PRIO_IRQON;

}



static inline void set_ssbs_bit(struct pt_regs *regs)

{

	regs->pstate |= PSR_SSBS_BIT;

}



static inline void set_compat_ssbs_bit(struct pt_regs *regs)

{

	regs->pstate |= PSR_AA32_SSBS_BIT;

}



static inline void start_thread(struct pt_regs *regs, unsigned long pc,

				unsigned long sp)

{
@@ -200,7 +210,7 @@ static inline void start_thread(struct pt_regs *regs, unsigned long pc, 
	regs->pstate = PSR_MODE_EL0t;



	if (arm64_get_ssbd_state() != ARM64_SSBD_FORCE_ENABLE)

		regs->pstate |= PSR_SSBS_BIT;

		set_ssbs_bit(regs);



	regs->sp = sp;

}
@@ -219,7 +229,7 @@ static inline void compat_start_thread(struct pt_regs *regs, unsigned long pc, 
#endif



	if (arm64_get_ssbd_state() != ARM64_SSBD_FORCE_ENABLE)

		regs->pstate |= PSR_AA32_SSBS_BIT;

		set_compat_ssbs_bit(regs);



	regs->compat_sp = sp;

}