From: James Sewart via iommu <iommu@lists.linux-foundation.org>
To: linux-pci@vger.kernel.org
Cc: Dmitry Safonov <dima@arista.com>,
Dmitry Safonov <0x7f454c46@gmail.com>,
iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
Alex Williamson <alex.williamson@redhat.com>,
Bjorn Helgaas <helgaas@kernel.org>,
Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH v3 1/2] PCI: Add helper pci_add_dma_alias_range
Date: Tue, 26 Nov 2019 17:36:13 +0000 [thread overview]
Message-ID: <8855EF11-4B75-4D09-B1E3-CD668DE94C27@arista.com> (raw)
In-Reply-To: <3cd1d36f-a8ba-92dc-f991-19e2f9196eba@deltatee.com>
pci_add_dma_alias_range can be used to create a dma alias for range of
devfns.
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: James Sewart <jamessewart@arista.com>
---
drivers/pci/pci.c | 30 +++++++++++++++++++++++-------
include/linux/pci.h | 1 +
2 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index a97e2571a527..68339309c0f4 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -5854,6 +5854,18 @@ int pci_set_vga_state(struct pci_dev *dev, bool decode,
return 0;
}
+int _pci_add_dma_alias_range(struct pci_dev *dev, u8 devfn_from, int len)
+{
+ if (!dev->dma_alias_mask)
+ dev->dma_alias_mask = bitmap_zalloc(U8_MAX, GFP_KERNEL);
+ if (!dev->dma_alias_mask) {
+ pci_warn(dev, "Unable to allocate DMA alias mask\n");
+ return -ENOMEM;
+ }
+ bitmap_set(dev->dma_alias_mask, devfn_from, len);
+ return 0;
+}
+
/**
* pci_add_dma_alias - Add a DMA devfn alias for a device
* @dev: the PCI device for which alias is added
@@ -5875,18 +5887,22 @@ int pci_set_vga_state(struct pci_dev *dev, bool decode,
*/
void pci_add_dma_alias(struct pci_dev *dev, u8 devfn)
{
- if (!dev->dma_alias_mask)
- dev->dma_alias_mask = bitmap_zalloc(U8_MAX, GFP_KERNEL);
- if (!dev->dma_alias_mask) {
- pci_warn(dev, "Unable to allocate DMA alias mask\n");
+ if (_pci_add_dma_alias_range(dev, devfn, 1) != 0)
return;
- }
-
- set_bit(devfn, dev->dma_alias_mask);
pci_info(dev, "Enabling fixed DMA alias to %02x.%d\n",
PCI_SLOT(devfn), PCI_FUNC(devfn));
}
+void pci_add_dma_alias_range(struct pci_dev *dev, u8 devfn_from, int len)
+{
+ int devfn_to = devfn_from + len - 1;
+
+ if (_pci_add_dma_alias_range(dev, devfn_from, len) != 0)
+ return;
+ pci_info(dev, "Enabling fixed DMA alias for devfn range from %02x.%d to %02x.%d\n",
+ PCI_SLOT(devfn_from), PCI_FUNC(devfn_from), PCI_SLOT(devfn_to), PCI_FUNC(devfn_to));
+}
+
bool pci_devs_are_dma_aliases(struct pci_dev *dev1, struct pci_dev *dev2)
{
return (dev1->dma_alias_mask &&
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 1a6cf19eac2d..6765f3d0102b 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -2324,6 +2324,7 @@ static inline struct eeh_dev *pci_dev_to_eeh_dev(struct pci_dev *pdev)
#endif
void pci_add_dma_alias(struct pci_dev *dev, u8 devfn);
+void pci_add_dma_alias_range(struct pci_dev *dev, u8 devfn_from, int len);
bool pci_devs_are_dma_aliases(struct pci_dev *dev1, struct pci_dev *dev2);
int pci_for_each_dma_alias(struct pci_dev *pdev,
int (*fn)(struct pci_dev *pdev,
--
2.24.0
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2019-11-26 17:42 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-24 12:52 [PATCH] Ensure pci transactions coming from PLX NTB are handled when IOMMU is turned on James Sewart via iommu
2019-11-05 12:17 ` James Sewart via iommu
2019-11-20 17:48 ` Dmitry Safonov
2019-11-20 19:30 ` Logan Gunthorpe
2019-11-20 19:49 ` Bjorn Helgaas
2019-11-20 19:32 ` Bjorn Helgaas
2019-11-26 17:03 ` [PATCH v2] PCI: Add DMA alias quirk for PLX PEX NTB James Sewart via iommu
2019-11-26 17:06 ` Logan Gunthorpe
2019-11-26 17:36 ` James Sewart via iommu [this message]
2019-11-26 17:37 ` [PATCH v3 2/2] " James Sewart via iommu
2019-11-26 17:38 ` [PATCH v2] " Christoph Hellwig
2019-11-27 13:27 ` [PATCH v3 1/2] PCI: Add parameter nr_devfns to pci_add_dma_alias James Sewart via iommu
2019-11-27 13:28 ` [PATCH v3 2/2] PCI: Add DMA alias quirk for PLX PEX NTB James Sewart via iommu
2019-11-27 17:38 ` [PATCH v3 1/2] PCI: Add parameter nr_devfns to pci_add_dma_alias Logan Gunthorpe
2019-11-29 12:49 ` [PATCH v4 " James Sewart via iommu
2019-11-29 12:49 ` [PATCH v4 2/2] PCI: Add DMA alias quirk for PLX PEX NTB James Sewart via iommu
2019-11-29 16:50 ` [PATCH v4 1/2] PCI: Add parameter nr_devfns to pci_add_dma_alias Logan Gunthorpe
2019-11-29 17:19 ` James Sewart via iommu
2019-11-29 17:26 ` Logan Gunthorpe
2019-11-29 17:56 ` [PATCH v5 1/3] PCI: Fix off by one in dma_alias_mask allocation size James Sewart via iommu
2019-11-29 17:56 ` [PATCH v5 2/3] PCI: Add parameter nr_devfns to pci_add_dma_alias James Sewart via iommu
2019-11-29 17:57 ` [PATCH v5 3/3] PCI: Add DMA alias quirk for PLX PEX NTB James Sewart via iommu
2019-12-02 17:03 ` [PATCH v5 2/3] PCI: Add parameter nr_devfns to pci_add_dma_alias Christoph Hellwig
2019-11-29 17:58 ` [PATCH v5 1/3] PCI: Fix off by one in dma_alias_mask allocation size Logan Gunthorpe
2019-12-02 17:03 ` Christoph Hellwig
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=8855EF11-4B75-4D09-B1E3-CD668DE94C27@arista.com \
--to=iommu@lists.linux-foundation.org \
--cc=0x7f454c46@gmail.com \
--cc=alex.williamson@redhat.com \
--cc=dima@arista.com \
--cc=helgaas@kernel.org \
--cc=jamessewart@arista.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=logang@deltatee.com \
/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).