PCI: Move ATS declarations to linux/pci-ats.h
PATCH 1/1 PCI: Move ATS declarations to linux/pci-ats.h
Move ATS function prototypes from include/linux/pci.h to include/linux/pci-ats.h as the ATS, PRI, and PASID interfaces are related, and are used only by the IOMMU drivers. This effecively reverts the change done in commit ff9bee895c4d ("PCI: Move ATS declarations to linux/pci.h so they're all together").
Also, remove surplus forward declaration of struct pci_ats from include/linux/pci.h, as it is no longer needed, since the struct pci_ats has been embedded directly into struct pci_dev in the commit d544d75ac96a ("PCI: Embed ATS info directly into struct pci_dev").
No functional changes intended.
---
Related:
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
include/linux/pci-ats.h | 76 +++++++++++++++-------------------------- include/linux/pci.h | 14 -------- 2 files changed, 28 insertions(+), 62 deletions(-)
include/linux/pci-ats.h +28 -48
@@ -4,74 +4,54 @@#include <linux/pci.h> -#ifdef CONFIG_PCI_PRI +#ifdef CONFIG_PCI_ATS +/* Address Translation Service */ +int pci_enable_ats (struct pci_dev *dev,int ps); +void pci_disable_ats (struct pci_dev *dev); +int pci_ats_queue_depth (struct pci_dev *dev); +int pci_ats_page_aligned (struct pci_dev *dev); +#else /* CONFIG_PCI_ATS */ +static inline int pci_enable_ats (struct pci_dev *d,int ps) +{return -ENODEV ; } +static inline void pci_disable_ats (struct pci_dev *d) { } +static inline int pci_ats_queue_depth (struct pci_dev *d) +{return -ENODEV ; } +static inline int pci_ats_page_aligned (struct pci_dev *dev) +{return 0 ; } +#endif /* CONFIG_PCI_ATS */ +#ifdef CONFIG_PCI_PRI int pci_enable_pri (struct pci_dev *pdev,u32 reqs);void pci_disable_pri (struct pci_dev *pdev);void pci_restore_pri_state (struct pci_dev *pdev);int pci_reset_pri (struct pci_dev *pdev); -#else /* CONFIG_PCI_PRI */ -static inline int pci_enable_pri (struct pci_dev *pdev,u32 reqs) -{ -return -ENODEV ; -} - -static inline void pci_disable_pri (struct pci_dev *pdev) -{ -} - -static inline void pci_restore_pri_state (struct pci_dev *pdev) -{ -} - +{return -ENODEV ; } +static inline void pci_disable_pri (struct pci_dev *pdev) { } +static inline void pci_restore_pri_state (struct pci_dev *pdev) { }static inline int pci_reset_pri (struct pci_dev *pdev) -{ -return -ENODEV ; -} - +{return -ENODEV ; }#endif /* CONFIG_PCI_PRI */ #ifdef CONFIG_PCI_PASID -int pci_enable_pasid (struct pci_dev *pdev,int features);void pci_disable_pasid (struct pci_dev *pdev);void pci_restore_pasid_state (struct pci_dev *pdev);int pci_pasid_features (struct pci_dev *pdev);int pci_max_pasids (struct pci_dev *pdev);int pci_prg_resp_pasid_required (struct pci_dev *pdev); - -#else /* CONFIG_PCI_PASID */ - +#else /* CONFIG_PCI_PASID */ static inline int pci_enable_pasid (struct pci_dev *pdev,int features) -{ -return -EINVAL ; -} - -static inline void pci_disable_pasid (struct pci_dev *pdev) -{ -} - -static inline void pci_restore_pasid_state (struct pci_dev *pdev) -{ -} - +{return -EINVAL ; } +static inline void pci_disable_pasid (struct pci_dev *pdev) { } +static inline void pci_restore_pasid_state (struct pci_dev *pdev) { }static inline int pci_pasid_features (struct pci_dev *pdev) -{ -return -EINVAL ; -} - +{return -EINVAL ; }static inline int pci_max_pasids (struct pci_dev *pdev) -{ -return -EINVAL ; -} - +{return -EINVAL ; }static inline int pci_prg_resp_pasid_required (struct pci_dev *pdev) -{ -return 0 ; -} +{return 0 ; }#endif /* CONFIG_PCI_PASID */ - -#endif /* LINUX_PCI_ATS_H*/ +#endif /* LINUX_PCI_ATS_H */
include/linux/pci.h +0 -14
@@ -284,7 +284,6 @@ struct irq_affinity;struct pcie_link_state ;struct pci_vpd ;struct pci_sriov ; -struct pci_ats ;struct pci_p2pdma ;/* The pci_dev structure describes PCI devices */
@@ -1764,19 +1763,6 @@ static inline const struct pci_device_id *pci_match_id(const struct pci_device_istatic inline bool pci_ats_disabled (void ) {return true; }#endif /* CONFIG_PCI */ -#ifdef CONFIG_PCI_ATS -/* Address Translation Service */ -int pci_enable_ats (struct pci_dev *dev,int ps); -void pci_disable_ats (struct pci_dev *dev); -int pci_ats_queue_depth (struct pci_dev *dev); -int pci_ats_page_aligned (struct pci_dev *dev); -#else -static inline int pci_enable_ats (struct pci_dev *d,int ps) {return -ENODEV ; } -static inline void pci_disable_ats (struct pci_dev *d) { } -static inline int pci_ats_queue_depth (struct pci_dev *d) {return -ENODEV ; } -static inline int pci_ats_page_aligned (struct pci_dev *dev) {return 0 ; } -#endif -/* Include architecture-dependent settings and functions */ #include <asm/pci.h>
Signature · 1 line
2.23.0
Bjorn Helgaas
AppliedQuoted 13 lines · Krzysztof Wilczynski
Move ATS function prototypes from
include/linux/pci.htoinclude/linux/pci-ats.has the ATS, PRI, and PASID interfaces are related, and are used only by the IOMMU drivers. This effecively reverts the change done in commitff9bee895c4d("PCI: Move ATS declarations tolinux/pci.hso they're all together").Also, remove surplus forward declaration of struct
pci_atsfrominclude/linux/pci.h, as it is no longer needed, since the structpci_atshas been embedded directly into structpci_devin the commitd544d75ac96a("PCI: Embed ATS info directly into structpci_dev").
Quoted 3 lines
No functional changes intended.
Signed-off-by Krzysztof Wilczynski <[email protected]>
Applied to pci/virtualization for v5.5, thanks!
Quoted 151 lines
---
Related:
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]include/linux/pci-ats.h | 76 +++++++++++++++-------------------------- include/linux/pci.h | 14 -------- 2 files changed, 28 insertions(+), 62 deletions(-)include/linux/pci-ats.h +28
-48@@ -4,74 +4,54 @@#include <linux/pci.h> -#ifdef CONFIG_PCI_PRI +#ifdef CONFIG_PCI_ATS +/* Address Translation Service */ +int pci_enable_ats (struct pci_dev *dev,int ps); +void pci_disable_ats (struct pci_dev *dev); +int pci_ats_queue_depth (struct pci_dev *dev); +int pci_ats_page_aligned (struct pci_dev *dev); +#else /* CONFIG_PCI_ATS */ +static inline int pci_enable_ats (struct pci_dev *d,int ps) +{return -ENODEV ; } +static inline void pci_disable_ats (struct pci_dev *d) { } +static inline int pci_ats_queue_depth (struct pci_dev *d) +{return -ENODEV ; } +static inline int pci_ats_page_aligned (struct pci_dev *dev) +{return 0 ; } +#endif /* CONFIG_PCI_ATS */ +#ifdef CONFIG_PCI_PRI int pci_enable_pri (struct pci_dev *pdev,u32 reqs);void pci_disable_pri (struct pci_dev *pdev);void pci_restore_pri_state (struct pci_dev *pdev);int pci_reset_pri (struct pci_dev *pdev); -#else /* CONFIG_PCI_PRI */ -static inline int pci_enable_pri (struct pci_dev *pdev,u32 reqs) -{ -return -ENODEV ; -} - -static inline void pci_disable_pri (struct pci_dev *pdev) -{ -} - -static inline void pci_restore_pri_state (struct pci_dev *pdev) -{ -} - +{return -ENODEV ; } +static inline void pci_disable_pri (struct pci_dev *pdev) { } +static inline void pci_restore_pri_state (struct pci_dev *pdev) { }static inline int pci_reset_pri (struct pci_dev *pdev) -{ -return -ENODEV ; -} - +{return -ENODEV ; }#endif /* CONFIG_PCI_PRI */ #ifdef CONFIG_PCI_PASID -int pci_enable_pasid (struct pci_dev *pdev,int features);void pci_disable_pasid (struct pci_dev *pdev);void pci_restore_pasid_state (struct pci_dev *pdev);int pci_pasid_features (struct pci_dev *pdev);int pci_max_pasids (struct pci_dev *pdev);int pci_prg_resp_pasid_required (struct pci_dev *pdev); - -#else /* CONFIG_PCI_PASID */ - +#else /* CONFIG_PCI_PASID */ static inline int pci_enable_pasid (struct pci_dev *pdev,int features) -{ -return -EINVAL ; -} - -static inline void pci_disable_pasid (struct pci_dev *pdev) -{ -} - -static inline void pci_restore_pasid_state (struct pci_dev *pdev) -{ -} - +{return -EINVAL ; } +static inline void pci_disable_pasid (struct pci_dev *pdev) { } +static inline void pci_restore_pasid_state (struct pci_dev *pdev) { }static inline int pci_pasid_features (struct pci_dev *pdev) -{ -return -EINVAL ; -} - +{return -EINVAL ; }static inline int pci_max_pasids (struct pci_dev *pdev) -{ -return -EINVAL ; -} - +{return -EINVAL ; }static inline int pci_prg_resp_pasid_required (struct pci_dev *pdev) -{ -return 0 ; -} +{return 0 ; }#endif /* CONFIG_PCI_PASID */ - -#endif /* LINUX_PCI_ATS_H*/ +#endif /* LINUX_PCI_ATS_H */ include/linux/pci.h +0
-14@@ -284,7 +284,6 @@ struct irq_affinity;struct pcie_link_state ;struct pci_vpd ;struct pci_sriov ; -struct pci_ats ;struct pci_p2pdma ;/* The pci_dev structure describes PCI devices */ @@ -1764,19 +1763,6 @@ static inline const struct pci_device_id *pci_match_id(const struct pci_device_istatic inline bool pci_ats_disabled (void ) {return true; }#endif /* CONFIG_PCI */ -#ifdef CONFIG_PCI_ATS -/* Address Translation Service */ -int pci_enable_ats (struct pci_dev *dev,int ps); -void pci_disable_ats (struct pci_dev *dev); -int pci_ats_queue_depth (struct pci_dev *dev); -int pci_ats_page_aligned (struct pci_dev *dev); -#else -static inline int pci_enable_ats (struct pci_dev *d,int ps) {return -ENODEV ; } -static inline void pci_disable_ats (struct pci_dev *d) { } -static inline int pci_ats_queue_depth (struct pci_dev *d) {return -ENODEV ; } -static inline int pci_ats_page_aligned (struct pci_dev *dev) {return 0 ; } -#endif -/* Include architecture-dependent settings and functions */ #include <asm/pci.h> Signature · 1 line
2.23.0