forked from Openwrt/openwrt
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
From edd661e1298992af02c87d389c1fa2cec366e29a Mon Sep 17 00:00:00 2001
|
|
From: popcornmix <popcornmix@gmail.com>
|
|
Date: Fri, 25 Aug 2017 19:18:13 +0100
|
|
Subject: [PATCH 0056/1085] cache: export clean and invalidate
|
|
|
|
hack: cache: Fix linker error
|
|
---
|
|
arch/arm/mm/cache-v6.S | 4 ++--
|
|
arch/arm/mm/cache-v7.S | 6 ++++--
|
|
2 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
--- a/arch/arm/mm/cache-v6.S
|
|
+++ b/arch/arm/mm/cache-v6.S
|
|
@@ -200,7 +200,7 @@ ENTRY(v6_flush_kern_dcache_area)
|
|
* - start - virtual start address of region
|
|
* - end - virtual end address of region
|
|
*/
|
|
-v6_dma_inv_range:
|
|
+ENTRY(v6_dma_inv_range)
|
|
#ifdef CONFIG_DMA_CACHE_RWFO
|
|
ldrb r2, [r0] @ read for ownership
|
|
strb r2, [r0] @ write for ownership
|
|
@@ -245,7 +245,7 @@ v6_dma_inv_range:
|
|
* - start - virtual start address of region
|
|
* - end - virtual end address of region
|
|
*/
|
|
-v6_dma_clean_range:
|
|
+ENTRY(v6_dma_clean_range)
|
|
bic r0, r0, #D_CACHE_LINE_SIZE - 1
|
|
1:
|
|
#ifdef CONFIG_DMA_CACHE_RWFO
|
|
--- a/arch/arm/mm/cache-v7.S
|
|
+++ b/arch/arm/mm/cache-v7.S
|
|
@@ -361,7 +361,8 @@ ENDPROC(v7_flush_kern_dcache_area)
|
|
* - start - virtual start address of region
|
|
* - end - virtual end address of region
|
|
*/
|
|
-v7_dma_inv_range:
|
|
+ENTRY(b15_dma_inv_range)
|
|
+ENTRY(v7_dma_inv_range)
|
|
dcache_line_size r2, r3
|
|
sub r3, r2, #1
|
|
tst r0, r3
|
|
@@ -391,7 +392,8 @@ ENDPROC(v7_dma_inv_range)
|
|
* - start - virtual start address of region
|
|
* - end - virtual end address of region
|
|
*/
|
|
-v7_dma_clean_range:
|
|
+ENTRY(b15_dma_clean_range)
|
|
+ENTRY(v7_dma_clean_range)
|
|
dcache_line_size r2, r3
|
|
sub r3, r2, #1
|
|
bic r0, r0, r3
|