mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-12 03:26:26 +00:00
Revert "PCI: Make pci_enable_ptm() private"
commit1d71eb53e4
upstream. 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 commitac6c26da29
("PCI: Make pci_enable_ptm() private"). Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Signed-off-by: Meng Tang <tangmeng@uniontech.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e1513a714d
commit
f0a7adff63
2 changed files with 7 additions and 3 deletions
|
@ -585,11 +585,8 @@ static inline void pcie_ecrc_get_policy(char *str) { }
|
||||||
|
|
||||||
#ifdef CONFIG_PCIE_PTM
|
#ifdef CONFIG_PCIE_PTM
|
||||||
void pci_ptm_init(struct pci_dev *dev);
|
void pci_ptm_init(struct pci_dev *dev);
|
||||||
int pci_enable_ptm(struct pci_dev *dev, u8 *granularity);
|
|
||||||
#else
|
#else
|
||||||
static inline void pci_ptm_init(struct pci_dev *dev) { }
|
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
|
#endif
|
||||||
|
|
||||||
struct pci_dev_reset_methods {
|
struct pci_dev_reset_methods {
|
||||||
|
|
|
@ -1599,6 +1599,13 @@ static inline bool pci_aer_available(void) { return false; }
|
||||||
|
|
||||||
bool pci_ats_disabled(void);
|
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);
|
void pci_cfg_access_lock(struct pci_dev *dev);
|
||||||
bool pci_cfg_access_trylock(struct pci_dev *dev);
|
bool pci_cfg_access_trylock(struct pci_dev *dev);
|
||||||
void pci_cfg_access_unlock(struct pci_dev *dev);
|
void pci_cfg_access_unlock(struct pci_dev *dev);
|
||||||
|
|
Loading…
Reference in a new issue