From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E01FEC433ED for ; Thu, 6 May 2021 09:53:13 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5410361168 for ; Thu, 6 May 2021 09:53:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5410361168 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/PQJIJXPX+kKD+cyZ6g/1D2/gdU1xo4KIl2g95ecsPU=; b=OjVEOrr8e45uWI91nv9eo35P5 3VY8QtTx9Lc3Gofe1u9E1mvoPyfb7fsVjmBL9uhvlqYIb2z4lVh8Ed9AS5u6ZHXfjzuVAKLHUpJGv 9ke8mLezxsFkv3T1U/YEHzArkzirnFVsrRyAbqbqqemvNOVeHPx6bA/CIPiCXUBEMibTJYc8kVDs+ dAMRT7mWjU9a06KoGw16dCb9JyfHTMf5roQcNqHkHt0PHOF1KNmSulIUsTTocRYzv1LQxfhxY60EG ZZRAVvogEAK/aApA6KfUhBO21pGqNTIPZbJbkonMewk6lEZ2vYvhBawZHzuCjVJ16V75Y4ffUi/Uq v6+GtnhQQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1leaei-003sDp-Da; Thu, 06 May 2021 09:50:52 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leaee-003sD1-8v for linux-arm-kernel@desiato.infradead.org; Thu, 06 May 2021 09:50:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=HRsD38vB4w3bcAzdgqmVf5Aa3IqhWXNm3XZsWYEoCjY=; b=lSSocUR6ki+tEhKqixq+rmn9GW KfoLaava6SgpRjxsVMRJrgqGBjrU+WgE+OEGf941N39K77TvugE7wDonEG2eoLkfvSZYVEQIedWwo z4VvbxFnbDPPRWEqYca/B7oxdrymH0EWs3tSdNCenduhwfjmIMESpRci0YcEgwhxv0BwbtJHBOX3E yq96wRgVPIgEboHZ/pxhBK4qqkct8baTJcUKdw12IzLSByvzRNJssZbMBpvMxVsEGmWzUh/y4kY+d 7MIsqv6c3Q5fx2eyCaCiB0CKBgga76PMO465Gal9laJEC4rhR+VjHeL5McXbzqMyAZ260HMM/i948 holGxBAQ==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leaeb-005vUh-MA for linux-arm-kernel@lists.infradead.org; Thu, 06 May 2021 09:50:47 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 08BD2611ED; Thu, 6 May 2021 09:50:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620294645; bh=iQwZuEmJ1pt81L9WjosFhK25XrXGHNOQNnX/Izxb9hY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tYWki1qSqJSKLYx4YuaWWQNnoMtnk6L7WjR2rVBmed6l3j3v0ijAblYXrFhYVkdnK MKMXdDqYPLNUmETbwBfQGQwmk7X84/6SwNiRYrRIlFxQHDg6E9NQatqmUDue7QEI5p hYGofydRImCmfe+lodpfLsQaRrTZ4j+NCXaeUpi4R/T1iUG8jyqUQn37ytmKFLXL0/ Ck9DkMkz+jjasYb6UwYQq5DOafyx1gXuayLGOt4uHV7Vej8nheM9ioWcJ/AzhwA/S6 PuQubIYoNMGZWPWf2vg23HQnYlBmA3rUhvo4wtMypWuC9P0oxDEqSOwxpzeM7OrO9w MNLotsVlU8chw== From: Will Deacon To: linux-arm-kernel@lists.infradead.org Cc: Will Deacon , Christoph Hellwig , Catalin Marinas , Ard Biesheuvel , Lorenzo Pieralisi Subject: [PATCH 1/3] arm64: mm: Remove unused support for Device-GRE memory type Date: Thu, 6 May 2021 10:50:32 +0100 Message-Id: <20210506095034.15246-2-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210506095034.15246-1-will@kernel.org> References: <20210506095034.15246-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210506_025045_770002_D3569A1F X-CRM114-Status: GOOD ( 11.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The Device-GRE memory type is unused, so remove it and reclaim a MAIR. Cc: Christoph Hellwig Suggested-by: Catalin Marinas Link: https://lore.kernel.org/r/20210505180228.GA3874@arm.com Signed-off-by: Will Deacon --- arch/arm64/include/asm/memory.h | 1 - arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/mm/proc.S | 1 - arch/arm64/mm/ptdump.c | 4 ---- 4 files changed, 7 deletions(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 15018dc59554..ea268be37ea2 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -138,7 +138,6 @@ #define MT_NORMAL_WT 3 #define MT_DEVICE_nGnRnE 4 #define MT_DEVICE_nGnRE 5 -#define MT_DEVICE_GRE 6 /* * Memory types for Stage-2 translation diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index b31ac5ccc8ab..aa8e53dd8686 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -651,7 +651,6 @@ /* MAIR_ELx memory attributes (used by Linux) */ #define MAIR_ATTR_DEVICE_nGnRnE UL(0x00) #define MAIR_ATTR_DEVICE_nGnRE UL(0x04) -#define MAIR_ATTR_DEVICE_GRE UL(0x0c) #define MAIR_ATTR_NORMAL_NC UL(0x44) #define MAIR_ATTR_NORMAL_WT UL(0xbb) #define MAIR_ATTR_NORMAL_TAGGED UL(0xf0) diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 0a48191534ff..be6e5d1e3673 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -58,7 +58,6 @@ #define MAIR_EL1_SET \ (MAIR_ATTRIDX(MAIR_ATTR_DEVICE_nGnRnE, MT_DEVICE_nGnRnE) | \ MAIR_ATTRIDX(MAIR_ATTR_DEVICE_nGnRE, MT_DEVICE_nGnRE) | \ - MAIR_ATTRIDX(MAIR_ATTR_DEVICE_GRE, MT_DEVICE_GRE) | \ MAIR_ATTRIDX(MAIR_ATTR_NORMAL_NC, MT_NORMAL_NC) | \ MAIR_ATTRIDX(MAIR_ATTR_NORMAL, MT_NORMAL) | \ MAIR_ATTRIDX(MAIR_ATTR_NORMAL_WT, MT_NORMAL_WT) | \ diff --git a/arch/arm64/mm/ptdump.c b/arch/arm64/mm/ptdump.c index a1937dfff31c..1c403536c9bb 100644 --- a/arch/arm64/mm/ptdump.c +++ b/arch/arm64/mm/ptdump.c @@ -157,10 +157,6 @@ static const struct prot_bits pte_bits[] = { .mask = PTE_ATTRINDX_MASK, .val = PTE_ATTRINDX(MT_DEVICE_nGnRE), .set = "DEVICE/nGnRE", - }, { - .mask = PTE_ATTRINDX_MASK, - .val = PTE_ATTRINDX(MT_DEVICE_GRE), - .set = "DEVICE/GRE", }, { .mask = PTE_ATTRINDX_MASK, .val = PTE_ATTRINDX(MT_NORMAL_NC), -- 2.31.1.607.g51e8a6a459-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel