From: Vinicius Costa Gomes <vinicius.gomes@intel.com>
To: intel-wired-lan@lists.osuosl.org
Cc: Vinicius Costa Gomes <vinicius.gomes@intel.com>,
sasha.neftin@intel.com, anthony.l.nguyen@intel.com,
linux-pci@vger.kernel.org, bhelgaas@google.com,
netdev@vger.kernel.org, mlichvar@redhat.com,
richardcochran@gmail.com, hch@infradead.org, helgaas@kernel.org
Subject: [PATCH next-queue v5 1/4] Revert "PCI: Make pci_enable_ptm() private"
Date: Fri, 4 Jun 2021 17:23:53 -0700 [thread overview]
Message-ID: <20210605002356.3996853-2-vinicius.gomes@intel.com> (raw)
In-Reply-To: <20210605002356.3996853-1-vinicius.gomes@intel.com>
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 ac6c26da29c1 ("PCI: Make pci_enable_ptm() private").
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
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
next prev parent reply other threads:[~2021-06-05 0:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-05 0:23 [PATCH next-queue v5 0/4] igc: Add support for PCIe PTM Vinicius Costa Gomes
2021-06-05 0:23 ` Vinicius Costa Gomes [this message]
2021-06-05 0:23 ` [PATCH next-queue v5 2/4] PCI: Add pcie_ptm_enabled() Vinicius Costa Gomes
2021-06-05 0:23 ` [PATCH next-queue v5 3/4] igc: Enable PCIe PTM Vinicius Costa Gomes
2021-06-05 6:42 ` [Intel-wired-lan] " Paul Menzel
2021-06-08 19:02 ` Vinicius Costa Gomes
2021-06-09 6:24 ` Paul Menzel
2021-06-09 20:08 ` Vinicius Costa Gomes
2021-06-09 21:26 ` Paul Menzel
2021-06-09 23:07 ` Vinicius Costa Gomes
2021-06-09 23:20 ` Bjorn Helgaas
2021-06-10 0:04 ` Vinicius Costa Gomes
2021-06-05 0:23 ` [PATCH next-queue v5 4/4] igc: Add support for PTP getcrosststamp() Vinicius Costa Gomes
2021-06-05 6:36 ` [Intel-wired-lan] " Paul Menzel
2021-06-08 22:02 ` Vinicius Costa Gomes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210605002356.3996853-2-vinicius.gomes@intel.com \
--to=vinicius.gomes@intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=bhelgaas@google.com \
--cc=hch@infradead.org \
--cc=helgaas@kernel.org \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=linux-pci@vger.kernel.org \
--cc=mlichvar@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.com \
--cc=sasha.neftin@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).