PCI: Remove unused pci_get_dma_source() (5d8f4c9f) · Commits · 戴 / test

drivers/pci/quirks.c

+0 −51

Original line number	Diff line number	Diff line
		@@ -3514,57 +3514,6 @@ DECLARE_PCI_FIXUP_HEADER(0x1283, 0x8892, quirk_use_pcie_bridge_dma_alias);
		/* Intel 82801, https://bugzilla.kernel.org/show_bug.cgi?id=44881#c49 */
		DECLARE_PCI_FIXUP_HEADER(0x8086, 0x244e, quirk_use_pcie_bridge_dma_alias);

		static struct pci_dev pci_func_0_dma_source(struct pci_dev dev)
		{
		if (!PCI_FUNC(dev->devfn))
		return pci_dev_get(dev);

		return pci_get_slot(dev->bus, PCI_DEVFN(PCI_SLOT(dev->devfn), 0));
		}

		static const struct pci_dev_dma_source {
		u16 vendor;
		u16 device;
		struct pci_dev (dma_source)(struct pci_dev *dev);
		} pci_dev_dma_source[] = {
		/*
		* https://bugzilla.redhat.com/show_bug.cgi?id=605888
		*
		* Some Ricoh devices use the function 0 source ID for DMA on
		* other functions of a multifunction device. The DMA devices
		* is therefore function 0, which will have implications of the
		* iommu grouping of these devices.
		*/
		{ PCI_VENDOR_ID_RICOH, 0xe822, pci_func_0_dma_source },
		{ PCI_VENDOR_ID_RICOH, 0xe230, pci_func_0_dma_source },
		{ PCI_VENDOR_ID_RICOH, 0xe832, pci_func_0_dma_source },
		{ PCI_VENDOR_ID_RICOH, 0xe476, pci_func_0_dma_source },
		{ 0 }
		};

		/*
		* IOMMUs with isolation capabilities need to be programmed with the
		* correct source ID of a device. In most cases, the source ID matches
		* the device doing the DMA, but sometimes hardware is broken and will
		* tag the DMA as being sourced from a different device. This function
		* allows that translation. Note that the reference count of the
		* returned device is incremented on all paths.
		*/
		struct pci_dev pci_get_dma_source(struct pci_dev dev)
		{
		const struct pci_dev_dma_source *i;

		for (i = pci_dev_dma_source; i->dma_source; i++) {
		if ((i->vendor == dev->vendor \|\|
		i->vendor == (u16)PCI_ANY_ID) &&
		(i->device == dev->device \|\|
		i->device == (u16)PCI_ANY_ID))
		return i->dma_source(dev);
		}

		return pci_dev_get(dev);
		}

		/*
		* AMD has indicated that the devices below do not support peer-to-peer
		* in any system where they are found in the southbridge with an AMD

include/linux/pci.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -1557,16 +1557,11 @@ enum pci_fixup_pass {

		#ifdef CONFIG_PCI_QUIRKS
		void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev);
		struct pci_dev pci_get_dma_source(struct pci_dev dev);
		int pci_dev_specific_acs_enabled(struct pci_dev *dev, u16 acs_flags);
		void pci_dev_specific_enable_acs(struct pci_dev *dev);
		#else
		static inline void pci_fixup_device(enum pci_fixup_pass pass,
		struct pci_dev *dev) { }
		static inline struct pci_dev pci_get_dma_source(struct pci_dev dev)
		{
		return pci_dev_get(dev);
		}
		static inline int pci_dev_specific_acs_enabled(struct pci_dev *dev,
		u16 acs_flags)
		{

Admin message