From patchwork Thu May 6 09:50:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 12241943 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 7A71FC433B4 for ; Thu, 6 May 2021 09:53:43 +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 E422361168 for ; Thu, 6 May 2021 09:53:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E422361168 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=5w6soXf3iKslDXX5Nd/Uhim4zPO/UQrXpJNHN0kr2zo=; b=N1GHeXLWQ1Db7Eex8KuspI0bJ 20TsbhxrppRdaA+jSB1TvjTTEK9hEWGx+2POi03r9oYdzIrV4fbSNy95xMWUBbkGEwbZFu70AYPMM McbCeFLNrPPyWiiFjDcNvLhBgn1wsX3+FYnHuG3wJTruIR0q67nVS+VKCEMPCyt8lD9o9rDY5MraO Al+9hr4xNUwubZLKZ9WBhrJWockLWs4r4ZGd7AQNq+g0dmoEBeQ52EYjU2dYr5LOOX5PNIU7Q/j3j lS3975Vp+VCvNzS3DkL7MYE8T6Byz6wK3NG5Axchv50n4xZzF8Z7uiN3q0+/g4hKYmty7nI4d72fD W2L2n/yKg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1leafZ-003sMJ-5I; Thu, 06 May 2021 09:51:45 +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 1leaeh-003sDm-KL for linux-arm-kernel@desiato.infradead.org; Thu, 06 May 2021 09:50:51 +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=bHV8GpScfHZut0oW11coa85Q2c+IfdylezlUEFcSPNA=; b=Zz2DmjNkw7134DfaUfeMk0x3CJ kiaHGNCDZGd+LXl+hzhY3b9qMoomH3g2IbPToAzjllZQkMDYdCiLuTpuj34vZYzvezMQADtFE+0t/ DSi1bY9E+6E1Dxi8BNMKlpD3hofSLUQmeIZM1RVsIDuqpwsZUQY9MP+gdDznTcGk0rM8YxQutW0Qq r+5HpapUZ3fPXFG5Ei7L7hxtttnOT+dDgYlouBRyA8k4BnF3QO76DOWZpGnkQ3WDooNnTmjBE11L+ pkQquMdWmrpM1YNslxj+kOy2LXWSnkC7kLD6D0UQagITIhgo/iWEX2jEMO5Z1xGgdDjR4bawnY5Uk bD/+j2iA==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leaee-005vVG-W4 for linux-arm-kernel@lists.infradead.org; Thu, 06 May 2021 09:50:50 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 70E9C61177; Thu, 6 May 2021 09:50:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620294648; bh=pgi5k6JBEhRGqmgI31o5P4Ecy/7RG2LiMHJjxgYJZms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=trqFj3Gkw93d/8ZiQ7LwvcuvXSvpAwvPm41PR8lvkEdK0pz6MeAp1LnQ/Ks412oVN ikL4PNqBSoOvTRDfozHNwYJwT0ADxJPVGMi1x6mNB2zzjmTw50Qe7KEy9Y+dL0XPup biLL9kay3rVwRuz9KEYc7qX6IPshco8e3Xj2mh8IPCxBWnrJ6AlPzbta19JCKHN7d5 Pc/LZljsGZCuYOZmGZYFSs0YDMNur03BGD3peay+LjmkrXTYh7u3qwlb5iEpoKJzh/ niXF9G2NsnOyYuMaL74Oj4sumWhE2tNcC2CZBBnOdP2woD+DpZiHRj8QooXP3ETZ2B Uz1qiW64pjNuw== From: Will Deacon To: linux-arm-kernel@lists.infradead.org Cc: Will Deacon , Christoph Hellwig , Catalin Marinas , Ard Biesheuvel , Lorenzo Pieralisi Subject: [PATCH 3/3] arm64: mm: Remove unused support for Normal-WT memory type Date: Thu, 6 May 2021 10:50:34 +0100 Message-Id: <20210506095034.15246-4-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_025049_094288_688FBE0C X-CRM114-Status: GOOD ( 11.26 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The Normal-WT memory type is unused, so remove it and reclaim a MAIR. Cc: Christoph Hellwig Signed-off-by: Will Deacon Acked-by: Catalin Marinas --- arch/arm64/include/asm/memory.h | 5 ++--- arch/arm64/include/asm/pgtable-prot.h | 1 - arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/mm/proc.S | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index ea268be37ea2..865fa2ab51b2 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -135,9 +135,8 @@ #define MT_NORMAL 0 #define MT_NORMAL_TAGGED 1 #define MT_NORMAL_NC 2 -#define MT_NORMAL_WT 3 -#define MT_DEVICE_nGnRnE 4 -#define MT_DEVICE_nGnRE 5 +#define MT_DEVICE_nGnRnE 3 +#define MT_DEVICE_nGnRE 4 /* * Memory types for Stage-2 translation diff --git a/arch/arm64/include/asm/pgtable-prot.h b/arch/arm64/include/asm/pgtable-prot.h index fab2f573f7a4..8923c9b119ae 100644 --- a/arch/arm64/include/asm/pgtable-prot.h +++ b/arch/arm64/include/asm/pgtable-prot.h @@ -55,7 +55,6 @@ extern bool arm64_use_ng_mappings; #define PROT_DEVICE_nGnRnE (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_DEVICE_nGnRnE)) #define PROT_DEVICE_nGnRE (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_DEVICE_nGnRE)) #define PROT_NORMAL_NC (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL_NC)) -#define PROT_NORMAL_WT (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL_WT)) #define PROT_NORMAL (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL)) #define PROT_NORMAL_TAGGED (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL_TAGGED)) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index aa8e53dd8686..ec27455d2a44 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -652,7 +652,6 @@ #define MAIR_ATTR_DEVICE_nGnRnE UL(0x00) #define MAIR_ATTR_DEVICE_nGnRE UL(0x04) #define MAIR_ATTR_NORMAL_NC UL(0x44) -#define MAIR_ATTR_NORMAL_WT UL(0xbb) #define MAIR_ATTR_NORMAL_TAGGED UL(0xf0) #define MAIR_ATTR_NORMAL UL(0xff) #define MAIR_ATTR_MASK UL(0xff) diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index be6e5d1e3673..c2d57eb0e671 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -60,7 +60,6 @@ MAIR_ATTRIDX(MAIR_ATTR_DEVICE_nGnRE, MT_DEVICE_nGnRE) | \ 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) | \ MAIR_ATTRIDX(MAIR_ATTR_NORMAL, MT_NORMAL_TAGGED)) #ifdef CONFIG_CPU_PM