Commit 66a27aba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc updates from Michael Ellerman:

 - Add AT_HWCAP3 and AT_HWCAP4 aux vector entries for future use
   by glibc

 - Add support for recognising the Power11 architected and raw PVRs

 - Add support for nr_cpus=n on the command line where the
   boot CPU is >= n

 - Add ppcxx_allmodconfig targets for all 32-bit sub-arches

 - Other small features, cleanups and fixes

Thanks to Akanksha J N, Brian King, Christophe Leroy, Dawei Li, Geoff
Levand, Greg Kroah-Hartman, Jan-Benedict Glaw, Kajol Jain, Kunwu Chan,
Li zeming, Madhavan Srinivasan, Masahiro Yamada, Nathan Chancellor,
Nicholas Piggin, Peter Bergner, Qiheng Lin, Randy Dunlap, Ricardo B.
Marliere, Rob Herring, Sathvika Vasireddy, Shrikanth Hegde, Uwe
Kleine-König, Vaibhav Jain, and Wen Xiong.

* tag 'powerpc-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (71 commits)
  powerpc/macio: Make remove callback of macio driver void returned
  powerpc/83xx: Fix build failure with FPU=n
  powerpc/64s: Fix get_hugepd_cache_index() build failure
  powerpc/4xx: Fix warp_gpio_leds build failure
  powerpc/amigaone: Make several functions static
  powerpc/embedded6xx: Fix no previous prototype for avr_uart_send() etc.
  macintosh/adb: make adb_dev_class constant
  powerpc: xor_vmx: Add '-mhard-float' to CFLAGS
  powerpc/fsl: Fix mfpmr() asm constraint error
  powerpc: Remove cpu-as-y completely
  powerpc/fsl: Modernise mt/mfpmr
  powerpc/fsl: Fix mfpmr build errors with newer binutils
  powerpc/64s: Use .machine power4 around dcbt
  powerpc/64s: Move dcbt/dcbtst sequence into a macro
  powerpc/mm: Code cleanup for __hash_page_thp
  powerpc/hv-gpci: Fix the H_GET_PERF_COUNTER_INFO hcall return value checks
  powerpc/irq: Allow softirq to hardirq stack transition
  powerpc: Stop using of_root
  powerpc/machdep: Define 'compatibles' property in ppc_md and use it
  of: Reimplement of_machine_is_compatible() using of_machine_compatible_match()
  ...
parents 82affc97 9db22353

arch/powerpc/Makefile

+20 −12
Original line number Diff line number Diff line
@@ -219,18 +219,6 @@ KBUILD_CFLAGS += -fno-asynchronous-unwind-tables 
# often slow when they are implemented at all

KBUILD_CFLAGS		+= $(call cc-option,-mno-string)



cpu-as-$(CONFIG_ALTIVEC)	+= $(call as-option,-Wa$(comma)-maltivec)



# When using '-many -mpower4' gas will first try and find a matching power4

# mnemonic and failing that it will allow any valid mnemonic that GAS knows

# about. GCC will pass -many to GAS when assembling, clang does not.

# LLVM IAS doesn't understand either flag: https://github.com/ClangBuiltLinux/linux/issues/675

# but LLVM IAS only supports ISA >= 2.06 for Book3S 64 anyway...

cpu-as-$(CONFIG_PPC_BOOK3S_64)	+= $(call as-option,-Wa$(comma)-mpower4) $(call as-option,-Wa$(comma)-many)



KBUILD_AFLAGS += $(cpu-as-y)

KBUILD_CFLAGS += $(cpu-as-y)



KBUILD_AFLAGS += $(aflags-y)

KBUILD_CFLAGS += $(cflags-y)
@@ -314,6 +302,26 @@ ppc32_allmodconfig: 
	$(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/powerpc/configs/book3s_32.config \

		-f $(srctree)/Makefile allmodconfig



generated_configs += ppc40x_allmodconfig

ppc40x_allmodconfig:

	$(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/powerpc/configs/40x.config \

		-f $(srctree)/Makefile allmodconfig



generated_configs += ppc44x_allmodconfig

ppc44x_allmodconfig:

	$(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/powerpc/configs/44x.config \

		-f $(srctree)/Makefile allmodconfig



generated_configs += ppc8xx_allmodconfig

ppc8xx_allmodconfig:

	$(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/powerpc/configs/8xx.config \

		-f $(srctree)/Makefile allmodconfig



generated_configs += ppc85xx_allmodconfig

ppc85xx_allmodconfig:

	$(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/powerpc/configs/85xx-32bit.config \

		-f $(srctree)/Makefile allmodconfig



generated_configs += ppc_defconfig

ppc_defconfig:

	$(call merge_into_defconfig,book3s_32.config,)

arch/powerpc/boot/simple_alloc.c

+5 −2
Original line number Diff line number Diff line
@@ -112,8 +112,11 @@ static void *simple_realloc(void *ptr, unsigned long size) 
		return ptr;



	new = simple_malloc(size);

	if (new) {

		memcpy(new, ptr, p->size);

		simple_free(ptr);

	}



	return new;

}

arch/powerpc/configs/40x.config

0 → 100644
+2 −0
Original line number Diff line number Diff line 
CONFIG_PPC64=n

CONFIG_40x=y

arch/powerpc/configs/44x.config

0 → 100644
+2 −0
Original line number Diff line number Diff line 
CONFIG_PPC64=n

CONFIG_44x=y

arch/powerpc/configs/85xx-32bit.config

+1 −0
Original line number Diff line number Diff line 
CONFIG_PPC64=n

CONFIG_HIGHMEM=y

CONFIG_KEXEC=y

CONFIG_PPC_85xx=y