From patchwork Mon May 5 23:19:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 887471 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2289609wrq; Mon, 5 May 2025 16:21:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXhLv5lLEONbaD0QMeNnBxxOhcVwpzZLBBiStAZ7zRcyPk/hM4ca9MbDcSCB483V2BDbCuZqg==@linaro.org X-Google-Smtp-Source: AGHT+IHlIAbudB4Pd1/K/VL2xwvs/jj2kjJLo7o2BoHEEhbEjBxlqNe8HlvP+L5c5/J/4dhh0nJZ X-Received: by 2002:a05:622a:1244:b0:48a:3824:1ddc with SMTP id d75a77b69052e-490e1cb5cedmr20080751cf.6.1746487281903; Mon, 05 May 2025 16:21:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746487281; cv=none; d=google.com; s=arc-20240605; b=C1UUVMeAYIZCzm/x/89NQJz9P3C56kfbAOSO18MQ0/+jbv+OzwCzaY0cyrtDKIES4c wfBDtEM8mDmQX8hUTRtukr1oN8+xpP79wsEaaIEN9aJfH3q1GaW3vcchRIkEfJVha8cS 41YQ8sfgHyjVZ0nZkF0iLg8MBlKasKfai8SLXIMMK5vJ7eOSTZGqOaVvnu7cJl0aR9YN UOC/wb74O+bUsh6zLXeUqYZbsG4+fnHyZveT5vJub+p0WYMHAmo20Dwg5cX2YO35Cfi8 YjmN/+KqY/wU5qIAK8hGaObuJRAVTyln72AgwaAcnot0IBUIRU5YWVwrwsxm1zCqwSTT JOCA== 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=sKdX4/MHbRvqsf1uWWiw/b4mRzIm0SRNXacICL4/ZgI=; b=fq2fJoEUaJxbmusEJ80tb5n7EM/XysvJSK9yJ+RTZLnUbdCgLJMi7WTn5hahFWt5Jx VdGFf7C4W6gMjaRlpXbcG0xyLbMlC8w6IK3g9rjTUwRz22aJWP95IiHig1DJVD3oHfnb Nr9B3NqQm2A0uKx+WgQAGdDVR29dKpp3QyeLW5cbvpc9zEowAIeBi6iRcI8V8+gDMZVl utkYWPumIm6/I7Md9t4TtYL/1dJ0pbkFENILLnSZK67KCYOQikdVBz0ZfTqfuDTlwVR7 CeIEqchGoD6B1BuBoodlKptlAxSUOxYuNVM15NPVIEsobZ4UX68kD+p4tMLJDoelLeoF qAAg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nf8XECfe; 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-48b966cdc0dsi95648311cf.170.2025.05.05.16.21.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 May 2025 16:21:21 -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=nf8XECfe; 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 1uC56y-0006Eq-UB; Mon, 05 May 2025 19:20:37 -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 1uC56u-0006B0-LM for qemu-devel@nongnu.org; Mon, 05 May 2025 19:20:32 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uC56q-0003Vo-QQ for qemu-devel@nongnu.org; Mon, 05 May 2025 19:20:32 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-22e09f57ed4so46777355ad.0 for ; Mon, 05 May 2025 16:20:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746487227; x=1747092027; 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=nf8XECfeGsA9OAri0+1s74pesU0BUfeacuLepFagNtvHAz1VsqLiuLgAQiniigCtbW LLXeUpXCwjDeOK3oPf1ekzu4UcLoVn4os4JJqCXVW+6QBn1L1rI6Hdso+q19CYqYod77 71ayDvRIewNwVfLGuALx55+TcH0vsUlg+rZCau35U7IpNHC4e5S9A9jNdfNgxWYpdfCK nXCbPGLZM0Sr/dnnPOJW6VJamDnmt7+8/GtdLvPLEtuLE41bzJ16IEGLjWt8/TktnVO0 Db3R66IzRP5bvEOlVvde1NT4ozvv8fd7VmWg6CfE1IHjCxUS1oLfF6wLnWeBBcOVTrc5 qRXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746487227; x=1747092027; 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=ZOyF8quy4V9QWcsxVVzpJo+PCsf59ye7bZUoDuYOPoRWWkoKfNVopo/o0YCYp7vf4i YFuCOVVup0MbgdAPesxAGYcdPkMfavj3h7zLnHQ3XTdi3agiSn2SScnielC8xq+FmVwM +4DrAE/cHVCK02jUP80LIL+wByD4jVLC6FLL3U9RiwJG6T9u17nwr1cIhXUSsMlbQF5q GqBr+kYSeCrky5e0U26WGY+8Tod+GEMo8IXtswJGX0+2c9c1KPCrbCpJwWvbXk82soBE bIKvuii0UphKMI5IYoewcuk6gJoExOli81jgjqCM41Wh4dv00QNImsWbEU7z6VNXdI5Z /AUA== X-Gm-Message-State: AOJu0YzXLTQ7cslNujdpsF0VMoqzdE3lL0PgMNoTy/S/6DUIIiEyOExD tRWyn7jbmatDnPR86XvGtbn0uQM7bFJXcDNvrCu790Na87F1f4EcBItx51ae3UKM1a1zt5Qlomi dVjs= X-Gm-Gg: ASbGncvzVGaE08k/YSErI5gNZdzqukFIXO1ybk4AH17OD7wDxSXLGCVhlyd+EmG73ny nylIDqJQ/a6AMqPcoOMMt/BqcfMy7K20FFW9GSuURbULiWiEvlgoiVdsCLK8x8UCtPQ4kJ8luPE K9TM8oipy2O/fc1rMbtrYc0Alzyq6KlLDwwxkTCOu4SBzTNkuB9ez/iVXghqIjiFK8ctQTDXFU2 HzZhGyItxyrVnBI/V0k3JjZb8tmgGeCOFjau/i0y3qLG42VoyS7CunB38LGu5K4obKkTZ+jDBAY fb8ks6+kKID2lxxl6r/HF2uwL1tBYeFqOrF7HQ/m X-Received: by 2002:a17:902:d486:b0:215:58be:334e with SMTP id d9443c01a7336-22e32776bf1mr17875875ad.10.1746487226858; Mon, 05 May 2025 16:20:26 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e1522917asm60981715ad.201.2025.05.05.16.20.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 May 2025 16:20:26 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, anjo@rev.ng, Peter Maydell , alex.bennee@linaro.org, kvm@vger.kernel.org, Paolo Bonzini , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v6 07/50] target/arm/cpu: move arm_cpu_kvm_set_irq to kvm.c Date: Mon, 5 May 2025 16:19:32 -0700 Message-ID: <20250505232015.130990-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250505232015.130990-1-pierrick.bouvier@linaro.org> References: <20250505232015.130990-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62f.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); +}