mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-25 05:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

arm: enable allocate-on-read for LPAE's DCACHE_WRITEBACK/_WRITETHROUGH

Browse Source 
The LPAE versions of DCACHE_WRITEBACK and DCACHE_WRITETHROUGH are currently
defined as no-allocate for both reads and writes, which deviates from the
non-LPAE definition, and mostly defeats the purpose of enabling the caches
in the first place.

So align LPAE with !LPAE, and enable allocate-on-read for both. And while
at it, add some clarification about the meaning of the chosen values.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
This commit is contained in:
Ard Biesheuvel 2020-07-07 12:07:07 +02:00 committed by Tom Rini
parent 0c7eb6e525
commit 6744ace5b3
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
arch/arm/include/asm/system.h
View File

@ -445,10 +445,16 @@ static inline void set_dacr(unsigned int val)
#define TTBCR_EPD0 (0 << 7)
/*
* Memory types
* VMSAv8-32 Long-descriptor format memory region attributes
* (ARM Architecture Reference Manual section G5.7.4 [DDI0487E.a])
*
* MAIR0[ 7: 0] 0x00 Device-nGnRnE (aka Strongly-Ordered)
* MAIR0[15: 8] 0xaa Outer/Inner Write-Through, Read-Allocate No Write-Allocate
* MAIR0[23:16] 0xee Outer/Inner Write-Back, Read-Allocate No Write-Allocate
* MAIR0[31:24] 0xff Outer/Inner Write-Back, Read-Allocate Write-Allocate
*/
#define MEMORY_ATTRIBUTES ((0x00 << (0 * 8)) | (0x88 << (1 * 8)) | \
(0xcc << (2 * 8)) | (0xff << (3 * 8)))
#define MEMORY_ATTRIBUTES ((0x00 << (0 * 8)) | (0xaa << (1 * 8)) | \
(0xee << (2 * 8)) | (0xff << (3 * 8)))
/* options available for data cache on each page */
enum dcache_option {
@ -471,7 +477,16 @@ enum dcache_option {
#define TTB_SECT_B_MASK (1 << 2)
#define TTB_SECT (2 << 0)
/* options available for data cache on each page */
/*
* Short-descriptor format memory region attributes, without TEX remap
* (ARM Architecture Reference Manual section G5.7.2 [DDI0487E.a])
*
* TEX[0] C B
* 0 0 0 Device-nGnRnE (aka Strongly-Ordered)
* 0 1 0 Outer/Inner Write-Through, Read-Allocate No Write-Allocate
* 0 1 1 Outer/Inner Write-Back, Read-Allocate No Write-Allocate
* 1 1 1 Outer/Inner Write-Back, Read-Allocate Write-Allocate
*/
enum dcache_option {
DCACHE_OFF = TTB_SECT_DOMAIN(0) | TTB_SECT_XN_MASK | TTB_SECT,
DCACHE_WRITETHROUGH = DCACHE_OFF | TTB_SECT_C_MASK,