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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 580ECC25B75 for ; Mon, 3 Jun 2024 13:05:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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=ISS2ZR7wqVAGt3PSEqPougJfvRCvAYBfTMHvyOy58vI=; b=u/gSM+yzZXfrW3 JrDJ7FM6JgN2UGUHGjsPahtLZaQKGUvPpppc3ob8nkMAWqXHm+i0C4EOHwcsZnNtHS9A2JoAQmHGZ J7Ak1qXi76oSXo6h8eEMaj2i4sMx8haAzH667MVYcSD8kbXY5xHQUl9uWsdkxiEXu6Fng38f7ilee Ntg6UYfCD3lVSLFxBPc7gHtAwl27iNHkgz0FaKWUvwg9IXFgdugCBUjMUFWyxpOgVlZweSPrVwlxm iFQF2syM6hZmuOWRjWam7Txj5mKYWw4+/giQ39tzwXu8WsZEX9J80B3BV2Jt4u46TDd/X7LCP3VDb HFk2BE2IlX1ZFjNC9hdA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sE7Na-0000000Gp5S-0Bnw; Mon, 03 Jun 2024 13:05:38 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sE7NV-0000000Gp11-3ygG for linux-arm-kernel@lists.infradead.org; Mon, 03 Jun 2024 13:05:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717419932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2hDp3mJM+KL3UzD0Xul7NRSgkymM8l/Ae4m4/fkqIqo=; b=VaQAPqwX3K0ONHJO+TeiiMo/F4vwqWIApEvY9iZqVqdXcYCM/WNQe6aVXfckTZ6CeQW83/ tECwTfIeKdpcI3a+SweR2nczHNHihtA+JeuNROQJBS6L5yyjhD3ZXcouAA0QoG4mUQinkD FuQdNnJ/hhRS1bXsJnj6Qob9Naruv+Y= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-662-_yOabO-uNMSwa6QLof6sbQ-1; Mon, 03 Jun 2024 09:05:31 -0400 X-MC-Unique: _yOabO-uNMSwa6QLof6sbQ-1 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-6af22efee18so35967356d6.2 for ; Mon, 03 Jun 2024 06:05:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717419930; x=1718024730; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2hDp3mJM+KL3UzD0Xul7NRSgkymM8l/Ae4m4/fkqIqo=; b=q+OvOgYjhEGrqcy9Uaw+OYj/t8fOsSUcg6fV0dW5t5mHk8HLx0lSG6AYIztOKEenLj p8+uemAnAxvV3jzC7RE4zVIfbinfybamPbC2mZEgP8LOPPAxetnakb2n7XV5BCmTUItz 5tqND9dKV87D9YST/dhAerq8EwhFp0+qj3VQz/iz96fXqovpeWpDtqZ6+FNLBrc0EvH1 EQHVvsKEvxtF4fI4VhdA4YhsZnafiZrVbzkW2pMKfZQDAPsX/EuMV2oPPjjkylQRMgbo y3yrCl+TnX9sbLmj1xEAU7YqvBoHlfUPgy/yyAVJNJakk/Vi69q8pMQ8QbjS99xQhcVl RgVw== X-Gm-Message-State: AOJu0Yyiuy8ujLXbV4aHPFrv9Zv5QC3slAQhPFCsPw2Jyzj0hD3LKy3b yCVNbzBOrZO0IeBxThEhCwLnEVrpg56HTW1x5wzr6W0n1IY+pClGTdS1nF/nibxBWzEvCKpLUjv BbG9llmgz9S4uFyg3BoLbjIto1qSc118sJiv7txtgp/P5YU0wo52a6/5NZ1Qr01X96zoia4YPRo yYt8J0S9YMwWSPUY8+sT6b0TZfJqzq3a/W+nbm9eBTU0o43S8OlGyktw== X-Received: by 2002:a05:6214:53c2:b0:6ae:ba6:2136 with SMTP id 6a1803df08f44-6aecd69c655mr116486196d6.36.1717419929168; Mon, 03 Jun 2024 06:05:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHIqrN3yZy5lXpQG4/otUItFzer4jmPLCycJ2Rj//HPLUZeLLc+f0g23vFqngAb9IsidJe/Vg== X-Received: by 2002:a05:6214:53c2:b0:6ae:ba6:2136 with SMTP id 6a1803df08f44-6aecd69c655mr116485636d6.36.1717419928535; Mon, 03 Jun 2024 06:05:28 -0700 (PDT) Received: from rh.redhat.com (p200300c93f02d1004c157eb0f018dd01.dip0.t-ipconnect.de. [2003:c9:3f02:d100:4c15:7eb0:f018:dd01]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6ae4b4179f4sm30558826d6.113.2024.06.03.06.05.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 06:05:28 -0700 (PDT) From: Sebastian Ott To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Catalin Marinas , Will Deacon , Shaoqin Huang , Eric Auger Subject: [PATCH v4 5/6] KVM: arm64: rename functions for invariant sys regs Date: Mon, 3 Jun 2024 15:05:06 +0200 Message-ID: <20240603130507.17597-6-sebott@redhat.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240603130507.17597-1-sebott@redhat.com> References: <20240603130507.17597-1-sebott@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240603_060534_157878_AE277E49 X-CRM114-Status: GOOD ( 13.13 ) 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 Invariant system id registers are populated with host values at initialization time using their .reset function cb. These are currently called get_* which is usually used by the functions implementing the .get_user callback. Change their function names to reset_* to reflect what they are used for. Signed-off-by: Sebastian Ott Reviewed-by: Eric Auger --- arch/arm64/kvm/sys_regs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 8008120d021b..12ce8461323a 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -3799,8 +3799,8 @@ id_to_sys_reg_desc(struct kvm_vcpu *vcpu, u64 id, */ #define FUNCTION_INVARIANT(reg) \ - static u64 get_##reg(struct kvm_vcpu *v, \ - const struct sys_reg_desc *r) \ + static u64 reset_##reg(struct kvm_vcpu *v, \ + const struct sys_reg_desc *r) \ { \ ((struct sys_reg_desc *)r)->val = read_sysreg(reg); \ return ((struct sys_reg_desc *)r)->val; \ @@ -3812,9 +3812,9 @@ FUNCTION_INVARIANT(aidr_el1) /* ->val is filled in by kvm_sys_reg_table_init() */ static struct sys_reg_desc invariant_sys_regs[] __ro_after_init = { - { SYS_DESC(SYS_MIDR_EL1), NULL, get_midr_el1 }, - { SYS_DESC(SYS_REVIDR_EL1), NULL, get_revidr_el1 }, - { SYS_DESC(SYS_AIDR_EL1), NULL, get_aidr_el1 }, + { SYS_DESC(SYS_MIDR_EL1), NULL, reset_midr_el1 }, + { SYS_DESC(SYS_REVIDR_EL1), NULL, reset_revidr_el1 }, + { SYS_DESC(SYS_AIDR_EL1), NULL, reset_aidr_el1 }, }; static int get_invariant_sys_reg(u64 id, u64 __user *uaddr) -- 2.42.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel