linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: catalin.marinas@arm.com (Catalin Marinas)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 13/18] ARM: LPAE: Add context switching support
Date: Tue, 24 May 2011 22:39:19 +0100	[thread overview]
Message-ID: <1306273164-18217-14-git-send-email-catalin.marinas@arm.com> (raw)
In-Reply-To: <1306273164-18217-1-git-send-email-catalin.marinas@arm.com>

With LPAE, TTBRx registers are 64-bit. The ASID is stored in TTBR0
rather than a separate Context ID register. This patch makes the
necessary changes to handle context switching on LPAE.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---
 arch/arm/mm/context.c |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
index 2352395..2dff1cf 100644
--- a/arch/arm/mm/context.c
+++ b/arch/arm/mm/context.c
@@ -22,6 +22,34 @@ unsigned int cpu_last_asid = ASID_FIRST_VERSION;
 DEFINE_PER_CPU(struct mm_struct *, current_mm);
 #endif
 
+#ifdef CONFIG_ARM_LPAE
+static void cpu_set_reserved_ttbr0(void)
+{
+	unsigned long ttbl = __pa(swapper_pg_dir);
+	unsigned long ttbh = 0;
+
+	/*
+	 * Set TTBR0 to swapper_pg_dir. Note that swapper_pg_dir only contains
+	 * global entries so the ASID value is not relevant.
+	 */
+	asm(
+	"	mcrr	p15, 0, %0, %1, c2		@ set TTBR0\n"
+	:
+	: "r" (ttbl), "r" (ttbh));
+}
+#else
+static void cpu_set_reserved_ttbr0(void)
+{
+	u32 ttb;
+
+	/* Copy TTBR1 into TTBR0 */
+	asm volatile(
+	"	mrc	p15, 0, %0, c2, c0, 1		@ read TTBR1\n"
+	"	mcr	p15, 0, %0, c2, c0, 0		@ set TTBR0\n"
+	: "=r" (ttb));
+}
+#endif
+
 /*
  * We fork()ed a process, and we need a new context for the child
  * to run in.
@@ -34,11 +62,7 @@ void __init_new_context(struct task_struct *tsk, struct mm_struct *mm)
 
 static void flush_context(void)
 {
-	u32 ttb;
-	/* Copy TTBR1 into TTBR0 */
-	asm volatile("mrc	p15, 0, %0, c2, c0, 1\n"
-		     "mcr	p15, 0, %0, c2, c0, 0"
-		     : "=r" (ttb));
+	cpu_set_reserved_ttbr0();
 	isb();
 	local_flush_tlb_all();
 	if (icache_is_vivt_asid_tagged()) {

  parent reply	other threads:[~2011-05-24 21:39 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-24 21:39 [PATCH v6 00/18] ARM: Add support for the Large Physical Address Extensions Catalin Marinas
2011-05-24 21:39 ` [PATCH v6 01/18] ARM: LPAE: Use long long printk format for displaying the pud Catalin Marinas
2011-05-24 21:39 ` [PATCH v6 02/18] ARM: LPAE: add ISBs around MMU enabling code Catalin Marinas
2011-05-24 21:39 ` [PATCH v6 03/18] ARM: LPAE: Use unsigned long for __phys_to_virt and __virt_to_phys Catalin Marinas
2011-05-24 21:39 ` [PATCH v6 04/18] ARM: LPAE: Use PMD_(SHIFT|SIZE|MASK) instead of PGDIR_* Catalin Marinas
2011-05-24 21:39 ` [PATCH v6 05/18] ARM: LPAE: Factor out 2-level page table definitions into separate files Catalin Marinas
2011-05-24 21:39 ` [PATCH v6 06/18] ARM: LPAE: Add (pte|pmd|pgd|pgprot)val_t type definitions as u32 Catalin Marinas
2011-05-24 21:39 ` [PATCH v6 07/18] ARM: LPAE: Use a mask for physical addresses in page table entries Catalin Marinas
2011-05-24 21:39 ` [PATCH v6 08/18] ARM: LPAE: Introduce the 3-level page table format definitions Catalin Marinas
2011-05-24 21:39 ` [PATCH v6 09/18] ARM: LPAE: Page table maintenance for the 3-level format Catalin Marinas
2011-05-24 21:39 ` [PATCH v6 10/18] ARM: LPAE: MMU setup for the 3-level page table format Catalin Marinas
2011-05-24 21:39 ` [PATCH v6 11/18] ARM: LPAE: Invalidate the TLB before freeing the PMD Catalin Marinas
2011-05-24 21:39 ` [PATCH v6 12/18] ARM: LPAE: Add fault handling support Catalin Marinas
2011-05-24 21:39 ` Catalin Marinas [this message]
2011-05-24 21:39 ` [PATCH v6 14/18] ARM: LPAE: Add identity mapping support for the 3-level page table format Catalin Marinas
2011-05-24 21:39 ` [PATCH v6 15/18] ARM: LPAE: Use generic dma_addr_t type definition Catalin Marinas
2011-05-24 21:39 ` [PATCH v6 16/18] ARM: LPAE: mark memory banks with start > ULONG_MAX as highmem Catalin Marinas
2011-05-24 21:39 ` [PATCH v6 17/18] ARM: LPAE: add support for ATAG_MEM64 Catalin Marinas
2011-05-24 21:39 ` [PATCH v6 18/18] ARM: LPAE: Add the Kconfig entries Catalin Marinas
2011-05-24 23:56 ` [PATCH v6 00/18] ARM: Add support for the Large Physical Address Extensions David Brown
2011-05-25  0:44   ` Nicolas Pitre
2011-05-25 11:10     ` Arnd Bergmann
2011-05-25 11:22       ` Catalin Marinas
2011-05-25 12:43         ` Catalin Marinas
2011-05-25  8:33   ` Catalin Marinas
2011-07-01 16:24 ` Catalin Marinas
2011-07-02 12:19   ` Russell King - ARM Linux
2011-07-04 17:23     ` Catalin Marinas
2011-07-08 19:21       ` Russell King - ARM Linux

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=1306273164-18217-14-git-send-email-catalin.marinas@arm.com \
    --to=catalin.marinas@arm.com \
    --cc=linux-arm-kernel@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;
as well as URLs for NNTP newsgroup(s).