From: Lucas Stach <dev@lynxeye.de>
To: barebox@lists.infradead.org
Subject: [PATCH 24/24] ARM: MMU: unexport cache maintenance functions
Date: Sun, 1 Mar 2015 14:17:22 +0100 [thread overview]
Message-ID: <1425215842-6982-25-git-send-email-dev@lynxeye.de> (raw)
In-Reply-To: <1425215842-6982-1-git-send-email-dev@lynxeye.de>
Those should only be used internally. All users should rather
use the streaming DMA API, which does proper cache maintenance.
Signed-off-by: Lucas Stach <dev@lynxeye.de>
---
arch/arm/cpu/mmu.c | 35 ++++++++++++++---------------------
arch/arm/include/asm/mmu.h | 14 --------------
2 files changed, 14 insertions(+), 35 deletions(-)
diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c
index c4ec72d..7076cb5 100644
--- a/arch/arm/cpu/mmu.c
+++ b/arch/arm/cpu/mmu.c
@@ -159,6 +159,20 @@ static u32 *find_pte(unsigned long adr)
return &table[(adr >> PAGE_SHIFT) & 0xff];
}
+static void dma_flush_range(unsigned long start, unsigned long end)
+{
+ if (outer_cache.flush_range)
+ outer_cache.flush_range(start, end);
+ __dma_flush_range(start, end);
+}
+
+static void dma_inv_range(unsigned long start, unsigned long end)
+{
+ if (outer_cache.inv_range)
+ outer_cache.inv_range(start, end);
+ __dma_inv_range(start, end);
+}
+
void remap_range(void *_start, size_t size, uint32_t flags)
{
unsigned long start = (unsigned long)_start;
@@ -412,27 +426,6 @@ void dma_free_coherent(void *mem, size_t size)
free(mem);
}
-void dma_clean_range(unsigned long start, unsigned long end)
-{
- if (outer_cache.clean_range)
- outer_cache.clean_range(start, end);
- __dma_clean_range(start, end);
-}
-
-void dma_flush_range(unsigned long start, unsigned long end)
-{
- if (outer_cache.flush_range)
- outer_cache.flush_range(start, end);
- __dma_flush_range(start, end);
-}
-
-void dma_inv_range(unsigned long start, unsigned long end)
-{
- if (outer_cache.inv_range)
- outer_cache.inv_range(start, end);
- __dma_inv_range(start, end);
-}
-
void dma_sync_single_for_cpu(unsigned long address, size_t size,
enum dma_data_direction dir)
{
diff --git a/arch/arm/include/asm/mmu.h b/arch/arm/include/asm/mmu.h
index 01c20bd..97bb0db 100644
--- a/arch/arm/include/asm/mmu.h
+++ b/arch/arm/include/asm/mmu.h
@@ -27,26 +27,12 @@ static inline void setup_dma_coherent(unsigned long offset)
}
#ifdef CONFIG_MMU
-void dma_clean_range(unsigned long, unsigned long);
-void dma_flush_range(unsigned long, unsigned long);
-void dma_inv_range(unsigned long, unsigned long);
void remap_range(void *_start, size_t size, uint32_t flags);
void *map_io_sections(unsigned long physaddr, void *start, size_t size);
uint32_t mmu_get_pte_cached_flags(void);
uint32_t mmu_get_pte_uncached_flags(void);
#else
-static inline void dma_clean_range(unsigned long s, unsigned long e)
-{
-}
-
-static inline void dma_flush_range(unsigned long s, unsigned long e)
-{
-}
-
-static inline void dma_inv_range(unsigned long s, unsigned long e)
-{
-}
static inline void remap_range(void *_start, size_t size, uint32_t flags)
{
--
2.1.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2015-03-01 13:19 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-01 13:16 [PATCH 00/24] Phasing out direct usage of asm/mmu.h on ARM Lucas Stach
2015-03-01 13:16 ` [PATCH 01/24] usb: gadget: include common.h in header Lucas Stach
2015-03-01 13:17 ` [PATCH 02/24] ARM: move virt<->phys translation to io.h Lucas Stach
2015-03-01 13:17 ` [PATCH 03/24] dma: add streaming DMA ops Lucas Stach
2015-03-01 13:17 ` [PATCH 04/24] ARM: move DMA alloc functions to dma.h Lucas Stach
2015-03-01 13:17 ` [PATCH 05/24] ARM: implement streaming DMA ops Lucas Stach
2015-03-01 13:17 ` [PATCH 06/24] AHCI: convert to " Lucas Stach
2015-03-01 13:17 ` [PATCH 07/24] MCI: dw-mmc: " Lucas Stach
2015-03-01 13:17 ` [PATCH 08/24] MCI: imx: " Lucas Stach
2015-03-01 13:17 ` [PATCH 09/24] MCI: tegra-sdmmc: " Lucas Stach
2015-03-01 13:17 ` [PATCH 10/24] net: arc-emac: " Lucas Stach
2015-03-01 13:17 ` [PATCH 11/24] net: cpsw: " Lucas Stach
2015-03-02 8:37 ` Jan Weitzel
2015-03-01 13:17 ` [PATCH 12/24] net: at91_ether: " Lucas Stach
2015-03-01 13:17 ` [PATCH 13/24] net: davinci_emac: " Lucas Stach
2015-03-01 13:17 ` [PATCH 14/24] net: designware: " Lucas Stach
2015-03-01 13:17 ` [PATCH 15/24] net: fec: " Lucas Stach
2015-03-01 13:17 ` [PATCH 16/24] net: macb: " Lucas Stach
2015-03-01 13:17 ` [PATCH 17/24] net: orion-gbe: " Lucas Stach
2015-03-01 13:17 ` [PATCH 18/24] net: rtl8169: " Lucas Stach
2015-03-01 13:17 ` [PATCH 19/24] net: xgmac: " Lucas Stach
2015-03-01 13:17 ` [PATCH 20/24] usb: gadget: fsl_udc: " Lucas Stach
2015-03-01 13:17 ` [PATCH 21/24] usb: host: ehci: " Lucas Stach
2015-03-01 13:17 ` [PATCH 22/24] usb: host: ohci: " Lucas Stach
2015-03-01 13:17 ` [PATCH 23/24] ARM: bcm2835: mbox: " Lucas Stach
2015-03-01 13:17 ` Lucas Stach [this message]
2015-03-03 8:37 ` [PATCH 00/24] Phasing out direct usage of asm/mmu.h on ARM Sascha Hauer
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=1425215842-6982-25-git-send-email-dev@lynxeye.de \
--to=dev@lynxeye.de \
--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