Skip to content

Commit fdabc3f

Browse files
bjorn-helgaasBjorn Helgaas
authored andcommitted
PCI: Add #defines for Completion Timeout Disable feature
Add #defines for the Completion Timeout Disable feature and use them. No functional change intended. Signed-off-by: Bjorn Helgaas <[email protected]> Acked-by: Michael Ellerman <[email protected]>
1 parent 3203e1d commit fdabc3f

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

arch/powerpc/platforms/powernv/eeh-powernv.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1654,14 +1654,14 @@ static int pnv_eeh_restore_vf_config(struct pci_dn *pdn)
16541654
eeh_ops->write_config(pdn, edev->pcie_cap + PCI_EXP_DEVCTL,
16551655
2, devctl);
16561656

1657-
/* Disable Completion Timeout */
1657+
/* Disable Completion Timeout if possible */
16581658
eeh_ops->read_config(pdn, edev->pcie_cap + PCI_EXP_DEVCAP2,
16591659
4, &cap2);
1660-
if (cap2 & 0x10) {
1660+
if (cap2 & PCI_EXP_DEVCAP2_COMP_TMOUT_DIS) {
16611661
eeh_ops->read_config(pdn,
16621662
edev->pcie_cap + PCI_EXP_DEVCTL2,
16631663
4, &cap2);
1664-
cap2 |= 0x10;
1664+
cap2 |= PCI_EXP_DEVCTL2_COMP_TMOUT_DIS;
16651665
eeh_ops->write_config(pdn,
16661666
edev->pcie_cap + PCI_EXP_DEVCTL2,
16671667
4, cap2);

include/uapi/linux/pci_regs.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -622,6 +622,7 @@
622622
* safely.
623623
*/
624624
#define PCI_EXP_DEVCAP2 36 /* Device Capabilities 2 */
625+
#define PCI_EXP_DEVCAP2_COMP_TMOUT_DIS 0x00000010 /* Completion Timeout Disable supported */
625626
#define PCI_EXP_DEVCAP2_ARI 0x00000020 /* Alternative Routing-ID */
626627
#define PCI_EXP_DEVCAP2_ATOMIC_ROUTE 0x00000040 /* Atomic Op routing */
627628
#define PCI_EXP_DEVCAP2_ATOMIC_COMP64 0x00000100 /* Atomic 64-bit compare */
@@ -631,6 +632,7 @@
631632
#define PCI_EXP_DEVCAP2_OBFF_WAKE 0x00080000 /* Re-use WAKE# for OBFF */
632633
#define PCI_EXP_DEVCTL2 40 /* Device Control 2 */
633634
#define PCI_EXP_DEVCTL2_COMP_TIMEOUT 0x000f /* Completion Timeout Value */
635+
#define PCI_EXP_DEVCTL2_COMP_TMOUT_DIS 0x0010 /* Completion Timeout Disable */
634636
#define PCI_EXP_DEVCTL2_ARI 0x0020 /* Alternative Routing-ID */
635637
#define PCI_EXP_DEVCTL2_ATOMIC_REQ 0x0040 /* Set Atomic requests */
636638
#define PCI_EXP_DEVCTL2_ATOMIC_EGRESS_BLOCK 0x0080 /* Block atomic egress */

0 commit comments

Comments
 (0)