From patchwork Wed Jul 11 13:56:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 141743 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp321286ljj; Wed, 11 Jul 2018 06:57:27 -0700 (PDT) X-Google-Smtp-Source: AAOMgpePXPux2viMLLLzl9FnqoimHIjaAnOLYi3ty3F+5dr8w7IuDe0StaM9dPL+Nzh5POWJcHxk X-Received: by 2002:a17:902:1005:: with SMTP id b5-v6mr29221252pla.207.1531317447294; Wed, 11 Jul 2018 06:57:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531317447; cv=none; d=google.com; s=arc-20160816; b=UvGHCueCDC9CYP8RtnljK3avopY8vsKjcRI/DLwznSsvBEq7SAqXu2iHM5IEOBvCIA CR+mIKHzsVScHat2BnV6clqgG6kznNQmO2PVFAwajvI1Oz8ZhWXU8VIx9JmbVj6S2H7o sVhnyz7Ts9iD9ji6SM8db1CmQE3LbORklnWb04Gh0Oxs4EsOktGCHmkMvrK15Y6KHH08 mFlb3fwolSrYFK2SfUELfiXtWXeudZKPygYO0GbWQgyWMJblFJakmeFcq7NUrKg2/+Xn 2XgB9M5JcdEe7r+6Gvf9eMRof6U1f/FNEulb7GNeXf1jJKNp9Fsx2d6DL0wdbZkoqbRk SCcA== 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=nbK+er5HgoQSGfo6/Z1b6j32U5iuKiIZThXipRAjitI=; b=yVoRleiDljJS8O5GGLktWBWv+BTu3YaNvYLMQMJBl0B+9uKy1Tbjk8olwjEtVbyWqU wKLSF7NpKfYaOwNCAQ5lUQgrXjAcDF2zqQ2pjRGcehmlvJCNQ5xA4J4zlPjqsyJjEVZw IB+PWW4n14SK741sl8yEYpfiMKzaLjhNdDDoyYY+WPsbi/N3Hbqy7nRVafJUkNTZIVlt bRsEc091DHzOkB2W9OjlfVAehJZcb0gqsPhtXVCQXN046xDqDcKPuY3nnxzw59MZBtzv UG3f9TpNEIFWkIyHJG6eKHMOFMVVc/baqOPvxXDeNH2zzHzmAoR5vmVBm6HBWfZapoae JO6g== 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 p91-v6si19053443plb.457.2018.07.11.06.57.27; Wed, 11 Jul 2018 06:57:27 -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 S2388404AbeGKOBw (ORCPT + 23 others); Wed, 11 Jul 2018 10:01:52 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:36346 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388376AbeGKOBv (ORCPT ); Wed, 11 Jul 2018 10:01:51 -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 4456C16A3; Wed, 11 Jul 2018 06:57:23 -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 343533F5B1; Wed, 11 Jul 2018 06:57:21 -0700 (PDT) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, will.deacon@arm.com Cc: catalin.marinas@arm.com, dave.martin@arm.com, hch@infradead.org, 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 Subject: [PATCHv5 04/21] arm64: kill change_cpacr() Date: Wed, 11 Jul 2018 14:56:39 +0100 Message-Id: <20180711135656.20670-5-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180711135656.20670-1-mark.rutland@arm.com> References: <20180711135656.20670-1-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that we have sysreg_clear_set(), we can use this instead of change_cpacr(). Note that the order of the set and clear arguments differs between change_cpacr() and sysreg_clear_set(), so these are flipped as part of the conversion. Also, sve_user_enable() redundantly clears CPACR_EL1_ZEN_EL0EN before setting it; this is removed for clarity. Signed-off-by: Mark Rutland Reviewed-by: Dave Martin Acked-by: Catalin Marinas Cc: James Morse Cc: Will Deacon --- arch/arm64/kernel/fpsimd.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) -- 2.11.0 diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index 84c68b14f1b2..a98a7f96aff1 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -159,23 +159,14 @@ static void sve_free(struct task_struct *task) __sve_free(task); } -static void change_cpacr(u64 val, u64 mask) -{ - u64 cpacr = read_sysreg(CPACR_EL1); - u64 new = (cpacr & ~mask) | val; - - if (new != cpacr) - write_sysreg(new, CPACR_EL1); -} - static void sve_user_disable(void) { - change_cpacr(0, CPACR_EL1_ZEN_EL0EN); + sysreg_clear_set(cpacr_el1, CPACR_EL1_ZEN_EL0EN, 0); } static void sve_user_enable(void) { - change_cpacr(CPACR_EL1_ZEN_EL0EN, CPACR_EL1_ZEN_EL0EN); + sysreg_clear_set(cpacr_el1, 0, CPACR_EL1_ZEN_EL0EN); } /*