From nobody Sat Apr 11 23:04:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1772452461; cv=none; d=zohomail.com; s=zohoarc; b=M21DzYdCERex3fLjUDhZZUuLlD7ae3s4/YhSu1rSUNC/+ssdCKM+2T04Hnj5yed32sKj53fD2CjTaZf3K+97gncbCImmEZ1qgBYBx8AyZR5bCEHElmh4a2q1HsVruXF3GiSVgk3trKJja2YjHT8nxREh7MVFhPMcNVrEgFohrMs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772452461; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=f2LdQ+ShPWhBpo+Qx9LvngELjv3j8IsLbzASGGZ8ZKA=; b=Kr3NR+bufd+sSXcue6l/mj6Ej+qrRpexjPPOkm3NaD5sYHeaVHQSU5aqV3gA1qXuUWunVbJ7rAhDzmpD2O/JCvOUWK7ll9DX63gSIyuczEwZQ5oWS3e1eCM/+AyKm20guZCbT4IRcbnhZzbylALRn6Z00eR7/HIkZGmOX9P3gug= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772452461409219.19129712240544; Mon, 2 Mar 2026 03:54:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vx1qa-0000yG-Qj; Mon, 02 Mar 2026 06:54:02 -0500 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 1vx1qU-0000xC-OE for qemu-devel@nongnu.org; Mon, 02 Mar 2026 06:53:54 -0500 Received: from rev.ng ([94.130.142.21]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vx1qQ-0007is-NI for qemu-devel@nongnu.org; Mon, 02 Mar 2026 06:53:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rev.ng; s=dkim; h=Cc:To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive:List-Unsubscribe:List-Unsubscribe-Post: List-Help; bh=f2LdQ+ShPWhBpo+Qx9LvngELjv3j8IsLbzASGGZ8ZKA=; b=qnX8Qn7AOqSkXF5 YBRwBrpi6cD2uZatePL0zSqdWiueqUYq8EJQxAFMLP7oIRyavntvsT943EGaZC/08Nzsno3t+LrMg +ZekiaGcpQ4Ew62qzVyB0rIJ/YR2vydo9zi7KH417WKqAKoK0BMOlgFUxLcBjC0xXr9sDc1JTsrEh M4=; Date: Mon, 02 Mar 2026 12:56:43 +0100 Subject: [PATCH v4 1/4] hppa: Restructure CPU Class heirarchy MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260302-hppa-c3600-v4-1-447a800da8cc@rev.ng> References: <20260302-hppa-c3600-v4-0-447a800da8cc@rev.ng> In-Reply-To: <20260302-hppa-c3600-v4-0-447a800da8cc@rev.ng> To: qemu-devel@nongnu.org Cc: Richard Henderson , Helge Deller , Anton Johansson X-Developer-Signature: v=1; a=ed25519-sha256; t=1772452649; l=6835; i=anjo@rev.ng; s=20260210; h=from:subject:message-id; bh=SfMB+PlLX//tToVM5JAbgc6Lak7IHcGzoWZgo1M+ZMI=; b=FC07TAai5GJOcpuYl2pOxtdWDQIw+ubpDS8zf8jkVQNM448h+Q5V2ODMB7UjgBEZucHqEn40i tCVgyftgeFyApJLpNi9qmnJl2DwLEJQ2AAuvcuaeCbAhLSfGC7pMmar X-Developer-Key: i=anjo@rev.ng; a=ed25519; pk=dKsZvj/g3kgDxnV1/SWg8a0YNGSpWtFGNsWIepQYKow= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=94.130.142.21; envelope-from=anjo@rev.ng; helo=rev.ng X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 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_VALIDITY_CERTIFIED_BLOCKED=0.012, RCVD_IN_VALIDITY_RPBL_BLOCKED=1.188, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Anton Johansson From: Anton Johansson via qemu development Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1772452463868158500 Clarifies current CPU model names, assuming 32-bit HPPA runs a PA-7300LC whereas 64-bit runs a PA-8700. The PA-8500 model is added, which will later be used by the A400 machine. All CPU models are made into children of the now abstract TYPE_HPPA_CPU base class. References to "hppa/hppa64" models in test cases are also updated. Signed-off-by: Anton Johansson Reviewed-by: Helge Deller --- target/hppa/cpu-qom.h | 8 +++++++- hw/hppa/machine.c | 21 +++++++++++++-------- linux-user/hppa/elfload.c | 2 +- target/hppa/cpu.c | 25 ++++++++++++++++++++----- tests/qtest/machine-none-test.c | 2 +- 5 files changed, 42 insertions(+), 16 deletions(-) diff --git a/target/hppa/cpu-qom.h b/target/hppa/cpu-qom.h index 5c454bf543..7541c25b3d 100644 --- a/target/hppa/cpu-qom.h +++ b/target/hppa/cpu-qom.h @@ -23,7 +23,13 @@ #include "hw/core/cpu.h" =20 #define TYPE_HPPA_CPU "hppa-cpu" -#define TYPE_HPPA64_CPU "hppa64-cpu" + +#define HPPA_CPU_TYPE_SUFFIX "-" TYPE_HPPA_CPU +#define HPPA_CPU_TYPE_NAME(name) (name HPPA_CPU_TYPE_SUFFIX) + +#define TYPE_HPPA_CPU_PA_7300LC HPPA_CPU_TYPE_NAME("pa-7300lc") +#define TYPE_HPPA_CPU_PA_8500 HPPA_CPU_TYPE_NAME("pa-8500") +#define TYPE_HPPA_CPU_PA_8700 HPPA_CPU_TYPE_NAME("pa-8700") =20 OBJECT_DECLARE_CPU_TYPE(HPPACPU, HPPACPUClass, HPPA_CPU) =20 diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index f55e84529f..5d0d4de09e 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -801,13 +801,13 @@ static void hppa_machine_common_class_init(ObjectClas= s *oc, const void *data) static void HP_B160L_machine_init_class_init(ObjectClass *oc, const void *= data) { static const char * const valid_cpu_types[] =3D { - TYPE_HPPA_CPU, + TYPE_HPPA_CPU_PA_7300LC, NULL }; MachineClass *mc =3D MACHINE_CLASS(oc); =20 mc->desc =3D "HP B160L workstation"; - mc->default_cpu_type =3D TYPE_HPPA_CPU; + mc->default_cpu_type =3D TYPE_HPPA_CPU_PA_7300LC; mc->valid_cpu_types =3D valid_cpu_types; mc->init =3D machine_HP_B160L_init; mc->is_default =3D true; @@ -817,13 +817,13 @@ static void HP_B160L_machine_init_class_init(ObjectCl= ass *oc, const void *data) static void HP_C3700_machine_init_class_init(ObjectClass *oc, const void *= data) { static const char * const valid_cpu_types[] =3D { - TYPE_HPPA64_CPU, + TYPE_HPPA_CPU_PA_8700, NULL }; MachineClass *mc =3D MACHINE_CLASS(oc); =20 mc->desc =3D "HP C3700 workstation"; - mc->default_cpu_type =3D TYPE_HPPA64_CPU; + mc->default_cpu_type =3D TYPE_HPPA_CPU_PA_8700; mc->valid_cpu_types =3D valid_cpu_types; mc->init =3D machine_HP_C3700_init; mc->max_cpus =3D HPPA_MAX_CPUS; @@ -833,13 +833,13 @@ static void HP_C3700_machine_init_class_init(ObjectCl= ass *oc, const void *data) static void HP_A400_machine_init_class_init(ObjectClass *oc, const void *d= ata) { static const char * const valid_cpu_types[] =3D { - TYPE_HPPA64_CPU, + TYPE_HPPA_CPU_PA_8500, NULL }; MachineClass *mc =3D MACHINE_CLASS(oc); =20 mc->desc =3D "HP A400-44 workstation"; - mc->default_cpu_type =3D TYPE_HPPA64_CPU; + mc->default_cpu_type =3D TYPE_HPPA_CPU_PA_8500; mc->valid_cpu_types =3D valid_cpu_types; mc->init =3D machine_HP_A400_init; mc->max_cpus =3D HPPA_MAX_CPUS; @@ -849,13 +849,18 @@ static void HP_A400_machine_init_class_init(ObjectCla= ss *oc, const void *data) static void HP_715_machine_init_class_init(ObjectClass *oc, const void *da= ta) { static const char * const valid_cpu_types[] =3D { - TYPE_HPPA_CPU, + TYPE_HPPA_CPU_PA_7300LC, NULL }; MachineClass *mc =3D MACHINE_CLASS(oc); =20 mc->desc =3D "HP 715/64 workstation"; - mc->default_cpu_type =3D TYPE_HPPA_CPU; + /* + * Although the 715 workstation should use a 7100LC, it can be safely + * modeled as a 7300LC as the difference is a moving of the L1 data ca= che + * to on-chip. + */ + mc->default_cpu_type =3D TYPE_HPPA_CPU_PA_7300LC; mc->valid_cpu_types =3D valid_cpu_types; mc->init =3D machine_HP_715_init; /* can only support up to max. 8 CPUs due inventory major numbers */ diff --git a/linux-user/hppa/elfload.c b/linux-user/hppa/elfload.c index 4600708702..7f7ece6dc1 100644 --- a/linux-user/hppa/elfload.c +++ b/linux-user/hppa/elfload.c @@ -8,7 +8,7 @@ =20 const char *get_elf_cpu_model(uint32_t eflags) { - return "hppa"; + return "pa-7300lc"; } =20 const char *get_elf_platform(CPUState *cs) diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 714f3bbdaf..910a919923 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -207,7 +207,9 @@ static void hppa_cpu_initfn(Object *obj) { CPUHPPAState *env =3D cpu_env(CPU(obj)); =20 - env->is_pa20 =3D !!object_dynamic_cast(obj, TYPE_HPPA64_CPU); + env->is_pa20 =3D !!object_dynamic_cast(obj, TYPE_HPPA_CPU_PA_8500) || + !!object_dynamic_cast(obj, TYPE_HPPA_CPU_PA_8700); + } =20 static void hppa_cpu_reset_hold(Object *obj, ResetType type) @@ -236,9 +238,14 @@ static void hppa_cpu_reset_hold(Object *obj, ResetType= type) =20 static ObjectClass *hppa_cpu_class_by_name(const char *cpu_model) { - g_autofree char *typename =3D g_strconcat(cpu_model, "-cpu", NULL); + ObjectClass *oc; + char *typename; + + typename =3D g_strdup_printf(HPPA_CPU_TYPE_NAME("%s"), cpu_model); + oc =3D object_class_by_name(typename); + g_free(typename); =20 - return object_class_by_name(typename); + return oc; } =20 #ifndef CONFIG_USER_ONLY @@ -314,12 +321,20 @@ static const TypeInfo hppa_cpu_type_infos[] =3D { .instance_size =3D sizeof(HPPACPU), .instance_align =3D __alignof(HPPACPU), .instance_init =3D hppa_cpu_initfn, - .abstract =3D false, + .abstract =3D true, .class_size =3D sizeof(HPPACPUClass), .class_init =3D hppa_cpu_class_init, }, { - .name =3D TYPE_HPPA64_CPU, + .name =3D TYPE_HPPA_CPU_PA_7300LC, + .parent =3D TYPE_HPPA_CPU, + }, + { + .name =3D TYPE_HPPA_CPU_PA_8500, + .parent =3D TYPE_HPPA_CPU, + }, + { + .name =3D TYPE_HPPA_CPU_PA_8700, .parent =3D TYPE_HPPA_CPU, }, }; diff --git a/tests/qtest/machine-none-test.c b/tests/qtest/machine-none-tes= t.c index b6a87d27ed..f871056fa4 100644 --- a/tests/qtest/machine-none-test.c +++ b/tests/qtest/machine-none-test.c @@ -48,7 +48,7 @@ static struct arch2cpu cpus_map[] =3D { { "tricore", "tc1796" }, { "xtensa", "dc233c" }, { "xtensaeb", "fsf" }, - { "hppa", "hppa" }, + { "hppa", "pa-7300lc" }, { "riscv64", "rv64" }, { "riscv32", "rv32" }, { "rx", "rx62n" }, --=20 2.52.0 From nobody Sat Apr 11 23:04:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1772452497; cv=none; d=zohomail.com; s=zohoarc; b=XUHkh9F2UfL03+y43zNc1WBIV/QCzYuWly4TK3tqGxoXaBHUVdhLo3gBP7JpRWumh2Po4GV9uiRA7GYIQBArRB0p24RiRd4KugjlY0Mk2/6Pp9WoPCofoOyIrxjduSoZ2aQ6QMZYaCZGQh+Z4TmTU6/vF2viQSalaVuHJZU9Xk4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772452497; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=OujbK1RP5GohieE6ZQBEX97A1GJy1akPuD5ViAOCRb4=; b=CEbwE98JY3UPkQAnBt9Pp3DoUuWXsyVyHTay5CwhrUEXrq4Mo4KyLY/BHYwsmKftz4bFBmDlqfcDnyXEwA0KqcqEuu9kOsyo7VBEZUg4Gk43GIVKJRiam5Mbc3xHGdzUDXUbAg0TlHAe48Rp9pnULI8pwM3mOzhcB0V5tIDDhnY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772452497625245.8138368428214; Mon, 2 Mar 2026 03:54:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vx1qk-00017z-3v; Mon, 02 Mar 2026 06:54:10 -0500 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 1vx1qU-0000xE-Oj for qemu-devel@nongnu.org; Mon, 02 Mar 2026 06:53:54 -0500 Received: from rev.ng ([94.130.142.21]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vx1qS-0007j4-1s for qemu-devel@nongnu.org; Mon, 02 Mar 2026 06:53:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rev.ng; s=dkim; h=Cc:To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive:List-Unsubscribe:List-Unsubscribe-Post: List-Help; bh=OujbK1RP5GohieE6ZQBEX97A1GJy1akPuD5ViAOCRb4=; b=jRea4hCqnrQIZor xDkjy/KYlpq6H3MkjYjy1jQ4UbNzWJZCIIYnun+jzMWgBWLW0WPTIrfIJRu/1SuwKZ212op9Z3gkI l7SjVLXZKurLZTRwZeADtNBUdfXon8SFNGF48ysrwxcdo/R4KvScYVu+Q9dcIoUq9RAEzV/haNDMq RA=; Date: Mon, 02 Mar 2026 12:56:44 +0100 Subject: [PATCH v4 2/4] hppa: Introduce HPPACPUDef MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260302-hppa-c3600-v4-2-447a800da8cc@rev.ng> References: <20260302-hppa-c3600-v4-0-447a800da8cc@rev.ng> In-Reply-To: <20260302-hppa-c3600-v4-0-447a800da8cc@rev.ng> To: qemu-devel@nongnu.org Cc: Richard Henderson , Helge Deller , Anton Johansson X-Developer-Signature: v=1; a=ed25519-sha256; t=1772452649; l=4452; i=anjo@rev.ng; s=20260210; h=from:subject:message-id; bh=zO4MBnIxiTPAVkkQNmorkziyIeF6F+tBE7Q7Qb9zrzc=; b=tUK/5UVBpGEASold/3p3fMRi0p/9VDYdH4Ok1zqkO2sZQTERjdYTv4KQq6Afm3IhQ4TgWef1k SkE5CnMRrKzAduirCvhYF4R0t9i2cOPbhqkbpruH7RsCFAp+oatSn9R X-Developer-Key: i=anjo@rev.ng; a=ed25519; pk=dKsZvj/g3kgDxnV1/SWg8a0YNGSpWtFGNsWIepQYKow= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=94.130.142.21; envelope-from=anjo@rev.ng; helo=rev.ng X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 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_VALIDITY_CERTIFIED_BLOCKED=0.012, RCVD_IN_VALIDITY_RPBL_BLOCKED=1.188, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Anton Johansson From: Anton Johansson via qemu development Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1772452497956158500 In preparation for handling different physical address spaces sizes (32, 40, 44 bits) a CPU model configuration struct is added to HPPACPUClass. Two fields are added describing the size of the physical address space, and whether or not the CPU uses the PA-RISC 2.0 architecture. The latter was previously a field in CPUHPPAState. phys_addr_bits is currently set but unused, and will be used in the following commit. Likewise, PA-8700 is moved to use 44 bit physical addresses in a followup commit to not bisection. Signed-off-by: Anton Johansson Reviewed-by: Helge Deller --- target/hppa/cpu.h | 24 ++++++++++++++++++++---- target/hppa/cpu.c | 31 +++++++++++++++++++++---------- 2 files changed, 41 insertions(+), 14 deletions(-) diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 092e647ccf..43b4882fb4 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -270,8 +270,6 @@ typedef struct CPUArchState { /* Fields up to this point are cleared by a CPU reset */ struct {} end_reset_fields; =20 - bool is_pa20; - target_ulong kernel_entry; /* Linux kernel was loaded here */ target_ulong cmdline_or_bootorder; target_ulong initrd_base, initrd_end; @@ -290,6 +288,18 @@ struct ArchCPU { QEMUTimer *alarm_timer; }; =20 +/** + * HPPACPUDef: + * @phys_addr_bits: Number of bits in the physical address space. + * @is_pa20: Whether the CPU model follows the PA-RISC 2.0 or 1.1 spec. + * + * Configuration options for a HPPA CPU model. + */ +typedef struct HPPACPUDef { + uint8_t phys_addr_bits; + bool is_pa20; +} HPPACPUDef; + /** * HPPACPUClass: * @parent_realize: The parent class' realize handler. @@ -302,11 +312,17 @@ struct HPPACPUClass { =20 DeviceRealize parent_realize; ResettablePhases parent_phases; + const HPPACPUDef *def; }; =20 -static inline bool hppa_is_pa20(const CPUHPPAState *env) +static inline const HPPACPUDef *hppa_def(CPUHPPAState *env) +{ + return HPPA_CPU_GET_CLASS(env_cpu(env))->def; +} + +static inline bool hppa_is_pa20(CPUHPPAState *env) { - return env->is_pa20; + return hppa_def(env)->is_pa20; } =20 static inline int HPPA_BTLB_ENTRIES(CPUHPPAState *env) diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 910a919923..cc755da8be 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -203,15 +203,6 @@ static void hppa_cpu_realizefn(DeviceState *dev, Error= **errp) tcg_cflags_set(cs, CF_PCREL); } =20 -static void hppa_cpu_initfn(Object *obj) -{ - CPUHPPAState *env =3D cpu_env(CPU(obj)); - - env->is_pa20 =3D !!object_dynamic_cast(obj, TYPE_HPPA_CPU_PA_8500) || - !!object_dynamic_cast(obj, TYPE_HPPA_CPU_PA_8700); - -} - static void hppa_cpu_reset_hold(Object *obj, ResetType type) { HPPACPUClass *scc =3D HPPA_CPU_GET_CLASS(obj); @@ -286,6 +277,14 @@ static const TCGCPUOps hppa_tcg_ops =3D { #endif /* !CONFIG_USER_ONLY */ }; =20 +static void hppa_cpu_class_base_init(ObjectClass *oc, const void *data) +{ + HPPACPUClass *acc =3D HPPA_CPU_CLASS(oc); + /* Make sure all CPU models define a HPPACPUDef */ + g_assert(!object_class_is_abstract(oc) && data !=3D NULL); + acc->def =3D data; +} + static void hppa_cpu_class_init(ObjectClass *oc, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); @@ -320,22 +319,34 @@ static const TypeInfo hppa_cpu_type_infos[] =3D { .parent =3D TYPE_CPU, .instance_size =3D sizeof(HPPACPU), .instance_align =3D __alignof(HPPACPU), - .instance_init =3D hppa_cpu_initfn, .abstract =3D true, .class_size =3D sizeof(HPPACPUClass), .class_init =3D hppa_cpu_class_init, + .class_base_init =3D hppa_cpu_class_base_init, }, { .name =3D TYPE_HPPA_CPU_PA_7300LC, .parent =3D TYPE_HPPA_CPU, + .class_data =3D &(const HPPACPUDef) { + .phys_addr_bits =3D 32, + .is_pa20 =3D false, + }, }, { .name =3D TYPE_HPPA_CPU_PA_8500, .parent =3D TYPE_HPPA_CPU, + .class_data =3D &(const HPPACPUDef) { + .phys_addr_bits =3D 40, + .is_pa20 =3D true, + }, }, { .name =3D TYPE_HPPA_CPU_PA_8700, .parent =3D TYPE_HPPA_CPU, + .class_data =3D &(const HPPACPUDef) { + .phys_addr_bits =3D 40, + .is_pa20 =3D true, + }, }, }; =20 --=20 2.52.0 From nobody Sat Apr 11 23:04:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1772452473; cv=none; d=zohomail.com; s=zohoarc; b=b6eePGOmhWZONBQjodu9uV51H/bj4SSXmL4VypzyWxVYfN+MaTzFlV1T8lPYJ27SnA/aeGCCFJ5FAdLRSIWTS1hg6h3Aex4jlAA6YSJzfxAKfQJbCmA3AyXn+s7GeorcMf4Y6MEAxzTi8Lk4PIF9iuVQYjG7bqJ3RF8SYGzbZYA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772452473; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=YadPZ0aTJXbwzawHMSRBH9gIQ1NSnD5MVy0jmK+z4Lg=; b=YmT6Wxou+S5/x9KLtJqaUZLjGDXe/P7tb+tlkEB+WlEovxZM6DY7fQftWoA8cCJaj1gQJw3y/b/1fLA86p2BwLp2OqxfqWtfg31eaa2327SRqlVkvWkn/J7Z3FbezaNJZnNYX4gNbim/gDfn4/zYI6wFjX2uRdGOyXyg+7UBol4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772452472864696.7004381000618; Mon, 2 Mar 2026 03:54:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vx1qd-00010Z-2V; Mon, 02 Mar 2026 06:54:03 -0500 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 1vx1qW-0000xf-6M for qemu-devel@nongnu.org; Mon, 02 Mar 2026 06:53:56 -0500 Received: from rev.ng ([94.130.142.21]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vx1qT-0007j6-DV for qemu-devel@nongnu.org; Mon, 02 Mar 2026 06:53:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rev.ng; s=dkim; h=Cc:To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive:List-Unsubscribe:List-Unsubscribe-Post: List-Help; bh=YadPZ0aTJXbwzawHMSRBH9gIQ1NSnD5MVy0jmK+z4Lg=; b=PburtldzguiFDPR nVggfH0ztv1e4C4Z88SLY+zWBzdy0SiDb1oDa+BOqOrQ8JUsju9RGmWsbybxy4yryWVET10coTQ7p wHbvK1SGiFkq5sjTnx2CHNn6loY9As0Ah+5ljUHclhFXSjXDGmlooj46kNw/lSSEzAgrdTbWPWx1S 40=; Date: Mon, 02 Mar 2026 12:56:45 +0100 Subject: [PATCH v4 3/4] hppa: Get physical address space bits from HPPACPUDef MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260302-hppa-c3600-v4-3-447a800da8cc@rev.ng> References: <20260302-hppa-c3600-v4-0-447a800da8cc@rev.ng> In-Reply-To: <20260302-hppa-c3600-v4-0-447a800da8cc@rev.ng> To: qemu-devel@nongnu.org Cc: Richard Henderson , Helge Deller , Anton Johansson X-Developer-Signature: v=1; a=ed25519-sha256; t=1772452649; l=5929; i=anjo@rev.ng; s=20260210; h=from:subject:message-id; bh=u9+rraQybM2rU+S9bRhj13RzOTAFi7pHEGyqIf7YR2A=; b=jJvPY26dSEY/3ZwPVGrTnpA3/fCXfQBpRBfd3oFpfH16jHIjjSZ2nyxjkyvjHErqONjETYiy/ R4N85+iC1mUD1zHfUZ2g60ULBVX1eZuYVLCCIuURzlGoiwfHLZGfh4M X-Developer-Key: i=anjo@rev.ng; a=ed25519; pk=dKsZvj/g3kgDxnV1/SWg8a0YNGSpWtFGNsWIepQYKow= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=94.130.142.21; envelope-from=anjo@rev.ng; helo=rev.ng X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 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_VALIDITY_CERTIFIED_BLOCKED=0.012, RCVD_IN_VALIDITY_RPBL_BLOCKED=1.188, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Anton Johansson From: Anton Johansson via qemu development Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1772452473905158500 Signed-off-by: Anton Johansson Reviewed-by: Helge Deller --- target/hppa/cpu.h | 11 ++++++++--- hw/hppa/machine.c | 4 ++-- hw/pci-host/astro.c | 2 +- target/hppa/mem_helper.c | 40 ++++++++++++---------------------------- 4 files changed, 23 insertions(+), 34 deletions(-) diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 43b4882fb4..487f0f5e9e 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -320,6 +320,11 @@ static inline const HPPACPUDef *hppa_def(CPUHPPAState = *env) return HPPA_CPU_GET_CLASS(env_cpu(env))->def; } =20 +static inline uint8_t hppa_phys_addr_bits(CPUHPPAState *env) +{ + return hppa_def(env)->phys_addr_bits; +} + static inline bool hppa_is_pa20(CPUHPPAState *env) { return hppa_def(env)->is_pa20; @@ -352,9 +357,9 @@ static inline vaddr hppa_form_gva(CPUHPPAState *env, ui= nt64_t spc, return hppa_form_gva_mask(env->gva_offset_mask, spc, off); } =20 -hwaddr hppa_abs_to_phys_pa1x(vaddr addr); -hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr); -hwaddr hppa_abs_to_phys_pa2_w1(vaddr addr); +hwaddr hppa_abs_to_phys_pa1x(CPUHPPAState *env, vaddr addr); +hwaddr hppa_abs_to_phys_pa2_w0(CPUHPPAState *env, vaddr addr); +hwaddr hppa_abs_to_phys_pa2_w1(CPUHPPAState *env, vaddr addr); =20 /* * Since PSW_{I,CB} will never need to be in tb->flags, reuse them. diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 5d0d4de09e..bb6b7dc76c 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -181,12 +181,12 @@ static uint64_t linux_kernel_virt_to_phys(void *opaqu= e, uint64_t addr) =20 static uint64_t translate_pa10(void *dummy, uint64_t addr) { - return hppa_abs_to_phys_pa1x(addr); + return hppa_abs_to_phys_pa1x(cpu_env(first_cpu), addr); } =20 static uint64_t translate_pa20(void *dummy, uint64_t addr) { - return hppa_abs_to_phys_pa2_w0(addr); + return hppa_abs_to_phys_pa2_w0(cpu_env(first_cpu), addr); } =20 static HPPACPU *cpu[HPPA_MAX_CPUS]; diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c index 00a904277c..d38f81e553 100644 --- a/hw/pci-host/astro.c +++ b/hw/pci-host/astro.c @@ -303,7 +303,7 @@ static IOMMUTLBEntry astro_translate_iommu(IOMMUMemoryR= egion *iommu, * language which not-coincidentally matches the PSW.W=3D0 mapping. */ if (addr <=3D UINT32_MAX) { - entry =3D hppa_abs_to_phys_pa2_w0(addr); + entry =3D hppa_abs_to_phys_pa2_w0(cpu_env(first_cpu), addr); } else { entry =3D addr; } diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index 9199d1e06a..4bd806a53f 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -29,29 +29,12 @@ #include "hw/core/cpu.h" #include "trace.h" =20 -/* - * 64-bit (PA-RISC 2.0) machines are assumed to run PA-8700, and 32-bit - * machines 7300LC. This should give 44 and 32 bits of physical address - * space respectively. - * - * CPU model Physical address space bits - * PA-7000--7300LC 32 - * PA-8000--8600 40 - * PA-8700--8900 44 - * - * FIXME: However, the SeaBIOS firmware that is that tested against - * uses 40-bit physical addresses, despite supposedly running a C3700 - * with a PA-8700 cpu, so use 40-bits for 64-bit. - */ -#define HPPA_PHYS_ADDR_SPACE_BITS_PA20 40 -#define HPPA_PHYS_ADDR_SPACE_BITS_PA1X 32 - -hwaddr hppa_abs_to_phys_pa1x(vaddr addr) +hwaddr hppa_abs_to_phys_pa1x(CPUHPPAState *env, vaddr addr) { - return extract64(addr, 0, HPPA_PHYS_ADDR_SPACE_BITS_PA1X); + return extract64(addr, 0, hppa_phys_addr_bits(env)); } =20 -hwaddr hppa_abs_to_phys_pa2_w1(vaddr addr) +hwaddr hppa_abs_to_phys_pa2_w1(CPUHPPAState *env, vaddr addr) { /* * Figure H-8 "62-bit Absolute Accesses when PSW W-bit is 1" describes @@ -64,11 +47,12 @@ hwaddr hppa_abs_to_phys_pa2_w1(vaddr addr) * Since the supported physical address space is below 54 bits, the * H-8 algorithm is moot and all that is left is to truncate. */ - QEMU_BUILD_BUG_ON(HPPA_PHYS_ADDR_SPACE_BITS_PA20 > 54); - return sextract64(addr, 0, HPPA_PHYS_ADDR_SPACE_BITS_PA20); + const uint8_t pa =3D hppa_phys_addr_bits(env); + g_assert(pa <=3D 54); + return sextract64(addr, 0, pa); } =20 -hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr) +hwaddr hppa_abs_to_phys_pa2_w0(CPUHPPAState *env, vaddr addr) { /* * See Figure H-10, "Absolute Accesses when PSW W-bit is 0", @@ -89,7 +73,7 @@ hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr) * is what can be seen on physical machines too. */ addr =3D (uint32_t)addr; - addr |=3D -1ull << (HPPA_PHYS_ADDR_SPACE_BITS_PA20 - 4); + addr |=3D -1ull << (hppa_phys_addr_bits(env) - 4); } return addr; } @@ -233,13 +217,13 @@ int hppa_get_physical_address(CPUHPPAState *env, vadd= r addr, int mmu_idx, if (MMU_IDX_MMU_DISABLED(mmu_idx)) { switch (mmu_idx) { case MMU_ABS_W_IDX: - phys =3D hppa_abs_to_phys_pa2_w1(addr); + phys =3D hppa_abs_to_phys_pa2_w1(env, addr); break; case MMU_ABS_IDX: if (hppa_is_pa20(env)) { - phys =3D hppa_abs_to_phys_pa2_w0(addr); + phys =3D hppa_abs_to_phys_pa2_w0(env, addr); } else { - phys =3D hppa_abs_to_phys_pa1x(addr); + phys =3D hppa_abs_to_phys_pa1x(env, addr); } break; default: @@ -580,7 +564,7 @@ static void itlbt_pa20(CPUHPPAState *env, target_ulong = r1, /* Align per the page size. */ ent->pa &=3D TARGET_PAGE_MASK << mask_shift; /* Ignore the bits beyond physical address space. */ - ent->pa =3D sextract64(ent->pa, 0, HPPA_PHYS_ADDR_SPACE_BITS_PA20); + ent->pa =3D sextract64(ent->pa, 0, hppa_phys_addr_bits(env)); =20 ent->t =3D extract64(r2, 61, 1); ent->d =3D extract64(r2, 60, 1); --=20 2.52.0 From nobody Sat Apr 11 23:04:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1772452472; cv=none; d=zohomail.com; s=zohoarc; b=mS/uGNiUy7+4X9NMWpsjVEBW8LpmZ/xBXduBECoYGaeasNQ2a6z2jp14Q3wuGa7QJC/dfLKhjrNWb9Yi2m5pkMhuQY2vViIvm1oxYi9d2abFXXl7hJ/gc1/yF6VdmfXV2uiWrUHB+NDazSfHzyJd3vz2IjjuMXpI6Mi1hs9yNHQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772452472; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=/jeHttps8DYEaDwl71tkYjKjUU3e/IGSNyYqPsM70Lg=; b=IfKxcqUD2i3p7ii6FM9dg+N/akpP8qcjWjrNFFw51GhFYtHIbSQ9b5j/LmSxbFbxLTJWMZ17cXsKuz4UpYujJID2m5j45lwh1jsp0Hx074tg8pJEbsJCxNz65aMk4vR6QwCfe+Y9ZMZ5wMCNY2J1Xy8iLjKKzvLNVplYItRGMTg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772452471517424.10176524631856; Mon, 2 Mar 2026 03:54:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vx1qd-00010b-2z; Mon, 02 Mar 2026 06:54:03 -0500 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 1vx1qV-0000xZ-Ph for qemu-devel@nongnu.org; Mon, 02 Mar 2026 06:53:56 -0500 Received: from rev.ng ([94.130.142.21]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vx1qT-0007jC-DY for qemu-devel@nongnu.org; Mon, 02 Mar 2026 06:53:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rev.ng; s=dkim; h=Cc:To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive:List-Unsubscribe:List-Unsubscribe-Post: List-Help; bh=/jeHttps8DYEaDwl71tkYjKjUU3e/IGSNyYqPsM70Lg=; b=HFSRlaZzrrMih0t WOaXD6+UgRd6M8nWJEhZ/skzaeqevzltjrM/p+IV/TqM9N7sdAmie1CAB4m0Pz2MG26PRIHvu6aZu 22a4M12lrwtJIY0XDu/cYC1busrr1QnNuKeFNXZ1rKewknj6oE8eLaMkfXpj9+iZMQYwvUpVNlJ2+ +I=; Date: Mon, 02 Mar 2026 12:56:46 +0100 Subject: [PATCH v4 4/4] hppa: Use 44 bit physical addresses for PA-8700 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260302-hppa-c3600-v4-4-447a800da8cc@rev.ng> References: <20260302-hppa-c3600-v4-0-447a800da8cc@rev.ng> In-Reply-To: <20260302-hppa-c3600-v4-0-447a800da8cc@rev.ng> To: qemu-devel@nongnu.org Cc: Richard Henderson , Helge Deller , Anton Johansson X-Developer-Signature: v=1; a=ed25519-sha256; t=1772452649; l=1553; i=anjo@rev.ng; s=20260210; h=from:subject:message-id; bh=SWZZwLNUpR+m+HlmyyzM//LAKhYk8Mfup25BuKvmefE=; b=sXvZYAEceCa+IOs/fMj1oxadHLe/Jm3uHsVTokiDO5+c/KA/p/WK1qfvBgDQVlpOTdomM5EO0 xnmvI3jhysYBMU9tCC1h1X47K939xvz1CxXFTjw0tRDEJCVoSwCAgw0 X-Developer-Key: i=anjo@rev.ng; a=ed25519; pk=dKsZvj/g3kgDxnV1/SWg8a0YNGSpWtFGNsWIepQYKow= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=94.130.142.21; envelope-from=anjo@rev.ng; helo=rev.ng X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 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_VALIDITY_CERTIFIED_BLOCKED=0.012, RCVD_IN_VALIDITY_RPBL_BLOCKED=1.188, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Anton Johansson From: Anton Johansson via qemu development Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1772452473825158500 This is in line with the PA-8700 specification. As the SeaBIOS functional tests requires a 40 bit physical address space and now support the A400 machine, update tests to run that instead. Signed-off-by: Anton Johansson Reviewed-by: Helge Deller --- target/hppa/cpu.c | 2 +- tests/functional/hppa/test_seabios.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index cc755da8be..5ba1045f1f 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -344,7 +344,7 @@ static const TypeInfo hppa_cpu_type_infos[] =3D { .name =3D TYPE_HPPA_CPU_PA_8700, .parent =3D TYPE_HPPA_CPU, .class_data =3D &(const HPPACPUDef) { - .phys_addr_bits =3D 40, + .phys_addr_bits =3D 44, .is_pa20 =3D true, }, }, diff --git a/tests/functional/hppa/test_seabios.py b/tests/functional/hppa/= test_seabios.py index 661b2464e1..bdb9d534ef 100755 --- a/tests/functional/hppa/test_seabios.py +++ b/tests/functional/hppa/test_seabios.py @@ -12,7 +12,7 @@ class HppaSeabios(QemuSystemTest): =20 timeout =3D 5 - MACH_BITS =3D {'B160L': 32, 'C3700': 64} + MACH_BITS =3D {'B160L': 32, 'A400': 64} =20 def boot_seabios(self): mach =3D self.machine @@ -28,7 +28,7 @@ def test_hppa_32(self): self.boot_seabios() =20 def test_hppa_64(self): - self.set_machine('C3700') + self.set_machine('A400') self.boot_seabios() =20 if __name__ =3D=3D '__main__': --=20 2.52.0