Commit 606c2cf6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-6.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Madhavan Srinivasan:

 - Merge two CONFIG_POWERPC64_CPU entries in Kconfig.cputype

 - Replace extra-y to always-y in Makefile

 - Cleanup to use dev_fwnode helper

 - Fix misleading comment in kvmppc_prepare_to_enter()

 - misc cleanup and fixes

Thanks to Amit Machhiwal, Andrew Donnellan, Christophe Leroy, Gautam
Menghani, Jiri Slaby (SUSE), Masahiro Yamada, Shrikanth Hegde, Stephen
Rothwell, Venkat Rao Bagalkote, and Xichao Zhao

* tag 'powerpc-6.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/boot/install.sh: Fix shellcheck warnings
  powerpc/prom_init: Fix shellcheck warnings
  powerpc/kvm: Fix ifdef to remove build warning
  powerpc: unify two CONFIG_POWERPC64_CPU entries in the same choice block
  powerpc: use always-y instead of extra-y in Makefiles
  powerpc/64: Drop unnecessary 'rc' variable
  powerpc: Use dev_fwnode()
  KVM: PPC: Fix misleading interrupts comment in kvmppc_prepare_to_enter()
parents ebf2bfec 8763d225

arch/powerpc/boot/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -243,13 +243,13 @@ $(obj)/wrapper.a: $(obj-wlib) FORCE 
hostprogs	:= addnote hack-coff mktree



targets		+= $(patsubst $(obj)/%,%,$(obj-boot) wrapper.a) zImage.lds

extra-y		:= $(obj)/wrapper.a $(obj-plat) $(obj)/empty.o \

always-y	:= $(obj)/wrapper.a $(obj-plat) $(obj)/empty.o \

		   $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds



dtstree		:= $(src)/dts



wrapper		:= $(src)/wrapper

wrapperbits	:= $(extra-y) $(addprefix $(obj)/,addnote hack-coff mktree) \

wrapperbits	:= $(always-y) $(addprefix $(obj)/,addnote hack-coff mktree) \

			$(wrapper) FORCE



#############
@@ -456,7 +456,7 @@ WRAPPER_DTSDIR := /usr/lib/kernel-wrapper/dts 
WRAPPER_BINDIR := /usr/sbin

INSTALL := install



extra-installed		:= $(patsubst $(obj)/%, $(DESTDIR)$(WRAPPER_OBJDIR)/%, $(extra-y))

extra-installed		:= $(patsubst $(obj)/%, $(DESTDIR)$(WRAPPER_OBJDIR)/%, $(always-y))

hostprogs-installed	:= $(patsubst %, $(DESTDIR)$(WRAPPER_BINDIR)/%, $(hostprogs))

wrapper-installed	:= $(DESTDIR)$(WRAPPER_BINDIR)/wrapper

dts-installed		:= $(patsubst $(dtstree)/%, $(DESTDIR)$(WRAPPER_DTSDIR)/%, $(wildcard $(dtstree)/*.dts))

arch/powerpc/boot/install.sh

+7 −7
Original line number Diff line number Diff line
@@ -19,19 +19,19 @@ 
set -e



# this should work for both the pSeries zImage and the iSeries vmlinux.sm

image_name=`basename $2`

image_name=$(basename "$2")





echo "Warning: '${INSTALLKERNEL}' command not available... Copying" \

     "directly to $4/$image_name-$1" >&2



if [ -f $4/$image_name-$1 ]; then

	mv $4/$image_name-$1 $4/$image_name-$1.old

if [ -f "$4"/"$image_name"-"$1" ]; then

	mv "$4"/"$image_name"-"$1" "$4"/"$image_name"-"$1".old

fi



if [ -f $4/System.map-$1 ]; then

	mv $4/System.map-$1 $4/System-$1.old

if [ -f "$4"/System.map-"$1" ]; then

	mv "$4"/System.map-"$1" "$4"/System-"$1".old

fi



cat $2 > $4/$image_name-$1

cp $3 $4/System.map-$1
 
cat "$2" > "$4"/"$image_name"-"$1"

cp "$3" "$4"/System.map-"$1"

arch/powerpc/kernel/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -199,7 +199,9 @@ obj-$(CONFIG_ALTIVEC) += vector.o 


obj-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init.o

obj64-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_entry_64.o

extra-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init_check

ifdef KBUILD_BUILTIN

always-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init_check

endif



obj-$(CONFIG_PPC64)		+= $(obj64-y)

obj-$(CONFIG_PPC32)		+= $(obj32-y)

arch/powerpc/kernel/kvm.c

+4 −4
Original line number Diff line number Diff line
@@ -632,19 +632,19 @@ static void __init kvm_check_ins(u32 *inst, u32 features) 
#endif

	}



	switch (inst_no_rt & ~KVM_MASK_RB) {

#ifdef CONFIG_PPC_BOOK3S_32

	switch (inst_no_rt & ~KVM_MASK_RB) {

	case KVM_INST_MTSRIN:

		if (features & KVM_MAGIC_FEAT_SR) {

			u32 inst_rb = _inst & KVM_MASK_RB;

			kvm_patch_ins_mtsrin(inst, inst_rt, inst_rb);

		}

		break;

#endif

	}

#endif



	switch (_inst) {

#ifdef CONFIG_BOOKE

	switch (_inst) {

	case KVM_INST_WRTEEI_0:

		kvm_patch_ins_wrteei_0(inst);

		break;
@@ -652,8 +652,8 @@ static void __init kvm_check_ins(u32 *inst, u32 features) 
	case KVM_INST_WRTEEI_1:

		kvm_patch_ins_wrtee(inst, 0, 1);

		break;

#endif

	}

#endif

}



extern u32 kvm_template_start[];

arch/powerpc/kernel/prom_init_check.sh

+8 −8
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 


has_renamed_memintrinsics()

{

	grep -q "^CONFIG_KASAN=y$" ${KCONFIG_CONFIG} && \

		! grep -q "^CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX=y" ${KCONFIG_CONFIG}

	grep -q "^CONFIG_KASAN=y$" "${KCONFIG_CONFIG}" && \

		! grep -q "^CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX=y" "${KCONFIG_CONFIG}"

}



if has_renamed_memintrinsics
@@ -42,15 +42,15 @@ check_section() 
{

    file=$1

    section=$2

    size=$(objdump -h -j $section $file 2>/dev/null | awk "\$2 == \"$section\" {print \$3}")

    size=$(objdump -h -j "$section" "$file" 2>/dev/null | awk "\$2 == \"$section\" {print \$3}")

    size=${size:-0}

    if [ $size -ne 0 ]; then

    if [ "$size" -ne 0 ]; then

	ERROR=1

	echo "Error: Section $section not empty in prom_init.c" >&2

    fi

}



for UNDEF in $($NM -u $OBJ | awk '{print $2}')

for UNDEF in $($NM -u "$OBJ" | awk '{print $2}')

do

	# On 64-bit nm gives us the function descriptors, which have

	# a leading . on the name, so strip it off here.
@@ -87,8 +87,8 @@ do 
	fi

done



check_section $OBJ .data

check_section $OBJ .bss

check_section $OBJ .init.data

check_section "$OBJ" .data

check_section "$OBJ" .bss

check_section "$OBJ" .init.data



exit $ERROR