# git rev-parse -q --verify 0f52b3a00c789569d7ed822b5a6b30f59a8d4393^{commit} 0f52b3a00c789569d7ed822b5a6b30f59a8d4393 already have revision, skipping fetch # git checkout -q -f -B kisskb 0f52b3a00c789569d7ed822b5a6b30f59a8d4393 # git clean -qxdf # < git log -1 # commit 0f52b3a00c789569d7ed822b5a6b30f59a8d4393 # Author: Mahesh Salgaonkar # Date: Thu Aug 23 10:26:08 2018 +0530 # # powerpc/mce: Fix SLB rebolting during MCE recovery path. # # The commit e7e81847478 ("powerpc/64s: move machine check SLB flushing # to mm/slb.c") introduced a bug in reloading bolted SLB entries. Unused # bolted entries are stored with .esid=0 in the slb_shadow area, and # that value is now used directly as the RB input to slbmte, which means # the RB[52:63] index field is set to 0, which causes SLB entry 0 to be # cleared. # # Fix this by storing the index bits in the unused bolted entries, which # directs the slbmte to the right place. # # The SLB shadow area is also used by the hypervisor, but PAPR is okay # with that, from LoPAPR v1.1, 14.11.1.3 SLB Shadow Buffer: # # Note: SLB is filled sequentially starting at index 0 # from the shadow buffer ignoring the contents of # RB field bits 52-63 # # 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/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < git log --format=%s --max-count=1 0f52b3a00c789569d7ed822b5a6b30f59a8d4393 # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-next_ppc64_book3e_allmodconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc64_book3e_allmodconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-next_ppc64_book3e_allmodconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/net/Makefile:24: CC cannot link executables. Skipping bpfilter. /kisskb/src/net/Makefile:24: CC cannot link executables. Skipping bpfilter. /kisskb/src/drivers/usb/phy/phy-fsl-usb.c: In function 'usb_otg_start': /kisskb/src/drivers/usb/phy/phy-fsl-usb.c:865:3: error: '_fsl_readl' undeclared (first use in this function) _fsl_readl = _fsl_readl_be; ^ /kisskb/src/drivers/usb/phy/phy-fsl-usb.c:865:3: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/drivers/usb/phy/phy-fsl-usb.c:865:16: error: '_fsl_readl_be' undeclared (first use in this function) _fsl_readl = _fsl_readl_be; ^ /kisskb/src/drivers/usb/phy/phy-fsl-usb.c:866:3: error: '_fsl_writel' undeclared (first use in this function) _fsl_writel = _fsl_writel_be; ^ /kisskb/src/drivers/usb/phy/phy-fsl-usb.c:866:17: error: '_fsl_writel_be' undeclared (first use in this function) _fsl_writel = _fsl_writel_be; ^ /kisskb/src/drivers/usb/phy/phy-fsl-usb.c:868:16: error: '_fsl_readl_le' undeclared (first use in this function) _fsl_readl = _fsl_readl_le; ^ /kisskb/src/drivers/usb/phy/phy-fsl-usb.c:869:17: error: '_fsl_writel_le' undeclared (first use in this function) _fsl_writel = _fsl_writel_le; ^ In file included from /kisskb/src/include/linux/kobject.h:20:0, from /kisskb/src/include/linux/module.h:17, from /kisskb/src/drivers/usb/phy/phy-fsl-usb.c:11: /kisskb/src/drivers/usb/phy/phy-fsl-usb.c: At top level: /kisskb/src/drivers/usb/phy/phy-fsl-usb.c:1042:49: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] static DEVICE_ATTR(fsl_usb2_otg_state, S_IRUGO, show_fsl_usb2_otg_state, NULL); ^ /kisskb/src/include/linux/sysfs.h:104:10: note: in definition of macro '__ATTR' .show = _show, \ ^ /kisskb/src/drivers/usb/phy/phy-fsl-usb.c:1042:8: note: in expansion of macro 'DEVICE_ATTR' static DEVICE_ATTR(fsl_usb2_otg_state, S_IRUGO, show_fsl_usb2_otg_state, NULL); ^ /kisskb/src/drivers/usb/phy/phy-fsl-usb.c:1042:49: note: (near initialization for 'dev_attr_fsl_usb2_otg_state.show') static DEVICE_ATTR(fsl_usb2_otg_state, S_IRUGO, show_fsl_usb2_otg_state, NULL); ^ /kisskb/src/include/linux/sysfs.h:104:10: note: in definition of macro '__ATTR' .show = _show, \ ^ /kisskb/src/drivers/usb/phy/phy-fsl-usb.c:1042:8: note: in expansion of macro 'DEVICE_ATTR' static DEVICE_ATTR(fsl_usb2_otg_state, S_IRUGO, show_fsl_usb2_otg_state, NULL); ^ cc1: some warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:318: drivers/usb/phy/phy-fsl-usb.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:558: drivers/usb/phy] Error 2 make[3]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/drivers/net/ethernet/aurora/nb8800.c:40:0: /kisskb/src/drivers/net/ethernet/aurora/nb8800.h:92:0: warning: "TCR_DIE" redefined #define TCR_DIE BIT(7) ^ In file included from /kisskb/src/arch/powerpc/include/asm/reg.h:21:0, from /kisskb/src/arch/powerpc/include/asm/processor.h:13, from /kisskb/src/arch/powerpc/include/asm/thread_info.h:28, from /kisskb/src/include/linux/thread_info.h:38, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/powerpc/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:81, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/module.h:10, from /kisskb/src/drivers/net/ethernet/aurora/nb8800.c:23: /kisskb/src/arch/powerpc/include/asm/reg_booke.h:554:0: note: this is the location of the previous definition #define TCR_DIE TCR_PIE /* DEC Interrupt Enable */ ^ make[2]: *** [/kisskb/src/scripts/Makefile.build:558: drivers/usb] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1034: drivers] Error 2 make: *** [Makefile:146: sub-make] Error 2 Command 'make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-next_ppc64_book3e_allmodconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/powerpc-next_ppc64_book3e_allmodconfig_powerpc-gcc5 # Build took: 0:11:00.683380