# 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.2.0-nolibc/powerpc64le-linux/bin/powerpc64le-linux-gcc --version # < git log --format=%s --max-count=1 13a83eac373c49c0a081cbcd137e79210fe78acd # < make -s -j 10 ARCH=powerpc O=/kisskb/build/powerpc-fixes_allmodconfig+ppc64le_ppc64le CROSS_COMPILE=/opt/cross/kisskb/gcc-5.2.0-nolibc/powerpc64le-linux/bin/powerpc64le-linux- allmodconfig # Added to kconfig CONFIG_CPU_LITTLE_ENDIAN=y # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # yes \n | make -s -j 10 ARCH=powerpc O=/kisskb/build/powerpc-fixes_allmodconfig+ppc64le_ppc64le CROSS_COMPILE=/opt/cross/kisskb/gcc-5.2.0-nolibc/powerpc64le-linux/bin/powerpc64le-linux- oldconfig yes: standard output: Broken pipe yes: write error # make -s -j 10 ARCH=powerpc O=/kisskb/build/powerpc-fixes_allmodconfig+ppc64le_ppc64le CROSS_COMPILE=/opt/cross/kisskb/gcc-5.2.0-nolibc/powerpc64le-linux/bin/powerpc64le-linux- In file included from /kisskb/src/include/linux/io.h:25:0, from /kisskb/src/include/linux/of_address.h:7, from /kisskb/src/drivers/ata/ahci_qoriq.c:18: /kisskb/src/drivers/ata/ahci_qoriq.c: In function 'ahci_qoriq_hardreset': /kisskb/src/arch/powerpc/include/asm/io.h:160:2: warning: 'px_is' may be used uninitialized in this function [-Wmaybe-uninitialized] __asm__ __volatile__("sync;"#insn"%U0%X0 %1,%0" \ ^ /kisskb/src/drivers/ata/ahci_qoriq.c:86:14: note: 'px_is' was declared here u32 px_cmd, px_is, px_val; ^ In file included from /kisskb/src/include/linux/io.h:25:0, from /kisskb/src/include/linux/of_address.h:7, from /kisskb/src/drivers/ata/ahci_qoriq.c:18: /kisskb/src/arch/powerpc/include/asm/io.h:160:2: warning: 'px_cmd' may be used uninitialized in this function [-Wmaybe-uninitialized] __asm__ __volatile__("sync;"#insn"%U0%X0 %1,%0" \ ^ /kisskb/src/drivers/ata/ahci_qoriq.c:86:6: note: 'px_cmd' was declared here u32 px_cmd, px_is, px_val; ^ WARNING: vmlinux.o(.text+0x3664): Section mismatch in reference from the variable __boot_from_prom to the function .init.text:prom_init() The function __boot_from_prom() references the function __init prom_init(). This is often because __boot_from_prom lacks a __init annotation or the annotation of prom_init is wrong. WARNING: vmlinux.o(.text+0x3944): Section mismatch in reference from the variable start_here_multiplatform to the function .init.text:early_setup() The function start_here_multiplatform() references the function __init early_setup(). This is often because start_here_multiplatform lacks a __init annotation or the annotation of early_setup is wrong. WARNING: vmlinux.o(.text+0x3978): Section mismatch in reference from the variable start_here_common to the function .init.text:start_kernel() The function start_here_common() references the function __init start_kernel(). This is often because start_here_common lacks a __init annotation or the annotation of start_kernel is wrong. WARNING: vmlinux.o(.text+0x35baec): Section mismatch in reference from the function devm_memremap_pages() to the function .meminit.text:arch_add_memory() The function devm_memremap_pages() references the function __meminit arch_add_memory(). This is often because devm_memremap_pages lacks a __meminit annotation or the annotation of arch_add_memory is wrong. WARNING: vmlinux.o(.text+0x35c3c8): Section mismatch in reference from the function devm_memremap_pages_release() to the function .meminit.text:arch_remove_memory() The function devm_memremap_pages_release() references the function __meminit arch_remove_memory(). This is often because devm_memremap_pages_release lacks a __meminit annotation or the annotation of arch_remove_memory is wrong. WARNING: vmlinux.o(.text+0x498dfc): Section mismatch in reference from the function hmm_devmem_release() to the function .meminit.text:arch_remove_memory() The function hmm_devmem_release() references the function __meminit arch_remove_memory(). This is often because hmm_devmem_release lacks a __meminit annotation or the annotation of arch_remove_memory is wrong. WARNING: vmlinux.o(.text+0x499170): Section mismatch in reference from the function hmm_devmem_pages_create() to the function .meminit.text:arch_add_memory() The function hmm_devmem_pages_create() references the function __meminit arch_add_memory(). This is often because hmm_devmem_pages_create lacks a __meminit annotation or the annotation of arch_add_memory is wrong. Completed OK # rm -rf /kisskb/build/powerpc-fixes_allmodconfig+ppc64le_ppc64le # Build took: 0:16:49.802812