# git rev-parse -q --verify 7312bd0c205dc9e6e30128ef9243d7bc8ba1187d^{commit} 7312bd0c205dc9e6e30128ef9243d7bc8ba1187d already have revision, skipping fetch # git checkout -q -f -B kisskb 7312bd0c205dc9e6e30128ef9243d7bc8ba1187d # git clean -qxdf # < git log -1 # commit 7312bd0c205dc9e6e30128ef9243d7bc8ba1187d # Author: Mahesh Salgaonkar # Date: Thu Aug 23 10:26:08 2018 +0530 # # powerpc/mce: Fix SLB rebolting during MCE recovery path. # # With the powerpc next commit e7e81847478b ("powerpc/64s: move machine # check SLB flushing to mm/slb.c"), the SLB error recovery is broken. # The new code now does not add the index value to RB[52-63] that # selects the SLB entry when rebolting, instead it assumes that the # shadow save area already has the index embeded correctly in the esid # field. # # While all valid bolted save areas do contain index value set # correctly, there is a case where 3rd (KSTACK_INDEX) entry for kernel # stack does not embed index for NULL esid entry. This patch fixes that. # # Without this patch the SLB rebolt code overwirtes the 1st entry of # kernel linear mapping and causes SLB recovery to fail. # # Fixes: e7e81847478b ("powerpc/64s: move machine check SLB flushing to mm/slb.c") # Signed-off-by: Mahesh Salgaonkar # Signed-off-by: Nicholas Piggin # Reviewed-by: Nicholas Piggin # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < git log --format=%s --max-count=1 7312bd0c205dc9e6e30128ef9243d7bc8ba1187d # < make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-next_44x_iss476-smp_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- 44x/iss476-smp_defconfig WARNING: unmet direct dependencies detected for HOTPLUG_CPU Depends on [n]: SMP [=y] && (PPC_PSERIES [=n] || PPC_PMAC [=n] || PPC_POWERNV [=n] || FSL_SOC_BOOKE [=n]) Selected by [y]: - PM_SLEEP_SMP [=y] && SMP [=y] && (ARCH_SUSPEND_POSSIBLE [=y] || ARCH_HIBERNATION_POSSIBLE [=y]) && PM_SLEEP [=y] WARNING: unmet direct dependencies detected for HOTPLUG_CPU Depends on [n]: SMP [=y] && (PPC_PSERIES [=n] || PPC_PMAC [=n] || PPC_POWERNV [=n] || FSL_SOC_BOOKE [=n]) Selected by [y]: - PM_SLEEP_SMP [=y] && SMP [=y] && (ARCH_SUSPEND_POSSIBLE [=y] || ARCH_HIBERNATION_POSSIBLE [=y]) && PM_SLEEP [=y] # make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-next_44x_iss476-smp_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- WARNING: unmet direct dependencies detected for HOTPLUG_CPU Depends on [n]: SMP [=y] && (PPC_PSERIES [=n] || PPC_PMAC [=n] || PPC_POWERNV [=n] || FSL_SOC_BOOKE [=n]) Selected by [y]: - PM_SLEEP_SMP [=y] && SMP [=y] && (ARCH_SUSPEND_POSSIBLE [=y] || ARCH_HIBERNATION_POSSIBLE [=y]) && PM_SLEEP [=y] WARNING: unmet direct dependencies detected for HOTPLUG_CPU Depends on [n]: SMP [=y] && (PPC_PSERIES [=n] || PPC_PMAC [=n] || PPC_POWERNV [=n] || FSL_SOC_BOOKE [=n]) Selected by [y]: - PM_SLEEP_SMP [=y] && SMP [=y] && (ARCH_SUSPEND_POSSIBLE [=y] || ARCH_HIBERNATION_POSSIBLE [=y]) && PM_SLEEP [=y] /kisskb/src/net/Makefile:24: CC cannot link executables. Skipping bpfilter. /kisskb/src/net/Makefile:24: CC cannot link executables. Skipping bpfilter. INFO: Uncompressed kernel (size 0x5cafb8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5cafb8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) Completed OK # rm -rf /kisskb/build/powerpc-next_44x_iss476-smp_defconfig_powerpc-5.3 # Build took: 0:00:26.882018