All of lore.kernel.org
 help / color / mirror / Atom feed
From: lauraa@codeaurora.org (Laura Abbott)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv2 3/3] arm64: Use arm64 coherent APIs for non-coherent freeing
Date: Fri, 14 Mar 2014 12:52:25 -0700	[thread overview]
Message-ID: <1394826745-24191-3-git-send-email-lauraa@codeaurora.org> (raw)
In-Reply-To: <1394732716-11507-2-git-send-email-lauraa@codeaurora.org>

The noncoherent free function currently unconditionally frees
back to the page allocator which is incorrect for CMA pages.
call the coherent free function to correctly differentiate
between pages.

Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
---
 arch/arm64/mm/dma-mapping.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index 608c343..99ff063 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -104,7 +104,7 @@ static void arm64_swiotlb_free_noncoherent(struct device *dev, size_t size,
 	void *swiotlb_addr = phys_to_virt(dma_to_phys(dev, dma_handle));
 
 	vunmap(vaddr);
-	swiotlb_free_coherent(dev, size, swiotlb_addr, dma_handle);
+	arm64_swiotlb_free_coherent(dev, size, swiotlb_addr, dma_handle, attrs);
 }
 
 static dma_addr_t arm64_swiotlb_map_page(struct device *dev,
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

      parent reply	other threads:[~2014-03-14 19:52 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-05 20:46 Query on patch to be upstream ? Ritesh Harjani
2014-03-11 12:15 ` Catalin Marinas
2014-03-11 18:04   ` Laura Abbott
2014-03-11 18:26     ` Catalin Marinas
2014-03-12 18:20       ` Laura Abbott
2014-03-13 17:45         ` [PATCH 1/2] arm64: Implement custom mmap functions for dma mapping Laura Abbott
2014-03-13 17:49           ` Catalin Marinas
2014-03-14  1:53             ` Laura Abbott
2014-03-13 17:45         ` [PATCH 2/2] arm64: Support DMA_ATTR_WRITE_COMBINE Laura Abbott
2014-03-13 17:52           ` Catalin Marinas
2014-03-14  2:02             ` Laura Abbott
2014-03-14 19:52           ` [PATCHv2 1/3] arm64: Implement custom mmap functions for dma mapping Laura Abbott
2014-03-24 10:33             ` Catalin Marinas
     [not found]             ` <CALk7dXr3cZSkQ6dTUyCjUDStOd6=ghGN9-iO5RQiTfHCciGxLg@mail.gmail.com>
2014-03-28 10:37               ` Catalin Marinas
2014-03-14 19:52           ` [PATCHv2 2/3] arm64: Support DMA_ATTR_WRITE_COMBINE Laura Abbott
2014-03-14 20:24             ` Rob Herring
2014-03-14 23:07               ` Catalin Marinas
2014-03-14 19:52           ` Laura Abbott [this message]

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=1394826745-24191-3-git-send-email-lauraa@codeaurora.org \
    --to=lauraa@codeaurora.org \
    --cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.