mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v3 21/28] ARM: mmu: Share code between dma_alloc_*() functions
Date: Thu, 17 May 2018 13:58:30 -0700	[thread overview]
Message-ID: <20180517205837.32421-22-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180517205837.32421-1-andrew.smirnov@gmail.com>

Code of dma_alloc_coherent() and dma_alloc_writecombine() is almost
identical with exception of the flags passed to undelying call to
__remap_range(). Move commong code into a shared subroutine and
convert both functions to use it.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 arch/arm/cpu/mmu.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c
index fc4046e85..7d4432b98 100644
--- a/arch/arm/cpu/mmu.c
+++ b/arch/arm/cpu/mmu.c
@@ -500,7 +500,7 @@ void mmu_disable(void)
 	__mmu_cache_off();
 }
 
-void *dma_alloc_coherent(size_t size, dma_addr_t *dma_handle)
+static void *dma_alloc(size_t size, dma_addr_t *dma_handle, uint32_t pte_flags)
 {
 	void *ret;
 
@@ -511,25 +511,19 @@ void *dma_alloc_coherent(size_t size, dma_addr_t *dma_handle)
 
 	dma_inv_range((unsigned long)ret, (unsigned long)ret + size);
 
-	__remap_range(ret, size, pte_flags_uncached);
+	__remap_range(ret, size, pte_flags);
 
 	return ret;
 }
 
-void *dma_alloc_writecombine(size_t size, dma_addr_t *dma_handle)
+void *dma_alloc_coherent(size_t size, dma_addr_t *dma_handle)
 {
-	void *ret;
-
-	size = PAGE_ALIGN(size);
-	ret = xmemalign(PAGE_SIZE, size);
-	if (dma_handle)
-		*dma_handle = (dma_addr_t)ret;
-
-	dma_inv_range((unsigned long)ret, (unsigned long)ret + size);
-
-	__remap_range(ret, size, pte_flags_wc);
+	return dma_alloc(size, dma_handle, pte_flags_uncached);
+}
 
-	return ret;
+void *dma_alloc_writecombine(size_t size, dma_addr_t *dma_handle)
+{
+	return dma_alloc(size, dma_handle, pte_flags_wc);
 }
 
 unsigned long virt_to_phys(volatile void *virt)
-- 
2.17.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2018-05-17 20:59 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-17 20:58 [PATCH v3 00/28] ARM MMU code improvements and on-demand PTE allocation Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 01/28] ARM: mmu: Remove unused ARM_VECTORS_SIZE Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 02/28] ARM: mmu: Make use of IS_ALIGNED in arm_mmu_remap_sdram() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 03/28] ARM: mmu: Use ALIGN and ALIGN_DOWN in map_cachable() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 04/28] ARM: mmu: Introduce set_ttbr() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 05/28] ARM: mmu: Introduce set_domain() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 06/28] ARM: mmu: Share code for create_sections() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 07/28] ARM: mmu: Separate index and address in create_sections() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 08/28] sizes.h: Sync with Linux 4.16 Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 09/28] ARM: mmu: Specify size in bytes in create_sections() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 10/28] ARM: mmu: Share code for initial flat mapping creation Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 11/28] ARM: mmu: Share PMD_SECT_DEF_CACHED Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 12/28] ARM: mmu: Drop needless shifting in map_io_sections() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 13/28] ARM: mmu: Replace hardcoded shifts with pgd_index() from Linux Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 14/28] ARM: mmu: Trivial simplification in arm_mmu_remap_sdram() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 15/28] ARM: mmu: Replace various SZ_1M with PGDIR_SIZE Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 16/28] ARM: mmu: Use PAGE_SIZE when specifying size of one page Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 17/28] ARM: mmu: Define and use PTRS_PER_PTE Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 18/28] ARM: mmu: Use PAGE_SIZE instead of magic right shift by 12 Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 19/28] ARM: mmu: Use xmemalign in arm_create_pte() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 20/28] ARM: mmu: Use xmemalign in mmu_init() Andrey Smirnov
2018-05-17 20:58 ` Andrey Smirnov [this message]
2018-05-17 20:58 ` [PATCH v3 22/28] ARM: mmu: Pass PTE flags a parameter to arm_create_pte() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 23/28] ARM: mmu: Make sure that address is 1M aligned in arm_create_pte() Andrey Smirnov
2018-05-18 20:23   ` Sam Ravnborg
2018-05-21 19:12     ` Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 24/28] ARM: mmu: Use find_pte() to find PTE in create_vector_table() Andrey Smirnov
2018-05-18 20:41   ` Sam Ravnborg
2018-05-18 23:30     ` Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 25/28] ARM: mmu: Use dma_inv_range() in dma_sync_single_for_cpu() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 26/28] ARM: mmu: Simplify the use of dma_flush_range() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 27/28] ARM: mmu: Implement on-demand PTE allocation Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 28/28] ARM: mmu: Introduce ARM_TTB_SIZE Andrey Smirnov

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=20180517205837.32421-22-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox