# git rev-parse -q --verify 13a83eac373c49c0a081cbcd137e79210fe78acd^{commit} 13a83eac373c49c0a081cbcd137e79210fe78acd already have revision, skipping fetch # git checkout -q -f -B kisskb 13a83eac373c49c0a081cbcd137e79210fe78acd # git clean -qxdf # < git log -1 # commit 13a83eac373c49c0a081cbcd137e79210fe78acd # Author: Michael Neuling # Date: Wed Apr 11 13:37:58 2018 +1000 # # powerpc/eeh: Fix enabling bridge MMIO windows # # On boot we save the configuration space of PCIe bridges. We do this so # when we get an EEH event and everything gets reset that we can restore # them. # # Unfortunately we save this state before we've enabled the MMIO space # on the bridges. Hence if we have to reset the bridge when we come back # MMIO is not enabled and we end up taking an PE freeze when the driver # starts accessing again. # # This patch forces the memory/MMIO and bus mastering on when restoring # bridges on EEH. Ideally we'd do this correctly by saving the # configuration space writes later, but that will have to come later in # a larger EEH rewrite. For now we have this simple fix. # # The original bug can be triggered on a boston machine by doing: # echo 0x8000000000000000 > /sys/kernel/debug/powerpc/PCI0001/err_injct_outbound # On boston, this PHB has a PCIe switch on it. Without this patch, # you'll see two EEH events, 1 expected and 1 the failure we are fixing # here. The second EEH event causes the anything under the PHB to # disappear (i.e. the i40e eth). # # With this patch, only 1 EEH event occurs and devices properly recover. # # Fixes: 652defed4875 ("powerpc/eeh: Check PCIe link after reset") # Cc: stable@vger.kernel.org # v3.11+ # Reported-by: Pridhiviraj Paidipeddi # Signed-off-by: Michael Neuling # Acked-by: Russell Currey # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-gcc --version # < git log --format=%s --max-count=1 13a83eac373c49c0a081cbcd137e79210fe78acd # < make -s -j 10 ARCH=powerpc O=/kisskb/build/powerpc-fixes_c2k_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- c2k_defconfig WARNING: unmet direct dependencies detected for NOT_COHERENT_CACHE Depends on [n]: 4xx [=n] || PPC_8xx [=n] || E200 [=n] || PPC_MPC512x [=n] || GAMECUBE_COMMON [=n] Selected by [y]: - PPC_C2K [=y] && EMBEDDED6xx [=y] WARNING: unmet direct dependencies detected for NOT_COHERENT_CACHE Depends on [n]: 4xx [=n] || PPC_8xx [=n] || E200 [=n] || PPC_MPC512x [=n] || GAMECUBE_COMMON [=n] Selected by [y]: - PPC_C2K [=y] && EMBEDDED6xx [=y] # make -s -j 10 ARCH=powerpc O=/kisskb/build/powerpc-fixes_c2k_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- WARNING: unmet direct dependencies detected for NOT_COHERENT_CACHE Depends on [n]: 4xx [=n] || PPC_8xx [=n] || E200 [=n] || PPC_MPC512x [=n] || GAMECUBE_COMMON [=n] Selected by [y]: - PPC_C2K [=y] && EMBEDDED6xx [=y] WARNING: unmet direct dependencies detected for NOT_COHERENT_CACHE Depends on [n]: 4xx [=n] || PPC_8xx [=n] || E200 [=n] || PPC_MPC512x [=n] || GAMECUBE_COMMON [=n] Selected by [y]: - PPC_C2K [=y] && EMBEDDED6xx [=y] /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:183:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/base/regmap/regmap.c: In function 'regmap_raw_read': /kisskb/src/drivers/base/regmap/regmap.c:2497:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/base/regmap/regmap.c: In function '_regmap_raw_write': /kisskb/src/drivers/base/regmap/regmap.c:1819:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c: In function 'proc_reg_open': /kisskb/src/include/linux/list.h:65:12: warning: 'pdeo' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c:340:21: note: 'pdeo' was declared here /kisskb/src/net/bridge/br_netlink.c: In function 'br_afspec': /kisskb/src/net/bridge/br_netlink.c:635:7: warning: 'err' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c: In function 'tun_get_user': /kisskb/src/drivers/net/tun.c:1827:30: warning: 'copylen' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c:1737:46: warning: 'linear' may be used uninitialized in this function [-Wuninitialized] INFO: Uncompressed kernel (size 0x6b9eac) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:52:05 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3251597 Bytes = 3175.39 kB = 3.10 MB Load Address: 00700000 Entry Point: 007004fc Completed OK # rm -rf /kisskb/build/powerpc-fixes_c2k_defconfig_powerpc # Build took: 0:01:59.227690