Commit 3e153256 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:
 "The trickle of arm64 fixes continues to come in.

  Nothing that's the end of the world, but we've got a fix for PCI IO
  port accesses, an accidental naked "asm goto" and a fix to the
  vmcoreinfo PT_NOTE merged this time around which we'd like to get
  sorted before it becomes ABI.

   - Fix ioport_map() mapping the wrong physical address for some I/O
     BARs

   - Remove direct use of "asm goto", since some compilers don't like
     that

   - Ensure kimage_voffset is always present in vmcoreinfo PT_NOTE"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  asm-generic: io: Fix ioport_map() for !CONFIG_GENERIC_IOMAP && CONFIG_INDIRECT_PIO
  arm64: kernel: arch_crash_save_vmcoreinfo() should depend on CONFIG_CRASH_CORE
  arm64: jump_label.h: use asm_volatile_goto macro instead of "asm goto"
parents f3c0b8ce 500dd232

arch/arm64/include/asm/jump_label.h

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


static __always_inline bool arch_static_branch(struct static_key *key, bool branch)

{

	asm goto("1: nop\n\t"

	asm_volatile_goto("1: nop\n\t"

		 ".pushsection __jump_table,  \"aw\"\n\t"

		 ".align 3\n\t"

		 ".quad 1b, %l[l_yes], %c0\n\t"
@@ -42,7 +42,7 @@ l_yes: 


static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)

{

	asm goto("1: b %l[l_yes]\n\t"

	asm_volatile_goto("1: b %l[l_yes]\n\t"

		 ".pushsection __jump_table,  \"aw\"\n\t"

		 ".align 3\n\t"

		 ".quad 1b, %l[l_yes], %c0\n\t"

arch/arm64/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ arm64-obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o \ 
arm64-obj-$(CONFIG_ARM64_RELOC_TEST)	+= arm64-reloc-test.o

arm64-reloc-test-y := reloc_test_core.o reloc_test_syms.o

arm64-obj-$(CONFIG_CRASH_DUMP)		+= crash_dump.o

arm64-obj-$(CONFIG_CRASH_CORE)		+= crash_core.o

arm64-obj-$(CONFIG_ARM_SDE_INTERFACE)	+= sdei.o

arm64-obj-$(CONFIG_ARM64_SSBD)		+= ssbd.o

arch/arm64/kernel/crash_core.c

0 → 100644
+19 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) Linaro.

 * Copyright (C) Huawei Futurewei Technologies.

 */



#include <linux/crash_core.h>

#include <asm/memory.h>



void arch_crash_save_vmcoreinfo(void)

{

	VMCOREINFO_NUMBER(VA_BITS);

	/* Please note VMCOREINFO_NUMBER() uses "%d", not "%x" */

	vmcoreinfo_append_str("NUMBER(kimage_voffset)=0x%llx\n",

						kimage_voffset);

	vmcoreinfo_append_str("NUMBER(PHYS_OFFSET)=0x%llx\n",

						PHYS_OFFSET);

	vmcoreinfo_append_str("KERNELOFFSET=%lx\n", kaslr_offset());

}

arch/arm64/kernel/machine_kexec.c

+0 −11
Original line number Diff line number Diff line
@@ -358,14 +358,3 @@ void crash_free_reserved_phys_range(unsigned long begin, unsigned long end) 
	}

}

#endif /* CONFIG_HIBERNATION */
 


void arch_crash_save_vmcoreinfo(void)

{

	VMCOREINFO_NUMBER(VA_BITS);

	/* Please note VMCOREINFO_NUMBER() uses "%d", not "%x" */

	vmcoreinfo_append_str("NUMBER(kimage_voffset)=0x%llx\n",

						kimage_voffset);

	vmcoreinfo_append_str("NUMBER(PHYS_OFFSET)=0x%llx\n",

						PHYS_OFFSET);

	vmcoreinfo_append_str("KERNELOFFSET=%lx\n", kaslr_offset());

}

include/asm-generic/io.h

+2 −1
Original line number Diff line number Diff line
@@ -1026,7 +1026,8 @@ static inline void __iomem *ioremap_wt(phys_addr_t offset, size_t size) 
#define ioport_map ioport_map

static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)

{

	return PCI_IOBASE + (port & MMIO_UPPER_LIMIT);

	port &= IO_SPACE_LIMIT;

	return (port > MMIO_UPPER_LIMIT) ? NULL : PCI_IOBASE + port;

}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE