From: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
To: Alexey Kardashevskiy <aik@ozlabs.ru>
Cc: Michael Ellerman <mpe@ellerman.id.au>,
Matthew Wilcox <willy@linux.intel.com>,
Keith Busch <keith.busch@intel.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
David Gibson <david@gibson.dropbear.id.au>,
Christoph Hellwig <hch@infradead.org>,
"David S. Miller" <davem@davemloft.net>,
linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org
Subject: Re: [PATCH 2/7 v2] powerpc/dma-mapping: override dma_get_page_shift
Date: Tue, 27 Oct 2015 15:27:06 -0700 [thread overview]
Message-ID: <20151027222706.GF7716@linux.vnet.ibm.com> (raw)
In-Reply-To: <562F1368.1030204@ozlabs.ru>
On 27.10.2015 [17:02:16 +1100], Alexey Kardashevskiy wrote:
> On 10/24/2015 07:57 AM, Nishanth Aravamudan wrote:
> >On Power, the kernel's page size can differ from the IOMMU's page size,
> >so we need to override the generic implementation, which always returns
> >the kernel's page size. Lookup the IOMMU's page size from struct
> >iommu_table, if available. Fallback to the kernel's page size,
> >otherwise.
> >
> >Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
> >---
> > arch/powerpc/include/asm/dma-mapping.h | 3 +++
> > arch/powerpc/kernel/dma.c | 9 +++++++++
> > 2 files changed, 12 insertions(+)
> >
> >diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h
> >index 7f522c0..c5638f4 100644
> >--- a/arch/powerpc/include/asm/dma-mapping.h
> >+++ b/arch/powerpc/include/asm/dma-mapping.h
> >@@ -125,6 +125,9 @@ static inline void set_dma_offset(struct device *dev, dma_addr_t off)
> > #define HAVE_ARCH_DMA_SET_MASK 1
> > extern int dma_set_mask(struct device *dev, u64 dma_mask);
> >
> >+#define HAVE_ARCH_DMA_GET_PAGE_SHIFT 1
> >+extern unsigned long dma_get_page_shift(struct device *dev);
> >+
> > #include <asm-generic/dma-mapping-common.h>
> >
> > extern int __dma_set_mask(struct device *dev, u64 dma_mask);
> >diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
> >index 59503ed..e805af2 100644
> >--- a/arch/powerpc/kernel/dma.c
> >+++ b/arch/powerpc/kernel/dma.c
> >@@ -335,6 +335,15 @@ int dma_set_mask(struct device *dev, u64 dma_mask)
> > }
> > EXPORT_SYMBOL(dma_set_mask);
> >
> >+unsigned long dma_get_page_shift(struct device *dev)
> >+{
> >+ struct iommu_table *tbl = get_iommu_table_base(dev);
> >+ if (tbl)
> >+ return tbl->it_page_shift;
>
>
> All PCI devices have this initialized on POWER (at least, our, IBM's
> POWER) so 4K will always be returned here while in the case of
> (get_dma_ops(dev)==&dma_direct_ops) it could actually return
> PAGE_SHIFT. Is 4K still preferred value to return here?
Right, so the logic of my series, goes like this:
a) We currently are assuming DMA_PAGE_SHIFT (conceptual constant) is
PAGE_SHIFT everywhere, including Power.
b) After 2/7, the Power code will return either the IOMMU table's shift
value, if set, or PAGE_SHIFT (I guess this would be the case if
get_dma_ops(dev) == &dma_direct_ops, as you said). That is no different
than we have now, except we can return the accurate IOMMU value if
available.
3) After 3/7, the platform can override the generic Power
get_dma_page_shift().
4) After 4/7, pseries will return the DDW value, if available, then
fallback to the IOMMU table's value. I think in the case of
get_dma_ops(dev)==&dma_direct_ops, the only way that can happen is if we
are using DDW, right?
-Nish
next prev parent reply other threads:[~2015-10-27 22:27 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-23 20:54 [PATCH 0/5 v3] Fix NVMe driver support on Power with 32-bit DMA Nishanth Aravamudan
2015-10-23 20:56 ` [PATCH 1/7 v3] dma-mapping: add generic dma_get_page_shift API Nishanth Aravamudan
2015-10-23 20:57 ` [PATCH 2/7 v2] powerpc/dma-mapping: override dma_get_page_shift Nishanth Aravamudan
2015-10-27 6:02 ` Alexey Kardashevskiy
2015-10-27 14:06 ` Busch, Keith
2015-10-27 22:27 ` Nishanth Aravamudan [this message]
2015-10-28 1:00 ` Alexey Kardashevskiy
2015-10-28 1:54 ` Nishanth Aravamudan
2015-10-28 2:20 ` Benjamin Herrenschmidt
2015-10-28 2:30 ` Nishanth Aravamudan
2015-10-28 3:20 ` Benjamin Herrenschmidt
2015-10-23 20:57 ` [PATCH 0/5 v3] Fix NVMe driver support on Power with 32-bit DMA Nishanth Aravamudan
2015-10-23 20:58 ` [PATCH 3/7 v2] powerpc/dma: implement per-platform dma_get_page_shift Nishanth Aravamudan
2015-10-23 20:59 ` [PATCH 4/7 v2] pseries/iommu: implement DDW-aware dma_get_page_shift Nishanth Aravamudan
2015-10-27 5:56 ` Alexey Kardashevskiy
2015-10-27 22:22 ` Nishanth Aravamudan
2015-10-23 21:00 ` [PATCH 5/7] [RFC PATCH 5/7] sparc: rename kernel/iommu_common.h -> include/asm/iommu_common.h Nishanth Aravamudan
2015-10-23 21:02 ` Nishanth Aravamudan
2015-10-23 21:01 ` [RFC PATCH 6/7] sparc/dma-mapping: override dma_get_page_shift Nishanth Aravamudan
2015-10-23 21:02 ` [PATCH 7/7 v2] drivers/nvme: default to the IOMMU page size Nishanth Aravamudan
2015-10-27 1:27 ` [PATCH 0/5 v3] Fix NVMe driver support on Power with 32-bit DMA David Miller
2015-10-27 22:20 ` Nishanth Aravamudan
2015-10-27 22:36 ` Busch, Keith
2015-10-28 0:54 ` David Miller
2015-10-28 13:59 ` Busch, Keith
2015-10-29 11:55 ` Christoph Hellwig
2015-10-29 15:57 ` Nishanth Aravamudan
2015-10-29 17:20 ` Busch, Keith
2015-10-30 21:35 ` [PATCH 1/1 v3] drivers/nvme: default to 4k device page size Nishanth Aravamudan
2015-10-30 21:48 ` Keith Busch
2015-10-30 22:13 ` Nishanth Aravamudan
2015-11-03 13:18 ` Christoph Hellwig
2015-11-03 13:46 ` Keith Busch
2015-11-05 17:01 ` [PATCH 1/1 v4] " Nishanth Aravamudan
2015-11-05 19:58 ` Christoph Hellwig
2015-11-05 21:54 ` Nishanth Aravamudan
2015-11-06 16:13 ` Nishanth Aravamudan
2015-11-13 7:37 ` Christoph Hellwig
2015-11-13 15:08 ` Keith Busch
2015-11-18 14:42 ` Christoph Hellwig
2015-10-30 1:49 ` [PATCH 0/5 v3] Fix NVMe driver support on Power with 32-bit DMA David Miller
2015-10-30 21:35 ` Nishanth Aravamudan
2015-10-27 22:57 ` Julian Calaby
2015-10-27 23:40 ` Nishanth Aravamudan
2015-10-27 23:43 ` Julian Calaby
2015-10-28 0:29 ` Benjamin Herrenschmidt
2015-10-28 1:00 ` David Miller
2015-10-28 0:53 ` David Miller
2015-10-28 1:52 ` Nishanth Aravamudan
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=20151027222706.GF7716@linux.vnet.ibm.com \
--to=nacc@linux.vnet.ibm.com \
--cc=aik@ozlabs.ru \
--cc=benh@kernel.crashing.org \
--cc=davem@davemloft.net \
--cc=david@gibson.dropbear.id.au \
--cc=hch@infradead.org \
--cc=keith.busch@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=sparclinux@vger.kernel.org \
--cc=willy@linux.intel.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).