From patchwork Thu Sep 6 10:22:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Minchan Kim X-Patchwork-Id: 10590411 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6BA61112B for ; Thu, 6 Sep 2018 10:23:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 440D02A4D4 for ; Thu, 6 Sep 2018 10:23:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 379D42A511; Thu, 6 Sep 2018 10:23:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A20B62A4D4 for ; Thu, 6 Sep 2018 10:23:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UzIf60HfoSWg+f8ll1vONlOjJscRi4KMlYhKTeDAxJo=; b=l731C3UbRTVkWL y36LCtsl6l/wJgWC6lXjz57AFOzrKw0mtK376IklBuVmGm9PKNgXeOkKnF5vFkiTlXY1QrvgmVP6t 4geRJjej26RHx+wY+cpcbLztIVAhZUO3CCU35acsp4TdUZbRcp2QVAHUd9+hX0Oh7yMqY0j8L8xMP WwgbNhQ7LVcPhly6wJKFb50LhjylUcqRqC8vqcq90GzbeBLoHpHdtQXwx6wn5ibXa+PHqdgZBZF3D qljK97k17yXlKjjuLRIQCUN7kPqfAkFwqvXYrYi9X7CoEWurahdrdgLDJYzKTBmZM7SkdJq+RCAlq l5js8Kf1mY/Q95JZCqxg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fxrRd-0003ue-RL; Thu, 06 Sep 2018 10:23:25 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fxrQy-0003QD-BR for linux-arm-kernel@lists.infradead.org; Thu, 06 Sep 2018 10:22:46 +0000 Received: by mail-pf1-x443.google.com with SMTP id j26-v6so5052929pfi.10 for ; Thu, 06 Sep 2018 03:22:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pVdxn+3vt6uBmQntezzi5p84CFfWT4Wz9Qc3XWM/P2I=; b=Uj6dYugECbTFq5bCh3KlVp6wUAaK9VN33+FUNZKjKrLFk0NpeMV5Lcu75PkkmH1jO5 nLHUDZx/staukoocEtTAJUjcckmJeRl4CvPLs4oXCp6/FUGn7OH1wYR4+uzp6o9AjyCR FctxgoOrh4o2G8xQZHhJ40VMP95rpyBzgQ0Ae4qjUKqxjCg37nsI06S8+rEgajqxDPzC Vtgaz/aeD6xe8R2SnByWGBcHZpOOedfc3191FEkP2g3hov+z5gcj+U1udj5J/kkuZKzz QfsXN2Y9816Tw2c1hioE2jqPEcNzXWIMXCxfIbNHtCcInRbnqXaRat0sFNo0P5o266uy bHMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pVdxn+3vt6uBmQntezzi5p84CFfWT4Wz9Qc3XWM/P2I=; b=jpITUseAGJ+2Nu5QNv5h7bIAt2SgXIeAvQnK4BOgWo/YtFFakaQg/dJwVYk0jXYagJ Ir/ppCwzZIPHz3E/RLdVENhrsYWStBQYo3/R9D7Yqa1TA00TIzAVaZK8kFj7zWBcKI6f H1YbWDOidIuYKKkph6iDzdlnJhiUkU5zFqyQkCxytndrSQ7J1VpLOBq0cAkxQgZxWFsc 3BXxZ95JEEyqKp0zH+rF/YGwCFqvQjO8no2Bt7zoeC3sdxKYPfX1snHzXx4PLPOVPonC GehJF5Nr+Tqco/FCNw26nQXICjB/sEckjfQCpJLlUxzxQMpu0tBQgal0tnK+FIkoOOzp DvJg== X-Gm-Message-State: APzg51DWdje7T69FD/7NokYy4Mh1DI77R8QLTPnn/ozuii5maoHbx36K lw9yGaRQNlxBMdJpyTXrDhc= X-Google-Smtp-Source: ANB0VdZWf0siBKdhWrhJ6Bz9HLbQzzJb49Z79wPC47qfzbXzfKczofzbxQDk7scN0TgV6IMQAAPShQ== X-Received: by 2002:a63:1c1b:: with SMTP id c27-v6mr2097691pgc.48.1536229352570; Thu, 06 Sep 2018 03:22:32 -0700 (PDT) Received: from bbox-2.seo.corp.google.com ([2401:fa00:d:10:affa:813f:5380:6613]) by smtp.gmail.com with ESMTPSA id h82-v6sm7909555pfa.173.2018.09.06.03.22.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Sep 2018 03:22:31 -0700 (PDT) From: Minchan Kim To: Andrew Morton , linux@armlinux.org.uk Subject: [RFC 1/3] arm: mm: reordering memory type table Date: Thu, 6 Sep 2018 19:22:10 +0900 Message-Id: <20180906102212.218294-2-minchan@kernel.org> X-Mailer: git-send-email 2.19.0.rc1.350.ge57e33dbd1-goog In-Reply-To: <20180906102212.218294-1-minchan@kernel.org> References: <20180906102212.218294-1-minchan@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180906_032244_520922_275EFC45 X-CRM114-Status: GOOD ( 12.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: steve.capper@linaro.org, catalin.marinas@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, Minchan Kim , android-treble-mediatek-ext@partner.android.com, kernel-team@android.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP To use bit 5th in page table, we need a room for that and it seems we don't need 4 bits for the memory type with ARMv6+. If so, let's reorder bits to make bit 5 free. We will use the bit for L_PTE_SPECIAL in next patch. Cc: Russell King Cc: Catalin Marinas Cc: Will Deacon Cc: Steve Capper Signed-off-by: Minchan Kim --- arch/arm/include/asm/pgtable-2level.h | 13 +++++++++++-- arch/arm/mm/proc-macros.S | 16 ++++++++-------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h index 92fd2c8a9af0..91b99fadcba1 100644 --- a/arch/arm/include/asm/pgtable-2level.h +++ b/arch/arm/include/asm/pgtable-2level.h @@ -164,14 +164,23 @@ #define L_PTE_MT_BUFFERABLE (_AT(pteval_t, 0x01) << 2) /* 0001 */ #define L_PTE_MT_WRITETHROUGH (_AT(pteval_t, 0x02) << 2) /* 0010 */ #define L_PTE_MT_WRITEBACK (_AT(pteval_t, 0x03) << 2) /* 0011 */ +#define L_PTE_MT_DEV_SHARED (_AT(pteval_t, 0x04) << 2) /* 0100 */ #define L_PTE_MT_MINICACHE (_AT(pteval_t, 0x06) << 2) /* 0110 (sa1100, xscale) */ #define L_PTE_MT_WRITEALLOC (_AT(pteval_t, 0x07) << 2) /* 0111 */ -#define L_PTE_MT_DEV_SHARED (_AT(pteval_t, 0x04) << 2) /* 0100 */ -#define L_PTE_MT_DEV_NONSHARED (_AT(pteval_t, 0x0c) << 2) /* 1100 */ +#if defined(CONFIG_CPU_V7) || defined(CONFIG_CPU_V7M) || \ + defined (CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) +#define L_PTE_MT_DEV_WC L_PTE_MT_BUFFERABLE +#define L_PTE_MT_DEV_CACHED L_PTE_MT_WRITEBACK +#define L_PTE_MT_DEV_NONSHARED L_PTE_MT_MINICACHE +#define L_PTE_MT_VECTORS (_AT(pteval_t, 0x05) << 2) /* 0101 */ +#define L_PTE_MT_MASK (_AT(pteval_t, 0x07) << 2) +#else #define L_PTE_MT_DEV_WC (_AT(pteval_t, 0x09) << 2) /* 1001 */ #define L_PTE_MT_DEV_CACHED (_AT(pteval_t, 0x0b) << 2) /* 1011 */ +#define L_PTE_MT_DEV_NONSHARED (_AT(pteval_t, 0x0c) << 2) /* 1100 */ #define L_PTE_MT_VECTORS (_AT(pteval_t, 0x0f) << 2) /* 1111 */ #define L_PTE_MT_MASK (_AT(pteval_t, 0x0f) << 2) +#endif #ifndef __ASSEMBLY__ diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S index 81d0efb055c6..f896a30653fa 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S @@ -134,21 +134,21 @@ .macro armv6_mt_table pfx \pfx\()_mt_table: .long 0x00 @ L_PTE_MT_UNCACHED - .long PTE_EXT_TEX(1) @ L_PTE_MT_BUFFERABLE + .long PTE_EXT_TEX(1) @ L_PTE_MT_BUFFERABLE(L_PTE_MT_DEV_WC) .long PTE_CACHEABLE @ L_PTE_MT_WRITETHROUGH - .long PTE_CACHEABLE | PTE_BUFFERABLE @ L_PTE_MT_WRITEBACK + .long PTE_CACHEABLE | PTE_BUFFERABLE @ L_PTE_MT_WRITEBACK(L_PTE_MT_DEV_CACHED) .long PTE_BUFFERABLE @ L_PTE_MT_DEV_SHARED - .long 0x00 @ unused - .long 0x00 @ L_PTE_MT_MINICACHE (not present) + .long PTE_CACHEABLE | PTE_BUFFERABLE | PTE_EXT_APX @ L_PTE_MT_VECTORS + .long PTE_EXT_TEX(2) @ L_PTE_MT_DEV_NONSHARED .long PTE_EXT_TEX(1) | PTE_CACHEABLE | PTE_BUFFERABLE @ L_PTE_MT_WRITEALLOC .long 0x00 @ unused - .long PTE_EXT_TEX(1) @ L_PTE_MT_DEV_WC .long 0x00 @ unused - .long PTE_CACHEABLE | PTE_BUFFERABLE @ L_PTE_MT_DEV_CACHED - .long PTE_EXT_TEX(2) @ L_PTE_MT_DEV_NONSHARED .long 0x00 @ unused .long 0x00 @ unused - .long PTE_CACHEABLE | PTE_BUFFERABLE | PTE_EXT_APX @ L_PTE_MT_VECTORS + .long 0x00 @ unused + .long 0x00 @ unused + .long 0x00 @ unused + .long 0x00 @ unused .endm .macro armv6_set_pte_ext pfx