PCI: Move ATS declarations to linux/pci.h so they're all together (ff9bee89) · Commits · 戴 / test

include/linux/pci-ats.h

+0 −41

Original line number	Diff line number	Diff line
		@@ -3,47 +3,6 @@

		#include <linux/pci.h>

		/* Address Translation Service */
		#ifdef CONFIG_PCI_ATS

		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);

		/**
		* pci_ats_enabled - query the ATS status
		* @dev: the PCI device
		*
		* Returns 1 if ATS capability is enabled, or 0 if not.
		*/
		static inline int pci_ats_enabled(struct pci_dev *dev)
		{
		return dev->ats_cap && dev->ats_enabled;
		}

		#else /* CONFIG_PCI_ATS */

		static inline int pci_enable_ats(struct pci_dev *dev, int ps)
		{
		return -ENODEV;
		}

		static inline void pci_disable_ats(struct pci_dev *dev)
		{
		}

		static inline int pci_ats_queue_depth(struct pci_dev *dev)
		{
		return -ENODEV;
		}

		static inline int pci_ats_enabled(struct pci_dev *dev)
		{
		return 0;
		}

		#endif /* CONFIG_PCI_ATS */

		#ifdef CONFIG_PCI_PRI

		int pci_enable_pri(struct pci_dev *pdev, u32 reqs);

+9 −1

Original line number	Diff line number	Diff line
		@@ -1301,8 +1301,16 @@ void ht_destroy_irq(unsigned int irq);
		#ifdef CONFIG_PCI_ATS
		/* Address Translation Service */
		void pci_ats_init(struct pci_dev *dev);
		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);
		static inline int pci_ats_enabled(struct pci_dev *dev) { return dev->ats_cap && dev->ats_enabled; }
		#else
		static inline void pci_ats_init(struct pci_dev *dev) { }
		static inline void pci_ats_init(struct pci_dev *d) { }
		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_enabled(struct pci_dev *d) { return 0; }
		#endif

		void pci_cfg_access_lock(struct pci_dev *dev);