From patchwork Fri Apr 26 10:49:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ott X-Patchwork-Id: 13644617 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 15215C4345F for ; Fri, 26 Apr 2024 10:50:27 +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=nFQr7c0y5F9CG4IybliCMUwEd4b06CgfFtMSljAsowA=; b=KD8KujLEm3WoxO 0sIuz96LKcaajTbliSR9cMzQIle77wRdIHnlBhSRqdmQa+J8gVpuU5gB7XpTwnXPA0Z0iGgDHVW34 l3+o4pJoxFOT124CTHv65p6mahxhIEEFJK5Z6EhinpOB+bK/fxWal9gVhwX6qJbBLEKG7SXHB+hK/ KZoYhhXYwDnLjOB0mBQz5xTa53HgnIXd04/w+ApYauTjklhcCyB77Xg4dQsePQJ3XfB+qS387mpLB E1q288qUuVFhHhqZAvkytSULz6aNKxTbWjpgnhT+Kk+guxx7kv4ldQ+TUYClEQQKZ46NYaqaq5NQ7 GHbydKS+wvtzQNzNQz/w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s0J9k-0000000CDOR-21D0; Fri, 26 Apr 2024 10:50:16 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s0J9g-0000000CDJc-1M4P for linux-arm-kernel@lists.infradead.org; Fri, 26 Apr 2024 10:50:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714128609; 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=wNqZh+z2EiZYSEoBRZTk0oPEfA8kIktvdRXuHyV2qbw=; b=DZ3bO+6+qd4cDw2BE316+RnR70lFd4p5GeozW2R3C8XNHB3s1zY/keoPDhSrT3oh8TF01w jSQWOcv1E0R5nio10vjj8PwNn/uAGSd3/2i7VawFWfIys/VPohUWvilvkYMIyr0JyBusgN +p2DhYuWEWlk4wSX1xx+H5GlmDOe5M8= Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-369-Gx2AbMMZMwmuD2lkFgVVVg-1; Fri, 26 Apr 2024 06:50:08 -0400 X-MC-Unique: Gx2AbMMZMwmuD2lkFgVVVg-1 Received: by mail-oi1-f199.google.com with SMTP id 5614622812f47-3c60bf6b8d5so2533612b6e.0 for ; Fri, 26 Apr 2024 03:50:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714128607; x=1714733407; 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=wNqZh+z2EiZYSEoBRZTk0oPEfA8kIktvdRXuHyV2qbw=; b=Y2cozzzJC5dToTv3Ezy9ic+dugW0lyEdJUFT2mpoCbVzfldxEZi2nfai2JMNoJW/vw Tc6O7PCgMPTu5cIQF3BBu0LAjyya+Hw9L2ke2dsn1ZY8CqNQ68838Pshh9KvzLjfrMhS tPeo8hhQT7/L3oDDWzR0T3wmhDCTIrMPHkEzVbB7rcsBjBtWV004n6pq89TyxH43CEfy 0v5buEGxLem0oOYzVS3IobOeFmHK+IYcceMfDhVoHaglsGavS42PLD0YOngumdhYDNae X+BKrRdKdaV68XSH3OL9J8lmqlicA58+WG2Vu2h99XKHxq0uval80MSGndWoJF/42BsC lGSg== X-Gm-Message-State: AOJu0YwdG36R1cRq1ZwPrFmkbo1Zs7Ra9prgDWoLxzSuGixh0B0zMi8f xnjAooHpklsdd1haxJBGSi1lTj1fQKPCndpBDZFLPh90A9vxaKGSsZCI7y4XCLXrKN7pk/hyQIi X+jdRZNrll1ovmo4gpIzllq90XHtbdISApKwgd9lPhdwc4JytE9lhktFNJNwYWyRWMB8oKwn0Eb hsgwPBRhvqDmEOxBml2Y6YElQ/tVe/nfajPnSSmZm0C2sMA8FRjQEc4w== X-Received: by 2002:a05:6808:30a4:b0:3c7:4d4e:efa with SMTP id bl36-20020a05680830a400b003c74d4e0efamr3051376oib.0.1714128607104; Fri, 26 Apr 2024 03:50:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEKgU12rJ0S8FySH9QjK+dyy5z+zqe2fLh87SXhBDOo4CIWHlr7Ul+j8/28IMaiu8xhUzD1bg== X-Received: by 2002:a05:6808:30a4:b0:3c7:4d4e:efa with SMTP id bl36-20020a05680830a400b003c74d4e0efamr3051354oib.0.1714128606675; Fri, 26 Apr 2024 03:50:06 -0700 (PDT) Received: from rh.redhat.com (p200300c93f4cc600a5cdf10de606b5e2.dip0.t-ipconnect.de. [2003:c9:3f4c:c600:a5cd:f10d:e606:b5e2]) by smtp.gmail.com with ESMTPSA id vv26-20020a05620a563a00b007907b57aa1fsm3888019qkn.12.2024.04.26.03.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Apr 2024 03:50:06 -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 Subject: [PATCH v2 6/6] KVM: arm64: rename functions for invariant sys regs Date: Fri, 26 Apr 2024 12:49:50 +0200 Message-ID: <20240426104950.7382-7-sebott@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240426104950.7382-1-sebott@redhat.com> References: <20240426104950.7382-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-20240426_035012_611062_C1A8E28B X-CRM114-Status: GOOD ( 13.11 ) 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 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 --- 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 7d5d55e5c16a..88f6cdf9b8d6 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -3753,8 +3753,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; \ @@ -3766,9 +3766,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)