From patchwork Mon May 14 09:46:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 135703 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1531352lji; Mon, 14 May 2018 02:47:18 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrnhM7VCec53VlzTqOH8Cs6cZJ8xaDRf79OnDFXXHJEpfgLHq7NwvOHLSzuDATWGp1hll4O X-Received: by 2002:a17:902:14cb:: with SMTP id y11-v6mr8948858plg.229.1526291238768; Mon, 14 May 2018 02:47:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526291238; cv=none; d=google.com; s=arc-20160816; b=jn0leCQAK2sgPkUJJbbJeuEz4lAfbVZpgxm2fj1oMjqt2CGmAzC0SNwOCzaK7ay3YZ fA3R+bcOETQxh2HyhiN1V5ytho/uTDsX/HBcdqFYYWBW191ivG8NeMAFKzWWAFe0Vphr prQTWGmLOzN6LlDrF5i4aNuJAzFQj1P+3pCk86j47GvjYeKxrN3+hDFT+fQDwdXIi0p/ i/3j2r5sLw1LUVHluEgBDplTEkxRX6JHwcte+SOxY8WnVRS3tbkA64NUGK+GCzjvAPiS LWBr2mr+AMfM/3ciXtX353CqWnsQdRw3TJ9e7Q55wbuhoslWOHG8NgNIu8D2LXBd2Mth z8HA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=S/BtI+vFnbNkUeV2dn+BUNh+xhM1JE/AKSCA9TJ8X+o=; b=U7Tf736gJkXMkmO6kwq5iDUsFa9n0NAhzUbU66goAT3mahAqRclzB59b4QuMhLi7Ag X5uAcVBI6/Jl5aMUpwwqfrdjeil6SWzFBdtKmYRti0JyLIoCE3EiuuhatrbsWIgYecOs oRfqIzeih0Ultcf8ScG7O0BEPAgrg5AQuiM0+gSD/WEk87ymFyXSnIbMulPw8T2GDZwU UJ7j8ZSlHRoqZ0oA6vb3tO/4R77p86LMtZT5cNd/uWej1yzzgHci/+fzyca8Jaw41PgZ MCH8gHhZDYJfX1H0getfEG9jumGTDht81r3Ge5xjDrF3igoCvsPEBfJzuU6+HIjPCAHD gVPw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g34-v6si9002906pld.411.2018.05.14.02.47.18; Mon, 14 May 2018 02:47:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752228AbeENJrQ (ORCPT + 29 others); Mon, 14 May 2018 05:47:16 -0400 Received: from foss.arm.com ([217.140.101.70]:38192 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752021AbeENJrO (ORCPT ); Mon, 14 May 2018 05:47:14 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 04A9715AD; Mon, 14 May 2018 02:47:14 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1770F3F25D; Mon, 14 May 2018 02:47:11 -0700 (PDT) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, catalin.marinas@arm.com, dave.martin@arm.com, james.morse@arm.com, linux@dominikbrodowski.net, linux-fsdevel@vger.kernel.org, marc.zyngier@arm.com, mark.rutland@arm.com, viro@zeniv.linux.org.uk, will.deacon@arm.com Subject: [PATCH 02/18] arm64: move SCTLR_EL{1, 2} assertions to Date: Mon, 14 May 2018 10:46:24 +0100 Message-Id: <20180514094640.27569-3-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514094640.27569-1-mark.rutland@arm.com> References: <20180514094640.27569-1-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently we assert that the SCTLR_EL{1,2}_{SET,CLEAR} bits are self-consistent with an assertion in config_sctlr_el1(). This is a bit unusual, since config_sctlr_el1() doesn't make use of these definitions, and is far away from the definitions themselves. We can use the CPP #error directive to have equivalent assertions in , next to the definitions of the set/clear bits, which is a bit clearer and simpler. Signed-off-by: Mark Rutland Cc: Catalin Marinas Cc: James Morse Cc: Will Deacon --- arch/arm64/include/asm/sysreg.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) -- 2.11.0 Reviewed-by: Dave Martin diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 6171178075dc..bd1d1194a5e7 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -452,9 +452,9 @@ SCTLR_ELx_SA | SCTLR_ELx_I | SCTLR_ELx_WXN | \ ENDIAN_CLEAR_EL2 | SCTLR_EL2_RES0) -/* Check all the bits are accounted for */ -#define SCTLR_EL2_BUILD_BUG_ON_MISSING_BITS BUILD_BUG_ON((SCTLR_EL2_SET ^ SCTLR_EL2_CLEAR) != ~0) - +#if (SCTLR_EL2_SET ^ SCTLR_EL2_CLEAR) != 0xffffffff +#error "Inconsistent SCTLR_EL2 set/clear bits" +#endif /* SCTLR_EL1 specific flags. */ #define SCTLR_EL1_UCI (1 << 26) @@ -492,8 +492,9 @@ SCTLR_EL1_UMA | SCTLR_ELx_WXN | ENDIAN_CLEAR_EL1 |\ SCTLR_EL1_RES0) -/* Check all the bits are accounted for */ -#define SCTLR_EL1_BUILD_BUG_ON_MISSING_BITS BUILD_BUG_ON((SCTLR_EL1_SET ^ SCTLR_EL1_CLEAR) != ~0) +#if (SCTLR_EL1_SET ^ SCTLR_EL1_CLEAR) != 0xffffffff +#error "Inconsistent SCTLR_EL1 set/clear bits" +#endif /* id_aa64isar0 */ #define ID_AA64ISAR0_TS_SHIFT 52 @@ -732,9 +733,6 @@ static inline void config_sctlr_el1(u32 clear, u32 set) { u32 val; - SCTLR_EL2_BUILD_BUG_ON_MISSING_BITS; - SCTLR_EL1_BUILD_BUG_ON_MISSING_BITS; - val = read_sysreg(sctlr_el1); val &= ~clear; val |= set;