From: Catalin Marinas <catalin.marinas@arm.com> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 04/19] ARM: LPAE: Use PMD_(SHIFT|SIZE|MASK) instead of PGDIR_* Date: Mon, 24 Jan 2011 17:55:46 +0000 [thread overview] Message-ID: <1295891761-18366-5-git-send-email-catalin.marinas@arm.com> (raw) In-Reply-To: <1295891761-18366-1-git-send-email-catalin.marinas@arm.com> PGDIR_SHIFT and PMD_SHIFT for the classic 2-level page table format have the same value (21). This patch converts the PGDIR_* uses in the kernel to the PMD_* equivalent so that LPAE builds can reuse the same code. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> --- arch/arm/kernel/module.c | 2 +- arch/arm/mm/dma-mapping.c | 6 +++--- arch/arm/mm/mmu.c | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index 2cfe816..94292bb 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c @@ -32,7 +32,7 @@ * recompiling the whole kernel when CONFIG_XIP_KERNEL is turned on/off. */ #undef MODULES_VADDR -#define MODULES_VADDR (((unsigned long)_etext + ~PGDIR_MASK) & PGDIR_MASK) +#define MODULES_VADDR (((unsigned long)_etext + ~PMD_MASK) & PMD_MASK) #endif #ifdef CONFIG_MMU diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 4771dba..4fbcda8 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -121,8 +121,8 @@ static void __dma_free_buffer(struct page *page, size_t size) #endif #define CONSISTENT_OFFSET(x) (((unsigned long)(x) - CONSISTENT_BASE) >> PAGE_SHIFT) -#define CONSISTENT_PTE_INDEX(x) (((unsigned long)(x) - CONSISTENT_BASE) >> PGDIR_SHIFT) -#define NUM_CONSISTENT_PTES (CONSISTENT_DMA_SIZE >> PGDIR_SHIFT) +#define CONSISTENT_PTE_INDEX(x) (((unsigned long)(x) - CONSISTENT_BASE) >> PMD_SHIFT) +#define NUM_CONSISTENT_PTES (CONSISTENT_DMA_SIZE >> PMD_SHIFT) /* * These are the page tables (2MB each) covering uncached, DMA consistent allocations @@ -172,7 +172,7 @@ static int __init consistent_init(void) } consistent_pte[i++] = pte; - base += (1 << PGDIR_SHIFT); + base += (1 << PMD_SHIFT); } while (base < CONSISTENT_END); return ret; diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index cae8d68..195a31e 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -857,14 +857,14 @@ static inline void prepare_page_table(void) /* * Clear out all the mappings below the kernel image. */ - for (addr = 0; addr < MODULES_VADDR; addr += PGDIR_SIZE) + for (addr = 0; addr < MODULES_VADDR; addr += PMD_SIZE) pmd_clear(pmd_off_k(addr)); #ifdef CONFIG_XIP_KERNEL /* The XIP kernel is mapped in the module area -- skip over it */ - addr = ((unsigned long)_etext + PGDIR_SIZE - 1) & PGDIR_MASK; + addr = ((unsigned long)_etext + PMD_SIZE - 1) & PMD_MASK; #endif - for ( ; addr < PAGE_OFFSET; addr += PGDIR_SIZE) + for ( ; addr < PAGE_OFFSET; addr += PMD_SIZE) pmd_clear(pmd_off_k(addr)); /* @@ -879,7 +879,7 @@ static inline void prepare_page_table(void) * memory bank, up to the end of the vmalloc region. */ for (addr = __phys_to_virt(end); - addr < VMALLOC_END; addr += PGDIR_SIZE) + addr < VMALLOC_END; addr += PMD_SIZE) pmd_clear(pmd_off_k(addr)); } @@ -920,7 +920,7 @@ static void __init devicemaps_init(struct machine_desc *mdesc) */ vectors_page = early_alloc(PAGE_SIZE); - for (addr = VMALLOC_END; addr; addr += PGDIR_SIZE) + for (addr = VMALLOC_END; addr; addr += PMD_SIZE) pmd_clear(pmd_off_k(addr)); /*
WARNING: multiple messages have this Message-ID (diff)
From: catalin.marinas@arm.com (Catalin Marinas) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 04/19] ARM: LPAE: Use PMD_(SHIFT|SIZE|MASK) instead of PGDIR_* Date: Mon, 24 Jan 2011 17:55:46 +0000 [thread overview] Message-ID: <1295891761-18366-5-git-send-email-catalin.marinas@arm.com> (raw) In-Reply-To: <1295891761-18366-1-git-send-email-catalin.marinas@arm.com> PGDIR_SHIFT and PMD_SHIFT for the classic 2-level page table format have the same value (21). This patch converts the PGDIR_* uses in the kernel to the PMD_* equivalent so that LPAE builds can reuse the same code. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> --- arch/arm/kernel/module.c | 2 +- arch/arm/mm/dma-mapping.c | 6 +++--- arch/arm/mm/mmu.c | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index 2cfe816..94292bb 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c @@ -32,7 +32,7 @@ * recompiling the whole kernel when CONFIG_XIP_KERNEL is turned on/off. */ #undef MODULES_VADDR -#define MODULES_VADDR (((unsigned long)_etext + ~PGDIR_MASK) & PGDIR_MASK) +#define MODULES_VADDR (((unsigned long)_etext + ~PMD_MASK) & PMD_MASK) #endif #ifdef CONFIG_MMU diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 4771dba..4fbcda8 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -121,8 +121,8 @@ static void __dma_free_buffer(struct page *page, size_t size) #endif #define CONSISTENT_OFFSET(x) (((unsigned long)(x) - CONSISTENT_BASE) >> PAGE_SHIFT) -#define CONSISTENT_PTE_INDEX(x) (((unsigned long)(x) - CONSISTENT_BASE) >> PGDIR_SHIFT) -#define NUM_CONSISTENT_PTES (CONSISTENT_DMA_SIZE >> PGDIR_SHIFT) +#define CONSISTENT_PTE_INDEX(x) (((unsigned long)(x) - CONSISTENT_BASE) >> PMD_SHIFT) +#define NUM_CONSISTENT_PTES (CONSISTENT_DMA_SIZE >> PMD_SHIFT) /* * These are the page tables (2MB each) covering uncached, DMA consistent allocations @@ -172,7 +172,7 @@ static int __init consistent_init(void) } consistent_pte[i++] = pte; - base += (1 << PGDIR_SHIFT); + base += (1 << PMD_SHIFT); } while (base < CONSISTENT_END); return ret; diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index cae8d68..195a31e 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -857,14 +857,14 @@ static inline void prepare_page_table(void) /* * Clear out all the mappings below the kernel image. */ - for (addr = 0; addr < MODULES_VADDR; addr += PGDIR_SIZE) + for (addr = 0; addr < MODULES_VADDR; addr += PMD_SIZE) pmd_clear(pmd_off_k(addr)); #ifdef CONFIG_XIP_KERNEL /* The XIP kernel is mapped in the module area -- skip over it */ - addr = ((unsigned long)_etext + PGDIR_SIZE - 1) & PGDIR_MASK; + addr = ((unsigned long)_etext + PMD_SIZE - 1) & PMD_MASK; #endif - for ( ; addr < PAGE_OFFSET; addr += PGDIR_SIZE) + for ( ; addr < PAGE_OFFSET; addr += PMD_SIZE) pmd_clear(pmd_off_k(addr)); /* @@ -879,7 +879,7 @@ static inline void prepare_page_table(void) * memory bank, up to the end of the vmalloc region. */ for (addr = __phys_to_virt(end); - addr < VMALLOC_END; addr += PGDIR_SIZE) + addr < VMALLOC_END; addr += PMD_SIZE) pmd_clear(pmd_off_k(addr)); } @@ -920,7 +920,7 @@ static void __init devicemaps_init(struct machine_desc *mdesc) */ vectors_page = early_alloc(PAGE_SIZE); - for (addr = VMALLOC_END; addr; addr += PGDIR_SIZE) + for (addr = VMALLOC_END; addr; addr += PMD_SIZE) pmd_clear(pmd_off_k(addr)); /*
next prev parent reply other threads:[~2011-01-24 17:56 UTC|newest] Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-01-24 17:55 [PATCH v4 00/19] ARM: Add support for the Large Physical Address Extensions Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-01-24 17:55 ` [PATCH v4 01/19] ARM: Make the argument to virt_to_phys() "const volatile" Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-01-24 19:19 ` Stephen Boyd 2011-01-24 19:19 ` Stephen Boyd 2011-01-24 23:38 ` Russell King - ARM Linux 2011-01-24 23:38 ` Russell King - ARM Linux 2011-01-25 10:00 ` Arnd Bergmann 2011-01-25 10:00 ` Arnd Bergmann 2011-01-25 10:29 ` Russell King - ARM Linux 2011-01-25 10:29 ` Russell King - ARM Linux 2011-01-25 14:14 ` Arnd Bergmann 2011-01-25 14:14 ` Arnd Bergmann 2011-01-24 17:55 ` [PATCH v4 02/19] ARM: LPAE: Fix early_pte_alloc() assumption about the Linux PTE Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-02-12 9:56 ` Russell King - ARM Linux 2011-02-12 9:56 ` Russell King - ARM Linux 2011-01-24 17:55 ` [PATCH v4 03/19] ARM: LPAE: use long long format when printing physical addresses and ptes Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-02-12 9:59 ` Russell King - ARM Linux 2011-02-12 9:59 ` Russell King - ARM Linux 2011-01-24 17:55 ` Catalin Marinas [this message] 2011-01-24 17:55 ` [PATCH v4 04/19] ARM: LPAE: Use PMD_(SHIFT|SIZE|MASK) instead of PGDIR_* Catalin Marinas 2011-01-24 17:55 ` [PATCH v4 05/19] ARM: LPAE: Factor out 2-level page table definitions into separate files Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-01-24 17:55 ` [PATCH v4 06/19] ARM: LPAE: Add (pte|pmd|pgd|pgprot)val_t type definitions as u32 Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-02-03 17:13 ` Catalin Marinas 2011-02-03 17:13 ` Catalin Marinas 2011-01-24 17:55 ` [PATCH v4 07/19] ARM: LPAE: Use a mask for physical addresses in page table entries Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-01-24 17:55 ` [PATCH v4 08/19] ARM: LPAE: Introduce the 3-level page table format definitions Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-01-24 21:26 ` Nick Piggin 2011-01-24 21:26 ` Nick Piggin 2011-01-24 21:42 ` Russell King - ARM Linux 2011-01-24 21:42 ` Russell King - ARM Linux 2011-01-25 10:04 ` Catalin Marinas 2011-01-25 10:04 ` Catalin Marinas 2011-03-21 12:36 ` Catalin Marinas 2011-03-21 12:36 ` Catalin Marinas 2011-03-21 12:56 ` Russell King - ARM Linux 2011-03-21 12:56 ` Russell King - ARM Linux 2011-03-21 13:19 ` Catalin Marinas 2011-03-21 13:19 ` Catalin Marinas 2011-02-03 17:11 ` Catalin Marinas 2011-02-03 17:11 ` Catalin Marinas 2011-01-24 17:55 ` [PATCH v4 09/19] ARM: LPAE: Page table maintenance for the 3-level format Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-02-03 17:09 ` Catalin Marinas 2011-02-03 17:09 ` Catalin Marinas 2011-02-03 17:56 ` Russell King - ARM Linux 2011-02-03 17:56 ` Russell King - ARM Linux 2011-02-03 22:00 ` Catalin Marinas 2011-02-03 22:00 ` Catalin Marinas 2011-01-24 17:55 ` [PATCH v4 10/19] ARM: LPAE: MMU setup for the 3-level page table format Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-01-24 17:55 ` [PATCH v4 11/19] ARM: LPAE: Add fault handling support Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-01-24 17:55 ` [PATCH v4 12/19] ARM: LPAE: Add context switching support Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-02-12 10:44 ` Russell King - ARM Linux 2011-02-12 10:44 ` Russell King - ARM Linux 2011-02-14 13:24 ` Catalin Marinas 2011-02-14 13:24 ` Catalin Marinas 2011-02-19 18:30 ` Russell King - ARM Linux 2011-02-19 18:30 ` Russell King - ARM Linux 2011-02-19 23:16 ` Catalin Marinas 2011-02-19 23:16 ` Catalin Marinas 2011-01-24 17:55 ` [PATCH v4 13/19] ARM: LPAE: Add identity mapping support for the 3-level page table format Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-01-24 17:55 ` [PATCH v4 14/19] ARM: LPAE: Add SMP " Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-01-24 17:55 ` [PATCH v4 15/19] ARM: LPAE: use phys_addr_t instead of unsigned long for physical addresses Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-02-12 10:28 ` Russell King - ARM Linux 2011-02-12 10:28 ` Russell King - ARM Linux 2011-02-15 11:52 ` Will Deacon 2011-02-15 11:52 ` Will Deacon 2011-02-15 12:35 ` Russell King - ARM Linux 2011-02-15 12:35 ` Russell King - ARM Linux 2011-02-15 12:39 ` Catalin Marinas 2011-02-15 12:39 ` Catalin Marinas 2011-02-15 13:37 ` Will Deacon 2011-02-15 13:37 ` Will Deacon 2011-02-15 14:23 ` Russell King - ARM Linux 2011-02-15 14:23 ` Russell King - ARM Linux 2011-02-15 15:26 ` Will Deacon 2011-02-15 15:26 ` Will Deacon 2011-02-15 15:48 ` Russell King - ARM Linux 2011-02-15 15:48 ` Russell King - ARM Linux 2011-02-19 18:26 ` Russell King - ARM Linux 2011-02-19 18:26 ` Russell King - ARM Linux 2011-02-21 14:36 ` Will Deacon 2011-02-21 14:36 ` Will Deacon 2011-02-21 14:58 ` Russell King - ARM Linux 2011-02-21 14:58 ` Russell King - ARM Linux 2011-02-21 15:01 ` Will Deacon 2011-02-21 15:01 ` Will Deacon 2011-01-24 17:55 ` [PATCH v4 16/19] ARM: LPAE: Use generic dma_addr_t type definition Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-02-12 10:34 ` Russell King - ARM Linux 2011-02-12 10:34 ` Russell King - ARM Linux 2011-02-14 13:01 ` Catalin Marinas 2011-02-14 13:01 ` Catalin Marinas 2011-02-15 14:27 ` Russell King - ARM Linux 2011-02-15 14:27 ` Russell King - ARM Linux 2011-02-15 15:24 ` Catalin Marinas 2011-02-15 15:24 ` Catalin Marinas 2011-01-24 17:55 ` [PATCH v4 17/19] ARM: LPAE: mark memory banks with start > ULONG_MAX as highmem Catalin Marinas 2011-01-24 17:55 ` Catalin Marinas 2011-02-12 10:36 ` Russell King - ARM Linux 2011-02-12 10:36 ` Russell King - ARM Linux 2011-01-24 17:56 ` [PATCH v4 18/19] ARM: LPAE: add support for ATAG_MEM64 Catalin Marinas 2011-01-24 17:56 ` Catalin Marinas 2011-01-24 17:56 ` [PATCH v4 19/19] ARM: LPAE: Add the Kconfig entries Catalin Marinas 2011-01-24 17:56 ` 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=1295891761-18366-5-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.