From nobody Sun Apr 12 04:23:21 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=1771443988; cv=none; d=zohomail.com; s=zohoarc; b=iarRr00O7VhLDc9YS4lNqVuLC9C1lgY6e88D5jTYTkDghd2Wp6hertcFPYmRfJUB5UU/f78LUGBRmCL38YuopcpAWaLW8GyQ+oPrFk4GLIKea0PSkIWwAMjDdzIlVnY7vlbLVIeVZCS5g1VigXzEVP3TEpXlr0rTesjNqyhx99U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771443988; 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=lUkcrU80D84kEy+f49IIeMgMdyXVDIaNwZViozHQhu8=; b=HD5IgqBIIgDIBaRVTxQj12rHxoT+1rXPFvTASW3wCZF6hOSnFPIQwNKEnyXFrWNyayCzn+if41ksX0csukTvuyh7TIu1hyjjikqaISpMw5I3TgAk6YVdxe8kNQfO7yVruFci1CMX3847nPTwMn6bVRf9uPRxIcylXNRZbK9PZxY= 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 1771443987677974.2519505826209; Wed, 18 Feb 2026 11:46:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsnUj-0008B1-Cl; Wed, 18 Feb 2026 14:45:57 -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 1vsnUg-0008AI-T5 for qemu-devel@nongnu.org; Wed, 18 Feb 2026 14:45:55 -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 1vsnUb-0001vr-O1 for qemu-devel@nongnu.org; Wed, 18 Feb 2026 14:45: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=lUkcrU80D84kEy+f49IIeMgMdyXVDIaNwZViozHQhu8=; b=eEeYoKG39Ti74M6 4nuLCltfpRkWmnzw6e+ckNtgUg4rHEtqtzmnNN0zkxYVRVlX/z4PZariTizseVCYACQZsC5WvN5DU ZTj1AbQb/tHFbNmf9q9XjPPaArtA/0Tdg7Lwji5k5+5axsump5OXzwMtTNE2FCbC9UjnhMk+glkA8 eU=; Date: Wed, 18 Feb 2026 20:48:58 +0100 Subject: [PATCH v3 1/4] hppa: Prepare for additional CPU models MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260218-hppa-c3600-v3-1-b37ad58a20dd@rev.ng> References: <20260218-hppa-c3600-v3-0-b37ad58a20dd@rev.ng> In-Reply-To: <20260218-hppa-c3600-v3-0-b37ad58a20dd@rev.ng> To: qemu-devel@nongnu.org Cc: Richard Henderson , Helge Deller , Anton Johansson X-Developer-Signature: v=1; a=ed25519-sha256; t=1771444170; l=5931; i=anjo@rev.ng; s=20260210; h=from:subject:message-id; bh=U0aGEkefPEzmEO6fJTiXurVDhO3I9fV+1TfWlmNKAyQ=; b=EBzm9s38kpdrzkqw/SqHpiWgc4i4/yGhjCtC8Nhtpj1UwYShNz1NLQxM3/PA+Ls4Eiy6t0wj/ 2+TNEsyM4yJCs9zXZLl4QFyKjGGDEbcEJtYIenmomv4SOmvhkNAbDiL 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: -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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: 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: 1771443990050158500 Clarifies current CPU model names, assuming 32-bit HPPA runs a PA-7300LC whereas 64-bit runs a PA-8700. Both CPU models are made into children of the now abstract TYPE_HPPA_CPU base class, simplifying the addition of other CPU models. References to "hppa/hppa64" models in test cases are also updated. Signed-off-by: Anton Johansson --- target/hppa/cpu-qom.h | 7 ++++++- hw/hppa/machine.c | 17 +++++++++++------ linux-user/hppa/elfload.c | 2 +- target/hppa/cpu.c | 19 ++++++++++++++----- tests/qtest/machine-none-test.c | 2 +- 5 files changed, 33 insertions(+), 14 deletions(-) diff --git a/target/hppa/cpu-qom.h b/target/hppa/cpu-qom.h index 5c454bf543..c6b82dc09b 100644 --- a/target/hppa/cpu-qom.h +++ b/target/hppa/cpu-qom.h @@ -23,7 +23,12 @@ #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_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 6b0f46c789..2d3eeff1c2 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -791,13 +791,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; @@ -807,13 +807,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; @@ -823,13 +823,18 @@ static void HP_C3700_machine_init_class_init(ObjectCl= ass *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..c8079016bf 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -207,7 +207,7 @@ 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_HPPA64_CPU_PA_8700); } =20 static void hppa_cpu_reset_hold(Object *obj, ResetType type) @@ -236,9 +236,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; =20 - return object_class_by_name(typename); + typename =3D g_strdup_printf(HPPA_CPU_TYPE_NAME("%s"), cpu_model); + oc =3D object_class_by_name(typename); + g_free(typename); + + return oc; } =20 #ifndef CONFIG_USER_ONLY @@ -314,12 +319,16 @@ 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_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 Sun Apr 12 04:23:21 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=1771444019; cv=none; d=zohomail.com; s=zohoarc; b=ZggMCKZKqHqrcmZw0k5EfNRiZhRF2FdR4k81o7ouOQbLIs4D986eXZZX4faQxs/+3YPaiNfQQfuTUAXCU6mZDbgyrUXwlF87kbJIQpHai6brM2yBXp45SKUWCJQjckO/caHSDPfx4vlIR7RrNQmqNm58l+fggyFFMBI0JjV54lA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771444019; 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=epPUNeODLu3/CJQTbpXdPwfeDLz0LIyfW/cEHBlj6Lk=; b=QBHTwgrWrwT4HHXejG48zB6Hgv5mjtLWCqlG7BNwLaTjJkN28Un6iVkMpifyPsckaklkdPwoboXJfK2wISjBh4yX2PnQI3MpLEuW4kpaG8eWhV1ioIM4tJF8UVHFyTcMXD/7hDF1NEcXG+PW+AtJnO4E8qMeP1zX6Qp4f7FNC4w= 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 1771444019123654.3597932875514; Wed, 18 Feb 2026 11:46:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsnUk-0008Bd-J5; Wed, 18 Feb 2026 14:45:58 -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 1vsnUh-0008AJ-1F for qemu-devel@nongnu.org; Wed, 18 Feb 2026 14:45:55 -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 1vsnUc-0001xE-O4 for qemu-devel@nongnu.org; Wed, 18 Feb 2026 14:45: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=epPUNeODLu3/CJQTbpXdPwfeDLz0LIyfW/cEHBlj6Lk=; b=OLyIwR/y0Ox70Rb 6wc6hKWpyAephwLhuWj79piNyUZcW4MsOLVWpXA5wFkNGLPkGgn3xgTVCS/pSjlVRxeQl94O1064b 7zZNXU0sUIkPl3pMIGk0VL/DmheLp8AXV+2aGT6VM5jSbWSOopDBmOu1yL0xBb/23xtNlpBon/6r6 6g=; Date: Wed, 18 Feb 2026 20:48:59 +0100 Subject: [PATCH v3 2/4] hppa: Introduce HPPACPUDef MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260218-hppa-c3600-v3-2-b37ad58a20dd@rev.ng> References: <20260218-hppa-c3600-v3-0-b37ad58a20dd@rev.ng> In-Reply-To: <20260218-hppa-c3600-v3-0-b37ad58a20dd@rev.ng> To: qemu-devel@nongnu.org Cc: Richard Henderson , Helge Deller , Anton Johansson X-Developer-Signature: v=1; a=ed25519-sha256; t=1771444170; l=4077; i=anjo@rev.ng; s=20260210; h=from:subject:message-id; bh=U1HFOW8gA9fD5XVXydQEHvlBHPfGP4u6n8C5Pn/UIBw=; b=eLdiDKL0vgQINPJf1xLlz/ztkGi4ymjKNA740tRHaHx9e7IZ21aiRBaNvX8fMAhs2DfRI/65z GE+NIXE6m0MBu5huZHIx9xRUlbpA8RK73L/nL9WsL9bd+MDVRJ382td 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: -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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: 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: 1771444021079154100 In preparation for adding a C3600 machine with 40 bits of physical address space, and moving C3700 to 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. Signed-off-by: Anton Johansson --- target/hppa/cpu.h | 24 ++++++++++++++++++++---- target/hppa/cpu.c | 25 +++++++++++++++++-------- 2 files changed, 37 insertions(+), 12 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 c8079016bf..7098940454 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -203,13 +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_HPPA64_CPU_PA_8700); -} - static void hppa_cpu_reset_hold(Object *obj, ResetType type) { HPPACPUClass *scc =3D HPPA_CPU_GET_CLASS(obj); @@ -284,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); @@ -318,18 +319,26 @@ 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_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 Sun Apr 12 04:23:21 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=1771444010; cv=none; d=zohomail.com; s=zohoarc; b=J4M2L6wEJBsEG0zvLRCKWwg+AbVuL4/GC50Dtu7xbxPka93wVi2OfQuT+/pHxDo6ARs+PhxjyZGEOXGdZqmuI1+jOGgvkvQ9v8wEHC5Kc3St5iFP5KvckXKdwztcN85RJP9/QCSsJgg7EFGZZ1CWO5iP9tIRjNzbTQ+3i3ZRr4Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771444010; 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=e2Feem7rUG1GXzBGdrP/1etZPA+kRcjy5UcDHy13UGA=; b=JCcwWHd2cFU3I5GjMuYACBhdoAFroeWCoTueTOoSj1Ft43z7CuvEhv6vhlwI5vvMDTXhj4GyCQz6WNvRLhFdFGmQPWWu8o8ATpQ2eafkXEfGAg3jG5noHgf9H7FndWTYlOQdSzDOEqDIPUF+y7WFyFgRbluqC/w/wNLU+NdOCwE= 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 1771444010863470.2037577727906; Wed, 18 Feb 2026 11:46:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsnUo-0008Bt-E1; Wed, 18 Feb 2026 14:46: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 1vsnUj-0008BG-Ka for qemu-devel@nongnu.org; Wed, 18 Feb 2026 14:45:57 -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 1vsnUe-0001zm-HE for qemu-devel@nongnu.org; Wed, 18 Feb 2026 14:45:57 -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=e2Feem7rUG1GXzBGdrP/1etZPA+kRcjy5UcDHy13UGA=; b=tsFQAWSVaigmNUU kPV4GfsMaLP1TnipboFC1qQMso+ti520jvTbMmWCIrREDKIeFVocu1ywF1exNtmATNkPzG/HMc8t9 ZdOYRsiv9YD0I7qr45Yuxx2sVqDEPh/9ur+H6tx65jfU94Q3NPEswP/OsMy2zq1larxRPNvgIzuOe kY=; Date: Wed, 18 Feb 2026 20:49:00 +0100 Subject: [PATCH v3 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: <20260218-hppa-c3600-v3-3-b37ad58a20dd@rev.ng> References: <20260218-hppa-c3600-v3-0-b37ad58a20dd@rev.ng> In-Reply-To: <20260218-hppa-c3600-v3-0-b37ad58a20dd@rev.ng> To: qemu-devel@nongnu.org Cc: Richard Henderson , Helge Deller , Anton Johansson X-Developer-Signature: v=1; a=ed25519-sha256; t=1771444170; l=5929; i=anjo@rev.ng; s=20260210; h=from:subject:message-id; bh=anSuhFWrOLydg8JCeIv0sf4SyBPMM5RSuMgUuxFxRYg=; b=S9pOFcCyadPVvLT/xo0c6+DurkQ2Rhefn8XCIyN7uWgc3ufW+AapvZr0M7yGdj8YTjUaDxQek ruJxUueuzquABsomiuDiRUzzaCDSc28mLys+M2JpmCy4eHfKZdY4xuM 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: -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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: 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: 1771444012779158500 Signed-off-by: Anton Johansson --- 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 2d3eeff1c2..f5358e5b7d 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 Sun Apr 12 04:23:21 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=1771443996; cv=none; d=zohomail.com; s=zohoarc; b=ShBFAQL2qeoLXrMT5ZSr1VsTrqHIKj9zfeTbFxxrd7WoLiOzHFz3WlpWMcfNKo6q76xa8TwyPPKunCgzjhwruhmNY/S02UJvly/1YCPW1XRh/pGzExqGkWx4tSPyi+TV8NOYWfPxh8Zwe0/L+zseQSZxG++XeVjFZDEvJrdzDkY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771443996; 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=hD3ab0UNbGAmHXH5Ql6W/cMGRgPLRp5vLI+BZwpDAmI=; b=SSYgu9BanczG9PewhAPEB6lp7z5XiyxHClI3o2t7KJkZgUnQJOg9Z90WyuRe0sWU3S8JhohdYFFYdWycPhqJMQAZrY4QhdIo53qZPkk8a8hLvNjmFfzemQn8V5Db/K67y/IgVTr7JYld3E3/3bHMDbX9kjdkKnM9aM5fTHiAcm8= 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 1771443996190588.0533278925669; Wed, 18 Feb 2026 11:46:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsnUo-0008CJ-UX; Wed, 18 Feb 2026 14:46: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 1vsnUj-0008BH-Kh for qemu-devel@nongnu.org; Wed, 18 Feb 2026 14:45:57 -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 1vsnUf-0001zs-2b for qemu-devel@nongnu.org; Wed, 18 Feb 2026 14:45:57 -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=hD3ab0UNbGAmHXH5Ql6W/cMGRgPLRp5vLI+BZwpDAmI=; b=voeYCk0QhLHarLY XYPYIpRlsvYltgfCsEDyDhdrvEbxRpn5yP7fDUrFe6l30RPIkHiU3bHDz8+74PdKdm95O3YRQl/JE J1zWgpohNxoqOK5DWKxlE8z+uA4qJXuj/7fBBsq+lXAHhQW7jB3/xMZ19PPX5F2v8GpuMSudFDkoR e0=; Date: Wed, 18 Feb 2026 20:49:01 +0100 Subject: [PATCH v3 4/4] hppa: Add C3600 machine with PA-8600 CPU MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260218-hppa-c3600-v3-4-b37ad58a20dd@rev.ng> References: <20260218-hppa-c3600-v3-0-b37ad58a20dd@rev.ng> In-Reply-To: <20260218-hppa-c3600-v3-0-b37ad58a20dd@rev.ng> To: qemu-devel@nongnu.org Cc: Richard Henderson , Helge Deller , Anton Johansson X-Developer-Signature: v=1; a=ed25519-sha256; t=1771444170; l=5249; i=anjo@rev.ng; s=20260210; h=from:subject:message-id; bh=0G9nxbw9lxubLibDUnyBjXwOTlm7HVIo4fEYJNL++II=; b=x92fo40CSra4leEeDiJNJnlEk3WrZ5hgUpYYbFguGtKAEvCQgiK26DxQSZAkZ+Nd0RO2hqBsZ OH7JCtCIpOfDHj17F4ZaFR9pkUNFcI1Tl9WBSJc/LTPWtVMBR3JfLH1 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: -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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: 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: 1771444005442158500 Adds a C3600/PA-8600 machine/CPU, which from the perspective of QEMU differ only in the size of the physical address, compared to C3700/PA-8700. With this addition, PA-8700 is changed to use the correct 44 bit physical address space. Signed-off-by: Anton Johansson --- target/hppa/cpu-qom.h | 1 + hw/hppa/machine.c | 43 ++++++++++++++++++++++++++++++-= ---- target/hppa/cpu.c | 10 +++++++- tests/functional/hppa/test_seabios.py | 3 +++ 4 files changed, 50 insertions(+), 7 deletions(-) diff --git a/target/hppa/cpu-qom.h b/target/hppa/cpu-qom.h index c6b82dc09b..078aa3b08a 100644 --- a/target/hppa/cpu-qom.h +++ b/target/hppa/cpu-qom.h @@ -28,6 +28,7 @@ #define HPPA_CPU_TYPE_NAME(name) (name HPPA_CPU_TYPE_SUFFIX) =20 #define TYPE_HPPA_CPU_PA_7300LC HPPA_CPU_TYPE_NAME("pa-7300lc") +#define TYPE_HPPA_CPU_PA_8600 HPPA_CPU_TYPE_NAME("pa-8600") #define TYPE_HPPA_CPU_PA_8700 HPPA_CPU_TYPE_NAME("pa-8700") =20 OBJECT_DECLARE_CPU_TYPE(HPPACPU, HPPACPUClass, HPPA_CPU) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index f5358e5b7d..b367a2bbc5 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -689,9 +689,9 @@ static AstroState *astro_init(void) } =20 /* - * Create HP C3700 workstation + * Create HP C3000 series workstation */ -static void machine_HP_C3700_init(MachineState *machine) +static void machine_HP_C3000_init(MachineState *machine) { PCIBus *pci_bus; AstroState *astro; @@ -804,9 +804,32 @@ static void HP_B160L_machine_init_class_init(ObjectCla= ss *oc, const void *data) mc->default_ram_size =3D 512 * MiB; } =20 +static void HP_C3600_machine_init_class_init(ObjectClass *oc, const void *= data) +{ + static const char * const valid_cpu_types[] =3D { + TYPE_HPPA_CPU_PA_8600, + NULL + }; + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->desc =3D "HP C3600 workstation"; + mc->default_cpu_type =3D TYPE_HPPA_CPU_PA_8600; + mc->valid_cpu_types =3D valid_cpu_types; + mc->init =3D machine_HP_C3000_init; + mc->max_cpus =3D HPPA_MAX_CPUS; + mc->default_ram_size =3D 1024 * MiB; +} + static void HP_C3700_machine_init_class_init(ObjectClass *oc, const void *= data) { + /* + * SeaBIOS for C3700 currently uses a 40 bit physical address space, + * as opposed to the 44 bits specified in the documentation. Allow + * the use of the PA-8600 with 40 bit physical addresses to retain + * previous behaviour. + */ static const char * const valid_cpu_types[] =3D { + TYPE_HPPA_CPU_PA_8600, TYPE_HPPA_CPU_PA_8700, NULL }; @@ -815,7 +838,7 @@ static void HP_C3700_machine_init_class_init(ObjectClas= s *oc, const void *data) mc->desc =3D "HP C3700 workstation"; 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->init =3D machine_HP_C3000_init; mc->max_cpus =3D HPPA_MAX_CPUS; mc->default_ram_size =3D 1024 * MiB; } @@ -855,15 +878,23 @@ static const TypeInfo hppa_machine_types[] =3D { { TYPE_NMI }, { } }, - }, { + }, + { .name =3D MACHINE_TYPE_NAME("B160L"), .parent =3D TYPE_HPPA_COMMON_MACHINE, .class_init =3D HP_B160L_machine_init_class_init, - }, { + }, + { + .name =3D MACHINE_TYPE_NAME("C3600"), + .parent =3D TYPE_HPPA_COMMON_MACHINE, + .class_init =3D HP_C3600_machine_init_class_init, + }, + { .name =3D MACHINE_TYPE_NAME("C3700"), .parent =3D TYPE_HPPA_COMMON_MACHINE, .class_init =3D HP_C3700_machine_init_class_init, - }, { + }, + { .name =3D MACHINE_TYPE_NAME("715"), .parent =3D TYPE_HPPA_COMMON_MACHINE, .class_init =3D HP_715_machine_init_class_init, diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 7098940454..764085a89a 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -333,13 +333,21 @@ static const TypeInfo hppa_cpu_type_infos[] =3D { }, }, { - .name =3D TYPE_HPPA_CPU_PA_8700, + .name =3D TYPE_HPPA_CPU_PA_8600, .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 44, + .is_pa20 =3D true, + }, + }, }; =20 DEFINE_TYPES(hppa_cpu_type_infos) diff --git a/tests/functional/hppa/test_seabios.py b/tests/functional/hppa/= test_seabios.py index 661b2464e1..41a429d4c4 100755 --- a/tests/functional/hppa/test_seabios.py +++ b/tests/functional/hppa/test_seabios.py @@ -29,6 +29,9 @@ def test_hppa_32(self): =20 def test_hppa_64(self): self.set_machine('C3700') + # SeaBIOS for C3700 currently uses a 40 bit physical address space, + # use the PA-8600 CPU instead of the default PA-8700. + self.cpu =3D 'pa-8600' self.boot_seabios() =20 if __name__ =3D=3D '__main__': --=20 2.52.0