# 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-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < git log --format=%s --max-count=1 13a83eac373c49c0a081cbcd137e79210fe78acd # < make -s -j 40 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc44x_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc44x_defconfig # make -s -j 40 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc44x_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- arch/powerpc/boot/ebony.dtb: Warning (pci_bridge): /plb/pci@20ec00000: missing bus-range for PCI bridge arch/powerpc/boot/ebony.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/bamboo.dtb: Warning (pci_bridge): /plb/pci@ec000000: missing bus-range for PCI bridge arch/powerpc/boot/bamboo.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/sam440ep.dtb: Warning (pci_bridge): /plb/pci@ec000000: missing bus-range for PCI bridge arch/powerpc/boot/sam440ep.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/sequoia.dtb: Warning (pci_bridge): /plb/pci@1ec000000: missing bus-range for PCI bridge arch/powerpc/boot/sequoia.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/rainier.dtb: Warning (pci_bridge): /plb/pci@1ec000000: missing bus-range for PCI bridge arch/powerpc/boot/rainier.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/taishan.dtb: Warning (pci_bridge): /plb/pci@20ec00000: missing bus-range for PCI bridge arch/powerpc/boot/taishan.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/katmai.dtb: Warning (pci_bridge): /plb/pciex@d00000000: node name is not "pci" or "pcie" arch/powerpc/boot/katmai.dtb: Warning (pci_bridge): /plb/pciex@d20000000: node name is not "pci" or "pcie" arch/powerpc/boot/katmai.dtb: Warning (pci_bridge): /plb/pciex@d40000000: node name is not "pci" or "pcie" arch/powerpc/boot/katmai.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/yosemite.dtb: Warning (pci_bridge): /plb/pci@ec000000: missing bus-range for PCI bridge arch/powerpc/boot/yosemite.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' INFO: Uncompressed kernel (size 0x567c68) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x567c68) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x567c68) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x567c68) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x567c68) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x567c68) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x567c68) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x567c68) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x567c68) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x567c68) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x567c68) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x557550) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:14:18 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2666174 Bytes = 2603.69 kB = 2.54 MB Load Address: 00600000 Entry Point: 006010f8 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:14:18 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2665583 Bytes = 2603.11 kB = 2.54 MB Load Address: 00600000 Entry Point: 006010ec Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:14:18 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2666058 Bytes = 2603.57 kB = 2.54 MB Load Address: 00600000 Entry Point: 0060110c Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:14:18 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2665580 Bytes = 2603.11 kB = 2.54 MB Load Address: 00600000 Entry Point: 00601104 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:14:18 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2665160 Bytes = 2602.70 kB = 2.54 MB Load Address: 00600000 Entry Point: 006000a8 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:14:18 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2639875 Bytes = 2578.00 kB = 2.52 MB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:14:18 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2666325 Bytes = 2603.83 kB = 2.54 MB Load Address: 00600000 Entry Point: 00601104 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:14:18 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2665227 Bytes = 2602.76 kB = 2.54 MB Load Address: 00600000 Entry Point: 006010fc Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:14:18 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2666088 Bytes = 2603.60 kB = 2.54 MB Load Address: 00600000 Entry Point: 0060018c Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:14:18 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2666207 Bytes = 2603.72 kB = 2.54 MB Load Address: 00600000 Entry Point: 00601110 Completed OK # rm -rf /kisskb/build/powerpc-fixes_ppc44x_defconfig_powerpc-5.3 # Build took: 0:00:23.135203