From patchwork Fri Aug 8 15:23:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 4697021 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8EF17C0338 for ; Fri, 8 Aug 2014 15:26:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A25B120158 for ; Fri, 8 Aug 2014 15:26:06 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9454020154 for ; Fri, 8 Aug 2014 15:26:05 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XFm1V-0007ye-ED; Fri, 08 Aug 2014 15:24:05 +0000 Received: from mail-ob0-x236.google.com ([2607:f8b0:4003:c01::236]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XFm1S-0007bB-PI for linux-arm-kernel@lists.infradead.org; Fri, 08 Aug 2014 15:24:03 +0000 Received: by mail-ob0-f182.google.com with SMTP id wm4so4069836obc.13 for ; Fri, 08 Aug 2014 08:23:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=ebo25G4twdeE4/M+u6cvDV3T4JYk8B2kZ51X+2RPBCE=; b=DkglDWsX2YY/C6sGDmfGzyLuWub0xQo+7AJfceDuVw+PC2Ubwg8Ec7UXbomWAd+2Vj 4NnpzLeBCFA0FePkiE+RuTx6kwG6wH0P2ZsKeT/Qzm23GtJImzu8dStGL+IILkCq7VLD KAVGo3ZzvWeIzJv/8HqX0YDG5jNQmAmXZROoG3mIJWx0QGwVlcD3LeRq4iwHxyYG0UFg Qg6pCDb2ldCZp4teShN0i/Y093F/93ciMHkQ7O1Xnd1PTCTAEZD9xXqji5A1oO6Qum2I df21om9utbYv+laR+j86WfvsdKx7Nx3yUTuPNxsyRd6afPT3//f8rtSlhKVumXsFeGqV QQSg== X-Received: by 10.60.145.143 with SMTP id su15mr31084721oeb.58.1407511419529; Fri, 08 Aug 2014 08:23:39 -0700 (PDT) Received: from localhost.localdomain (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by mx.google.com with ESMTPSA id u5sm14855521obt.18.2014.08.08.08.23.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Aug 2014 08:23:39 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org, Russell King Subject: [PATCH] ARM: expand fixmap region to 3MB Date: Fri, 8 Aug 2014 10:23:24 -0500 Message-Id: <1407511404-11997-1-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140808_082402_870679_1F461357 X-CRM114-Status: GOOD ( 16.57 ) X-Spam-Score: 0.1 (/) Cc: Rob Herring , Mark Salter , Kees Cook , Leif Lindholm , Nicolas Pitre X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rob Herring With commit a05e54c103b0b8 "ARM: 8031/2: change fixmap mapping region to support 32 CPUs", the fixmap region was expanded to 2MB, but it precluded any other uses of the fixmap region in order to support up to 32 CPUs. In order to support other uses the fixmap region needs to be expanded beyond 2MB. Fortunately, the adjacent 1MB range 0xffe00000-0xfff00000 is availabe to use. Remove fixmap_page_table ptr and lookup the page table via the virtual address so that the fixmap region can span more that one pmd. The 2nd pmd is already created since it is shared with the vector page. Cc: Leif Lindholm Cc: Kees Cook Cc: Russell King Signed-off-by: Rob Herring Acked-by: Nicolas Pitre Tested-by: Leif Lindholm --- This patch can come before or after the generic fixmap.h. There's a single line conflict with the ending address This worked for earlycon, but I've not done any highmem specific testing. My full series is available here: git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git fixmap Rob Documentation/arm/memory.txt | 2 +- arch/arm/include/asm/fixmap.h | 2 +- arch/arm/mm/highmem.c | 15 ++++++++------- arch/arm/mm/mmu.c | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt index 38dc06d..4178ebd 100644 --- a/Documentation/arm/memory.txt +++ b/Documentation/arm/memory.txt @@ -41,7 +41,7 @@ fffe8000 fffeffff DTCM mapping area for platforms with fffe0000 fffe7fff ITCM mapping area for platforms with ITCM mounted inside the CPU. -ffc00000 ffdfffff Fixmap mapping region. Addresses provided +ffc00000 ffefffff Fixmap mapping region. Addresses provided by fix_to_virt() will be located here. fee00000 feffffff Mapping of PCI I/O space. This is a static diff --git a/arch/arm/include/asm/fixmap.h b/arch/arm/include/asm/fixmap.h index 74124b0..cb50cee 100644 --- a/arch/arm/include/asm/fixmap.h +++ b/arch/arm/include/asm/fixmap.h @@ -2,7 +2,7 @@ #define _ASM_FIXMAP_H #define FIXADDR_START 0xffc00000UL -#define FIXADDR_TOP 0xffe00000UL +#define FIXADDR_TOP 0xfff00000UL #define FIXADDR_SIZE (FIXADDR_TOP - FIXADDR_START) #define FIX_KMAP_NR_PTES (FIXADDR_SIZE >> PAGE_SHIFT) diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c index 45aeaac..ac2938f 100644 --- a/arch/arm/mm/highmem.c +++ b/arch/arm/mm/highmem.c @@ -18,19 +18,20 @@ #include #include "mm.h" -pte_t *fixmap_page_table; - static inline void set_fixmap_pte(int idx, pte_t pte) { unsigned long vaddr = __fix_to_virt(idx); - set_pte_ext(fixmap_page_table + idx, pte, 0); + pte_t *ptep = pte_offset_kernel(pmd_off_k(vaddr), vaddr); + + set_pte_ext(ptep, pte, 0); local_flush_tlb_kernel_page(vaddr); } static inline pte_t get_fixmap_pte(unsigned long vaddr) { - unsigned long idx = __virt_to_fix(vaddr); - return *(fixmap_page_table + idx); + pte_t *ptep = pte_offset_kernel(pmd_off_k(vaddr), vaddr); + + return *ptep; } void *kmap(struct page *page) @@ -84,7 +85,7 @@ void *kmap_atomic(struct page *page) * With debugging enabled, kunmap_atomic forces that entry to 0. * Make sure it was indeed properly unmapped. */ - BUG_ON(!pte_none(*(fixmap_page_table + idx))); + BUG_ON(!pte_none(*get_fixmap_pte(vaddr))); #endif /* * When debugging is off, kunmap_atomic leaves the previous mapping @@ -134,7 +135,7 @@ void *kmap_atomic_pfn(unsigned long pfn) idx = type + KM_TYPE_NR * smp_processor_id(); vaddr = __fix_to_virt(idx); #ifdef CONFIG_DEBUG_HIGHMEM - BUG_ON(!pte_none(*(fixmap_page_table + idx))); + BUG_ON(!pte_none(*get_fixmap_pte(vaddr))); #endif set_fixmap_pte(idx, pfn_pte(pfn, kmap_prot)); diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 8348ed6..5e5d0ba 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1327,7 +1327,7 @@ static void __init kmap_init(void) pkmap_page_table = early_pte_alloc(pmd_off_k(PKMAP_BASE), PKMAP_BASE, _PAGE_KERNEL_TABLE); - fixmap_page_table = early_pte_alloc(pmd_off_k(FIXADDR_START), + early_pte_alloc(pmd_off_k(FIXADDR_START), FIXADDR_START, _PAGE_KERNEL_TABLE); #endif }