From: Paul Burton <paul.burton@mips.com>
To: "Maciej W. Rozycki" <macro@linux-mips.org>
Cc: Christoph Hellwig <hch@lst.de>,
"iommu@lists.linux-foundation.org"
<iommu@lists.linux-foundation.org>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Robin Murphy <robin.murphy@arm.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"linux-mips@linux-mips.org" <linux-mips@linux-mips.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: Re: [PATCH] MIPS: Fix `dma_alloc_coherent' returning a non-coherent allocation
Date: Mon, 5 Nov 2018 18:10:38 +0000 [thread overview]
Message-ID: <20181105181037.m2hxoosf7z2bz7lu@pburton-laptop> (raw)
In-Reply-To: <alpine.LFD.2.21.1811010523440.20378@eddie.linux-mips.org>
Hi Maciej,
On Thu, Nov 01, 2018 at 07:54:24AM +0000, Maciej W. Rozycki wrote:
> Fix a MIPS `dma_alloc_coherent' regression from commit bc3ec75de545
> ("dma-mapping: merge direct and noncoherent ops") that causes a cached
> allocation to be returned on noncoherent cache systems.
>
> This is due to an inverted check now used in the MIPS implementation of
> `arch_dma_alloc' on the result from `dma_direct_alloc_pages' before
> doing the cached-to-uncached mapping of the allocation address obtained.
> The mapping has to be done for a non-NULL rather than NULL result,
> because a NULL result means the allocation has failed.
>
> Invert the check for correct operation then.
>
> Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
> Fixes: bc3ec75de545 ("dma-mapping: merge direct and noncoherent ops")
> Cc: stable@vger.kernel.org # 4.19+
> ---
> arch/mips/mm/dma-noncoherent.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Thanks, nice catch! Applied to mips-fixes.
Paul
next prev parent reply other threads:[~2018-11-05 18:22 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-14 9:58 merge dma_direct_ops and dma_noncoherent_ops v3 Christoph Hellwig
2018-09-14 9:58 ` [PATCH 1/6] dma-mapping: add the missing ARCH_HAS_SYNC_DMA_FOR_CPU_ALL declaration Christoph Hellwig
2018-09-14 9:58 ` [PATCH 2/6] MIPS: don't select DMA_MAYBE_COHERENT from DMA_PERDEV_COHERENT Christoph Hellwig
2018-09-14 9:58 ` [PATCH 3/6] dma-mapping: move the dma_coherent flag to struct device Christoph Hellwig
2018-09-14 9:58 ` [PATCH 4/6] dma-mapping: merge direct and noncoherent ops Christoph Hellwig
2018-10-31 14:24 ` Maciej W. Rozycki
2018-10-31 16:31 ` Maciej W. Rozycki
2018-10-31 20:32 ` Christoph Hellwig
2018-10-31 20:50 ` Maciej W. Rozycki
2018-11-01 5:13 ` Christoph Hellwig
2018-11-01 7:54 ` [PATCH] MIPS: Fix `dma_alloc_coherent' returning a non-coherent allocation Maciej W. Rozycki
2018-11-01 8:33 ` Christoph Hellwig
2018-11-01 14:30 ` Maciej W. Rozycki
2018-11-05 18:10 ` Paul Burton [this message]
2018-09-14 9:58 ` [PATCH 5/6] dma-mapping: consolidate the dma mmap implementations Christoph Hellwig
2018-09-14 9:58 ` [PATCH 6/6] dma-mapping: support non-coherent devices in dma_common_get_sgtable Christoph Hellwig
2018-09-20 7:02 ` merge dma_direct_ops and dma_noncoherent_ops v3 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=20181105181037.m2hxoosf7z2bz7lu@pburton-laptop \
--to=paul.burton@mips.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=m.szyprowski@samsung.com \
--cc=macro@linux-mips.org \
--cc=robin.murphy@arm.com \
--cc=stable@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).