Commit 3e3a138a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM updates from Russell King:

 - amba bus irq rework

 - add kfence support

 - support for Cortex M33 and M55 CPUs

 - kbuild updates for decompressor

 - let core code manage thread_info::cpu

 - avoid unpredictable NOP encoding in decompressor

 - reduce information printed in calltraces

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: reduce the information printed in call traces
  ARM: 9168/1: Add support for Cortex-M55 processor
  ARM: 9167/1: Add support for Cortex-M33 processor
  ARM: 9166/1: Support KFENCE for ARM
  ARM: 9165/1: mm: Provide is_write_fault()
  ARM: 9164/1: mm: Provide set_memory_valid()
  ARM: 9163/1: amba: Move of_amba_device_decode_irq() into amba_probe()
  ARM: 9162/1: amba: Kill sysfs attribute file of irq
  ARM: 9161/1: mm: mark private VM_FAULT_X defines as vm_fault_t
  ARM: 9159/1: decompressor: Avoid UNPREDICTABLE NOP encoding
  ARM: 9158/1: leave it to core code to manage thread_info::cpu
  ARM: 9154/1: decompressor: do not copy source files while building
parents c1eb8f6c b0343ab3

Documentation/features/core/thread-info-in-task/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
    -----------------------

    |       alpha: | TODO |

    |         arc: | TODO |

    |         arm: | TODO |

    |         arm: |  ok  |

    |       arm64: |  ok  |

    |        csky: | TODO |

    |       h8300: | TODO |

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ config ARM 
	select HAVE_ARCH_AUDITSYSCALL if AEABI && !OABI_COMPAT

	select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6

	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU

	select HAVE_ARCH_KFENCE if MMU && !XIP_KERNEL

	select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU

	select HAVE_ARCH_KASAN if MMU && !XIP_KERNEL

	select HAVE_ARCH_MMAP_RND_BITS if MMU

arch/arm/Kconfig.debug

+11 −0
Original line number Diff line number Diff line
@@ -81,6 +81,17 @@ endchoice 
config ARM_UNWIND

	bool



config BACKTRACE_VERBOSE

	bool "Verbose backtrace"

	depends on EXPERT

	help

	  When the kernel produces a warning or oops, the kernel prints a

	  trace of the call chain. This option controls whether we include

	  the numeric addresses or only include the symbolic information.



	  In most cases, say N here, unless you are intending to debug the

	  kernel and have access to the kernel binary image.



config FRAME_POINTER

	bool

arch/arm/boot/compressed/.gitignore

+0 −5
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

ashldi3.S

bswapsdi2.S

font.c

lib1funcs.S

hyp-stub.S

piggy_data

vmlinux

vmlinux.lds

arch/arm/boot/compressed/Makefile

+3 −30
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ ifeq ($(CONFIG_DEBUG_UNCOMPRESS),y) 
OBJS	+= debug.o

AFLAGS_head.o += -DDEBUG

endif

FONTC	= $(srctree)/lib/fonts/font_acorn_8x8.c



# string library code (-Os is enforced to keep it much smaller)

OBJS		+= string.o
@@ -99,11 +98,8 @@ $(foreach o, $(libfdt_objs) atags_to_fdt.o fdt_check_mem_start.o, \ 
	$(eval CFLAGS_$(o) := -I $(srctree)/scripts/dtc/libfdt -fno-stack-protector))



targets       := vmlinux vmlinux.lds piggy_data piggy.o \

		 lib1funcs.o ashldi3.o bswapsdi2.o \

		 head.o $(OBJS)



clean-files += lib1funcs.S ashldi3.S bswapsdi2.S hyp-stub.S



KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING



ccflags-y := -fpic $(call cc-option,-mno-single-pic-base,) -fno-builtin \
@@ -134,23 +130,7 @@ endif 
# Next argument is a linker script

LDFLAGS_vmlinux += -T



# For __aeabi_uidivmod

lib1funcs = $(obj)/lib1funcs.o



$(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S

	$(call cmd,shipped)



# For __aeabi_llsl

ashldi3 = $(obj)/ashldi3.o



$(obj)/ashldi3.S: $(srctree)/arch/$(SRCARCH)/lib/ashldi3.S

	$(call cmd,shipped)



# For __bswapsi2, __bswapdi2

bswapsdi2 = $(obj)/bswapsdi2.o



$(obj)/bswapsdi2.S: $(srctree)/arch/$(SRCARCH)/lib/bswapsdi2.S

	$(call cmd,shipped)

OBJS	+= lib1funcs.o ashldi3.o bswapsdi2.o



# We need to prevent any GOTOFF relocs being used with references

# to symbols in the .bss section since we cannot relocate them
@@ -175,8 +155,8 @@ fi 
efi-obj-$(CONFIG_EFI_STUB) := $(objtree)/drivers/firmware/efi/libstub/lib.a



$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \

		$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) $(ashldi3) \

		$(bswapsdi2) $(efi-obj-y) FORCE

		$(addprefix $(obj)/, $(OBJS)) \

		$(efi-obj-y) FORCE

	@$(check_for_multiple_zreladdr)

	$(call if_changed,ld)

	@$(check_for_bad_syms)
@@ -187,11 +167,4 @@ $(obj)/piggy_data: $(obj)/../Image FORCE 
$(obj)/piggy.o: $(obj)/piggy_data



CFLAGS_font.o := -Dstatic=



$(obj)/font.c: $(FONTC)

	$(call cmd,shipped)



AFLAGS_hyp-stub.o := -Wa,-march=armv7-a
 


$(obj)/hyp-stub.S: $(srctree)/arch/$(SRCARCH)/kernel/hyp-stub.S

	$(call cmd,shipped)