From patchwork Mon Jun 23 12:18:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 899218 Delivered-To: patch@linaro.org Received: by 2002:a05:6504:191c:b0:290:25b2:841c with SMTP id v28csp3839994ltt; Mon, 23 Jun 2025 05:23:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXJGPHQZscnsDLbliMFf5t3zOWu82EiUqavESPFbwITDYFRLOY0ufTTrPUm6nT+5b/2+WBEyw==@linaro.org X-Google-Smtp-Source: AGHT+IGcKf1991PaXqrnNqj1AkKO3j6N+WY5HZUZqvjI37QGTUAOo13ewFoFlva0GWi1If20OH9g X-Received: by 2002:a05:620a:6004:b0:7cd:43f5:8b27 with SMTP id af79cd13be357-7d3f9932a4bmr1511628285a.32.1750681427509; Mon, 23 Jun 2025 05:23:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1750681427; cv=none; d=google.com; s=arc-20240605; b=IgA62KeRNgA5vujBck3H7xki5Nl76e6S6eZbQSB0CMkWJh7glqNTUdoL6jO66I3uGE qiDE605GVXUBkebXNIOIBAzmqTb9S8gbnkloK38TavUG6hVPrOJP64Y360Pv2SANifwL TK2UFYulvidcO5HFc5CLURmqhoBM8AQBj7BCRcN2s/mqaRSmWdythytZi+Kv9O4tJwLi FnkJ4uFHXqb1LmMPxLnKJKTSnSbmq6ggd9Gk0IegPOsGLSFRzCrts1n9oM3eFAiFzZTA xqvhCafQwQTvLjgE7oTThDqvEtosqHukUfnuK54nOgWWTDrrpjLvbo29n5mfrwFPUZ5F oGsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=LDQM9sk8xLoIDxyTCgc//1G3alM8o04T+fdq/t3mMdE=; fh=x5VJDl6FrykOwQuDK8d67WYnSid/uzpvpvankGNJv0o=; b=Wf1Dmv2O0PiX4+qFrbhQHDqhivJp9jY+HU9o2RGGa34dgEYsqdbuOOrYsIf9e+vDeW R1f7as7nawwdyEpm4MIxrNO24LkBcpn/DwyVBvBKOlDPgLa0eC7SDFYFlh5yY+je1ICr hR8Hi/539o3LZpTStdt+LkiJWcn/enWBEjbiGSWPFm3g5izlEowUTEI9pHpJDf68JLH6 HfYv86FnWyVsNFZ/eI9odLbMn0DsDbf1eR8LBxSROXktpEs3U4zHbuvUraAwdcFE2ltQ iC2xnQJ86uLgUR5FLtKmYhYmF0DVoLn3r7YuRN93bMzzqmWzTol3yvD7veArfrNrRwtQ AyZA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R+2WfNtR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7d3f999f4a7si781636585a.130.2025.06.23.05.23.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Jun 2025 05:23:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R+2WfNtR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTg8q-0001Jp-6M; Mon, 23 Jun 2025 08:19:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uTg8n-0001Iv-9T for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:13 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTg8l-0000ST-5P for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:19:12 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-451dbe494d6so47691665e9.1 for ; Mon, 23 Jun 2025 05:19:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681148; x=1751285948; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LDQM9sk8xLoIDxyTCgc//1G3alM8o04T+fdq/t3mMdE=; b=R+2WfNtRk1CAxJ7DwUKLdNlJVU9K9STWmmg+bZ10jVMxfsXz3Ezk86d8MwVRSke/ix cdG5Eg4AcFP8IOeau3IGuuiVxy/QiF1C0byp4aFchexTt7sve8rengM9mGwkUgYZCGJc VhxCmWuZfwdXzorkOB0jNBHulEqMs5m7Dk4AqBAw0RTaOvdVryl2CUyDFwZqS65ssZ+s HrY9vjnt0IcwlKyVFV04V2NNnGjVADlGxuW/JBRydBNH5/ubwzpqIxlZ0cUMIpx9+XU1 NhDbTde+232NYMe3yzl/H0d7KbAM+Aodb+byYsfYb+O5xP9DyBwwicvIBR9YrFa5f0RC Oh9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681148; x=1751285948; 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=LDQM9sk8xLoIDxyTCgc//1G3alM8o04T+fdq/t3mMdE=; b=hvXw1GYd6azonYlxmq38rVYh2s3wvm0Bwvaq6HEs4xg3iHa139xGRS1hEPRZ//kOfi 3NJaLLHHAni/PQI+o5f1E1y7dTDrv/NkaIUsNUj/temSHIARm1LJbYNyHNKPvhyt/dEs CXblb/zJpQP16N1J+Y4M/rGl/w5wDa7jA4SEmlqvwPU5X5tuyk6L+nYMgg76eZv7CSGk 7TGuMrPvkm3ZS6AAEqlS7Z5jc0JwEZa7u/DxTI7nAxB+x9nK0fNMmUYTwI5EUXudyRUg /ufz0kbLyvvCBh7u0UGbcARMCkGzwkxo6EnGdMynv8E1TtcWXC0B/gBZ1IUNV8F+z8br s52g== X-Gm-Message-State: AOJu0YwebJCVxr0p3C7dhJ42jnpL/sBdz6I9vxtum+UBTY2T9rcWoQx0 nd1bWxPhnIY+1xCSnWLmITo5XKQrq96nNdu2RToV7fArre3uyh2J74R3DAt901q2nh4Phs+cAJW iKG4c X-Gm-Gg: ASbGncsbLQgzDB3YlN8ZT5TXLvmgQ5J3niR0JYmkbideYpzcmFuthr6L/P3CBhiLSSF 09eJB72ATpz0CgwIVi6bMDBqNWFC6gwN37nQz3G4gWmlQZuP1FwcZsWt4znZqASrEyuafshgleU 3B8Y8/vBg11yQODFwUa03hIPpR499Jl3cP/vWr+tBlACwifDekTBwC1Cg0KmFTIZO5lvYXPH2lt PBosoM0nEh4tXwckXuIzj4bkMsexPY9Z7+Z8JGIpcUKRK1lfWHriOUB0L23vwUDT7okpOsH6wUF 1mIWW204XZA5iSeB1PI8cTLh5RJTWW2EyfqB1SNDAnqjK22sPPzcWcINkJUMfYiaIgMtxMuIuui 4w2cc2bKjN8biv080R1XzOzKEc9F1QRQRSjY0 X-Received: by 2002:a05:600c:c172:b0:442:f4d4:522 with SMTP id 5b1f17b1804b1-453660d7e3fmr109375695e9.5.1750681148220; Mon, 23 Jun 2025 05:19:08 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-453646fd7aasm108543505e9.20.2025.06.23.05.19.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:19:07 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?utf-8?q?Mar?= =?utf-8?q?c-Andr=C3=A9_Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= Subject: [PATCH v3 04/26] target/arm/hvf: Simplify GIC hvf_arch_init_vcpu() Date: Mon, 23 Jun 2025 14:18:23 +0200 Message-ID: <20250623121845.7214-5-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Only update the ID_AA64PFR0_EL1 register when a GIC is provided. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/arm/hvf/hvf.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 42258cc2d88..c1ed8b510db 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1057,11 +1057,15 @@ int hvf_arch_init_vcpu(CPUState *cpu) arm_cpu->mp_affinity); assert_hvf_ok(ret); - ret = hv_vcpu_get_sys_reg(cpu->accel->fd, HV_SYS_REG_ID_AA64PFR0_EL1, &pfr); - assert_hvf_ok(ret); - pfr |= env->gicv3state ? (1 << 24) : 0; - ret = hv_vcpu_set_sys_reg(cpu->accel->fd, HV_SYS_REG_ID_AA64PFR0_EL1, pfr); - assert_hvf_ok(ret); + if (env->gicv3state) { + ret = hv_vcpu_get_sys_reg(cpu->accel->fd, + HV_SYS_REG_ID_AA64PFR0_EL1, &pfr); + assert_hvf_ok(ret); + pfr = FIELD_DP64(pfr, ID_AA64PFR0, GIC, 1); + ret = hv_vcpu_set_sys_reg(cpu->accel->fd, + HV_SYS_REG_ID_AA64PFR0_EL1, pfr); + assert_hvf_ok(ret); + } /* We're limited to underlying hardware caps, override internal versions */ ret = hv_vcpu_get_sys_reg(cpu->accel->fd, HV_SYS_REG_ID_AA64MMFR0_EL1,