From: Reza Arbab <arbab@linux.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Andrew Donnellan <ajd@linux.ibm.com>,
Alexey Kardashevskiy <aik@ozlabs.ru>,
Oliver O'Halloran <oohall@gmail.com>,
Alistair Popple <alistair@popple.id.au>,
Paul Mackerras <paulus@samba.org>,
Thomas Gleixner <tglx@linutronix.de>,
Christoph Hellwig <hch@lst.de>
Subject: [PATCH 03/11] powerpc/powernv/npu: Change pnv_npu_try_dma_set_bypass() argument
Date: Wed, 30 Oct 2019 11:59:52 -0500 [thread overview]
Message-ID: <1572454800-17976-4-git-send-email-arbab@linux.ibm.com> (raw)
In-Reply-To: <1572454800-17976-1-git-send-email-arbab@linux.ibm.com>
To enable simpler calling code, change this function to find the value
of bypass instead of taking it as an argument.
Signed-off-by: Reza Arbab <arbab@linux.ibm.com>
---
arch/powerpc/platforms/powernv/npu-dma.c | 12 +++++++++---
arch/powerpc/platforms/powernv/pci.h | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/platforms/powernv/npu-dma.c b/arch/powerpc/platforms/powernv/npu-dma.c
index 5a8313654033..a6b8c7ad36e4 100644
--- a/arch/powerpc/platforms/powernv/npu-dma.c
+++ b/arch/powerpc/platforms/powernv/npu-dma.c
@@ -258,13 +258,21 @@ static int pnv_npu_dma_set_bypass(struct pnv_ioda_pe *npe)
return rc;
}
-void pnv_npu_try_dma_set_bypass(struct pci_dev *gpdev, bool bypass)
+void pnv_npu_try_dma_set_bypass(struct pci_dev *gpdev, u64 mask)
{
+ struct pnv_ioda_pe *gpe = pnv_ioda_get_pe(gpdev);
int i;
struct pnv_phb *phb;
struct pci_dn *pdn;
struct pnv_ioda_pe *npe;
struct pci_dev *npdev;
+ bool bypass;
+
+ if (!gpe)
+ return;
+
+ /* We only do bypass if it's enabled on the linked device */
+ bypass = pnv_ioda_pe_iommu_bypass_supported(gpe, mask);
for (i = 0; ; ++i) {
npdev = pnv_pci_get_npu_dev(gpdev, i);
@@ -277,8 +285,6 @@ void pnv_npu_try_dma_set_bypass(struct pci_dev *gpdev, bool bypass)
return;
phb = pci_bus_to_host(npdev->bus)->private_data;
-
- /* We only do bypass if it's enabled on the linked device */
npe = &phb->ioda.pe_array[pdn->pe_number];
if (bypass) {
diff --git a/arch/powerpc/platforms/powernv/pci.h b/arch/powerpc/platforms/powernv/pci.h
index 41f7dec3aee5..21db0f4cfb11 100644
--- a/arch/powerpc/platforms/powernv/pci.h
+++ b/arch/powerpc/platforms/powernv/pci.h
@@ -211,7 +211,7 @@ extern void pe_level_printk(const struct pnv_ioda_pe *pe, const char *level,
pe_level_printk(pe, KERN_INFO, fmt, ##__VA_ARGS__)
/* Nvlink functions */
-extern void pnv_npu_try_dma_set_bypass(struct pci_dev *gpdev, bool bypass);
+extern void pnv_npu_try_dma_set_bypass(struct pci_dev *gpdev, u64 mask);
extern void pnv_pci_ioda2_tce_invalidate_entire(struct pnv_phb *phb, bool rm);
extern struct pnv_ioda_pe *pnv_pci_npu_setup_iommu(struct pnv_ioda_pe *npe);
extern struct iommu_table_group *pnv_try_setup_npu_table_group(
--
1.8.3.1
next prev parent reply other threads:[~2019-10-30 17:27 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-30 16:59 [PATCH 00/11] powerpv/powernv: Restore pnv_npu_try_dma_set_bypass() Reza Arbab
2019-10-30 16:59 ` [PATCH 01/11] Revert "powerpc/powernv: Remove unused pnv_npu_try_dma_set_bypass() function" Reza Arbab
2019-10-30 16:59 ` [PATCH 02/11] powerpc/powernv: Add pnv_ioda_pe_iommu_bypass_supported() Reza Arbab
2019-10-30 16:59 ` Reza Arbab [this message]
2019-10-30 16:59 ` [PATCH 04/11] powerpc/powernv/npu: Wire up pnv_npu_try_dma_set_bypass() Reza Arbab
2019-10-30 16:59 ` [PATCH 05/11] powerpc/powernv: Return failure for some uses of dma_set_mask() Reza Arbab
2019-10-30 16:59 ` [PATCH 06/11] powerpc/powernv: Remove intermediate variable Reza Arbab
2019-10-30 16:59 ` [PATCH 07/11] powerpc/powernv/npu: Simplify pnv_npu_try_dma_set_bypass() loop Reza Arbab
2019-10-30 16:59 ` [PATCH 08/11] powerpc/powernv: Replace open coded pnv_ioda_get_pe()s Reza Arbab
2019-10-30 16:59 ` [PATCH 09/11] Revert "powerpc/pci: remove the dma_set_mask pci_controller ops methods" Reza Arbab
2019-10-30 16:59 ` [PATCH 10/11] powerpc/powernv: Add pnv_phb3_iommu_bypass_supported() Reza Arbab
2019-10-30 17:00 ` [PATCH 11/11] powerpc/powernv: Add pnv_pci_ioda_dma_set_mask() Reza Arbab
2019-10-30 17:55 ` Christoph Hellwig
2019-10-30 18:10 ` Reza Arbab
2019-10-30 17:53 ` [PATCH 00/11] powerpv/powernv: Restore pnv_npu_try_dma_set_bypass() Christoph Hellwig
2019-10-30 18:08 ` Reza Arbab
2019-10-30 18:13 ` Christoph Hellwig
2019-10-30 18:32 ` Reza Arbab
2019-10-30 18:33 ` 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=1572454800-17976-4-git-send-email-arbab@linux.ibm.com \
--to=arbab@linux.ibm.com \
--cc=aik@ozlabs.ru \
--cc=ajd@linux.ibm.com \
--cc=alistair@popple.id.au \
--cc=hch@lst.de \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=oohall@gmail.com \
--cc=paulus@samba.org \
--cc=tglx@linutronix.de \
/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).