Commit 1d71eb53 authored by Vinicius Costa Gomes's avatar Vinicius Costa Gomes Committed by Tony Nguyen
Browse files

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 ac6c26da ("PCI: Make pci_enable_ptm() private").

Signed-off-by: default avatarVinicius Costa Gomes <vinicius.gomes@intel.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 3a62c333

drivers/pci/pci.h

+0 −3
Original line number Diff line number Diff line
@@ -597,11 +597,8 @@ static inline void pcie_ecrc_get_policy(char *str) { } 


#ifdef CONFIG_PCIE_PTM

void pci_ptm_init(struct pci_dev *dev);

int pci_enable_ptm(struct pci_dev *dev, u8 *granularity);

#else

static inline void pci_ptm_init(struct pci_dev *dev) { }

static inline int pci_enable_ptm(struct pci_dev *dev, u8 *granularity)

{ return -EINVAL; }

#endif



struct pci_dev_reset_methods {

include/linux/pci.h

+7 −0
Original line number Diff line number Diff line
@@ -1620,6 +1620,13 @@ static inline bool pci_aer_available(void) { return false; } 


bool pci_ats_disabled(void);



#ifdef CONFIG_PCIE_PTM

int pci_enable_ptm(struct pci_dev *dev, u8 *granularity);

#else

static inline int pci_enable_ptm(struct pci_dev *dev, u8 *granularity)

{ return -EINVAL; }

#endif



void pci_cfg_access_lock(struct pci_dev *dev);

bool pci_cfg_access_trylock(struct pci_dev *dev);

void pci_cfg_access_unlock(struct pci_dev *dev);