From nobody Wed Feb 11 04:02:47 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=1770728600; cv=none; d=zohomail.com; s=zohoarc; b=QwZE8INUyWx/pr2ftQY+yE6u2yWEDin05Yz3BOIemMwQWj12qdYn6MRVjIKhsjqx4I4EDpqGeRoBeQpIJ03HG8NJ+mv3frxQDim0D0/8sBlzF8CfoeAR0ejOxvVSPIb4TTG7zmeUaaPDSLOcbNaTVhOgNepwvUuV8EZKE1CRGfc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770728600; 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=/Cuf+Ucx9P/5YzPKylvJUXVJV5Pm6GGJQgztlq4/zoI=; b=hXr3ibNltB7h/jCEtAGLLC2SifWPMLClABTZZfzqjCGv77NIkucuMIN+z+9U6lNgCrmVym3U8fQmB8x9eoXowVcxaRDiUQVFCV1Thu4gq2zjUiO5sQ5J05vQC6T/cYP5C9Lnlg1y2Huw1q/R3+ExKxp+z9omZXlTaSee9CdnCjU= 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 1770728600369756.6518558406865; Tue, 10 Feb 2026 05:03:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vpnOY-00043B-9e; Tue, 10 Feb 2026 08:03: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 1vpnNj-0003s0-G5 for qemu-devel@nongnu.org; Tue, 10 Feb 2026 08:02:19 -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 1vpnNh-0002rR-Nd for qemu-devel@nongnu.org; Tue, 10 Feb 2026 08:02:19 -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=/Cuf+Ucx9P/5YzPKylvJUXVJV5Pm6GGJQgztlq4/zoI=; b=OEKdbJQDx7/kvho Bp2gMVAZgVnYphNdC0IYz9k42ZCPXeFtufrFYk8GRKI+gdAPSeT1STq3xNepPA4pABNqqITq1+E0v gJ+1dCMGvklNPEzZABXepZKvB91XuLPsxkwSrHNmRFFbNrDetDboGsZOJMN1qfGkIwb/m2dQYqqwL CM=; Date: Tue, 10 Feb 2026 14:04:58 +0100 Subject: [PATCH 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: <20260210-hppa-c3600-v1-4-a17ec58f053f@rev.ng> References: <20260210-hppa-c3600-v1-0-a17ec58f053f@rev.ng> In-Reply-To: <20260210-hppa-c3600-v1-0-a17ec58f053f@rev.ng> To: qemu-devel@nongnu.org Cc: Richard Henderson , Helge Deller , Anton Johansson 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: 1770728602444158500 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 | 41 ++++++++++++++++++++++++++++++-= ---- target/hppa/cpu.c | 10 ++++++++- tests/functional/hppa/test_seabios.py | 3 +++ 4 files changed, 48 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 8246f6bf65..ab5b8b6422 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,30 @@ 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, + * allow use of use the PA-8600. + */ static const char * const valid_cpu_types[] =3D { + TYPE_HPPA_CPU_PA_8600, TYPE_HPPA_CPU_PA_8700, NULL }; @@ -815,7 +836,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 +876,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 1ba281df20..c88252e071 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -335,13 +335,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