Skip to content

Commit 1d71eb5

Browse files
vcgomesanguy11
authored andcommitted
Revert "PCI: Make pci_enable_ptm() private"
Make pci_enable_ptm() accessible from the drivers. Exposing this to the driver enables the driver to use the 'ptm_enabled' field of 'pci_dev' to check if PTM is enabled or not. This reverts commit ac6c26d ("PCI: Make pci_enable_ptm() private"). Signed-off-by: Vinicius Costa Gomes <[email protected]> Acked-by: Bjorn Helgaas <[email protected]> Signed-off-by: Tony Nguyen <[email protected]>
1 parent 3a62c33 commit 1d71eb5

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

drivers/pci/pci.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -597,11 +597,8 @@ static inline void pcie_ecrc_get_policy(char *str) { }
597597

598598
#ifdef CONFIG_PCIE_PTM
599599
void pci_ptm_init(struct pci_dev *dev);
600-
int pci_enable_ptm(struct pci_dev *dev, u8 *granularity);
601600
#else
602601
static inline void pci_ptm_init(struct pci_dev *dev) { }
603-
static inline int pci_enable_ptm(struct pci_dev *dev, u8 *granularity)
604-
{ return -EINVAL; }
605602
#endif
606603

607604
struct pci_dev_reset_methods {

include/linux/pci.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1620,6 +1620,13 @@ static inline bool pci_aer_available(void) { return false; }
16201620

16211621
bool pci_ats_disabled(void);
16221622

1623+
#ifdef CONFIG_PCIE_PTM
1624+
int pci_enable_ptm(struct pci_dev *dev, u8 *granularity);
1625+
#else
1626+
static inline int pci_enable_ptm(struct pci_dev *dev, u8 *granularity)
1627+
{ return -EINVAL; }
1628+
#endif
1629+
16231630
void pci_cfg_access_lock(struct pci_dev *dev);
16241631
bool pci_cfg_access_trylock(struct pci_dev *dev);
16251632
void pci_cfg_access_unlock(struct pci_dev *dev);

0 commit comments

Comments
 (0)