mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Catalin Marinas <catalin.marinas@arm.com>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v9 13/15] ARM: LPAE: Add identity mapping support for the 3-level page table format
Date: Mon, 14 Nov 2011 16:23:49 +0000	[thread overview]
Message-ID: <1321287831-24560-14-git-send-email-catalin.marinas@arm.com> (raw)
In-Reply-To: <1321287831-24560-1-git-send-email-catalin.marinas@arm.com>

With LPAE, the pgd is a separate page table with entries pointing to the
pmd. The identity_mapping_add() function needs to ensure that the pgd is
populated before populating the pmd level. The do..while blocks now loop
over the pmd in order to have the same implementation for the two page
table formats. The pmd_addr_end() definition has been removed and the
generic one used instead. The pmd clean-up is done in the pgd_free()
function.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---

The idmap_add_pmd() function cannot be called in an atomic context. The
setup_mm_for_reboot() function is being re-implemented as part of the
kexec patches and no longer calls identity_mapping_add().

 arch/arm/mm/idmap.c |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mm/idmap.c b/arch/arm/mm/idmap.c
index 2be9139..267db72 100644
--- a/arch/arm/mm/idmap.c
+++ b/arch/arm/mm/idmap.c
@@ -4,6 +4,31 @@
 #include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 
+#ifdef CONFIG_ARM_LPAE
+static void idmap_add_pmd(pud_t *pud, unsigned long addr, unsigned long end,
+	unsigned long prot)
+{
+	pmd_t *pmd;
+	unsigned long next;
+
+	if (pud_none_or_clear_bad(pud) || (pud_val(*pud) & L_PGD_SWAPPER)) {
+		pmd = pmd_alloc_one(&init_mm, addr);
+		if (!pmd) {
+			pr_warning("Failed to allocate identity pmd.\n");
+			return;
+		}
+		pud_populate(&init_mm, pud, pmd);
+		pmd += pmd_index(addr);
+	} else
+		pmd = pmd_offset(pud, addr);
+
+	do {
+		next = pmd_addr_end(addr, end);
+		*pmd = __pmd((addr & PMD_MASK) | prot);
+		flush_pmd_entry(pmd);
+	} while (pmd++, addr = next, addr != end);
+}
+#else	/* !CONFIG_ARM_LPAE */
 static void idmap_add_pmd(pud_t *pud, unsigned long addr, unsigned long end,
 	unsigned long prot)
 {
@@ -15,6 +40,7 @@ static void idmap_add_pmd(pud_t *pud, unsigned long addr, unsigned long end,
 	pmd[1] = __pmd(addr);
 	flush_pmd_entry(pmd);
 }
+#endif	/* CONFIG_ARM_LPAE */
 
 static void idmap_add_pud(pgd_t *pgd, unsigned long addr, unsigned long end,
 	unsigned long prot)
@@ -32,7 +58,7 @@ void identity_mapping_add(pgd_t *pgd, unsigned long addr, unsigned long end)
 {
 	unsigned long prot, next;
 
-	prot = PMD_TYPE_SECT | PMD_SECT_AP_WRITE;
+	prot = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_AF;
 	if (cpu_architecture() <= CPU_ARCH_ARMv5TEJ && !cpu_is_xscale())
 		prot |= PMD_BIT4;
 
@@ -46,7 +72,11 @@ void identity_mapping_add(pgd_t *pgd, unsigned long addr, unsigned long end)
 #ifdef CONFIG_SMP
 static void idmap_del_pmd(pud_t *pud, unsigned long addr, unsigned long end)
 {
-	pmd_t *pmd = pmd_offset(pud, addr);
+	pmd_t *pmd;
+
+	if (pud_none_or_clear_bad(pud))
+		return;
+	pmd = pmd_offset(pud, addr);
 	pmd_clear(pmd);
 }
 


  parent reply	other threads:[~2011-11-14 16:24 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-14 16:23 [PATCH v9 00/15] ARM: Add support for the Large Physical Address Extensions Catalin Marinas
2011-11-14 16:23 ` [PATCH v9 01/15] ARM: pgtable: Fix compiler warning in ioremap.c introduced by nopud Catalin Marinas
2011-11-14 16:23 ` [PATCH v9 02/15] ARM: pgtable: switch to use pgtable-nopud.h Catalin Marinas
2011-11-14 16:23 ` [PATCH v9 03/15] ARM: LPAE: Move page table maintenance macros to pgtable-2level.h Catalin Marinas
2011-11-14 16:23 ` [PATCH v9 04/15] ARM: LPAE: Move the FSR definitions to separate files Catalin Marinas
2011-11-14 16:23 ` [PATCH v9 05/15] ARM: LPAE: Factor out classic-MMU specific code into proc-v7-2level.S Catalin Marinas
2011-11-14 16:23 ` [PATCH v9 06/15] ARM: LPAE: add ISBs around MMU enabling code Catalin Marinas
2011-11-14 16:23 ` [PATCH v9 07/15] ARM: LPAE: Introduce the 3-level page table format definitions Catalin Marinas
2011-11-14 16:23 ` [PATCH v9 08/15] ARM: LPAE: Page table maintenance for the 3-level format Catalin Marinas
2011-11-14 16:23 ` [PATCH v9 09/15] ARM: LPAE: MMU setup for the 3-level page table format Catalin Marinas
2011-11-14 16:23 ` [PATCH v9 10/15] ARM: LPAE: Invalidate the TLB before freeing the PMD Catalin Marinas
2011-11-14 16:23 ` [PATCH v9 11/15] ARM: LPAE: Add fault handling support Catalin Marinas
2011-11-14 16:23 ` [PATCH v9 12/15] ARM: LPAE: Add context switching support Catalin Marinas
2011-11-14 16:23 ` Catalin Marinas [this message]
2011-11-14 16:23 ` [PATCH v9 14/15] ARM: LPAE: mark memory banks with start > ULONG_MAX as highmem Catalin Marinas
2011-11-14 16:23 ` [PATCH v9 15/15] ARM: LPAE: Add the Kconfig entries Catalin Marinas

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=1321287831-24560-14-git-send-email-catalin.marinas@arm.com \
    --to=catalin.marinas@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.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

all inboxes | Powered by JetHome®