# 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 20 ARCH=powerpc O=/kisskb/build/powerpc-fixes_powerpc-allyesconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- allyesconfig # Added to kconfig CONFIG_PROFILE_ALL_BRANCHES=n # Added to kconfig CONFIG_ENABLE_WARN_DEPRECATED=n # Added to kconfig CONFIG_ENABLE_MUST_CHECK=n # Added to kconfig CONFIG_DEBUG_INFO=n # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # yes \n | make -s -j 20 ARCH=powerpc O=/kisskb/build/powerpc-fixes_powerpc-allyesconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- oldconfig yes: standard output: Broken pipe yes: write error # make -s -j 20 ARCH=powerpc O=/kisskb/build/powerpc-fixes_powerpc-allyesconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/sound/aoa/codecs/onyx.c: In function 'onyx_snd_single_bit_get': /kisskb/src/sound/aoa/codecs/onyx.c:380:37: warning: 'c' may be used uninitialized in this function [-Wmaybe-uninitialized] ucontrol->value.integer.value[0] = !!(c & mask) ^ polarity; ^ 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:623:3: warning: 'px_is' may be used uninitialized in this function [-Wmaybe-uninitialized] ppc_pci_io.name al; \ ^ /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:142:2: warning: 'px_cmd' may be used uninitialized in this function [-Wmaybe-uninitialized] __asm__ __volatile__("sync;"#insn" %1,%y0" \ ^ /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+0x3ebd9c): 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+0x3ec688): 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+0x527b7c): 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+0x527ee0): 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_powerpc-allyesconfig_powerpc-5.3 # Build took: 0:20:33.479421