From patchwork Mon May 5 01:51:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 887444 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp1826494wrq; Sun, 4 May 2025 19:02:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVX9/i47r5WkkXwyfeObpyNAIqjanUmT6yZ0KPVL36jYL9iScvpoScC/9YMguwv1NipVxHsrw==@linaro.org X-Google-Smtp-Source: AGHT+IFDp/6PR2ruvknkv8GOBBkDnGV/DyYjCASMJuOhQMh3x9npRfyoZX6URbYaFtH3mckjRjBm X-Received: by 2002:a05:622a:2505:b0:476:b7e2:385e with SMTP id d75a77b69052e-48d5bf7e669mr111815351cf.17.1746410574570; Sun, 04 May 2025 19:02:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746410574; cv=none; d=google.com; s=arc-20240605; b=fDL6mzHUYFO8ubXTXp1hjudfa7c4BJC0DEh7mLYmtLrIaR6z98U78P021n0p3zrjBJ kXIgpJLa+Ek869a2RVr1PJlo/O0Gs60S0Z1fDPioHFzeCXyHRrVnKgfo+wyIOB8sCai+ zjzjPls0tAkwvD+LxgXGzHVjddBrW9eKllLao+HMqP8bRPLPmy89tCBzoyKYtZI/lCkL bmnJaXdxknAd92JSmL8ENXW7aLtP4mZxvu3vIpBv98GvhnXvCbsXHIMfpW9Io8hlUZot 7ZPUTuGAfnLw6TL0gqVZxDR6d3ZheDSflSGOzQ/cWNfE9RK83GUYzpki+vMcyY0oWdah IFYg== 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=48VeJmtQLPOhxBVuGtRwfY5ps2vP+Hg73z2yA0rcj8A=; fh=NjGqp/B1Bwp2wtTnyHxTvlXYBfwRSGY9cE7hmKIZquY=; b=LEEgKf4tTZ2skY5eU8jQSA059WkHFXl2XtwR2TbOdK/yEIWvIaWCEYxHuZPH27dJ44 lX9cGGqYTUtdwclj2yI8FNuSyno8jejZE90RmnzNUyG3ZWAeLVDqVoMiU+yCM6QiLK3q TcSfmCNo1Yv3j5lCRxwdN8pkue7WUrc8m71qEQMLVtTS1YN8KLPSjJgxhykgDOd5GuWH 1gxWfNQ+FSIpNo0nwn/rTJbpwMJlzNCgd+dZm1f8ySs4L1Qa4yc4FXnosUS4HixFYGKr NGEQVwCGp0YNGQVmUX16zGm53B3bYbaH2ITgHw2VKyb1wZNBxyD7TGu6AgICWQkxhVCG q6QQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qt7LFuWE; 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-48dcc8ce939si35766551cf.23.2025.05.04.19.02.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 04 May 2025 19:02:54 -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=qt7LFuWE; 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 1uBl15-0004DG-Ro; Sun, 04 May 2025 21:53:11 -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 1uBl0g-0003ub-Tk for qemu-devel@nongnu.org; Sun, 04 May 2025 21:52:49 -0400 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uBl0V-0002Ue-Nd for qemu-devel@nongnu.org; Sun, 04 May 2025 21:52:46 -0400 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-af91fc1fa90so3546555a12.0 for ; Sun, 04 May 2025 18:52:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746409954; x=1747014754; 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=48VeJmtQLPOhxBVuGtRwfY5ps2vP+Hg73z2yA0rcj8A=; b=qt7LFuWE9F+7cdUFI7Rpu8jrl68IrT2Qs/yDztDEwm6F07hPuI3mHN1d2IWiBm2vGS xqjUk+J2GPLawQTjz1lPK5/YOJ1gRiPyshiLR5cxBVYBLfmG63XjS/QD0rkr0Mj3XyV1 DBUsNU45Wq4Wdkf14bOVFyScVAeuHcfapLbnqQKDef5xaxAjWADIwHioFlwiIfxB/TYZ KSdrLMp3uYbzjIOyA2glRGCO4YHgmdnfZBfRD081pc+iERWXzxQKN9F2Z1W/vZkZQqjv pql0JSdxspyomWXnfz1Krz+PGcEpuYzQ+bSQpCoDL4i2f+pX+gDu+pPN+CQcMlt1xc1/ zPPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746409954; x=1747014754; 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=48VeJmtQLPOhxBVuGtRwfY5ps2vP+Hg73z2yA0rcj8A=; b=W16Qz6AU9hU20fApdfAIs8OKVu7ATIkpGqKbDsPEwQE4KRxhzg+xZ8qsNqBZTEsWek cE7OMgQADqcYTA1FCwFkqhQjjMOL+kiY74wafPogG336jklzRpZpop6gxdgC94ifMDxF 2bZJie/59cODm1uxkcZM45KHo1RB9LUd7Yfuhnmrfn2fs9iNGPVCdA1RK8qN/aNeX1rc E7y30Zndb+zt4WCP5zJ6DJW8TLSl37ZmBEqYPIulYmQalfeRYYE8yI/eFex48fGJ5d5C vGkxG8byMu6+1mKCapJ/zfpgqvH3e9juGa4kWWDuFIGljQJ6x6BqEYwttCWEZ6Z2m6Tv 5I+w== X-Gm-Message-State: AOJu0Yy+sr6a3Ojwny0zpZvN/qKULylilGZqWMm739HPhIUs8z68oqqL SN/KR3VQEEFkT/MKD6Eb2t0Q7H4U1A6jleGM5akSvTpc3GTvXEaVqShOGqaAzKsZCJmumebsJ5X ijp0= X-Gm-Gg: ASbGncti/OLuGno5goOdeJwJRvYT4wDHRaPvKhrF/DCkPxP5rUIvsGEwch0dS+ySSn6 pyM9Ds5hiapeySgCE1dsEe8LT9/djDOrQ1bQrCR7AV+HAXrzqjp8Bj01ATRyNwbKs5cv6yjRFpX XBImurlQVzOuiSBIZKs5hzGhVPIyqN0WQy2Hb+kQ9S5e8iQbNI9SFTNWjZOy4QDNhkrngiNAIMZ VMv01ML2xh85Q0eZISf1wZdp9Y4uGBDfegaDvN1z3ZtdrN7j8sjUSBgRkgmVEFdC0usGrecCTXl +gnIAkdRGr7yT8d2A61uU8tUxi07cgq44RsK1yFj X-Received: by 2002:a05:6a20:9d91:b0:1f5:6680:82b6 with SMTP id adf61e73a8af0-20e079f2659mr10290006637.38.1746409954391; Sun, 04 May 2025 18:52:34 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b1fb3920074sm4462101a12.11.2025.05.04.18.52.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 May 2025 18:52:34 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, richard.henderson@linaro.org, alex.bennee@linaro.org, kvm@vger.kernel.org, Peter Maydell , anjo@rev.ng, =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v5 07/48] target/arm/cpu: move arm_cpu_kvm_set_irq to kvm.c Date: Sun, 4 May 2025 18:51:42 -0700 Message-ID: <20250505015223.3895275-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250505015223.3895275-1-pierrick.bouvier@linaro.org> References: <20250505015223.3895275-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x52e.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 Allow to get rid of CONFIG_KVM in target/arm/cpu.c Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Pierrick Bouvier --- 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); +}