From patchwork Thu May 1 06:23:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 886304 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp174335wrq; Wed, 30 Apr 2025 23:26:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXUFClQ8EVDRT3w3xzDn5RUFBfUSHClcvRhpLf/GdYjhBA6vAo0/tDosQXAmIq7Udto8My2TA==@linaro.org X-Google-Smtp-Source: AGHT+IHadC8c4/WDj0uMH/ZB17t+aJOZuhWzsjJZ4CEPGtF9R2FBkZsuEh9lVVM9vJbkfNnnOOzL X-Received: by 2002:a05:622a:4005:b0:476:63e5:eb96 with SMTP id d75a77b69052e-48b20897c20mr23883291cf.28.1746080797183; Wed, 30 Apr 2025 23:26:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746080797; cv=none; d=google.com; s=arc-20240605; b=eVoxxI/uqkRBCs2tGA1LgyyJWRJH7VQ4fURMyQorsLKs8LfS36elJKrrDB9gjcJmsi Xh6Z641iwZEtzMEJItUh17onfXTwpDFOlh2VagfKZsXQJAptjYjo5YH4ysccGU+PQHAq QU+4NJ19HDWM/rDeg8TlGTcLMAsGCKm9Z/Ck1i6XGU3u8qluHggWg8yYfAFWLjCpzimX 0WFwmoSLzBaemHUD2XmkPXeJixKKeEAZ+FKgHt3S82zVyMHgNer1MAvqutFtjxl13w54 ptPhk9Ac9uAQ8+mmdJyvPp8KmNEyjdK/oPDk5kfktIJH4J0Ni+YZoHGS+99ha/1IFAF8 0gZg== 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=kOxKXFGwCu039etMQxzOSUx9I5tz+a2xiou6nYotXOs=; fh=Fszn0PKjr1lTJ9agfldZI0BguDyTJI4MYSL4G/fcmsE=; b=WsBCwHQ2Ds+HTxw5dJgxehLZBRCXt1n3X6sH3X/q+IQ69nGETFK38qqld1nnxKkmLc SnWn2Plef5Lf0BwXmKc+c0sqzbbvrC2Sf9SytWN0FhJJ4o16V8m5acMsgzLekoIdNG3/ N4Y46RiVYbK+x6TPYoV4InPoGeBMjlDUzI3nttcM196LDgCgX/acFyuqFG0vsA5C121W 85qGdFm4e5/mcg9FwrbNvoooMYmnvbXbMXbklE3tMwo5SSiV1OVr2TeXZC25/mcOSOle tnA6FoXVHrFNHS/TEHeG8wMPrKyeaQ4ECmi+jfyFICWY0jndtafHlVoGwJU3Ek7QrOHk Uw1w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="ZMND/4Cf"; 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 d75a77b69052e-48b09658598si10688761cf.631.2025.04.30.23.26.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 23:26:37 -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="ZMND/4Cf"; 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 1uANLO-0005HY-TF; Thu, 01 May 2025 02:24:28 -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 1uANKy-00059H-Ct for qemu-devel@nongnu.org; Thu, 01 May 2025 02:24:00 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uANKw-00072k-G1 for qemu-devel@nongnu.org; Thu, 01 May 2025 02:24:00 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-7390d21bb1cso721558b3a.2 for ; Wed, 30 Apr 2025 23:23:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746080637; x=1746685437; 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=kOxKXFGwCu039etMQxzOSUx9I5tz+a2xiou6nYotXOs=; b=ZMND/4Cf0TWwzQXI4mJn9fEhySFKXgHtrKebxzNqoUPB1e6Ls8B2cqq0/eI7CFlPeO SPSH3Cx2FwyfWtDhhqLe7dr5qF6NUSeg3jUfw4MR+Re8phFAtUb0JDhc1Q+r5AVY6qLQ hcNTBh1ksWgh/Ht6zFc/WCEMS8Ned7w72lNSAz3AzgJsMOowJuSqJmEb5vrjMK3orbTG DztlCAxGDwAcT4zfu8ikChIhxUOdhIQ97F6zk8L/yxrqSihN/Odhz2404WVRFvz1/qnM qG7QhuonmLl6cc5GE3cuUWyhq8ODGFNDFe18WXUHbz5KHGfZdqy17wxXhpY8bmbs7PTt Km9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746080637; x=1746685437; 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=kOxKXFGwCu039etMQxzOSUx9I5tz+a2xiou6nYotXOs=; b=kK38LgayciPyJb3dCtK8kQqSaUwbHUOxeKtvHb4fyanta/1B0ZnGYYdlguarZgyGDJ TKVLS/pJhVh8iVuAQV0W5p2Qr0VUuXFlmCbFmZZ3RPAlX7yyj0yKNVpiYNf6rxq+NvLS VHW1xOGy2FG9ZK4MponvVgvZsBPXY3Ojul7+OjZGF2bRkKCl4/Y+yyXdshgg/z3E8jtg yuqvB/J57Tc4mif531gjYsCjFSiD2Z+H+XQ+mnL2ghgbWlf2iHMtXsq+LLK/byvoUtmT 2rZQdi26puiZ+LPql0JfTX1G0ZPvG6acpFE277dDKim71IMSSpiiNj7K089WU07CI1SH cexQ== X-Gm-Message-State: AOJu0YzAmHyC1BMJZTcuk/1zPXbbLeNTM0wAYZua9Pak3JZ03BzmFxod mHI3y/Jb1E9jrlp6MhlDXFONK0ZDQhs7+OlaQcTcIDkFMftEyU9bW56Tlvh1/bIZYXihGVEI6xq V X-Gm-Gg: ASbGncvmhmDTY1xBGaO18g9A2PeP6Z/ISehQQMQJTPYCool1QUI14NZMakZ8/+fJuMX VRIzvfq3KDFQwtjhf+dZICiGPp2D2EmLYsFbpwZ8v1SWfNGjh4it//miVxFaba1x76kLshBXb3U QRT7IQ1gdC8yoJo0EbRZSBDxL2srkgnOXS4wWcPY3tq7EALVglf+5lyN7xl6RsBYrHMDPDw7FuQ 9xfX0lwfhBYgqAefxgigwKtyRh+gdwczX9TU3uyCrzf6uumsNc+fANidjT58Obw5RON594/vnW2 C3zgrA/o7v4NyK+2RPvXb0hHe1RlM5pl9GyOMsZS X-Received: by 2002:a05:6a00:a96:b0:736:33fd:f57d with SMTP id d2e1a72fcca58-74049239b22mr1705425b3a.17.1746080636763; Wed, 30 Apr 2025 23:23:56 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7404f9fed21sm108134b3a.93.2025.04.30.23.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 23:23:56 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, richard.henderson@linaro.org, alex.bennee@linaro.org, Paolo Bonzini , anjo@rev.ng, =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , kvm@vger.kernel.org, Pierrick Bouvier Subject: [PATCH v3 06/33] target/arm/cpu: move arm_cpu_kvm_set_irq to kvm.c Date: Wed, 30 Apr 2025 23:23:17 -0700 Message-ID: <20250501062344.2526061-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250501062344.2526061-1-pierrick.bouvier@linaro.org> References: <20250501062344.2526061-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x42f.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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé --- target/arm/kvm_arm.h | 2 ++ target/arm/cpu.c | 31 ------------------------------- target/arm/kvm-stub.c | 5 +++++ target/arm/kvm.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 31 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 7b9c7c4a148..d156c790b66 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -221,4 +221,6 @@ int kvm_arm_set_irq(int cpu, int irqtype, int irq, int level); void kvm_arm_enable_mte(Object *cpuobj, Error **errp); +void arm_cpu_kvm_set_irq(void *arm_cpu, int irq, int level); + #endif diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 5e951675c60..07f279fec8c 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1099,37 +1099,6 @@ static void arm_cpu_set_irq(void *opaque, int irq, int level) } } -static void arm_cpu_kvm_set_irq(void *opaque, int irq, int level) -{ -#ifdef CONFIG_KVM - ARMCPU *cpu = opaque; - CPUARMState *env = &cpu->env; - CPUState *cs = CPU(cpu); - uint32_t linestate_bit; - int irq_id; - - switch (irq) { - case ARM_CPU_IRQ: - irq_id = KVM_ARM_IRQ_CPU_IRQ; - linestate_bit = CPU_INTERRUPT_HARD; - break; - case ARM_CPU_FIQ: - irq_id = KVM_ARM_IRQ_CPU_FIQ; - linestate_bit = CPU_INTERRUPT_FIQ; - break; - default: - g_assert_not_reached(); - } - - if (level) { - env->irq_line_state |= linestate_bit; - } else { - env->irq_line_state &= ~linestate_bit; - } - kvm_arm_set_irq(cs->cpu_index, KVM_ARM_IRQ_TYPE_CPU, irq_id, !!level); -#endif -} - static bool arm_cpu_virtio_is_big_endian(CPUState *cs) { ARMCPU *cpu = ARM_CPU(cs); diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c index e34d3f5e6b4..4806365cdc5 100644 --- a/target/arm/kvm-stub.c +++ b/target/arm/kvm-stub.c @@ -104,3 +104,8 @@ void kvm_arm_reset_vcpu(ARMCPU *cpu) { g_assert_not_reached(); } + +void arm_cpu_kvm_set_irq(void *arm_cpu, int irq, int level) +{ + g_assert_not_reached(); +} diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 97de8c7e939..8f68aa10298 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -2468,3 +2468,32 @@ void kvm_arm_enable_mte(Object *cpuobj, Error **errp) cpu->kvm_mte = true; } } + +void arm_cpu_kvm_set_irq(void *arm_cpu, int irq, int level) +{ + ARMCPU *cpu = arm_cpu; + CPUARMState *env = &cpu->env; + CPUState *cs = CPU(cpu); + uint32_t linestate_bit; + int irq_id; + + switch (irq) { + case ARM_CPU_IRQ: + irq_id = KVM_ARM_IRQ_CPU_IRQ; + linestate_bit = CPU_INTERRUPT_HARD; + break; + case ARM_CPU_FIQ: + irq_id = KVM_ARM_IRQ_CPU_FIQ; + linestate_bit = CPU_INTERRUPT_FIQ; + break; + default: + g_assert_not_reached(); + } + + if (level) { + env->irq_line_state |= linestate_bit; + } else { + env->irq_line_state &= ~linestate_bit; + } + kvm_arm_set_irq(cs->cpu_index, KVM_ARM_IRQ_TYPE_CPU, irq_id, !!level); +}