# 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_mpc85xx_smp_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- mpc85xx_smp_defconfig # make -s -j 10 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- /kisskb/src/kernel/cgroup/cgroup-v1.c: In function 'cgroup1_mount': /kisskb/src/kernel/cgroup/cgroup-v1.c:1268:20: warning: 'root' may be used uninitialized in this function [-Wuninitialized] /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/mm/hugetlb.c: In function 'alloc_pool_huge_page': /kisskb/src/mm/hugetlb.c:1433:5: warning: 'page' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/sound/soc/codecs/wm8960.c: In function 'wm8960_configure_clocking': /kisskb/src/sound/soc/codecs/wm8960.c:803:70: warning: 'j' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/sound/soc/codecs/wm8960.c:800:68: warning: 'i' 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/drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:6: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] /kisskb/src/drivers/tty/serial/8250/8250_core.c: In function 'univ8250_release_irq': /kisskb/src/drivers/tty/serial/8250/8250_core.c:251:18: warning: 'i' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/tty/serial/8250/8250_core.c:231:19: note: 'i' was declared here arch/powerpc/boot/mpc8541cds.dtb: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) arch/powerpc/boot/mpc8548cds_32b.dtb: Warning (pci_bridge): /pcie@e000a000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/mpc8548cds_32b.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/mpc8555cds.dtb: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) arch/powerpc/boot/mpc8568mds.dtb: Warning (pci_bridge): /pcie@e000a000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/mpc8568mds.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/mpc8544ds.dtb: Warning (pci_bridge): /pcie@e0009000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/mpc8544ds.dtb: Warning (pci_bridge): /pcie@e000a000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/mpc8544ds.dtb: Warning (pci_bridge): /pcie@e000b000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/mpc8544ds.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/mpc8572ds.dtb: Warning (pci_bridge): /pcie@ffe08000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/mpc8572ds.dtb: Warning (pci_bridge): /pcie@ffe09000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/mpc8572ds.dtb: Warning (pci_bridge): /pcie@ffe0a000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/mpc8572ds.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/tqm8548.dtb: Warning (pci_bridge): /pcie@e000a000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/tqm8548.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/sbc8548.dtb: Warning (pci_bridge): /pcie@e000a000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/sbc8548.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' INFO: Uncompressed kernel (size 0xbf13b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf13b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf13b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf13b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf13b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf13b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf13b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf13b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf13b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe0c2c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:54:41 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5761301 Bytes = 5626.27 kB = 5.49 MB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:54:41 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5785633 Bytes = 5650.03 kB = 5.52 MB Load Address: 00c00000 Entry Point: 00c00248 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:54:41 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5785684 Bytes = 5650.08 kB = 5.52 MB Load Address: 00c00000 Entry Point: 00c00248 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:54:41 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5787515 Bytes = 5651.87 kB = 5.52 MB Load Address: 00c00000 Entry Point: 00c00248 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:54:41 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5784530 Bytes = 5648.96 kB = 5.52 MB Load Address: 00c00000 Entry Point: 00c00248 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:54:41 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5787500 Bytes = 5651.86 kB = 5.52 MB Load Address: 00c00000 Entry Point: 00c00248 INFO: Uncompressed kernel (size 0xbf13b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:54:41 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5786618 Bytes = 5650.99 kB = 5.52 MB Load Address: 00c00000 Entry Point: 00c00248 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:54:41 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5787743 Bytes = 5652.09 kB = 5.52 MB Load Address: 00c00000 Entry Point: 00c00248 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:54:41 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5786021 Bytes = 5650.41 kB = 5.52 MB Load Address: 00c00000 Entry Point: 00c00288 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:54:41 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5785899 Bytes = 5650.29 kB = 5.52 MB Load Address: 00c00000 Entry Point: 00c00248 INFO: Uncompressed kernel (size 0xbf13b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf13b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf13b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf13b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf13b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:54:43 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5785589 Bytes = 5649.99 kB = 5.52 MB Load Address: 00c00000 Entry Point: 00c00288 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:54:43 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5786088 Bytes = 5650.48 kB = 5.52 MB Load Address: 00c00000 Entry Point: 00c00288 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:54:43 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5785590 Bytes = 5649.99 kB = 5.52 MB Load Address: 00c00000 Entry Point: 00c00288 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:54:43 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5785638 Bytes = 5650.04 kB = 5.52 MB Load Address: 00c00000 Entry Point: 00c00288 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:54:43 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5786139 Bytes = 5650.53 kB = 5.52 MB Load Address: 00c00000 Entry Point: 00c00248 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 17:54:43 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5786281 Bytes = 5650.67 kB = 5.52 MB Load Address: 00c00000 Entry Point: 00c00248 Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc # Build took: 0:03:02.581746