From patchwork Fri Jun 20 13:06:47 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: 898295 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f54:0:b0:3a4:ee3f:8f15 with SMTP id cm20csp1321020wrb; Fri, 20 Jun 2025 06:08:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX+Xc5GT4KMDfNYjqyiSc4JhH/E74QtALcs/kMuREGie8TkxMWyQbqMsrGOJBl6UctLeEPjTA==@linaro.org X-Google-Smtp-Source: AGHT+IGDGr57tMANj1FWw5RUFYlasf673CHL2dI933wSEhDwZFaOy+4ckEf+1nGgwaf4BsGCHLEL X-Received: by 2002:a05:620a:1a20:b0:7d3:ba53:b7b9 with SMTP id af79cd13be357-7d3f9935263mr383180585a.33.1750424884946; Fri, 20 Jun 2025 06:08:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1750424884; cv=none; d=google.com; s=arc-20240605; b=Z+HOBldlY2wnCnEHq/Yh2lhqVZTaHvOctS8Y6o0EtpnBsXN5WuL2dQ3oOnhU2Rw6l0 gWvUuo5hHORQL4GmfZbhz9xlPWOscQ6aPdNk5zyt+99j2D2q+cBXiAgR1JZPxHNFTugR jOQ9Pbuf6jb1KjxlXH3x0ctM3cfvE02VKJtEQoVwzluY8vRvcuCFdAXzEpyZcSZnM3kM cF5r6JLndVHjvkuMkx/O5nS4WZzoJZilOfjRf1HWP1WC7UmRR+YV9jYRTkRiplJWVxDx yD6R7i4ZsTwtqcAvfTg23Jjnz3qW+FwnfGtZzbdGB/MHau3e2cmF14CrknVs38gSKHbj d1RA== 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=i7X9qE0A0zkH5gg9YDfRhHn13dFLj9D3tYtyAnJR94U=; fh=rvFFfFUeajrBSZUZbNRiqOinI+1sct87Q5T4lCmXKcc=; b=CLHOzs6iBGbUvZ6hGoRMr9bj4s6OAJPSvs/XrLNpL+GizCpCe61xQHJJvsgQDx/2Go h8NMzg3bDA6UGULY4DkWhaXVa2FH22wT5Lr7tsawYulDhuQxhLA9wqSxPs5a4tyt246C iKqbtNZRnQ6z50XzvnX4KDktwFMadugRUG7unGHBHsFO6AVndfCjqvLAugwvYrAzq1es Z/WrrVbwIULI22maePvSLUCkVtaDi5037sFlUAm0AMEV/mV+jIQ3vRxWNw+GB7Mk2b9h izSG3qs9brkqpO4zoIWw4RcDxMMxaU1P2fkqsf0sEJPBFWsL5TUEfh2kX0TGxXQP7YIg l9VA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="RriqMD/7"; 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-7d3f999f075si159725685a.121.2025.06.20.06.08.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Jun 2025 06:08:04 -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="RriqMD/7"; 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 1uSbT2-0002O3-O1; Fri, 20 Jun 2025 09:07:40 -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 1uSbT0-0002Mw-Cp for qemu-devel@nongnu.org; Fri, 20 Jun 2025 09:07:38 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSbSy-0004WZ-QT for qemu-devel@nongnu.org; Fri, 20 Jun 2025 09:07:38 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3a375e72473so862902f8f.0 for ; Fri, 20 Jun 2025 06:07:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750424854; x=1751029654; 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=i7X9qE0A0zkH5gg9YDfRhHn13dFLj9D3tYtyAnJR94U=; b=RriqMD/7m9gtm3lFIfhojDFxFLhIvvtHSX8TKcO/jpQmHX7brYioAzj7WxlHNYNzUT GG9VUtZbLYYXzWsl3v0eyylhe+s7KZgqrDeVWmYodc26h4LIv8QJ3qr6owflIfJye8OO prK6aFGSYE6mwjyENP/adObTInGfxW6zOizt3S28CAgCk1VGcpeA/jNeTCEbYzhVUCNl CtF35ywrtn73UGMD9Dyv5JeIaEE9cywQqLhoJXFnoo8Bn3Y9IW0jwr5IqrQE4AZzjrgl BH5sxeRGm7UWEWidv39NI97arNy0EY3gv96zvINpU2pLBGPXhMCnM0hPwi8Hn676Jmwq Z+MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750424854; x=1751029654; 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=i7X9qE0A0zkH5gg9YDfRhHn13dFLj9D3tYtyAnJR94U=; b=WHyMqjHgV/TOvFCSiHAvmBfCmdEvHjZbJ6g53N6ZkbopRp+wrYzH0WQUdx93W5Pkbv RfTX7uK+L6VQr5vzYmlFY/4XfKPCOMBk4bTkRTKiiE+ARvUSZ55tDL5i3jnQol6k4l/r EaqoEiTCiqmPNSKwsyhDnZZEBvqyfwb4QuRQ5Yu6LYC2u4pKG/4jcXDuOSg/fxiaBBs/ z/q7oakXrWDXWG6Eeo3E4Z0P0EGm9R0D+qVfspk3VLwnkPzWGk8U+eYt7aBJRJuU+SQy NcI4o3bjyxi+IUy4e+Un7eK0KkdTFqe80pILxXHtiu44T/Ocx/NXMTc4SsvYQmFJhT87 idiA== X-Gm-Message-State: AOJu0YyVAnJFXvYOEEZg9mu4mlkBsQK5Mj2HMJ3hU/ek+9upa9OLiUnx t+ooJzjnyBdPUi7F1V0HX8wMUuDg6JtGYPN2HKPGvQg+q4EFZVbUPbkLliueqVHB8p6/SXy8nww Q3lh3wTc= X-Gm-Gg: ASbGncsFLxdnoQH3hugXhwuY9sSn2gb02whP7EtXr+JdZp1yqIbA1jVTo4iSiEIYYEJ xgInC7x8n8FIHS70p9nTsA7x0owyIUM1+3kp5scwxS9S2jgfJf2Kygk6w1m8hYNVrFPsxS1z03i LQ2oWgklkgq3wL3wZQw5fF6oCKvt26xJzLKiupzh5a+VFC0q6EvdvXihXCP8+WTMWg4f3YRq4Vk +7L+89D13+qp8P08TgwKzLAkIhgtxBftAZkAtiThMHD1MNS2MELd9uIX0gRSISfHl3eDNQ1csRg xp/yEZdax7rCv26ciBxdVy7rO4stZ/Dnv0t6cqBbfivHQiKcO3ZUci0bPP3dVY7CdO4KzOqWkcQ 2zDnOHnjzXecxIPW3ywRDMk6ED4ecEzn6NATqFwj0dGfwOQA= X-Received: by 2002:a05:6000:4715:b0:3a5:2923:7ffa with SMTP id ffacd0b85a97d-3a6d1193fd2mr2532616f8f.7.1750424854370; Fri, 20 Jun 2025 06:07:34 -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-45364703f1esm25142395e9.32.2025.06.20.06.07.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jun 2025 06:07:33 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , Richard Henderson , Radoslaw Biernacki , Alexander Graf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Phil Dennis-Jordan , =?utf-8?q?Alex_Benn=C3=A9e?= , Bernhard Beschow , Cleber Rosa , Peter Maydell , Cameron Esfahani , kvm@vger.kernel.org, qemu-arm@nongnu.org, Eric Auger , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth , Roman Bolshakov , John Snow Subject: [PATCH v2 04/26] target/arm/hvf: Simplify GIC hvf_arch_init_vcpu() Date: Fri, 20 Jun 2025 15:06:47 +0200 Message-ID: <20250620130709.31073-5-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250620130709.31073-1-philmd@linaro.org> References: <20250620130709.31073-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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=ham 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,