Re: [PATCH next-queue v4 1/4] Revert "PCI: Make pci_enable_ptm() private"
From: Bjorn Helgaas <helgaas@kernel.org>
Date: 2021-06-04 22:25:47
Also in:
intel-wired-lan, linux-pci
On Fri, Jun 04, 2021 at 03:09:30PM -0700, Vinicius Costa Gomes wrote:
Make pci_enable_ptm() accessible from the drivers. Even if PTM still works on the platform I am using without calling this function, it might be possible that it's not always the case.
Not really relevant to this commit, strictly speaking.
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 ac6c26da29c12fa511c877c273ed5c939dc9e96c.
Ideally I would cite this as ac6c26da29c1 ("PCI: Make pci_enable_ptm()
private") so there's a little more context.
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Acked regardless of the above.
quoted hunk ↗ jump to hunk
--- drivers/pci/pci.h | 3 --- include/linux/pci.h | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-)diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 37c913bbc6e1..32dab36c717e 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h@@ -593,11 +593,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 {diff --git a/include/linux/pci.h b/include/linux/pci.h index c20211e59a57..a687dda262dd 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h@@ -1617,6 +1617,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);-- 2.31.1