From patchwork Tue May 13 17:39:23 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: 889626 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2233654wrr; Tue, 13 May 2025 10:49:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUFSb019m/LuVtmJnh0QH3+PYCYm8SHaICsQS2vT38hbUcKDW/HrdhXYSaGztm27OxbdfaWHg==@linaro.org X-Google-Smtp-Source: AGHT+IHtIr4ILxnqbFo7JjrjKmHmlXXiUF9RvZHxaZou3RawVBjTjSJ+cCdflc5Iip1Uy/jKUEm0 X-Received: by 2002:a05:622a:4a8a:b0:476:a03b:96ec with SMTP id d75a77b69052e-49495d0213emr6407181cf.32.1747158550748; Tue, 13 May 2025 10:49:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747158550; cv=none; d=google.com; s=arc-20240605; b=fsfqQtuWr3f+jvxeNL4UIDyeFTv+v2ujklgnSGkKzIb23BAX5AtzhpMWwIy3+CRfCc z66QBWuJOOdXWpTLATgOsYI5zXIaOrEMsQweqa6aK/byiCZqEQ/50Vf9MyxL0gv0brCq KOvun2nDPOlWa8IXP4lZJhNAS3L5n1fPwxYDLlEBV+IDQJg9ywjQP4UeVz93upgscVa/ qSiGkH174nVU/NrhSQqG6wyL/Z0z3EpkTAXPYHPvlQvSVM5VOOoFZXIW/fx2CKxsbqnG 7hB9+da6LfQjZdCF1KVf1P3854Kzfuq7inZKHYButu00RLBfDeXIOzLbtfQxMk5P9pBw 888A== 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=neloj2ajHaqhmJKWG5e1yATLyBo4rGwFX0cyyLIOZTY=; fh=oAG6HIcuSPumOYs2ef0NYEkSLIm7D6VhhjfDQzOYEY4=; b=iKOHVypNMlM39F90gcJaRskud0tBnsBcZbehQGmJXdl50cBlfppoPqIZmvCiWXH82T N0bhtWEwr3hs9cj1A5WC/Q84BTeXNNPeVtIazK8HtqAwIbDyvkMYQwtlv26BLC4xi5NT DTGX1Zs1kHl7Q88DrhMkYFtIkMIPqpYMr18qXRZID2Her5j+zO4AxjWrNi41bx5gw5rz JgoCUs6mASwCW8nexMcpyjgQHnUc2vWzuSaNfB/umZXKFm+t1VqHa6uSRwS78DMXPvLu L0XiZe0QBDAWOyKqQ3+g7vTVNxpcDRzRQvHiSO/gTJiU09aZvaIjdqgRGdTXX34+M0jW vMzg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bfREviDu; 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-49452479c0esi112428731cf.178.2025.05.13.10.49.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 May 2025 10:49:10 -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=bfREviDu; 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 1uEtk9-0001Ix-Uf; Tue, 13 May 2025 13:48:41 -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 1uEtcS-0000bn-FA for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:44 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEtcP-0003QW-Qd for qemu-devel@nongnu.org; Tue, 13 May 2025 13:40:44 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-442d146a1aaso54373145e9.1 for ; Tue, 13 May 2025 10:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747158040; x=1747762840; 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=neloj2ajHaqhmJKWG5e1yATLyBo4rGwFX0cyyLIOZTY=; b=bfREviDu+0i//TdpfEOa3kEuqEgEEx92hYoR+mTs7hADq8ebbP/bN+EmmLIXxnDC/+ E43p1ZlXPdpjwKQUY7HlQoo4rMa94XTJ67fSk9VTDmmNcdWKueIrrS9nA0y8zEKTCIxq iMt9xtGZrwu+PS6PXehK5M+7fyEBGq9Tk1ycO5w3Zfs0irEjsi1SAPIq7UZaLPEvjOY8 UOLmFcRbNx2LLcq2/H5sc96NVNPfcQ7kdMQRRcw51TmBbaPPUwW306INPTzQPG7Z4ba5 ftloINI86oMffxfPes+AjPKAG3zucXBoHxzIQyJc3fJsBtd8/f8mU0GkLQWH3ZipA0X6 FWzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747158040; x=1747762840; 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=neloj2ajHaqhmJKWG5e1yATLyBo4rGwFX0cyyLIOZTY=; b=KuJBOYSlOl56NVfrHpmQtfdGZ6nzBZzTQqGIMOCujEmZ1qYPHIJf90yxN5N6XLCffd Xcccuy5ZGE2nge0xSo0ZOmM8RlfsZ+ns4zxF5Gsi5lBDALysXhflfUFyzty9tJwMBM4b iAIFpqp4jYOVER/wQRvsgPnRi7sHe1DMJnd5XTsrRogx+qhzcBLjMiOR6knENaVGc0nK 8vm6HqP6PlQvZTYune2g0mkDqMzK/VqNnAFma5GGcrc5Lo4DOFNGZRMDM7YBNVtr1NJk r8RbWTsZ0r4HmyUtmERXMuz9UihT6ahU5xmeTM1M4i3ROKlwlsOdR30TiPUoWmnZRts3 oqBg== X-Gm-Message-State: AOJu0YzTabLpYvMkKvjF5UWvEiZ+gbqJXzWziRT8HUZsq16ZIuoD5LlW Rn7Ek0SQiDKgz+2cgyvYYE+TvJrgQQjsL2xPNSGq9DLUtxgHHqDyFkmSBe9oGygCGTM86MqAHrF tG7I= X-Gm-Gg: ASbGncuFRgVfUULcybPc1qnFWriHxTftQI6lCywGjBO+HZJCp2u4qMKgX/SSFbi67Af wgZXUU9Vp6xyk5SjqJm3M3H3Dz87yC4NvchtyscsjPLEbBV/U0Ckb7ZX1gEYnyjJKd6aDk85k9G D1hGz3a6ftC3pjd8wpFUeKESL7sBu4c9PdYw5g9br9ccfZ592nKeuHoNSEhjN5PWmZFtGR6ZayO wSskVNZWt6Gcw2SSloyjICowGCiozVpAakTxP3mLrsEFm6Bm4hg0malTRSKNKJ9XoUdTBeZTcLO Co6jkDTfhk41LYfUW6Jli4LLPcHf2P6wHbJ998UCcjKULbbwt4E3XU4/a5e3ygD9AkyFdDk5leQ tMkAhnPTNOVmt1Cc1xfyUppR1jsiO X-Received: by 2002:a05:600c:3e88:b0:43c:ec28:d31b with SMTP id 5b1f17b1804b1-442f20db116mr2935415e9.10.1747158039949; Tue, 13 May 2025 10:40:39 -0700 (PDT) Received: from localhost.localdomain (110.8.30.213.rev.vodafone.pt. [213.30.8.110]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442d67d5c09sm178270065e9.7.2025.05.13.10.40.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 May 2025 10:40:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH 14/19] target/arm: Extract PSCI definitions to 'psci.h' Date: Tue, 13 May 2025 18:39:23 +0100 Message-ID: <20250513173928.77376-15-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250513173928.77376-1-philmd@linaro.org> References: <20250513173928.77376-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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 Extract PSCI definitions (which are not target specific) to the new "target/arm/psci.h", so code from hw/arm/ can use them without having to include the target specific "cpu.h" header. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- include/hw/arm/boot.h | 3 ++- target/arm/cpu.h | 7 ++----- target/arm/psci.h | 18 ++++++++++++++++++ hw/arm/bananapi_m2u.c | 1 + hw/arm/boot.c | 1 + hw/arm/highbank.c | 1 + hw/arm/imx8mp-evk.c | 1 + hw/arm/mcimx6ul-evk.c | 1 + hw/arm/mcimx7d-sabre.c | 1 + hw/arm/orangepi.c | 1 + hw/arm/sbsa-ref.c | 1 + hw/arm/virt-acpi-build.c | 1 + hw/arm/virt.c | 1 + hw/arm/xlnx-versal-virt.c | 1 + hw/arm/xlnx-zcu102.c | 1 + hw/vmapple/vmapple.c | 1 + target/arm/helper.c | 1 + target/arm/hvf/hvf.c | 1 + target/arm/tcg/op_helper.c | 1 + target/arm/tcg/psci.c | 1 + 20 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 target/arm/psci.h diff --git a/include/hw/arm/boot.h b/include/hw/arm/boot.h index b12bf61ca81..648fdb88862 100644 --- a/include/hw/arm/boot.h +++ b/include/hw/arm/boot.h @@ -12,6 +12,7 @@ #define HW_ARM_BOOT_H #include "target/arm/cpu-qom.h" +//#include "target/arm/psci.h" #include "qemu/notify.h" typedef enum { @@ -100,7 +101,7 @@ struct arm_boot_info { * as the conduit specifies calls should go to (eg guest firmware booted * to EL3) then PSCI will not be enabled. */ - int psci_conduit; + int psci_conduit;// /* Used internally by arm_boot.c */ int is_linux; hwaddr initrd_start; diff --git a/target/arm/cpu.h b/target/arm/cpu.h index b70c7a3ecd2..116745975fa 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3098,11 +3098,8 @@ static inline bool bswap_code(bool sctlr_b) #endif } -enum { - QEMU_PSCI_CONDUIT_DISABLED = 0, - QEMU_PSCI_CONDUIT_SMC = 1, - QEMU_PSCI_CONDUIT_HVC = 2, -}; +void cpu_get_tb_cpu_state(CPUARMState *env, vaddr *pc, + uint64_t *cs_base, uint32_t *flags); #ifndef CONFIG_USER_ONLY /* Return the address space index to use for a memory access */ diff --git a/target/arm/psci.h b/target/arm/psci.h new file mode 100644 index 00000000000..8b868dfbb91 --- /dev/null +++ b/target/arm/psci.h @@ -0,0 +1,18 @@ +/* + * ARM Power State Coordination Interface (PSCI) definitions + * + * Copyright (c) 2003 Fabrice Bellard + * + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#ifndef TARGET_ARM_PSCI_H +#define TARGET_ARM_PSCI_H + +enum { + QEMU_PSCI_CONDUIT_DISABLED = 0, + QEMU_PSCI_CONDUIT_SMC = 1, + QEMU_PSCI_CONDUIT_HVC = 2, +}; + +#endif diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c index b750a575f72..61e01a38099 100644 --- a/hw/arm/bananapi_m2u.c +++ b/hw/arm/bananapi_m2u.c @@ -27,6 +27,7 @@ #include "hw/qdev-properties.h" #include "hw/arm/allwinner-r40.h" #include "hw/arm/boot.h" +#include "target/arm/psci.h" static struct arm_boot_info bpim2u_binfo; diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 79afb51b8a5..b81a850819b 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -29,6 +29,7 @@ #include "qemu/config-file.h" #include "qemu/option.h" #include "qemu/units.h" +#include "target/arm/psci.h" /* Kernel boot protocol is specified in the kernel docs * Documentation/arm/Booting and Documentation/arm64/booting.txt diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 5b2719555af..0ce39877822 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -36,6 +36,7 @@ #include "qemu/log.h" #include "qom/object.h" #include "target/arm/cpu-qom.h" +#include "target/arm/psci.h" #define SMP_BOOT_ADDR 0x100 #define SMP_BOOT_REG 0x40 diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index b3082fa60d8..81fe0361ea7 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -15,6 +15,7 @@ #include "system/qtest.h" #include "qemu/error-report.h" #include "qapi/error.h" +#include "target/arm/psci.h" #include static void imx8mp_evk_modify_dtb(const struct arm_boot_info *info, void *fdt) diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index 86982cb0772..be5e50abf17 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -18,6 +18,7 @@ #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "system/qtest.h" +#include "target/arm/psci.h" static void mcimx6ul_evk_init(MachineState *machine) { diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index 33119610113..e0f25b92594 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -20,6 +20,7 @@ #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "system/qtest.h" +#include "target/arm/psci.h" static void mcimx7d_sabre_init(MachineState *machine) { diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index e0956880d11..99037a09a36 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -26,6 +26,7 @@ #include "hw/qdev-properties.h" #include "hw/arm/allwinner-h3.h" #include "hw/arm/boot.h" +#include "target/arm/psci.h" static struct arm_boot_info orangepi_binfo; diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 25ffb029ff4..d5ce15b688f 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -53,6 +53,7 @@ #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h" #include "target/arm/multiprocessing.h" +#include "target/arm/psci.h" #define RAMLIMIT_GB 8192 #define RAMLIMIT_BYTES (RAMLIMIT_GB * GiB) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 7e8e0f0298d..20dc93fbc54 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -59,6 +59,7 @@ #include "hw/acpi/viot.h" #include "hw/virtio/virtio-acpi.h" #include "target/arm/multiprocessing.h" +#include "target/arm/psci.h" #define ARM_SPI_BASE 32 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9a6cd085a37..d110cb07943 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -79,6 +79,7 @@ #include "target/arm/internals.h" #include "target/arm/multiprocessing.h" #include "target/arm/gtimer.h" +#include "target/arm/psci.h" #include "hw/mem/pc-dimm.h" #include "hw/mem/nvdimm.h" #include "hw/acpi/generic_event_device.h" diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index adadbb72902..7e1b93b782d 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -21,6 +21,7 @@ #include "hw/arm/xlnx-versal.h" #include "hw/arm/boot.h" #include "target/arm/multiprocessing.h" +#include "target/arm/psci.h" #include "qom/object.h" #define TYPE_XLNX_VERSAL_VIRT_MACHINE MACHINE_TYPE_NAME("xlnx-versal-virt") diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index 14b6641a713..c46bf11ce24 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -26,6 +26,7 @@ #include "qom/object.h" #include "net/can_emu.h" #include "audio/audio.h" +#include "target/arm/psci.h" struct XlnxZCU102 { MachineState parent_obj; diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c index 2dc5e15e791..b61f5ea51a4 100644 --- a/hw/vmapple/vmapple.c +++ b/hw/vmapple/vmapple.c @@ -53,6 +53,7 @@ #include "system/system.h" #include "target/arm/gtimer.h" #include "target/arm/multiprocessing.h" +#include "target/arm/psci.h" struct VMAppleMachineState { MachineState parent; diff --git a/target/arm/helper.c b/target/arm/helper.c index 76312102879..7859729c39f 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -34,6 +34,7 @@ #endif #include "cpregs.h" #include "target/arm/gtimer.h" +#include "target/arm/psci.h" #define HELPER_H "tcg/helper.h" #include "exec/helper-proto.h.inc" diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 42258cc2d88..8fbd4c4be59 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -33,6 +33,7 @@ #include "target/arm/internals.h" #include "target/arm/multiprocessing.h" #include "target/arm/gtimer.h" +#include "target/arm/psci.h" #include "trace.h" #include "migration/vmstate.h" diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index 073a8319fa5..e0f9c91450a 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -26,6 +26,7 @@ #include "accel/tcg/cpu-ldst.h" #include "accel/tcg/probe.h" #include "target/arm/gtimer.h" +#include "target/arm/psci.h" #include "cpregs.h" #define SIGNBIT (uint32_t)0x80000000 diff --git a/target/arm/tcg/psci.c b/target/arm/tcg/psci.c index cabed43e8a8..0313cdd6ba2 100644 --- a/target/arm/tcg/psci.c +++ b/target/arm/tcg/psci.c @@ -25,6 +25,7 @@ #include "internals.h" #include "arm-powerctl.h" #include "target/arm/multiprocessing.h" +#include "target/arm/psci.h" bool arm_is_psci_call(ARMCPU *cpu, int excp_type) {