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 87687C04A94 for ; Tue, 1 Aug 2023 15:20:59 +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:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=11dIyygjAk8yA9AXoD9/8fukRlDp9ZSoIf6lSm702MI=; b=u5b4rwZu8ggcwVLJaVcxBOsyoH yyHyCPWjQFQjPNR1TCRkLl6M8BoIgyki0Uc4eQg+NV2l8v1th7WUvLoE8vzd+ZA3dI48yTOYNZGxK sLNGXhUpopI0CsbWVWi6kvQeScV+I6duULfxbAEDiqphLDAbRRQGYxcC1ibdAKieTKQhYKqSt4UIk rqipRxDEj+y9wwErlqcfJeXcsQElP8NmUzUOt7e9Y8EgHPlNyJ/QbnQ51LJjQit++jhEW3DuUbNow jJ6xDz3/Ot4xmY13sf/T62tD7rv5/aO1n/2HIckosrAtj6ReTj0oqC2OHOfGbz/nqsshnMYzo+msD aoFGodbg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qQrAl-002hhO-0Z; Tue, 01 Aug 2023 15:20:31 +0000 Received: from mail-pl1-x64a.google.com ([2607:f8b0:4864:20::64a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qQrAh-002haY-2n for linux-arm-kernel@lists.infradead.org; Tue, 01 Aug 2023 15:20:29 +0000 Received: by mail-pl1-x64a.google.com with SMTP id d9443c01a7336-1b88decb2a9so45516325ad.0 for ; Tue, 01 Aug 2023 08:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690903217; x=1691508017; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=4m6WXeBLyRHr+QvNXIbI2jFxW3avFe83y+pcJg40hnI=; b=41CSSN+hrqV+uEQcg062xb3BDESzeeaZrpLGmBiFuxwUYBsb39Ajf4JSPo+BnqEgph GrjSldr+fqJbSsULyLROGCqdMwJ6TPcEvBoVqHSLOk+R/n87pDxRhy98pn9Hko3TkWy8 hadEWh7vpkVun5nkli3CBu22HaEfMwDlFX4/lfrHcwM+vpthhZekf6YFpnphlxc8mcOZ /tCUu6i1UfO7pHCYc/bz3S3y5IA4/rdr1KqkE9ugV+EJbcsx5MsA6+N2bJ3L/D9HokGN sFSp0hvkwd7iT7Xnq8UDGuYPwZVC1ofE4o7p8U193EiPY3+mMfFzysmq6ICIwWSgnw6c bQuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690903217; x=1691508017; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4m6WXeBLyRHr+QvNXIbI2jFxW3avFe83y+pcJg40hnI=; b=A6z/3jPrT+fna6BgtvRSyoPtds3UVVfcLiZdQNDrt9aER02xCxOCLFk9TtlJpmtvXQ u47owKQTK47GNiov9hbBaJxQ5o/rNJUyy6NT1AnNbOYBaxc24o0+rPh1ckWppHWHt2FW MJm/JScBlpgDn23uey6vQsZq9qFb/LndRnWqGEQzbCwqY1JPHipKQHbHuZeO1neLdg2x Diqkbxu25TB/DZ5CGpdzTBTieEbvBKeddYl8GBvE7YlLIgB8JIKwdz9ihZuuVRprTcLI giZUI5dg2zW3pdBCWltxQfkQEQQw1T91C2jnDyk+wMNPCfRfFh3rV5xvLaoQk1VK+fjk lKHw== X-Gm-Message-State: ABy/qLZFeVPExPeW0wcSmVf6mg+MV9E6JijVdAb24zs2x4aYcDPjUW1k HxjxBlYSeadNHS8B7/XeW04fDlCRJCK8jt5aHg== X-Google-Smtp-Source: APBJJlF5pQV//6JpAgPsrrwmu1eJKxYmdCqhfZm9zICtlUCY7L5aEFcjDBXXU7rrEPxZCvZlO/QmM5V89O0TvCqmmw== X-Received: from jgzg.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1acf]) (user=jingzhangos job=sendgmr) by 2002:a17:902:7588:b0:1bc:1189:189 with SMTP id j8-20020a170902758800b001bc11890189mr53532pll.3.1690903217346; Tue, 01 Aug 2023 08:20:17 -0700 (PDT) Date: Tue, 1 Aug 2023 08:19:59 -0700 In-Reply-To: <20230801152007.337272-1-jingzhangos@google.com> Mime-Version: 1.0 References: <20230801152007.337272-1-jingzhangos@google.com> X-Mailer: git-send-email 2.41.0.585.gd2178a4bd4-goog Message-ID: <20230801152007.337272-4-jingzhangos@google.com> Subject: [PATCH v7 03/10] KVM: arm64: Use guest ID register values for the sake of emulation From: Jing Zhang To: KVM , KVMARM , ARMLinux , Marc Zyngier , Oliver Upton Cc: Will Deacon , Paolo Bonzini , James Morse , Alexandru Elisei , Suzuki K Poulose , Fuad Tabba , Reiji Watanabe , Raghavendra Rao Ananta , Suraj Jitindar Singh , Cornelia Huck , Jing Zhang X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230801_082027_912580_F675B000 X-CRM114-Status: GOOD ( 11.76 ) 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 Since KVM now supports per-VM ID registers, use per-VM ID register values for the sake of emulation for DBGDIDR and LORegion. Signed-off-by: Jing Zhang --- arch/arm64/kvm/sys_regs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index d9317b640ba5..6eab45ce05d9 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -379,7 +379,7 @@ static bool trap_loregion(struct kvm_vcpu *vcpu, struct sys_reg_params *p, const struct sys_reg_desc *r) { - u64 val = read_sanitised_ftr_reg(SYS_ID_AA64MMFR1_EL1); + u64 val = IDREG(vcpu->kvm, SYS_ID_AA64MMFR1_EL1); u32 sr = reg_to_encoding(r); if (!(val & (0xfUL << ID_AA64MMFR1_EL1_LO_SHIFT))) { @@ -2429,8 +2429,8 @@ static bool trap_dbgdidr(struct kvm_vcpu *vcpu, if (p->is_write) { return ignore_write(vcpu, p); } else { - u64 dfr = read_sanitised_ftr_reg(SYS_ID_AA64DFR0_EL1); - u64 pfr = read_sanitised_ftr_reg(SYS_ID_AA64PFR0_EL1); + u64 dfr = IDREG(vcpu->kvm, SYS_ID_AA64DFR0_EL1); + u64 pfr = IDREG(vcpu->kvm, SYS_ID_AA64PFR0_EL1); u32 el3 = !!cpuid_feature_extract_unsigned_field(pfr, ID_AA64PFR0_EL1_EL3_SHIFT); p->regval = ((((dfr >> ID_AA64DFR0_EL1_WRPs_SHIFT) & 0xf) << 28) | -- 2.41.0.585.gd2178a4bd4-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel