Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdabc3fe authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

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: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 3203e1d9

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

+3 −3
Original line number Diff line number Diff line
@@ -1654,14 +1654,14 @@ static int pnv_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);

include/uapi/linux/pci_regs.h

+2 −0
Original line number Diff line number Diff line
@@ -622,6 +622,7 @@ 
 * safely.

 */

#define PCI_EXP_DEVCAP2		36	/* Device Capabilities 2 */

#define  PCI_EXP_DEVCAP2_COMP_TMOUT_DIS	0x00000010 /* Completion Timeout Disable supported */

#define  PCI_EXP_DEVCAP2_ARI		0x00000020 /* Alternative Routing-ID */

#define  PCI_EXP_DEVCAP2_ATOMIC_ROUTE	0x00000040 /* Atomic Op routing */

#define PCI_EXP_DEVCAP2_ATOMIC_COMP64	0x00000100 /* Atomic 64-bit compare */
@@ -631,6 +632,7 @@ 
#define  PCI_EXP_DEVCAP2_OBFF_WAKE	0x00080000 /* Re-use WAKE# for OBFF */

#define PCI_EXP_DEVCTL2		40	/* Device Control 2 */

#define  PCI_EXP_DEVCTL2_COMP_TIMEOUT	0x000f	/* Completion Timeout Value */

#define  PCI_EXP_DEVCTL2_COMP_TMOUT_DIS	0x0010	/* Completion Timeout Disable */

#define  PCI_EXP_DEVCTL2_ARI		0x0020	/* Alternative Routing-ID */

#define PCI_EXP_DEVCTL2_ATOMIC_REQ	0x0040	/* Set Atomic requests */

#define PCI_EXP_DEVCTL2_ATOMIC_EGRESS_BLOCK 0x0080 /* Block atomic egress */