From nobody Sat May 30 18:34:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1779197633; cv=none; d=zohomail.com; s=zohoarc; b=AGRoWliA67Y1zbcXzGb/aF5wf4h95eWM0TPPB9hl2HLw5+pK3Dcck4esn1lnp1HAdKgU+Vpw3jBepp27+HnpfWT0EgdRzEI0HTKBggRFyV7mW6lNRCnjm1W8dw81fivcQNZSJUkU//OsbkIELxLHuFYyvhJwO9FsccyevsCwRok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779197633; 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:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=NicltI6zkRPGXWBtekPNnrLm2i/vQ5Goga6LR01ktaw=; b=loyJBSrMS0lkmSSiQpNWYNwwVpsKMoJlGESdhEgnSF5DpZgJLz4v36RKiKQrp3YE/M3VmeRz9rBL2RxL5S8wBsljDEZdwQAVpTz3XY975lr2A2QsnXsLdEaqT+AEFcW24gAB3uwqTV+KZpHmi0yk81Di9W5XLpRnQztQw19CdAc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779197633869855.1167542650994; Tue, 19 May 2026 06:33:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPKZm-0008M4-Hw; Tue, 19 May 2026 09:33:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPKZk-0008KX-Rc for qemu-devel@nongnu.org; Tue, 19 May 2026 09:33:36 -0400 Received: from sea.source.kernel.org ([172.234.252.31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPKZj-0000i3-GK for qemu-devel@nongnu.org; Tue, 19 May 2026 09:33:36 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 45C354176C; Tue, 19 May 2026 13:33:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09383C2BCB3; Tue, 19 May 2026 13:33:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779197614; bh=5Hag2ilN+ESkd2Kb+HT0871PS9TxMnHFXG88KpF4W+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hiZdU7bNV0dmiq4raqfaH+Dj5v1u3YXRQlCzveMLV2HVVUi9k55+CUxmkMUo2Wi65 n71pz6i1AOmjHPWjKzqIAaJwWEcVdyPl0N3VSluAWsf95Iyqb0UVLaysh5yMYzVUv4 L1c+I7TlldAE55+rD6x5jBgw+2Rn4Rsm3OrrUeEc/OsVNP/4lJ8KCc2PBZkoh7p7GZ CgBp6AmEwl4IOOIg14x8xjmq+Bui9e/X3Rt+qakQnGsV/+wdT3fGritNLTJCIDjfXp i6JuYD3hPaeetlKWCtzTYlFTD/IBwCMMjtm2PcYzja4K1/bdeBvkT6iYAJ6bPI6eEn CUq48gCP6Ci+A== From: Helge Deller To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Helge Deller , Richard Henderson Subject: [PATCH 1/2] hw/pci-host/astro: Encode Astro version numbers Date: Tue, 19 May 2026 15:33:28 +0200 Message-ID: <20260519133329.4268-2-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260519133329.4268-1-deller@kernel.org> References: <20260519133329.4268-1-deller@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=lists1p.gnu.org; Received-SPF: pass client-ip=172.234.252.31; envelope-from=deller@kernel.org; helo=sea.source.kernel.org X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1779197635729154100 From: Helge Deller Add enum which encodes the Astro version numbers. Signed-off-by: Helge Deller Suggested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/astro.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c index 8c61c696bd..fc07608da7 100644 --- a/hw/pci-host/astro.c +++ b/hw/pci-host/astro.c @@ -41,6 +41,9 @@ static const int elroy_hpa_offsets[ELROY_NUM] =3D { static const char elroy_rope_nr[ELROY_NUM] =3D { 0, 1, 4, 6 }; /* busnum path, e.g. [10:6] */ =20 +/* Astro version numbers */ +enum { ID_ASTRO_1_0 =3D 0, ID_ASTRO_2_1 =3D 9, ID_ASTRO_3_0 =3D 2 }; + /* * Helper functions */ @@ -738,7 +741,7 @@ static MemTxResult astro_chip_read_with_attrs(void *opa= que, hwaddr addr, switch ((addr >> 3) << 3) { /* R2I registers */ case 0x0000: /* ID */ - val =3D (0x01 << 3) | 0x01ULL; + val =3D ID_ASTRO_2_1; break; case 0x0008: /* IOC_CTRL */ val =3D s->ioc_ctrl; --=20 2.54.0 From nobody Sat May 30 18:34:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1779197630; cv=none; d=zohomail.com; s=zohoarc; b=ao0NOFhu7mgZi8taeLOlrMY6BaUv98Ikq/Yi/EDjrLVPzFUO4t7jFHQpsla9ITygTm2cEjqZL1m0B0o5m1+xR6W5xm/1p6t1SZuP1N44n/rdDukX3lLkOhLZ3jKDpn1wwz2LNLXD3vXaMqmG98lnBmBBjG7x5itq+2Cygvxuc44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779197630; 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:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=b7WDxKjMHLA7wk01FTq/HwOm6Jc6AVk4KGSxGbIs3dQ=; b=XeowRH5zKPW5aVb2U2+0VMQg7ITBFd0LtGdd5Xa5+apA/q0GKWEXwc3S7+C16c3caLIx9GrBAQyf1hEN5thqn1/Z8coILg69q2extPc1yuOw6FTYySPIgoYEoWhJtgsgGhUgtzoJz0c1Ko6G59nWdX/MhwdveO8FY5MfrvFkdow= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779197630388743.9024459921798; Tue, 19 May 2026 06:33:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPKZo-0008Qk-33; Tue, 19 May 2026 09:33:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPKZm-0008Lt-7V for qemu-devel@nongnu.org; Tue, 19 May 2026 09:33:38 -0400 Received: from tor.source.kernel.org ([172.105.4.254]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPKZk-0000iK-N3 for qemu-devel@nongnu.org; Tue, 19 May 2026 09:33:37 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 1259E60121; Tue, 19 May 2026 13:33:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D424C2BCB3; Tue, 19 May 2026 13:33:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779197615; bh=d7kHH40NXkm5PLQnHeKBiAkrWHkArmpkDiTZyow9SlI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t+wTRTOuNZErg2/pQRnsmhANulFdYu9y3eCKSehIQVRikzHJwfUNXaKWAGrBgWSMk Dn4ld9TA3LkT4LLr+bg+PmUopFTybCglzq3QCSUd4m7maKG5tjGen72mYQHNC0fslo q2cUl+7G6O44pqKK05TSbuqXDElPoR7cBFuBjuimcgXcOwv0lYav6mFtsHcaM2Om2j lUBw1RvFBOTrIvUeFfZQHdTNMB0N0GDGlwOV7FPxUNcJVj9qh2XQRnZpMATmAKRTal uM5+u02yJqaP/Ch6wpGFAZFQO6PY0JDs/3Dxdjoj8Ockk0omh83jDwynZYAAP2sdgM KA2jQv+B9nd5A== From: Helge Deller To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Helge Deller , Richard Henderson Subject: [PATCH 2/2] hw/hppa: Move static variable lasi_dev into MachineState Date: Tue, 19 May 2026 15:33:29 +0200 Message-ID: <20260519133329.4268-3-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260519133329.4268-1-deller@kernel.org> References: <20260519133329.4268-1-deller@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=lists1p.gnu.org; Received-SPF: pass client-ip=172.105.4.254; envelope-from=deller@kernel.org; helo=tor.source.kernel.org X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1779197630748158500 From: Helge Deller Avoid static variables, so move lasi_dev into the MachineState struct. Signed-off-by: Helge Deller Suggested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/hppa/machine.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 0937d90ed2..d762163ddf 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -44,6 +44,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(HppaMachineState, HPPA_COMMON_= MACHINE) struct HppaMachineState { MachineState parent_obj; =20 + DeviceState *lasi_dev; uint64_t memsplit_addr; }; =20 @@ -52,8 +53,6 @@ struct HppaMachineState { #define HPA_POWER_BUTTON (FIRMWARE_END - 0x10) static hwaddr soft_power_reg; =20 -static DeviceState *lasi_dev; - static void hppa_powerdown_req(Notifier *n, void *opaque) { uint32_t val; @@ -399,7 +398,8 @@ static void machine_HP_common_init_tail(MachineState *m= achine, PCIBus *pci_bus, { const char *kernel_filename =3D machine->kernel_filename; MachineClass *mc =3D MACHINE_GET_CLASS(machine); - DeviceState *dev; + HppaMachineState *hpm =3D HPPA_COMMON_MACHINE(machine); + DeviceState *dev, *lasi_dev; PCIDevice *pci_dev; long size; uint64_t kernel_entry =3D 0; @@ -408,6 +408,7 @@ static void machine_HP_common_init_tail(MachineState *m= achine, PCIBus *pci_bus, SysBusDevice *s; =20 /* Graphics setup. */ + lasi_dev =3D hpm->lasi_dev; if (lasi_dev && machine->enable_graphics && vga_interface_type !=3D VGA_NONE) { dev =3D qdev_new("artist"); @@ -576,7 +577,8 @@ static void machine_HP_common_init_tail(MachineState *m= achine, PCIBus *pci_bus, */ static void machine_HP_715_init(MachineState *machine) { - DeviceState *dev; + HppaMachineState *hpm =3D HPPA_COMMON_MACHINE(machine); + DeviceState *dev, *lasi_dev; MemoryRegion *addr_space =3D get_system_memory(); TranslateFn *translate; ISABus *isa_bus; @@ -596,6 +598,7 @@ static void machine_HP_715_init(MachineState *machine) =20 /* Init Lasi chip */ lasi_dev =3D DEVICE(lasi_init()); + hpm->lasi_dev =3D lasi_dev; memory_region_add_subregion(addr_space, translate(NULL, LASI_HPA_715), sysbus_mmio_get_region( SYS_BUS_DEVICE(lasi_dev), 0)); @@ -652,7 +655,8 @@ static void machine_HP_715_init(MachineState *machine) */ static void machine_HP_B160L_init(MachineState *machine) { - DeviceState *dev, *dino_dev; + HppaMachineState *hpm =3D HPPA_COMMON_MACHINE(machine); + DeviceState *dev, *dino_dev, *lasi_dev; MemoryRegion *addr_space =3D get_system_memory(); TranslateFn *translate; ISABus *isa_bus; @@ -669,6 +673,7 @@ static void machine_HP_B160L_init(MachineState *machine) =20 /* Init Lasi chip */ lasi_dev =3D DEVICE(lasi_init()); + hpm->lasi_dev =3D lasi_dev; memory_region_add_subregion(addr_space, translate(NULL, LASI_HPA), sysbus_mmio_get_region( SYS_BUS_DEVICE(lasi_dev), 0)); --=20 2.54.0