Merge tag 'pci-v4.16-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[linux-2.6-block.git] / arch / powerpc / kernel / eeh.c

diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index cc649809885e6ed2d1a2058f9cb2654c6c99d5e0..2b9df0040d6b507c1c64de47d9c7101c91f9a2f7 100644 (file)
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -756,14 +756,14 @@ int eeh_restore_vf_config(struct pci_dn *pdn)
                eeh_ops->write_config(pdn, edev->pcie_cap + PCI_EXP_DEVCTL,
                                      2, devctl);
 
-               /* Disable Completion Timeout */
+               /* Disable Completion Timeout if possible */
                eeh_ops->read_config(pdn, edev->pcie_cap + PCI_EXP_DEVCAP2,
                                     4, &cap2);
-               if (cap2 & 0x10) {
+               if (cap2 & PCI_EXP_DEVCAP2_COMP_TMOUT_DIS) {
                        eeh_ops->read_config(pdn,
                                             edev->pcie_cap + PCI_EXP_DEVCTL2,
                                             4, &cap2);
-                       cap2 |= 0x10;
+                       cap2 |= PCI_EXP_DEVCTL2_COMP_TMOUT_DIS;
                        eeh_ops->write_config(pdn,
                                              edev->pcie_cap + PCI_EXP_DEVCTL2,
                                              4, cap2);