From nobody Sat May 30 18:34:17 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=1779203945; cv=none; d=zohomail.com; s=zohoarc; b=PlxASnkNpbVADP1QbjkdD/bQEr+5Wssf+eGdIi0K05NKPhPd1i7mVvR8S9HrVTlPXkoDaxZPLwjIJgkCTabRWNB3cLRsVZXI8GKX8MtIrol9crDw6mj++2p/LRxmTEfgVyjjrjBuXUL+H6N+pHGITRQWnWR4uzd1UOo9IkaxVvE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779203945; 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=0EC0MGh1in7whz/H8b1MUTmJcTKpP+tyAnteKUnrfoo=; b=Tro3GQJw/9J5X6vuhZTDOR2EccJSTpwxuP6oeuvx3MmVySTo29gygqRplIRBBm9j2Cno2a3cYTKmCkHLG8KVvNVKd6OvhjGXk15oBABD11lKZyPJ9Q3qoFQpk2HQKqXrbJ50OnhOe5Gs+IjRM4smTvK4cjwpr626IKzFm/TU/Xc= 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 1779203945035281.92837005771685; Tue, 19 May 2026 08:19:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPMDS-0003EP-Jj; Tue, 19 May 2026 11:18:42 -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 1wPMDH-0003DO-HE for qemu-devel@nongnu.org; Tue, 19 May 2026 11:18:32 -0400 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPMDG-0006u3-2S for qemu-devel@nongnu.org; Tue, 19 May 2026 11:18:31 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id BD9016021A; Tue, 19 May 2026 15:18:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 766E9C2BCFB; Tue, 19 May 2026 15:18:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779203908; bh=JVMF+Ez1DKkOsgVFkewaLwlvfUh3cmOhQNDtxNke7iA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y9+i9ezszhm7/kwUPMc5E49HlHKmbwRW+mGFOhT7ddpNqUPS/Rm35iVdbuXy7YlvS rxNLK4w2xOWHEuTPDKVEsDvSo+judg7V2BuHB9bhyQaT56iUS7165rwjsSDkZlLgRi Rhd6fr4gJnjXOuSA5k288HJJWEKsqPTC9jqr/QeUdv/YhmE2x9qLLoPU0yZOlK87dS c8LxziTXA20A43KeOLXGAeTzOt8aGmDNj7gVeF1tbMcPnEwKngRzAFTUOPGpAlxR59 YjSlbVCl1xQkei7OjLM44MPYgCDIPNwOiA2/EOsZ3hidbYLsDvgVFGMEqiqu649GT2 bJ4ZIP1kboz9g== From: Helge Deller To: qemu-devel@nongnu.org Cc: Richard Henderson , deller@gmx.de, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 1/2] hw/pci-host/astro: Encode Astro version numbers Date: Tue, 19 May 2026 17:18:22 +0200 Message-ID: <20260519151823.13878-2-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260519151823.13878-1-deller@kernel.org> References: <20260519151823.13878-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=2600:3c04:e001:324:0:1991:8:25; 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: 1779203946563158500 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 Reviewed-by: Peter Maydell --- 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:17 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=1779203943; cv=none; d=zohomail.com; s=zohoarc; b=a87h8/pYJh9sTDY7Vr5ccUg0xNL0yXCTlQ8PcGcjom6MIeK4XvduQGwBGz7/SzKx7mm7KSKinTfrslGdA5fAF8rW/sJUY8XqNsDPV9wOIbkzUwow2uxKD0GZoFQi12UIyodxb7RhZsfOcJZA7RWxQzcLDK5nm7+TpfW/OWWdzSg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779203943; 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=e9b4VppA5AEBjbN8UFoqdtD7+hMFJ7OyqCRfFtBFXD0=; b=lL7+uerH5EU+q5WZeBfrkT3oyzVbV9sBF9tlUXRVHYAOJfTPz2ruOopVLkqP9GbmEMFS+Wy1RlNWe4p2DNB4rV8MNZIoiJmrA4fBOpI/jLI7JWjRvf9DdUR/OvgIoli7kI4UvwDR/kzH3Lsg2Kd/L4m/5CWiBZZ4ppMRmNZGKU0= 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 1779203943238921.7356056751423; Tue, 19 May 2026 08:19:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPMDV-0003G2-Sh; Tue, 19 May 2026 11:18:46 -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 1wPMDI-0003DT-V6 for qemu-devel@nongnu.org; Tue, 19 May 2026 11:18:32 -0400 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPMDH-0006u7-Fl for qemu-devel@nongnu.org; Tue, 19 May 2026 11:18:32 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 826306021D; Tue, 19 May 2026 15:18:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 012E2C2BCFD; Tue, 19 May 2026 15:18:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779203910; bh=ZHZMWK/Y6BLbreJHxxZE96bnmbO8p9Qkj5s5S03gJ4U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LE5DOMOFsJyi0wX60vI4gzKmUPAWDhoTPJGEUVTQIwzU1fcgvsM6QPGEPHH0BjAdN ZCo/8DF4yFC0khFyuZbJmi2N3Oy7C7rNLsHzm4LvalFr3DzT8JNhN9fEQK8uEVzouc wCNCC5h3OsQaZNPCNgVz2auPs8HQc+U4Q08ckRKur+sWaX28w8h+3/xnY7IZFpe+Fi SxPVuw2xOGlgX3X4olKotunfBG1EHL3rsiIlYxugmojRQzbnzqLGcqWU6I0fXZnAUP ikgEkpdDJ08cagtIpETc4t+KuXq7glu1g22VYpBNxIsInLbKlHFfU0ZuOciOrdQ4D3 RTKh0qK51cw9A== From: Helge Deller To: qemu-devel@nongnu.org Cc: Richard Henderson , deller@gmx.de, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 2/2] hw/hppa: Move static variable lasi_dev into MachineState Date: Tue, 19 May 2026 17:18:23 +0200 Message-ID: <20260519151823.13878-3-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260519151823.13878-1-deller@kernel.org> References: <20260519151823.13878-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=2600:3c04:e001:324:0:1991:8:25; 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: 1779203944689154100 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: 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