# 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_mpc85xx_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_defconfig # make -s -j 40 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/kernel.h:10:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:9, from /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:15: /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/include/linux/err.h:22:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO) ^ /kisskb/src/include/linux/compiler.h:77:42: note: in definition of macro 'unlikely' # define unlikely(x) __builtin_expect(!!(x), 0) ^ /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:6: note: in expansion of macro 'IS_ERR_VALUE' if (IS_ERR_VALUE(fep->ring_mem_addr)) ^ 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/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/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/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/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/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/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' 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' INFO: Uncompressed kernel (size 0xb5b70c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb5b70c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb5b70c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb5b70c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb5b70c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb5b70c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb5b70c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb5b70c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb5b70c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb5b70c) overlaps the address of the wrapper(0x400000) INFO: Uncompressed kernel (size 0xb5b70c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb5b70c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb5b70c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb5b70c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb5b70c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb4af54) 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 19:13:54 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5584294 Bytes = 5453.41 kB = 5.33 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:13:54 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5584482 Bytes = 5453.60 kB = 5.33 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:13:54 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5584738 Bytes = 5453.85 kB = 5.33 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:13:55 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5561268 Bytes = 5430.93 kB = 5.30 MB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:13:54 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5584747 Bytes = 5453.85 kB = 5.33 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:13:54 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5584939 Bytes = 5454.04 kB = 5.33 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:13:55 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5584833 Bytes = 5453.94 kB = 5.33 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:13:54 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5585015 Bytes = 5454.12 kB = 5.33 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:13:55 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5584830 Bytes = 5453.94 kB = 5.33 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:13:55 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5584685 Bytes = 5453.79 kB = 5.33 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:13:55 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5584136 Bytes = 5453.26 kB = 5.33 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:13:55 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5584610 Bytes = 5453.72 kB = 5.33 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:13:54 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5585052 Bytes = 5454.15 kB = 5.33 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:13:54 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5585006 Bytes = 5454.11 kB = 5.33 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:13:55 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5585042 Bytes = 5454.14 kB = 5.33 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.17.0-rc1-g13a83ea Created: Thu Apr 19 19:13:55 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5585008 Bytes = 5454.11 kB = 5.33 MB Load Address: 00c00000 Entry Point: 00c00278 Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_defconfig_powerpc-5.3 # Build took: 0:00:54.781862