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

Commit 2dc10ad8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull arm64 updates from Catalin Marinas:

 - "genirq: Introduce generic irq migration for cpu hotunplugged" patch
   merged from tip/irq/for-arm to allow the arm64-specific part to be
   upstreamed via the arm64 tree

 - CPU feature detection reworked to cope with heterogeneous systems
   where CPUs may not have exactly the same features.  The features
   reported by the kernel via internal data structures or ELF_HWCAP are
   delayed until all the CPUs are up (and before user space starts)

 - Support for 16KB pages, with the additional bonus of a 36-bit VA
   space, though the latter only depending on EXPERT

 - Implement native {relaxed, acquire, release} atomics for arm64

 - New ASID allocation algorithm which avoids IPI on roll-over, together
   with TLB invalidation optimisations (using local vs global where
   feasible)

 - KASan support for arm64

 - EFI_STUB clean-up and isolation for the kernel proper (required by
   KASan)

 - copy_{to,from,in}_user optimisations (sharing the memcpy template)

 - perf: moving arm64 to the arm32/64 shared PMU framework

 - L1_CACHE_BYTES increased to 128 to accommodate Cavium hardware

 - Support for the contiguous PTE hint on kernel mapping (16 consecutive
   entries may be able to use a single TLB entry)

 - Generic CONFIG_HZ now used on arm64

 - defconfig updates

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (91 commits)
  arm64/efi: fix libstub build under CONFIG_MODVERSIONS
  ARM64: Enable multi-core scheduler support by default
  arm64/efi: move arm64 specific stub C code to libstub
  arm64: page-align sections for DEBUG_RODATA
  arm64: Fix build with CONFIG_ZONE_DMA=n
  arm64: Fix compat register mappings
  arm64: Increase the max granular size
  arm64: remove bogus TASK_SIZE_64 check
  arm64: make Timer Interrupt Frequency selectable
  arm64/mm: use PAGE_ALIGNED instead of IS_ALIGNED
  arm64: cachetype: fix definitions of ICACHEF_* flags
  arm64: cpufeature: declare enable_cpu_capabilities as static
  genirq: Make the cpuhotplug migration code less noisy
  arm64: Constify hwcap name string arrays
  arm64/kvm: Make use of the system wide safe values
  arm64/debug: Make use of the system wide safe value
  arm64: Move FP/ASIMD hwcap handling to common code
  arm64/HWCAP: Use system wide safe values
  arm64/capabilities: Make use of system wide safe value
  arm64: Delay cpu feature capability checks
  ...
parents e627078a f8f8bdc4

Documentation/arm/uefi.txt

+0 −2
Original line number Diff line number Diff line
@@ -58,5 +58,3 @@ linux,uefi-mmap-desc-size | 32-bit | Size in bytes of each entry in the UEFI 
--------------------------------------------------------------------------------

linux,uefi-mmap-desc-ver  | 32-bit | Version of the mmap descriptor format.

--------------------------------------------------------------------------------
 
linux,uefi-stub-kern-ver  | string | Copy of linux_banner from build.

--------------------------------------------------------------------------------

Documentation/arm64/booting.txt

+6 −1
Original line number Diff line number Diff line
@@ -104,7 +104,12 @@ Header notes: 
- The flags field (introduced in v3.17) is a little-endian 64-bit field

  composed as follows:

  Bit 0:	Kernel endianness.  1 if BE, 0 if LE.

  Bits 1-63:	Reserved.

  Bit 1-2:	Kernel Page size.

			0 - Unspecified.

			1 - 4K

			2 - 16K

			3 - 64K

  Bits 3-63:	Reserved.



- When image_size is zero, a bootloader should attempt to keep as much

  memory as possible free for use by the kernel immediately after the

Documentation/devicetree/bindings/arm/pmu.txt

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ Required properties: 


- compatible : should be one of

	"arm,armv8-pmuv3"

	"arm.cortex-a57-pmu"

	"arm.cortex-a53-pmu"

	"arm,cortex-a17-pmu"

	"arm,cortex-a15-pmu"

	"arm,cortex-a12-pmu"

Documentation/features/debug/KASAN/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
    |       alpha: | TODO |

    |         arc: | TODO |

    |         arm: | TODO |

    |       arm64: | TODO |

    |       arm64: |  ok  |

    |       avr32: | TODO |

    |    blackfin: | TODO |

    |         c6x: | TODO |

MAINTAINERS

+5 −4
Original line number Diff line number Diff line
@@ -823,12 +823,13 @@ F: arch/arm/include/asm/floppy.h 


ARM PMU PROFILING AND DEBUGGING

M:	Will Deacon <will.deacon@arm.com>

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

S:	Maintained

F:	arch/arm/kernel/perf_*

F:	arch/arm*/kernel/perf_*

F:	arch/arm/oprofile/common.c

F:	arch/arm/kernel/hw_breakpoint.c

F:	arch/arm/include/asm/hw_breakpoint.h

F:	arch/arm/include/asm/perf_event.h

F:	arch/arm*/kernel/hw_breakpoint.c

F:	arch/arm*/include/asm/hw_breakpoint.h

F:	arch/arm*/include/asm/perf_event.h

F:	drivers/perf/arm_pmu.c

F:	include/linux/perf/arm_pmu.h