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 248D9EE49A0 for ; Mon, 21 Aug 2023 21:23: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: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=uWDxpdTYP5rrz3hpESls+wmZ8IThKAWlvSo2rvc+i3A=; b=GzkZ2g/Ov1OUznycIJ+IfTeXPA aMZJb2InhuUGtcTXi2FwOe1a2ez5Xsr9bSGRvmjnsdim3QRSWgU86LvRpDYY0fO3JxeYuhmw9peLd KqYVOYOcuVljIPSS4dGlg32WHvwYOmlwtHfaNGydruX92qmxt/Te6OUNIS18ekKQGzil9hwb3Q+lL ZH3hzNE5k58dsjx2iliBftc84lgQ5TOd+Y5uhj5jtUbUdI3+PC9AN12JK3GtyqRJuSyZffh0WCNeS LtIc6iiqB5bKGPvKVEVd/67/ZwdwQ9sNHXFb4/5d+iuze/tV/GG2GKiBgABRFICqqu3VedE4Hhz63 pRsSUysg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qYCMV-00EiHE-2J; Mon, 21 Aug 2023 21:22:59 +0000 Received: from mail-pl1-x649.google.com ([2607:f8b0:4864:20::649]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qYCMQ-00EiEK-35 for linux-arm-kernel@lists.infradead.org; Mon, 21 Aug 2023 21:22:56 +0000 Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-1c08a15fcf4so7064875ad.3 for ; Mon, 21 Aug 2023 14:22:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1692652972; x=1693257772; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=/7e7+T+7gGeD+hfC7oK94gmG9hjXKCpcMKW6ZDA6Zbw=; b=xPqz03Kc3MbngNofSxW7EbIK6ztFSQxq/NyvSD4MREYsiuhcfG2Ve03vFpqN7NhmF6 R2PWmA7m4solm/AsMzUo5qr2cHLgBVkrqqoSdLmIPOVp6eGey+ag5QB7wQvD0LbDFAIp sF9hsbmJC5LAkhF7uuPIqTyjx5SGpgKd2s1riPBRwab4cg5boz3LplSc/WsMa6EzYxXu GL1ttfAqJi44WwJMFwEqKhxw6ENDXqY4ZCajnnvVXr7QxMGoAujun6YBGhKIAtADgJRI t7gl6j+CYLFusanJimkIIqFTGG/LDzV+XDhn7vFbxhY6t7uu49Nre1BshLPRWwt2VVCe Kpag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692652972; x=1693257772; 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=/7e7+T+7gGeD+hfC7oK94gmG9hjXKCpcMKW6ZDA6Zbw=; b=fbOYI0Erpc8QSiEGI+D771HiKtd/VngaW2G1ASCKYv0bxKM0agUFHar02X2XxnBLGV nw32VGlpUo1Nn8h//MRsU2Bv2jTJzJqi5c1l5cNEacIuRh8Zto+Bdht6gDPDcJhYkqGe m9WFZNqLf0vSSHUDcXRq+BJKgFBGJ5KcAY7crUFTSIo6wJnfyao/Qw419G04Znc6Zn3U HMR4ubXKipoCImS4I/X7Ulw6Tkea4kveexmHG9FMduQlSqJ9v4nkYOQlCt95S2EbOEA5 AYlDnlECBJ4ZMfmffF5AWzhti/g0pZFut50bS8MatVKDQ3Ue/y79QpUkDhTuWkvmFQ6D S4AQ== X-Gm-Message-State: AOJu0YwCQeSNQxQOhUUruR7HNnlqcrasnZ4RBsr/cKg3rEZi0ieXfvWQ MynnAY8BBddWzIN1dMuToIGAn+WVhs6FIMoWuQ== X-Google-Smtp-Source: AGHT+IEwLjGrqVvblbAjrv7R7DKyqfbxYUNAxq1ht70WxGu39YS8/s2eB5c/lYBUlVlBXLjiJ9UutGkqmPcLZiFd4w== X-Received: from jgzg.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1acf]) (user=jingzhangos job=sendgmr) by 2002:a17:903:230c:b0:1b9:e338:a8b7 with SMTP id d12-20020a170903230c00b001b9e338a8b7mr3857028plh.5.1692652972740; Mon, 21 Aug 2023 14:22:52 -0700 (PDT) Date: Mon, 21 Aug 2023 14:22:35 -0700 In-Reply-To: <20230821212243.491660-1-jingzhangos@google.com> Mime-Version: 1.0 References: <20230821212243.491660-1-jingzhangos@google.com> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog Message-ID: <20230821212243.491660-4-jingzhangos@google.com> Subject: [PATCH v9 03/11] 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 , Shaoqin Huang , Jing Zhang X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230821_142254_992116_973C4680 X-CRM114-Status: GOOD ( 10.87 ) 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 216905840c92..42c4d71f40f3 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.42.0.rc1.204.g551eb34607-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel