From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Christoph Hellwig <hch@lst.de>,
x86@kernel.org, linux-arm-kernel@lists.infradead.org,
xen-devel@lists.xenproject.org, linux-c6x-dev@linux-c6x.org,
linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-mips@linux-mips.org, openrisc@lists.librecores.org,
linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org,
linux-sh@vger.kernel.org, sparclinux@vger.kernel.org,
linux-xtensa@linux-xtensa.org, dmaengine@vger.kernel.org,
linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-samsung-soc@vger.kernel.org,
iommu@lists.linux-foundation.org, netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: Re: [PATCH 42/44] powerpc/cell: use the dma_supported method for ops switching
Date: Sun, 18 Jun 2017 06:50:27 +1000 [thread overview]
Message-ID: <1497732627.2897.128.camel__40939.1825124205$1497732769$gmane$org@kernel.crashing.org> (raw)
In-Reply-To: <20170616181059.19206-43-hch@lst.de>
On Fri, 2017-06-16 at 20:10 +0200, Christoph Hellwig wrote:
> Besides removing the last instance of the set_dma_mask method this also
> reduced the code duplication.
What is your rationale here ? (I have missed patch 0 it seems).
dma_supported() was supposed to be pretty much a "const" function
simply informing whether a given setup is possible. Having it perform
an actual switch of ops seems to be pushing it...
What if a driver wants to test various dma masks and then pick one ?
Where does the API documents that if a driver calls dma_supported() it
then *must* set the corresponding mask and use that ?
I don't like a function that is a "boolean query" like this one to have
such a major side effect.
From an API standpoint, dma_set_mask() is when the mask is established,
and thus when the ops switch should happen.
Ben.
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> arch/powerpc/platforms/cell/iommu.c | 25 +++++++++----------------
> 1 file changed, 9 insertions(+), 16 deletions(-)
>
> diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
> index 497bfbdbd967..29d4f96ed33e 100644
> --- a/arch/powerpc/platforms/cell/iommu.c
> +++ b/arch/powerpc/platforms/cell/iommu.c
> @@ -644,20 +644,14 @@ static void dma_fixed_unmap_sg(struct device *dev, struct scatterlist *sg,
> direction, attrs);
> }
>
> -static int dma_fixed_dma_supported(struct device *dev, u64 mask)
> -{
> - return mask == DMA_BIT_MASK(64);
> -}
> -
> -static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
> +static int dma_suported_and_switch(struct device *dev, u64 dma_mask);
>
> static const struct dma_map_ops dma_iommu_fixed_ops = {
> .alloc = dma_fixed_alloc_coherent,
> .free = dma_fixed_free_coherent,
> .map_sg = dma_fixed_map_sg,
> .unmap_sg = dma_fixed_unmap_sg,
> - .dma_supported = dma_fixed_dma_supported,
> - .set_dma_mask = dma_set_mask_and_switch,
> + .dma_supported = dma_suported_and_switch,
> .map_page = dma_fixed_map_page,
> .unmap_page = dma_fixed_unmap_page,
> .mapping_error = dma_iommu_mapping_error,
> @@ -952,11 +946,8 @@ static u64 cell_iommu_get_fixed_address(struct device *dev)
> return dev_addr;
> }
>
> -static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask)
> +static int dma_suported_and_switch(struct device *dev, u64 dma_mask)
> {
> - if (!dev->dma_mask || !dma_supported(dev, dma_mask))
> - return -EIO;
> -
> if (dma_mask == DMA_BIT_MASK(64) &&
> cell_iommu_get_fixed_address(dev) != OF_BAD_ADDR) {
> u64 addr = cell_iommu_get_fixed_address(dev) +
> @@ -965,14 +956,16 @@ static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask)
> dev_dbg(dev, "iommu: fixed addr = %llx\n", addr);
> set_dma_ops(dev, &dma_iommu_fixed_ops);
> set_dma_offset(dev, addr);
> - } else {
> + return 1;
> + }
> +
> + if (dma_iommu_dma_supported(dev, dma_mask)) {
> dev_dbg(dev, "iommu: not 64-bit, using default ops\n");
> set_dma_ops(dev, get_pci_dma_ops());
> cell_dma_dev_setup(dev);
> + return 1;
> }
>
> - *dev->dma_mask = dma_mask;
> -
> return 0;
> }
>
> @@ -1127,7 +1120,7 @@ static int __init cell_iommu_fixed_mapping_init(void)
> cell_iommu_setup_window(iommu, np, dbase, dsize, 0);
> }
>
> - dma_iommu_ops.set_dma_mask = dma_set_mask_and_switch;
> + dma_iommu_ops.dma_supported = dma_suported_and_switch;
> set_pci_dma_ops(&dma_iommu_ops);
>
> return 0;
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-06-17 20:51 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20170616181059.19206-1-hch@lst.de>
2017-06-16 18:10 ` [PATCH 01/44] firmware/ivc: use dma_mapping_error Christoph Hellwig
2017-06-16 18:10 ` [PATCH 02/44] ibmveth: properly unwind on init errors Christoph Hellwig
2017-06-16 18:10 ` [PATCH 03/44] dmaengine: ioat: don't use DMA_ERROR_CODE Christoph Hellwig
2017-06-16 18:10 ` [PATCH 04/44] drm/exynos: " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 05/44] drm/armada: don't abuse DMA_ERROR_CODE Christoph Hellwig
2017-06-16 18:10 ` [PATCH 06/44] iommu/dma: don't rely on DMA_ERROR_CODE Christoph Hellwig
2017-06-16 18:10 ` [PATCH 07/44] xen-swiotlb: consolidate xen_swiotlb_dma_ops Christoph Hellwig
2017-06-16 18:10 ` [PATCH 08/44] xen-swiotlb: implement ->mapping_error Christoph Hellwig
2017-06-16 18:10 ` [PATCH 09/44] c6x: remove DMA_ERROR_CODE Christoph Hellwig
2017-06-16 18:10 ` [PATCH 10/44] ia64: " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 11/44] m32r: " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 12/44] microblaze: " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 13/44] openrisc: " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 14/44] sh: " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 15/44] xtensa: " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 16/44] arm64: " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 17/44] hexagon: switch to use ->mapping_error for error reporting Christoph Hellwig
2017-06-16 18:10 ` [PATCH 18/44] iommu/amd: implement ->mapping_error Christoph Hellwig
2017-06-16 18:10 ` [PATCH 19/44] s390: " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 20/44] sparc: " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 21/44] powerpc: " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 22/44] x86/pci-nommu: " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 23/44] x86/calgary: " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 24/44] x86: remove DMA_ERROR_CODE Christoph Hellwig
2017-06-16 18:10 ` [PATCH 25/44] arm: implement ->mapping_error Christoph Hellwig
2017-06-16 18:10 ` [PATCH 26/44] dma-mapping: remove DMA_ERROR_CODE Christoph Hellwig
2017-06-16 18:10 ` [PATCH 27/44] sparc: remove leon_dma_ops Christoph Hellwig
2017-06-16 18:10 ` [PATCH 28/44] sparc: remove arch specific dma_supported implementations Christoph Hellwig
2017-06-16 18:10 ` [PATCH 29/44] dma-noop: remove dma_supported and mapping_error methods Christoph Hellwig
2017-06-16 18:10 ` [PATCH 30/44] dma-virt: " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 31/44] hexagon: remove arch-specific dma_supported implementation Christoph Hellwig
2017-06-16 18:10 ` [PATCH 32/44] hexagon: remove the unused dma_is_consistent prototype Christoph Hellwig
2017-06-16 18:10 ` [PATCH 33/44] openrisc: remove arch-specific dma_supported implementation Christoph Hellwig
2017-06-16 18:10 ` [PATCH 34/44] arm: remove arch specific " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 35/44] x86: " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 36/44] dma-mapping: remove HAVE_ARCH_DMA_SUPPORTED Christoph Hellwig
2017-06-16 18:10 ` [PATCH 37/44] mips/loongson64: implement ->dma_supported instead of ->set_dma_mask Christoph Hellwig
2017-06-16 18:10 ` [PATCH 38/44] arm: " Christoph Hellwig
2017-06-16 18:10 ` [PATCH 39/44] xen-swiotlb: remove xen_swiotlb_set_dma_mask Christoph Hellwig
2017-06-16 18:10 ` [PATCH 40/44] tile: remove dma_supported and mapping_error methods Christoph Hellwig
2017-06-16 18:10 ` [PATCH 41/44] powerpc/cell: clean up fixed mapping dma_ops initialization Christoph Hellwig
2017-06-16 18:10 ` [PATCH 42/44] powerpc/cell: use the dma_supported method for ops switching Christoph Hellwig
2017-06-16 18:10 ` [PATCH 43/44] dma-mapping: remove the set_dma_mask method Christoph Hellwig
2017-06-16 18:10 ` [PATCH 44/44] powerpc: merge __dma_set_mask into dma_set_mask Christoph Hellwig
[not found] ` <20170616181059.19206-4-hch@lst.de>
2017-06-16 20:40 ` [PATCH 03/44] dmaengine: ioat: don't use DMA_ERROR_CODE Alexander Duyck
[not found] ` <CAKgT0UdxrimWrxNVsLMQ9G6ABBJZwfWHTcP18qqd4rT0Fa-KWg@mail.gmail.com>
2017-06-18 7:09 ` Christoph Hellwig
[not found] ` <20170616181059.19206-43-hch@lst.de>
2017-06-17 20:50 ` Benjamin Herrenschmidt [this message]
[not found] ` <1497732627.2897.128.camel@kernel.crashing.org>
2017-06-18 7:13 ` [PATCH 42/44] powerpc/cell: use the dma_supported method for ops switching Christoph Hellwig
[not found] ` <20170618071344.GB18526@infradead.org>
2017-06-18 9:54 ` Benjamin Herrenschmidt
[not found] ` <20170616181059.19206-7-hch@lst.de>
2017-06-19 15:12 ` [PATCH 06/44] iommu/dma: don't rely on DMA_ERROR_CODE Robin Murphy
2017-06-20 12:41 ` new dma-mapping tree, was Re: clean up and modularize arch dma_mapping interface V2 Christoph Hellwig
[not found] ` <20170620124140.GA27163@lst.de>
2017-06-20 13:04 ` Stephen Rothwell
2017-06-20 13:14 ` Robin Murphy
[not found] ` <6025d4d4-1975-9598-c16d-26d17d029ec7@arm.com>
2017-06-20 13:15 ` Christoph Hellwig
[not found] ` <20170620230400.1a5ae889@canb.auug.org.au>
2017-06-20 13:16 ` Christoph Hellwig
[not found] ` <CGME20170620131628epcas1p4f21d821bd414cba7e2d49abcbe414365@epcas1p4.samsung.com>
[not found] ` <20170620131623.GB30769@lst.de>
2017-06-21 13:32 ` Marek Szyprowski
[not found] ` <5425587c-73e8-e24a-86a3-8a65a7791dcb@samsung.com>
2017-06-22 21:53 ` Stephen Rothwell
2017-06-26 7:03 ` Christoph Hellwig
2017-06-21 19:24 ` tndave
[not found] ` <162d7932-5766-4c29-5471-07d1b699190a@oracle.com>
2017-06-24 7:18 ` Christoph Hellwig
[not found] ` <20170624071855.GD14580@lst.de>
2017-06-24 15:36 ` Benjamin Herrenschmidt
[not found] ` <1498318616.31581.87.camel@kernel.crashing.org>
2017-06-26 9:47 ` Christoph Hellwig
[not found] ` <20170626094739.GB13981@lst.de>
2017-06-26 22:06 ` tndave
[not found] <20170608132609.32662-1-hch@lst.de>
2017-06-08 13:26 ` [PATCH 42/44] powerpc/cell: use the dma_supported method for ops switching 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='1497732627.2897.128.camel__40939.1825124205$1497732769$gmane$org@kernel.crashing.org' \
--to=benh@kernel.crashing.org \
--cc=dmaengine@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-c6x-dev@linux-c6x.org \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=netdev@vger.kernel.org \
--cc=openrisc@lists.librecores.org \
--cc=sparclinux@vger.kernel.org \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.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).