From patchwork Wed Apr 30 14:58:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 886055 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp899236wrq; Wed, 30 Apr 2025 08:01:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVf6wF8e2rkb+p3ySpWfDahFC/BVEBacykKzIpr65YL9/LE3G7iBIS3arRwjFgFqcQccJ/bsQ==@linaro.org X-Google-Smtp-Source: AGHT+IES4LD0bBssDSzYiSLJsfidyp/gS2i+hcYPhrvs5siDAx4Ld5d8niWcz9Cs20w8Uczl6/8L X-Received: by 2002:a05:651c:210f:b0:30d:c4c3:eafa with SMTP id 38308e7fff4ca-31e7cff0d07mr11935431fa.7.1746025311733; Wed, 30 Apr 2025 08:01:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746025311; cv=none; d=google.com; s=arc-20240605; b=ba4/FzpPV7R45UfmgdTkHMybdsZd+wqQmwhHtFYZjVjXnNt4c/bygJZcW1nHfKU4WE f4HplcWwrFD2Uhtl1zpW1OrEyzv+S3Y3YLc0vZrGCzPFe0iM9+0H6YZlFok0eVBjawZx b44aybMVsOVjEP5rz2iNtsII4GFKpmZGixCJuCMGdYcDQfgKdfRyjTYZekpGbNhzbP7N 2Qxq66jyKz71VfIN5qPaV444qcs1uL9hE+WkQMkmlE27+Xb6PlJ7YlA9cW94qgJ+eUNg Pti8X69BGJiID84w+5x5MaVCd7kG51P1i8jwasN089TqXsT1JyE/QlWm5srYF5QNjo5E /PbA== 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=hX/hJH1gLLVfS0bwh/LZYqdKvfx19Rxb8RxfxI3LnbE=; fh=T8RHNXuETE6pPT/3lIjz35HWFTO082WWvkWbd1S+hc8=; b=lAH3cotbobc3STOrrKlAqY2PJ1TCvwqHDV7tuHZjTZ2tchDnP08OpJpgaew/tdd7q0 mCJ7jp7IsirBf+Obn0vgs/6JwPPMTANgWdQ0N9QuizV+Z2DaUVl3YDN9mlOMC/bbG2mJ eqvAwTBk1MeWhpoqmalKZSpoJj0dMgt2rBIgVPTmJOLGUmryf8rCvP1JQUROXzaxJTAl KXa2SoGRQ5ujbhBO8D1dMdBa1N9Y2zCVWBr/LjdQP2ErNY7FdtWgj1bIwJiqWAbmc1TD qXKkyRBOgBj8RzTb7W7uHALPiKYgKlSydXSxNcOiQW+e9z+8fliLcK/VZwqPWeADCh/n GlOA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q5R8dlZ0; 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 38308e7fff4ca-31e959fccdfsi7392591fa.285.2025.04.30.08.01.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 08:01:51 -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=q5R8dlZ0; 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 1uA8tx-0002K9-CD; Wed, 30 Apr 2025 10:59:09 -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 1uA8tn-0002Cb-7i for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:58:59 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8tl-0002fI-4z for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:58:58 -0400 Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-b061a775ac3so7127533a12.0 for ; Wed, 30 Apr 2025 07:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746025136; x=1746629936; 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=hX/hJH1gLLVfS0bwh/LZYqdKvfx19Rxb8RxfxI3LnbE=; b=q5R8dlZ0mTEJnmI/p9CwaweAFcufMaGurUJUwD8lkfvAXuD8bcCOfgyjC5rRRk8ur6 ITyt/FIg/A36OwIQj5IZ2eOylOeCf1QeZ9hWV+n5gzLqQv4/kPY0xceUTmDv2jd50FCV kkQwIUp1EaHLAN3TRr8mH/SO8SXuhNRnx1EuFRQJigztUap+sJVaaJwPdUBWl6qiStGX I9kW71WnoSr6ofc72uEa0Ht9sFCzqmYvs2Am2IpgVx6wV8AIsQdV7ontty6SJnoHCEMA MJjixKyUxJQ+TtmXzxsEYheCbnp1ieX4PMSXRElLcqVA5HUJRgnhvkFYchu/mfTbOcaf bXZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746025136; x=1746629936; 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=hX/hJH1gLLVfS0bwh/LZYqdKvfx19Rxb8RxfxI3LnbE=; b=Vx+LqNnc0fKBpX35QdcXUuesCo1VFG7V7m0FtIc0uGQj+tsfg5GYmiEo7CQv3r9cla G6ZfNpqILwHwXnGto5EuqFcYNPX3cx9KYoul0bWB3mbMNulyUiOdoAh+56bbbrDI9N1T QFIzumFm0Cl7KVppoDvVBonC29jZjTC3m44smPt3+AZ1qOhHM3a6X9uvUnY72fA697Hh 8Di5MGZzAbyBfH5f36WsrdD5xDu8dFkO+WZJsQJBNSTL5YKdxtio79iYoYHG2xrKWJnJ X3k7xOIU9fUAwQsioC3hKkMnSoaBqml2ocXTTviKdHPS8WVZQjwwrudDYIPQjkKQA4IL Zc1w== X-Gm-Message-State: AOJu0YxL40ko1Mm0kFGe4HNAvM46s6mMyYqW8kEUSpwbk+WqYg+b06Ch QX6F6PY8+sBKFFOQo8cCNdOa1ng5h9ObxO3BPnOkHudVKBhq6iQQe/PB1UAKZZqkdIZGO4rpF/8 k X-Gm-Gg: ASbGncs3x9FdBae1CbsouBLOUWOsj27xvg+bYyY1uODXzq1lZsSWP9G3QRizJJ7GYN5 w04braQmXp64GQnoJ8vjgdS8Ub/Ib1Tr6ZnHHr/XxAf8PzCjsOq8E+tcqvEc5NyKGA/+yrNM/2f uancPIKuzJ4QYsHVFbrRmhFYdG4GeWlv5aIsETI2Badqht5X9Ys25vDOpWKAEG5dVfHO6m+t/Tl 32S0wDTzSxqFzM3ixVQRphhkVs4FzLuktViMPHslRWY5wHTlnvCqHQv+WA89PK24yBAVtC4Wdl0 mfYkzSWImgs3eV2UM4afNAjY7a0vs/EOZePDGO29 X-Received: by 2002:a17:90b:3806:b0:2f2:a664:df20 with SMTP id 98e67ed59e1d1-30a343e80afmr5103795a91.7.1746025135869; Wed, 30 Apr 2025 07:58:55 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a34a5bd78sm1705652a91.42.2025.04.30.07.58.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 07:58:55 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Paolo Bonzini , kvm@vger.kernel.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , alex.bennee@linaro.org, richard.henderson@linaro.org, anjo@rev.ng, Pierrick Bouvier Subject: [PATCH v2 06/12] target/arm/cpu: move arm_cpu_kvm_set_irq to kvm.c Date: Wed, 30 Apr 2025 07:58:31 -0700 Message-ID: <20250430145838.1790471-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> References: <20250430145838.1790471-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x536.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 Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- 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); +}