From: Jiang Liu <liuj97@gmail.com>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: bhelgaas@google.com, linux-pci@vger.kernel.org,
benh@kernel.crashing.org, aik@ozlabs.ru,
david@gibson.dropbear.id.au, joerg.roedel@amd.com,
dwmw2@infradead.org, konrad.wilk@oracle.com,
iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
ddutile@redhat.com
Subject: Re: [PATCH 1/5] pci: Add PCI DMA source ID quirk
Date: Wed, 30 May 2012 21:27:40 +0800 [thread overview]
Message-ID: <4FC6204C.5000209@gmail.com> (raw)
In-Reply-To: <20120530044834.1164.9081.stgit@bling.home>
Hi Alex,
pci_get_slot() will hold a reference count on the returned
pci device, so need to release the reference count for balance.
According to patches "[PATCH 5/7] amd_iommu: Make use of DMA quirks
and ACS checks in IOMMU groups" and "[PATCH 6/7] intel-iommu: Make
use of DMA quirks and ACS checks in IOMMU groups", current patches
failed to release the reference count gained by pci_get_slot().
Thanks
Gerry
On 05/30/2012 12:48 PM, Alex Williamson wrote:
> DMA transactions are tagged with the source ID of the device making
> the request. Occasionally hardware screws this up and uses the
> source ID of a different device (often the wrong function number of
> a multifunction device). A specific Ricoh multifunction device is
> a prime example of this problem and included in this patch. The
> purpose of this function is that given a pci_dev, return the pci_dev
> to use as the source ID for DMA. When hardware works correctly,
> this returns the input device. For the components of the Ricoh
> multifunction device, return the pci_dev for function 0.
>
> This will be used by IOMMU drivers for determining the boundaries
> of IOMMU groups as multiple devices using the same source ID must
> be contained within the same group. This can also be used by
> existing streaming DMA paths for the same purpose.
>
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> ---
>
> drivers/pci/quirks.c | 40 ++++++++++++++++++++++++++++++++++++++++
> include/linux/pci.h | 5 +++++
> 2 files changed, 45 insertions(+)
>
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 2a75216..004e167 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -3179,3 +3179,43 @@ int pci_dev_specific_reset(struct pci_dev *dev, int probe)
>
> return -ENOTTY;
> }
> +
> +static struct pci_dev *pci_func_0_dma_source(struct pci_dev *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, 0xe832, pci_func_0_dma_source },
> + { 0 }
> +};
> +
> +struct pci_dev *pci_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 dev;
> +}
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index d8c379d..5bc7502 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -1486,9 +1486,14 @@ 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_dma_source(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_dma_source(struct pci_dev *dev)
> +{
> + return dev;
> +}
> #endif
>
> void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen);
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2012-05-30 13:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-30 4:48 [PATCH 0/5] PCI: Prep for VFIO and IOMMU Groups Alex Williamson
2012-05-30 4:48 ` [PATCH 1/5] pci: Add PCI DMA source ID quirk Alex Williamson
2012-05-30 8:34 ` Gavin Shan
2012-05-30 15:36 ` Alex Williamson
2012-05-30 13:27 ` Jiang Liu [this message]
2012-05-30 18:05 ` Alex Williamson
2012-05-30 4:48 ` [PATCH 2/5] pci: Add ACS validation utility Alex Williamson
2012-05-30 4:48 ` [PATCH 3/5] pci: export pci_user functions for use by other drivers Alex Williamson
2012-05-30 4:48 ` [PATCH 4/5] pci: Create common pcibios_err_to_errno Alex Williamson
2012-05-30 4:49 ` [PATCH 5/5] pci: Misc pci_reg additions Alex Williamson
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=4FC6204C.5000209@gmail.com \
--to=liuj97@gmail.com \
--cc=aik@ozlabs.ru \
--cc=alex.williamson@redhat.com \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=david@gibson.dropbear.id.au \
--cc=ddutile@redhat.com \
--cc=dwmw2@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joerg.roedel@amd.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
/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).