From: Alexander Graf <agraf@suse.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v5 02/30] arm64: Disable TTBR1 maps in EL1
Date: Fri, 4 Mar 2016 01:09:46 +0100 [thread overview]
Message-ID: <1457050214-117592-3-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1457050214-117592-1-git-send-email-agraf@suse.de>
When running in EL1, AArch64 knows two page table maps. One with addresses
that start with all zeros (TTBR0) and one with addresses that start with all
ones (TTBR1).
In U-Boot we don't care about the high up maps, so just disable them to ensure
we don't walk an invalid page table by accident.
Reported-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
arch/arm/cpu/armv8/cache_v8.c | 2 +-
arch/arm/include/asm/armv8/mmu.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c
index 9229532..d92f2d1 100644
--- a/arch/arm/cpu/armv8/cache_v8.c
+++ b/arch/arm/cpu/armv8/cache_v8.c
@@ -71,7 +71,7 @@ static u64 get_tcr(int el, u64 *pips, u64 *pva_bits)
}
if (el == 1) {
- tcr = TCR_EL1_RSVD | (ips << 32);
+ tcr = TCR_EL1_RSVD | (ips << 32) | TCR_EPD1_DISABLE;
} else if (el == 2) {
tcr = TCR_EL2_RSVD | (ips << 16);
} else {
diff --git a/arch/arm/include/asm/armv8/mmu.h b/arch/arm/include/asm/armv8/mmu.h
index 39ff745..0080ae6 100644
--- a/arch/arm/include/asm/armv8/mmu.h
+++ b/arch/arm/include/asm/armv8/mmu.h
@@ -154,6 +154,7 @@
#define TCR_TG0_4K (0 << 14)
#define TCR_TG0_64K (1 << 14)
#define TCR_TG0_16K (2 << 14)
+#define TCR_EPD1_DISABLE (1 << 23)
#ifndef CONFIG_SYS_FULL_VA
#define TCR_EL1_IPS_BITS (UL(3) << 32) /* 42 bits physical address */
--
1.8.5.6
next prev parent reply other threads:[~2016-03-04 0:09 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-04 0:09 [U-Boot] [PATCH v5 00/30] EFI payload / application support Alexander Graf
2016-03-04 0:09 ` [U-Boot] [PATCH v5 01/30] thunderx: Calculate TCR dynamically Alexander Graf
2016-03-17 1:59 ` [U-Boot] [U-Boot,v5,01/30] " Tom Rini
2016-03-04 0:09 ` Alexander Graf [this message]
2016-03-17 1:59 ` [U-Boot] [U-Boot,v5,02/30] arm64: Disable TTBR1 maps in EL1 Tom Rini
2016-03-04 0:09 ` [U-Boot] [PATCH v5 03/30] arm64: Make full va map code more dynamic Alexander Graf
2016-03-17 1:59 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-03-04 0:09 ` [U-Boot] [PATCH v5 04/30] thunderx: Move mmu table into board file Alexander Graf
2016-03-17 2:00 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-03-04 0:09 ` [U-Boot] [PATCH v5 05/30] zymqmp: Replace home grown mmu code with generic table approach Alexander Graf
2016-03-17 2:00 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-03-04 0:09 ` [U-Boot] [PATCH v5 06/30] tegra: " Alexander Graf
2016-03-17 2:00 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-03-04 0:09 ` [U-Boot] [PATCH v5 07/30] vexpress64: Add MMU tables Alexander Graf
2016-03-17 2:00 ` [U-Boot] [U-Boot,v5,07/30] " Tom Rini
2016-03-04 0:09 ` [U-Boot] [PATCH v5 08/30] dwmmc: Increase retry timeout Alexander Graf
2016-03-17 2:00 ` [U-Boot] [U-Boot,v5,08/30] " Tom Rini
2016-03-04 0:09 ` [U-Boot] [PATCH v5 09/30] hikey: Add MMU tables Alexander Graf
2016-03-17 2:00 ` [U-Boot] [U-Boot,v5,09/30] " Tom Rini
2016-03-04 0:09 ` [U-Boot] [PATCH v5 10/30] arm64: Remove non-full-va map code Alexander Graf
2016-03-17 2:00 ` [U-Boot] [U-Boot,v5,10/30] " Tom Rini
2016-03-04 0:09 ` [U-Boot] [PATCH v5 11/30] arm64: Only allow dcache disabled in SPL builds Alexander Graf
2016-03-17 2:01 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-03-04 0:09 ` [U-Boot] [PATCH v5 12/30] disk/part.c: Expose list of available block drivers Alexander Graf
2016-03-17 2:01 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-03-04 0:09 ` [U-Boot] [PATCH v5 13/30] include/efi_api.h: Add more detailed API definitions Alexander Graf
2016-03-17 2:01 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-03-04 0:09 ` [U-Boot] [PATCH v5 14/30] efi_loader: Add PE image loader Alexander Graf
2016-03-17 2:01 ` [U-Boot] [U-Boot,v5,14/30] " Tom Rini
2016-03-04 0:09 ` [U-Boot] [PATCH v5 15/30] efi_loader: Add boot time services Alexander Graf
2016-03-17 2:01 ` [U-Boot] [U-Boot,v5,15/30] " Tom Rini
2016-03-04 0:10 ` [U-Boot] [PATCH v5 16/30] efi_loader: Add console interface Alexander Graf
2016-03-17 2:01 ` [U-Boot] [U-Boot,v5,16/30] " Tom Rini
2016-03-04 0:10 ` [U-Boot] [PATCH v5 17/30] efi_loader: Add runtime services Alexander Graf
2016-03-17 2:01 ` [U-Boot] [U-Boot,v5,17/30] " Tom Rini
2016-03-04 0:10 ` [U-Boot] [PATCH v5 18/30] efi_loader: Add disk interfaces Alexander Graf
2016-03-17 2:01 ` [U-Boot] [U-Boot,v5,18/30] " Tom Rini
2016-03-04 0:10 ` [U-Boot] [PATCH v5 19/30] efi_loader: Add "bootefi" command Alexander Graf
2016-03-09 23:27 ` [U-Boot] [PATCH v6 " Alexander Graf
2016-03-17 2:01 ` [U-Boot] [U-Boot,v6,19/30] " Tom Rini
2016-03-04 0:10 ` [U-Boot] [PATCH v5 20/30] efi_loader: Implement memory allocation and map Alexander Graf
2016-03-17 2:02 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-03-04 0:10 ` [U-Boot] [PATCH v5 21/30] arm64: Allow exceptions to return Alexander Graf
2016-03-17 2:02 ` [U-Boot] [U-Boot,v5,21/30] " Tom Rini
2016-03-04 0:10 ` [U-Boot] [PATCH v5 22/30] arm64: Allow EFI payload code to take exceptions Alexander Graf
2016-03-17 2:02 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-03-04 0:10 ` [U-Boot] [PATCH v5 23/30] efi_loader: hook up in build environment Alexander Graf
2016-03-17 2:02 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-03-04 0:10 ` [U-Boot] [PATCH v5 24/30] efi_loader: Add distro boot script for removable media Alexander Graf
2016-03-09 23:05 ` Alexander Graf
2016-03-09 23:16 ` Tom Rini
2016-03-09 23:26 ` [U-Boot] [PATCH v6 " Alexander Graf
2016-03-17 2:02 ` [U-Boot] [U-Boot, v6, " Tom Rini
2016-03-04 0:10 ` [U-Boot] [PATCH v5 25/30] efi_loader: Add README section in README.efi Alexander Graf
2016-03-17 2:02 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-03-04 0:10 ` [U-Boot] [PATCH v5 26/30] efi_loader: Add MAINTAINERS entry Alexander Graf
2016-03-17 2:02 ` [U-Boot] [U-Boot,v5,26/30] " Tom Rini
2016-03-04 0:10 ` [U-Boot] [PATCH v5 27/30] arm64: Replace fdt_name env variables with fdtfile Alexander Graf
2016-03-17 2:02 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-03-04 0:10 ` [U-Boot] [PATCH v5 28/30] arm: Allow EFI payload code to take exceptions Alexander Graf
2016-03-17 2:03 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-03-04 0:10 ` [U-Boot] [PATCH v5 29/30] efi_loader: Call fdt preparation functions Alexander Graf
2016-03-17 2:03 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-03-04 0:10 ` [U-Boot] [PATCH v5 30/30] efi_loader: Pass proper device path in on boot Alexander Graf
2016-03-17 2:03 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-03-04 9:19 ` [U-Boot] [PATCH] efi_loader: Reserve 2 additional pages for fdt Alexander Graf
2016-03-04 9:41 ` Leif Lindholm
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=1457050214-117592-3-git-send-email-agraf@suse.de \
--to=agraf@suse.de \
--cc=u-boot@lists.denx.de \
/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