diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2026-04-13 12:50:04 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2026-04-13 12:50:04 -0500 |
| commit | 7d7c6ebd46d952335ff33e21f77fdd761ac2b573 (patch) | |
| tree | 2f268aeab9141687a0c8d23838828ea6b153ad66 /include | |
| parent | a735a513ff2c219f3dc4f9c159f3a328bfb41834 (diff) | |
| parent | e1092d5e15e6a9b168bf830af9a26d7ea17cd57d (diff) | |
| download | lwn-7d7c6ebd46d952335ff33e21f77fdd761ac2b573.tar.gz lwn-7d7c6ebd46d952335ff33e21f77fdd761ac2b573.zip | |
Merge branch 'pci/ptm'
- Leave Precision Time Measurement disabled until a driver enables it to
avoid PCIe errors (Mika Westerberg)
* pci/ptm:
PCI/PTM: Do not enable PTM automatically for Root and Switch Upstream Ports
PCI/PTM: Drop pci_enable_ptm() granularity parameter
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 482dd8460dd9..47c5b0c09ffb 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -518,7 +518,7 @@ struct pci_dev { unsigned int ptm_root:1; unsigned int ptm_responder:1; unsigned int ptm_requester:1; - unsigned int ptm_enabled:1; + atomic_t ptm_enable_cnt; u8 ptm_granularity; #endif #ifdef CONFIG_PCI_MSI @@ -1973,11 +1973,11 @@ struct pci_ptm_debugfs { }; #ifdef CONFIG_PCIE_PTM -int pci_enable_ptm(struct pci_dev *dev, u8 *granularity); +int pci_enable_ptm(struct pci_dev *dev); void pci_disable_ptm(struct pci_dev *dev); bool pcie_ptm_enabled(struct pci_dev *dev); #else -static inline int pci_enable_ptm(struct pci_dev *dev, u8 *granularity) +static inline int pci_enable_ptm(struct pci_dev *dev) { return -EINVAL; } static inline void pci_disable_ptm(struct pci_dev *dev) { } static inline bool pcie_ptm_enabled(struct pci_dev *dev) |