From patchwork Sat Feb 1 09:15:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13956137 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 239E6C02192 for ; Sat, 1 Feb 2025 09:17:24 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1te9bK-0000zb-On; Sat, 01 Feb 2025 04:15:42 -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 1te9bJ-0000yd-60 for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:15:41 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1te9bH-0000P1-KZ for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:15:40 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-385e27c75f4so2339216f8f.2 for ; Sat, 01 Feb 2025 01:15:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738401337; x=1739006137; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qyqWIFSMh+oTSqypjVXjebXLGHkmeLQM4JJ2rEUUT8A=; b=CjDKko0HgNkFx5zto03ObMoh7zsOr8RTy1NDEgL6hx2aqmM4fz+40c2uf4E2tIMN7D Rf/Aq06lAKuDgmJ81d2tpeltPhCT6CtdethGxnvh6eoI0+AkxYsyeFjw5LlrwlwEdrLP ER+6VHvVnXgMq1d1rMe0rqjMGE0+7yU0xUCc/La0ZkceFNhdrt5BZTpsQ0bJW4DlM3lX IldW9slGWhMaTgFJFj5bCXG2thj6eUwDdL9heJFU8VLmjhUVulqiF6FH8uGYf5va9MPX jC3AWdvgDuiZchsT04j5l/CrL2LHPkGNXLJSdPrkrwUrpt3lVsuWtHGrlA3ERdUOkw2k CjNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738401337; x=1739006137; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qyqWIFSMh+oTSqypjVXjebXLGHkmeLQM4JJ2rEUUT8A=; b=iNcq6A36WASboSMMdiiZ3kIJwHIpOxDttgW9S9Blgh4EOYUGJzUKYTeoDRHYViWdfD oy2vy1A43+ofUHuYNUOO7lRA7EtIL2v9tRCJ43+yiD1Ftgfc0yqzsaCl3mry5fktjsbq zzY8l/e4Dp9danxBwzKMxUhyeYuekWdBRrgMSuqF6E6ufxMIUYjQ1MuyWYlibyi+Eo9N eOmLJpsOC54eIRWqVzWxaiiGpa6kP4BQ6HCg4cXeyvyt8UKwUU50pStnihyJ/mS4gqcX rurtMTioPHSr4l7R4DhdTL+s4FcpfXR00HFqVPvANIk3TUF7NIll2sZ0K456iKwobfKE DoZg== X-Gm-Message-State: AOJu0Yx/XzaHjES41PC/4GltPmzQ3kn5dscBTZZxMOepvcUNwc/d+TrP rnyqltZzBvDHgY5osDfQcrZ1AJurIC7PdknRg+7wL/J6sK8gmkNP4i5LFlVpYP/5+fqNejO1MMB U9Mg= X-Gm-Gg: ASbGncvLknSH/Xep4qAcFDVN1ax2YsqdgGh7eS8iYOarwOsDvl2q13aDN8qJtkAiwPF GQYx+1SScJRlrq+ZlJUNq3O/y0JCPLQVft1cfZKag9OzBE1FUARGJPgOKsEYiSb8WMsZv24AQXX 5cWo2AB36Mi37YZqAP8YqLIskKNxxIdEkOboG3W1AzgNgTTJpFMmUTB2flli7i16uhswx8CFssL U86agwnP0VTzHH6mpzNg8z5jeJiwxT5G0W8RmvR/jqkMNqbjmgZMtyln+4/LUPL5D+U8y17ywn3 IOmrSApEC0HAUGOML+v4iZYc5VifCBxTQwPsO4CHYnLpp0/ZS12a5UVevNKJ/XDmTA== X-Google-Smtp-Source: AGHT+IG2OxupglZ3cehJnn/RZHJKbtWAcfx/Qo/TURAD8Hlr3lJZvTDvgCuuQME3intvFWXxvgw4bw== X-Received: by 2002:a5d:6d86:0:b0:385:df43:2179 with SMTP id ffacd0b85a97d-38c51967fd9mr10269078f8f.17.1738401337027; Sat, 01 Feb 2025 01:15:37 -0800 (PST) Received: from localhost.localdomain (232.170.88.92.rev.sfr.net. [92.88.170.232]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438dcc1317fsm118446185e9.8.2025.02.01.01.15.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 01 Feb 2025 01:15:36 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jared Mauch , Peter Maydell , qemu-arm@nongnu.org, devel@lists.libvirt.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/7] hw/arm/raspi4b: Declare machine types using DEFINE_TYPES() macro Date: Sat, 1 Feb 2025 10:15:22 +0100 Message-ID: <20250201091528.1177-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250201091528.1177-1-philmd@linaro.org> References: <20250201091528.1177-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com 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_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org When multiple QOM types are registered in the same file, it is simpler to use the the DEFINE_TYPES() macro. Since we are going to add more machines, convert type_init() by DEFINE_TYPES(). Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/raspi4b.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 1264e0d6eed..5c78d26f957 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -121,16 +121,13 @@ static void raspi4b_machine_class_init(ObjectClass *oc, void *data) mc->init = raspi4b_machine_init; } -static const TypeInfo raspi4b_machine_type = { - .name = TYPE_RASPI4B_MACHINE, - .parent = TYPE_RASPI_BASE_MACHINE, - .instance_size = sizeof(Raspi4bMachineState), - .class_init = raspi4b_machine_class_init, +static const TypeInfo raspi4_machine_types[] = { + { + .name = TYPE_RASPI4B_MACHINE, + .parent = TYPE_RASPI_BASE_MACHINE, + .instance_size = sizeof(Raspi4bMachineState), + .class_init = raspi4b_machine_class_init, + }, }; -static void raspi4b_machine_register_type(void) -{ - type_register_static(&raspi4b_machine_type); -} - -type_init(raspi4b_machine_register_type) +DEFINE_TYPES(raspi4_machine_types) From patchwork Sat Feb 1 09:15:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13956131 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3B003C02192 for ; Sat, 1 Feb 2025 09:16:36 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1te9bR-00011P-4A; Sat, 01 Feb 2025 04:15:49 -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 1te9bO-00010X-FL for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:15:46 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1te9bM-0000T3-Fs for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:15:46 -0500 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-385df53e559so2012779f8f.3 for ; Sat, 01 Feb 2025 01:15:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738401342; x=1739006142; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8SVQMLAYnWYkem+1LN8L06NityQ8o7wifm7JnMwf0uI=; b=lPGuPTiJUKu+0n2cQOown33woOMIiMmBuU7XzF1PznHq+zbkkdhFVq+6IcKHawX8MO 3n2xlRy+xGQja4os+9aejjAqp6P4E1jcrWeIyVX2BhKApaJm5QwUdoru7BoQ2dHr33sJ gf+KuUPyZYIOQUCWqsSgCnQdOnGxPpbFg5X8ygcFteVlgY0+r43FjK/0cUyrhG7nyZcO CbxpPtX+Ny8rfmY1bdsOkA2VEAKY6zxp0LhFsf4u0b8nfZIaobSe3PzXhPaKZuz5rKYk Zm7u+DHM4E8C+oRmg2DaNG4iapYy99NAr16+zj1A+fZZaE9Dbym+mWAdKuojdOGva4Nv HCgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738401342; x=1739006142; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8SVQMLAYnWYkem+1LN8L06NityQ8o7wifm7JnMwf0uI=; b=ICQoT1Hwjs+3NxzscjfmIBrnD0v5Yy73U+068z3Rz64NM5+/X5wenby29pGTfFulCm 6m1NXxeG6LhE1D4Spwch1TaThaJwST+TRoikEF+ul9yyjhOIfpUY3vsVgihVhb85rZxW ot1OehW8zr3h/+JVuAGup/jrUN1tOr8SUGiT0ceuHNM3iWIHwSRB5ZMLgQPVs+pNHn9e 352GOPDmHXbJafyNNCi/Gukq7oPMKBErZRXJw1EMk/XzFIAfI9CwomLqjS/LmC/JSC0B a9zsuX2daGRtRPkfbnvkVo5Zbq/cczW6qY0T6WY9FSaRg08AE5TmWmwJQFC6+mM2O8Ff IRNA== X-Gm-Message-State: AOJu0Yw9nypwREG0rEm75zMDbZOMxiM6/uRdeneA3fC4r0zKjv5yevHu o+3LJ9Bxnvo3OgWDBl4ChW3JnTgZdlvB3AlM5djWlxeGu75DvUc/VytGFNnXaM7TrGNBsjEe8rf kQ54= X-Gm-Gg: ASbGncsSjxXxJPpTxwOh6U8kv0JoRiuE+p9HRwb/5mrHw/IY+lD9Pmp6W0JQdjiKoYb zTyIDZAVmKTi7KdgY5GK84CXHe2QcQY6hMx8AltmOjxeZu24EGsukZ6gJNHYVTyyr9Nxe8jqzyE /3rMiLCreZSqOSwYHDyNXdIZQtXD0Nd0BOTUj+UXkYdMeVCDqHC38ihHFvYo9GZVchqJvce9CDv Q6IUXUYoBtyNHIlppMdymzGwx5kquG6Otu9S+t+0WIPSmYy82GC43Wg+6BpY0ZbAZAM5QjHr1QH CMXdpS0X0R+x4qJMqkvP6YiV5ZrTSpaas+21xcEr2zTzKKRLrVvgwZcbg4jkKGGCcg== X-Google-Smtp-Source: AGHT+IHRXnkkbk0ZZQ6tl39QprkH5MxX2Z/uA6l3tQp41XDzBDESwm20wCvmraMaIqfRDq30jGNxmw== X-Received: by 2002:a5d:5583:0:b0:386:37f5:99e7 with SMTP id ffacd0b85a97d-38c5196fd12mr9884961f8f.33.1738401342505; Sat, 01 Feb 2025 01:15:42 -0800 (PST) Received: from localhost.localdomain (232.170.88.92.rev.sfr.net. [92.88.170.232]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438dcc13151sm115999295e9.1.2025.02.01.01.15.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 01 Feb 2025 01:15:42 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jared Mauch , Peter Maydell , qemu-arm@nongnu.org, devel@lists.libvirt.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 2/7] hw/arm/raspi4b: Introduce abstract raspi4-base machine type Date: Sat, 1 Feb 2025 10:15:23 +0100 Message-ID: <20250201091528.1177-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250201091528.1177-1-philmd@linaro.org> References: <20250201091528.1177-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.google.com 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_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org In preparation of adding more machines based on the raspi4, introduce TYPE_RASPI4_MACHINE. Remove TYPE_RASPI4B_MACHINE definitions, declaring the machine name in place via the MACHINE_TYPE_NAME("raspi4b") macro. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/raspi4b.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 5c78d26f957..548059f6d69 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -23,8 +23,8 @@ #include "hw/arm/bcm2838.h" #include -#define TYPE_RASPI4B_MACHINE MACHINE_TYPE_NAME("raspi4b") -OBJECT_DECLARE_SIMPLE_TYPE(Raspi4bMachineState, RASPI4B_MACHINE) +#define TYPE_RASPI4_MACHINE MACHINE_TYPE_NAME("raspi4-base") +OBJECT_DECLARE_SIMPLE_TYPE(Raspi4bMachineState, RASPI4_MACHINE) struct Raspi4bMachineState { RaspiBaseMachineState parent_obj; @@ -93,7 +93,7 @@ static void raspi4_modify_dtb(const struct arm_boot_info *info, void *fdt) static void raspi4b_machine_init(MachineState *machine) { - Raspi4bMachineState *s = RASPI4B_MACHINE(machine); + Raspi4bMachineState *s = RASPI4_MACHINE(machine); RaspiBaseMachineState *s_base = RASPI_BASE_MACHINE(machine); RaspiBaseMachineClass *mc = RASPI_BASE_MACHINE_GET_CLASS(machine); BCM2838State *soc = &s->soc; @@ -123,11 +123,15 @@ static void raspi4b_machine_class_init(ObjectClass *oc, void *data) static const TypeInfo raspi4_machine_types[] = { { - .name = TYPE_RASPI4B_MACHINE, + .name = MACHINE_TYPE_NAME("raspi4b"), + .parent = TYPE_RASPI4_MACHINE, + .class_init = raspi4b_machine_class_init, + }, { + .name = TYPE_RASPI4_MACHINE, .parent = TYPE_RASPI_BASE_MACHINE, .instance_size = sizeof(Raspi4bMachineState), - .class_init = raspi4b_machine_class_init, - }, + .abstract = true, + } }; DEFINE_TYPES(raspi4_machine_types) From patchwork Sat Feb 1 09:15:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13956135 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ED28CC0218A for ; Sat, 1 Feb 2025 09:17:13 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1te9bb-00012x-0q; Sat, 01 Feb 2025 04:15:59 -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 1te9bV-00011s-8R for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:15:56 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1te9bT-0000bB-LD for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:15:53 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-436249df846so19297785e9.3 for ; Sat, 01 Feb 2025 01:15:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738401350; x=1739006150; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hEJr+KxKG+5t/x8q8wqYlKjB+Sy8stapfLkWTHUsQNw=; b=cf8BDdDf/0SP9XvpiP+c5qJgNkvTn72kZHXN4IF5QDz9S2ypHpdyeNrCaCobVvRNtH 4sJqTtQsMOkTA/lXoBz+jhE70dpD5dXZE1d8upp79Th73IXxbfd4sfBKsIpxYhutQ0V9 jY3eSXFG6JNaqloHjFSM7LIxB3ia6ymbJFFChdKZxIYYWpcHN/EH1Rq0Z0sVaiVe5/32 cvo1cUjR9+vBaYAOwDYlcCVtxGLxBHlM6p6AGY/FHfnpsRkDpr8Goh//Jp0d/FaMb9OY OWl0z+6eNgImJsn52x3OfO4w0XBwerejsgojD2wuJR3DGfkzVc4+gNCY4EpN5neLhUsQ hpNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738401350; x=1739006150; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hEJr+KxKG+5t/x8q8wqYlKjB+Sy8stapfLkWTHUsQNw=; b=hK1epMOXcYNr1kPsXGAVVEm/AN1YWExqElGav0Npw0ISdVepWtJLD3ISbXDyiJTLbk 5S/892HMvpfN1ORiXnWf89R79z+FwTmlu98ePQPamnXxLvjkbE0YNbH1LeAadgKCbzjb ARdG4XAHXZLpkcNo2vEZ+q2qodPTJKxU1fh0fMqJmx8jPAAeFb1cMqlZ/9WtpFEVaVsH zHXWf3AF1rtTNMCrH+aOW2pDyyR5ZHDEQcc3/Dx8OOUDrqKPHnrMnNm1ixsQ6URwsFct JngXROQMrzxu0lceoXehSsaX0bA4IT/RvCyJUkFOHJkdN2jHayvJ+lB5L302cY+F6rH5 GYCA== X-Gm-Message-State: AOJu0YwRuyqNrhNPhrmBd1AMnbPDmH8XFpPrTJlsD8leRR/MSO+2E7Yx MzbZ63lobxszdjCrb/cnWI7pNeEraMiBfzQAL4pNju8/VV0JfG00Kr+OOT0KQkIHpF0CbvpiIku cgUw= X-Gm-Gg: ASbGncuNYUFIjxITm/4BbXtNzz5jZCAZb81H6neIZOHKnR3WQgvIn/p6TiQGDdTpRRw 3V/Vw0q5uQV8JEJO+Vs4LBFAUZdEtMNexN1lXvoVM9sRsEa0NPpTrHQkmFkFyoj5P22njslvZbl fB1YyUYQp4K9Fz9kXJKgGzYqoHEc1pDGWy+Y40S6XDP8QFX1lxPMZ1mlWZQDmbwZH0TNUbAkznC 4HIv7ayYQR5SISOKclwyj/i704BA4y25WRhQkmVYR5mOrq3Y5Me8horr+OvHeKmXLSwjKRkhCXR tATIT18Es1osfUEmdy51yUVQW6LfiCydzkLwIPbVbLWBCDcxMs9L9DWuZEvicVlbbw== X-Google-Smtp-Source: AGHT+IFtxTfKjyY3QOd9aKkfkjZ+Z4/R4gXLu9zWH0ZKWK+E9myYwk8LU+odVAo6pAQqYXWwPoqyQQ== X-Received: by 2002:a05:600c:198b:b0:434:a7f1:6545 with SMTP id 5b1f17b1804b1-438dc429291mr112652585e9.27.1738401349784; Sat, 01 Feb 2025 01:15:49 -0800 (PST) Received: from localhost.localdomain (232.170.88.92.rev.sfr.net. [92.88.170.232]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438dcc80e61sm118252725e9.34.2025.02.01.01.15.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 01 Feb 2025 01:15:48 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jared Mauch , Peter Maydell , qemu-arm@nongnu.org, devel@lists.libvirt.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 3/7] hw/arm/raspi4b: Split raspi4b_machine_class_init() in two (1g and 2g) Date: Sat, 1 Feb 2025 10:15:24 +0100 Message-ID: <20250201091528.1177-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250201091528.1177-1-philmd@linaro.org> References: <20250201091528.1177-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com 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_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Current raspi4b_machine_class_init() method register 2 distinct machines, with different board revision (thus different memory size), whether the host is 32-bit or more. Split it as 2 new methods, one for the raspi4b with 1GB of memory (on 32-bit hosts) and another for the raspi4b with 2GB of memory. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/raspi4b.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 548059f6d69..4ea79ec7092 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -107,26 +107,45 @@ static void raspi4b_machine_init(MachineState *machine) raspi_base_machine_init(machine, &soc->parent_obj); } -static void raspi4b_machine_class_init(ObjectClass *oc, void *data) +#if HOST_LONG_BITS == 32 +static void raspi4b_1g_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc); -#if HOST_LONG_BITS == 32 rmc->board_rev = 0xa03111; /* Revision 1.1, 1 Gb RAM */ -#else - rmc->board_rev = 0xb03115; /* Revision 1.5, 2 Gb RAM */ -#endif + raspi_machine_class_common_init(mc, rmc->board_rev); mc->init = raspi4b_machine_init; } +#else +static void raspi4b_2g_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc); + + + rmc->board_rev = 0xb03115; /* Revision 1.5, 2 Gb RAM */ + raspi_machine_class_common_init(mc, rmc->board_rev); + mc->init = raspi4b_machine_init; +} +#endif static const TypeInfo raspi4_machine_types[] = { +#if HOST_LONG_BITS == 32 { .name = MACHINE_TYPE_NAME("raspi4b"), .parent = TYPE_RASPI4_MACHINE, - .class_init = raspi4b_machine_class_init, - }, { + .class_init = raspi4b_1g_machine_class_init, + }, +#else + { + .name = MACHINE_TYPE_NAME("raspi4b"), + .parent = TYPE_RASPI4_MACHINE, + .class_init = raspi4b_2g_machine_class_init, + }, +#endif + { .name = TYPE_RASPI4_MACHINE, .parent = TYPE_RASPI_BASE_MACHINE, .instance_size = sizeof(Raspi4bMachineState), From patchwork Sat Feb 1 09:15:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13956133 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E760CC0218A for ; Sat, 1 Feb 2025 09:17:06 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1te9be-000140-M2; Sat, 01 Feb 2025 04:16: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 1te9ba-00012w-TO for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:15:58 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1te9bZ-0000dC-BF for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:15:58 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4362bae4d7dso20053855e9.1 for ; Sat, 01 Feb 2025 01:15:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738401355; x=1739006155; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jNWPuDa8TGdgIkgMQ7fmGixmIo8d3RAnXJJCGYAmUDI=; b=q6Nuu4IZenEvIhSnvawAbLMDj8IQV2vLfiVBaPTdwvUltZnpJ1XdabcwNj5pkN5isS Ixf8UEqi83kg2NCJZ8CesOZF52vG8sTFG526vFgQvdYQz3nZv8Kzc6xwWy3T60XjYnpb 3oueHnj+mz1bQGuE0zOwPXix3fCd+GWz/zVtMusVnmam7SaXE5u+MH8HhAdqmmfuaHDU 27ZlFre203AzoNWWMk/+z7/Zv7jRaTbk4YslHzFNG/p3g/Lu9H3sGM4cOK2Qe/N6nKH8 57FTvR7GGx77ZYAmQJVMa42VDOAf6uCAO423K8QVK+bThGMOvuZqjVzg6dLg3RCa7ZSo 1/fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738401355; x=1739006155; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jNWPuDa8TGdgIkgMQ7fmGixmIo8d3RAnXJJCGYAmUDI=; b=J3bV5rvKRLG0Oy4Il4L6oe7b1JSy6lJIESJsD8wcIyiSt+Re9YBDyqZn7h455MhJ0c GfejmeMlbdlAQMXfEEN/wKb5bOzLBj9LLkWuGqI+81ftRh/3HwWFvQLOJfy7VXWaN6e7 kF+77O0QWz5tSw/domPE/kAQt6kEGZPsTwSZkOZZBaHqplSHo19GScdDQ7l8PV17o7Ar CslT2y0VQZyBwzX0JyT03IL7s+fABTLBO9HWuwidYbhtI9SEfwVD4e6iDxtSLluTUTTG xUcvgMPjtf8rk7KQAD5vqMnW0GM4Z9yAN4CRFxZZHZ6yEjpQUPBnMr+EADqpcLvWc/LZ nf9A== X-Gm-Message-State: AOJu0YxkcHEzaJ407znxQxL9vi7Tjvvpi9qhYI8FVPMrOiZbXDmpGH1c o8sPDTVIQj4MP+GXAjzh48y8fZ684M/LSpDRFZUjKDHUzdzbVCfN/HyxwBOOZrZr2s07QW7W04i EANg= X-Gm-Gg: ASbGnctEFJvaXK77EFClE/rmJw3K5y34FwGjZe4rwO/k8v8wTZNnxZqgQJKxMicPuHY k/bJU+j1+exO7JatByZ/GBqzAqqi4FtQj5J81PJJ67t6jo9bUpwiNGGqwMFQujJvbzhb438/enb QH72Nxh1goIaMFNho+la3bS3PNmMaIufZRHlhf5Uz+q5b2o5T9RVEHs2SNFKH/vZh5bOHZbG76g t7NxAfI8gjx23WHkXNgoJcxse471vDmnLery8H1GDxtKszKPzHt/LECw1VNjkRFr7ObkFFlbug3 mXFtxXOfDff1oxD80kNkC4coxqN0LDeQ3+nPZC9G/FRuUPo0o4pBgXPDe0+Pv9vzuQ== X-Google-Smtp-Source: AGHT+IFQ5mRPrNqZmR4MNd/zs6xiN8nBs8HG9i6hX1lK9EWJ5B0WpAmDDfMyOCn7THKQsBWb/bkU+A== X-Received: by 2002:a05:600c:458a:b0:436:1c0c:bfb6 with SMTP id 5b1f17b1804b1-438dc40f2c7mr111656295e9.27.1738401355492; Sat, 01 Feb 2025 01:15:55 -0800 (PST) Received: from localhost.localdomain (232.170.88.92.rev.sfr.net. [92.88.170.232]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c5c1cf571sm6680720f8f.82.2025.02.01.01.15.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 01 Feb 2025 01:15:55 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jared Mauch , Peter Maydell , qemu-arm@nongnu.org, devel@lists.libvirt.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 4/7] hw/arm/raspi4b: Rename as raspi4b-1g / raspi4b-2g, deprecating old name Date: Sat, 1 Feb 2025 10:15:25 +0100 Message-ID: <20250201091528.1177-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250201091528.1177-1-philmd@linaro.org> References: <20250201091528.1177-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com 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_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 32-bit hosts, rename 'raspi4b' -> 'raspi4b-1g' to clarify the machine has 1GB of RAM. On 64-bit hosts, rename 'raspi4b' -> 'raspi4b-2g'. Keep the 'raspi4b' alias but deprecate it. Signed-off-by: Philippe Mathieu-Daudé --- docs/about/deprecated.rst | 6 ++++++ hw/arm/raspi4b.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 4a3c302962a..d635bd60d74 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -257,6 +257,12 @@ Big-Endian variants of MicroBlaze ``petalogix-ml605`` and ``xlnx-zynqmp-pmu`` ma Both ``petalogix-ml605`` and ``xlnx-zynqmp-pmu`` were added for little endian CPUs. Big endian support is not tested. +ARM ``raspi4b`` machine (since 10.0) +'''''''''''''''''''''''''''''''''''' + +This machine has been renamed ``raspi4b-1g`` on 32-bit hosts and ``raspi4b-2g`` +on 64-bit ones. + Backend options --------------- diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 4ea79ec7092..713b4693a49 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -117,6 +117,7 @@ static void raspi4b_1g_machine_class_init(ObjectClass *oc, void *data) raspi_machine_class_common_init(mc, rmc->board_rev); mc->init = raspi4b_machine_init; + mc->alias = "raspi4b"; } #else static void raspi4b_2g_machine_class_init(ObjectClass *oc, void *data) @@ -128,19 +129,20 @@ static void raspi4b_2g_machine_class_init(ObjectClass *oc, void *data) rmc->board_rev = 0xb03115; /* Revision 1.5, 2 Gb RAM */ raspi_machine_class_common_init(mc, rmc->board_rev); mc->init = raspi4b_machine_init; + mc->alias = "raspi4b"; } #endif static const TypeInfo raspi4_machine_types[] = { #if HOST_LONG_BITS == 32 { - .name = MACHINE_TYPE_NAME("raspi4b"), + .name = MACHINE_TYPE_NAME("raspi4b-1g"), .parent = TYPE_RASPI4_MACHINE, .class_init = raspi4b_1g_machine_class_init, }, #else { - .name = MACHINE_TYPE_NAME("raspi4b"), + .name = MACHINE_TYPE_NAME("raspi4b-2g"), .parent = TYPE_RASPI4_MACHINE, .class_init = raspi4b_2g_machine_class_init, }, From patchwork Sat Feb 1 09:15:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13956136 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D4F27C02192 for ; Sat, 1 Feb 2025 09:17:18 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1te9bl-00014i-Aq; Sat, 01 Feb 2025 04:16:09 -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 1te9bg-00014C-As for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:16:05 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1te9be-0000ja-U0 for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:16:04 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-436345cc17bso20846985e9.0 for ; Sat, 01 Feb 2025 01:16:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738401361; x=1739006161; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=h0KOfqY1jZzuDBLOoyIvqjDh4dLpYlCKlbjmZKCpncY=; b=Cgql6/QtC1u95c6dcBjJqqWEKbAnv4ORmQ3frkiUrZR0T8c7PWXOVFh+FFbQI/D88U 8KHEv10VmerLvP83375WosyKQmHnfocIT8upHwV4dHWMACWHFwf4wYj/LhYogL/slVbN /XGQXeylVD/eu0UkqMcdsQzeR5qiZShsQueEEUh+fA8KyakjrVY6nbgS+hVp7BPHJTsw zkPbYtFbB+uHkJsBmZrqQ7bKbH9ggT4kQqv81Ok8q19gxr6a/pDMPNnx9970VKhsDaEO PYCJEaX/u2t7E4BbQmzxud3eQh9zHSjY/5WD3/hfwFOTAoJYRFNMq7rn4rL1J2M1FlP6 ePXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738401361; x=1739006161; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h0KOfqY1jZzuDBLOoyIvqjDh4dLpYlCKlbjmZKCpncY=; b=LoQOw+4Uz5kj3fB71qguTQ6bePdESPm1mUb8RdzMw3SRT8leJxS0qesuRiT2iph7Mx cJhHu2WAdpnRowW56PibIJVjJB8G6N+xrPa+kAjSD6p4UWKFSU4hX/C0x40ARPzu+fmv gutzN+vsi5d13J0GK8BRpaE3NSHOVC0iP0xlFLKezH8A/Ixsc8rgVGJI07R2POdv1obz AfqOeKUDS6to6fP4/PXC2vD5L+ytuNPToUcx5iu9tSAJuOKrKrN1pVmDZwoq7Rd7Kl1g nX8FA7y4JinG+kEBXr8oHiMmdwvQSHLoe851mUc/ZL0uAnff9abLKimbWgPrb9oTRHHY XdeA== X-Gm-Message-State: AOJu0YxUONHTxnvxCyWgTh2KbTisSjY4h587Rn+fgX9ABDTeCrrJwTI4 7nfJzsbjSOwy5RIeEyohEYOOgILGZHX/fNdB6cCBo0y6hROvaQAbaS+aY1PXVJ/qDy2NIrRsE/A 6Uzw= X-Gm-Gg: ASbGncvLEiJYeDdyF/i7ETUrlVcAjo3VudUEePIqGeM5OCQWqmvSsYcglzKUVSj29Vv BzfuRQ+YqJgLNLKde6b1bQ/za2HaxGPX/t3t1QiZd6Thv+eMaa5ch1YC7z5+7ruqeKdDcEmDTJD gp2UZa6+YzhyEfVFkTFue3pQvgFnoC0bdeNi9vKwx6y8WRFf6kdci9mI5NHF7b8ko9mImcXXoRu HdueAAqLjFIFwnbItxeC9aVXm/fBudu+JqYuz6Y9s4Yla+eDokQRjkXOerdn5AAe9V5Oe0nZrSo xc/3PnPTv6OCXdr2vk9LRDTQF/6BVbG6f6l/W56lasGAEmK+Px7ry8IbK/YjEkdFVg== X-Google-Smtp-Source: AGHT+IHud876BMZ/APlo5xZ+MxstGyVHcTwcYW4a27I3C1chvn9bo3mAf/dbsNnCVUka3qigCD05hw== X-Received: by 2002:a05:600c:154f:b0:434:a367:2bd9 with SMTP id 5b1f17b1804b1-438dc3ca79fmr141484875e9.14.1738401361073; Sat, 01 Feb 2025 01:16:01 -0800 (PST) Received: from localhost.localdomain (232.170.88.92.rev.sfr.net. [92.88.170.232]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c5c1b5a03sm6766496f8f.71.2025.02.01.01.15.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 01 Feb 2025 01:16:00 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jared Mauch , Peter Maydell , qemu-arm@nongnu.org, devel@lists.libvirt.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 5/7] hw/arm/raspi4b: Expose the raspi4b-1g machine on 64-bit hosts Date: Sat, 1 Feb 2025 10:15:26 +0100 Message-ID: <20250201091528.1177-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250201091528.1177-1-philmd@linaro.org> References: <20250201091528.1177-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.google.com 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_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org There is no particular reason to not have the raspi4b-1g machine available on 64-bit hosts, so expose it there. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/raspi4b.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 713b4693a49..59b0d2ced44 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -107,7 +107,6 @@ static void raspi4b_machine_init(MachineState *machine) raspi_base_machine_init(machine, &soc->parent_obj); } -#if HOST_LONG_BITS == 32 static void raspi4b_1g_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -117,9 +116,12 @@ static void raspi4b_1g_machine_class_init(ObjectClass *oc, void *data) raspi_machine_class_common_init(mc, rmc->board_rev); mc->init = raspi4b_machine_init; +#if HOST_LONG_BITS == 32 mc->alias = "raspi4b"; +#endif } -#else + +#if HOST_LONG_BITS > 32 static void raspi4b_2g_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -131,22 +133,21 @@ static void raspi4b_2g_machine_class_init(ObjectClass *oc, void *data) mc->init = raspi4b_machine_init; mc->alias = "raspi4b"; } -#endif +#endif /* HOST_LONG_BITS > 32 */ static const TypeInfo raspi4_machine_types[] = { -#if HOST_LONG_BITS == 32 { .name = MACHINE_TYPE_NAME("raspi4b-1g"), .parent = TYPE_RASPI4_MACHINE, .class_init = raspi4b_1g_machine_class_init, }, -#else +#if HOST_LONG_BITS > 32 { .name = MACHINE_TYPE_NAME("raspi4b-2g"), .parent = TYPE_RASPI4_MACHINE, .class_init = raspi4b_2g_machine_class_init, }, -#endif +#endif /* HOST_LONG_BITS > 32 */ { .name = TYPE_RASPI4_MACHINE, .parent = TYPE_RASPI_BASE_MACHINE, From patchwork Sat Feb 1 09:15:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13956134 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B4C5AC0218A for ; Sat, 1 Feb 2025 09:17:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1te9br-0001Bb-Qp; Sat, 01 Feb 2025 04:16:16 -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 1te9bm-00018A-8F for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:16:10 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1te9bk-0000ln-LK for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:16:09 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-436a39e4891so19347635e9.1 for ; Sat, 01 Feb 2025 01:16:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738401367; x=1739006167; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T1LJZGDPBmQwNGoIT0EBNTzucOYXIeT9I+AbkFPx5nk=; b=q1cDpUPV2OKheBAMGMoyEK/KAsMYMLpDp8uQbc4y8iOERgIWhClB2Nf721hhjA369G OKGIywXBoARe2j2FqHhuIJbGNJepOvse3V3BesQewZqCcM9/SONUTtqCMFth4TO1csY2 HKUbKpAtZyld1ONXIwXt7IpgtfVzKBz/3ToLx5H8R7i11sHDd1j+aQ8KPl9if2CnrfpL z9kDGAS+oiPnHkC3hq3sAMrcZ9+60bZF8kjvCa4NkGtgu+8ujWZJsljsN2vuGNfb1AYe ac+dnKW3kwsXeXb2H36afvT58VP2DlnSsa9pIDLKwKO7MAXlUdIUO2Oi88ZLFIAQKy57 eNfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738401367; x=1739006167; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T1LJZGDPBmQwNGoIT0EBNTzucOYXIeT9I+AbkFPx5nk=; b=Iu3qoWai2qBpK3JozEhaGiLZN9Uj7b1mSacJ3PyRwfhklw0zdGPRgp3ZvlL2h7rs28 +Tur3oxlIVXLnZB6QVB6JxC15O6fwvWDzytPz7S4KoROck5Lgt6VZzOmsCjftB/HCKoK xvjUmcUyyUbaj4Uwg7nNj5faNrUOwP0It8HYp/ZrDAm4dezugXflwBAt4YlxBuRL7MrF GWRk+64XAnnINPzwpLh9VlaJ9daKtJJmmxxQg2/T5wxhwUXje7D+PpeXsfTsJP/oPrd2 9BVZllAAwSsDPVlI3OrEIpf7WjDK46KTChLeCjPL7cPBa5NTXmh1fWmfG5c0Eam3N6/Z 0OJA== X-Gm-Message-State: AOJu0Yxy1GNmupn9PiV2vmQn744k8crkjGmK2RgS8KWOh0uktqlNUjWj iHvCgoRHbBSrnUk4CkFU3lopONyMJHgED5fov6iW3sC1tWITV5dkDQVOE0rF5SXmRNmlnDZWidS 1t24= X-Gm-Gg: ASbGncuRTtIuR6IEyZU9y5CcoCMwMlcVSSHngtrK7NhCGxPMT0HjcQ9CDGXh8BmkfH1 GJbZ7L2FRmT7UOBfbew0M2QtEf5nNhzhDh8vXrDBrm4EONRiVzqdZG7WVN5KJQwdWCFzKubiD4Y AVIj5Qywh5XsaQPgwQ5Q5HGLh0bKH5AwCJxpqodgx5hQW8FAmGYD2aG9S4GXJbeuDm9PQSlubRP bidgrLzJBhPwuPfO9jN0t64PmF5ltXNaYdnYqLrVH4MoJjd0xNnsgjXxzvTmcIXV15FB02q/i1P d+SoalC5G4+6WVV2ckfk/lmXYoRO5S7l5PkbNhBqbS7RGj0GvE/6ssG2VQFDqT4LfA== X-Google-Smtp-Source: AGHT+IFdkWT1zY77Sr0yKYlBUWm23tzVHjnggZk5gWNKeKe00wI5idLZdjFwqy8r7vDk1ZvHszXZBA== X-Received: by 2002:a5d:47a3:0:b0:38c:4a05:c25f with SMTP id ffacd0b85a97d-38c5209605dmr11904138f8f.42.1738401366812; Sat, 01 Feb 2025 01:16:06 -0800 (PST) Received: from localhost.localdomain (232.170.88.92.rev.sfr.net. [92.88.170.232]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c5c102e51sm6925917f8f.31.2025.02.01.01.16.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 01 Feb 2025 01:16:06 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jared Mauch , Peter Maydell , qemu-arm@nongnu.org, devel@lists.libvirt.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 6/7] hw/arm/raspi4b: Add the raspi4b-4g machine Date: Sat, 1 Feb 2025 10:15:27 +0100 Message-ID: <20250201091528.1177-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250201091528.1177-1-philmd@linaro.org> References: <20250201091528.1177-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com 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_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Add the raspi4b-4g machine, a raspi4b rev1.4 with 4GB of RAM. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2797 Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/raspi4b.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 59b0d2ced44..2cf8bc467c5 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -133,6 +133,17 @@ static void raspi4b_2g_machine_class_init(ObjectClass *oc, void *data) mc->init = raspi4b_machine_init; mc->alias = "raspi4b"; } + +static void raspi4b_4g_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc); + + + rmc->board_rev = 0xc03114; /* Revision 1.4, 4 GiB RAM */ + raspi_machine_class_common_init(mc, rmc->board_rev); + mc->init = raspi4b_machine_init; +} #endif /* HOST_LONG_BITS > 32 */ static const TypeInfo raspi4_machine_types[] = { @@ -147,6 +158,11 @@ static const TypeInfo raspi4_machine_types[] = { .parent = TYPE_RASPI4_MACHINE, .class_init = raspi4b_2g_machine_class_init, }, + { + .name = MACHINE_TYPE_NAME("raspi4b-4g"), + .parent = TYPE_RASPI4_MACHINE, + .class_init = raspi4b_4g_machine_class_init, + }, #endif /* HOST_LONG_BITS > 32 */ { .name = TYPE_RASPI4_MACHINE, From patchwork Sat Feb 1 09:15:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13956132 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CCCF2C0218A for ; Sat, 1 Feb 2025 09:16:47 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1te9cB-0001Ha-Oq; Sat, 01 Feb 2025 04:16:36 -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 1te9bs-0001Da-Lr for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:16:16 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1te9br-0000pt-4L for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:16:16 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-436345cc17bso20847805e9.0 for ; Sat, 01 Feb 2025 01:16:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738401373; x=1739006173; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=66gXMVjCY3cMcHioA5BCOH2x7vAMmwWjDCHfHbiYPrs=; b=d1wBjv914EzUUOthRM0pdrPZj1xkqzAzhGgUeCKWouWGbeQJMk553eQZfYFSZptbhx VpP/k+xUIGP//7zrHQUX+A7P8WvavtIepX6n1V3LMHd3jvTB953jWTnIahKFO6V5jQpH EtHSwqUxX393zCQ3pxgFyM4UKKOzLeMJUMheuP8Th5KLYfeQqMRG0b7DSQTaJrmpNPpt VW1SD0kMiffbbOd6TTzqc0RnEbU59egJtH70P+q48YjMHOkZTSMzy9vnE7mEWQ1gvUEW KHgg1xRF32Rzh6pwGqrhlQm8ssv8w1bMzZW565Esy1u1Mf7ag76qs0MQXga6iiVg7X7A ddMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738401373; x=1739006173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=66gXMVjCY3cMcHioA5BCOH2x7vAMmwWjDCHfHbiYPrs=; b=gi9uvaM2pEwju/IduQWG9bEcX+MRQZcyuqdqDQnLDJKwaE4koZdJMkoSJmlsKugp9z 3umWDjxAhvfF410Rk3J3OtUeVuHqaX2hDr08kLyAls7UhScd7y/j6Z7yMeobh4bWa4/K CeyIrgQ4PSAFr3csBBTpGCjlmfhlM+A0rF/j3Yhs1gHJTlQyexXtdtB7c33sSnxBDEgu hdh6G7SttOJyGoJkZaV1b8po2FCKJkonH4L5B9wHMcs7N0Y7rRuMWv3c3Y028kCr/3O2 MDmHymd51rz79IY//lGqXnJ7ju/7kuqpwoS/yEAKd++5bwLVA8dfw+zO+3OfRvLJbd1T UeNQ== X-Gm-Message-State: AOJu0Yyb3w/WD46x57ltZVzrCjR7sap4x6C3dX3/+vGbaicXmdlzt9Y1 zfVF8Spd33g+TMZHS83B5axiDMi/AUky9cbhDhv7aJ6u1z7s+Mzt4r9NdeSkoCMHDEzl29j0pLf v3To= X-Gm-Gg: ASbGncvUzd9OpFmmGnWFlYLMVNZTshDP0LZSJXuda/f1WEH8sM20fwNOboDfdvcqY9+ 9ewAx1mEuccLbiz677DRsYLeUof9jZXTz5sHMDnkw6z6Fqbdmwo00Bh/kfMstC55Yc/bViTHXou fHm0tuB7fwxLfgt03AtxKvkxvYl2MfsDAQ5aQrwTqyi5Kbhqwz/JVxU/8aY6WfWMey/FuVIrTCi BI1cpX0yJSbCjSjjQqHjj1O7DfDJpWR/5l1UdBfGPiUWV51Qd2DgT2I/ZBL2VZ7t110dXLcJHkE MMKufY0fwmcSstpBCTa//7ovPaxrce6xjftw31YB7A0C/YxeYX+y5XuezpbbW0p6zw== X-Google-Smtp-Source: AGHT+IHvIJ+me109i6CvqVMh7lj/yT3Vr5ofWpYkacnR+RWSGpiL4ih/G2vesJ7ey+rnjXuyHWJxOQ== X-Received: by 2002:a05:600c:3511:b0:434:f3a1:b214 with SMTP id 5b1f17b1804b1-438dc41ef52mr105976065e9.28.1738401373022; Sat, 01 Feb 2025 01:16:13 -0800 (PST) Received: from localhost.localdomain (232.170.88.92.rev.sfr.net. [92.88.170.232]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438e245f41esm81118335e9.36.2025.02.01.01.16.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 01 Feb 2025 01:16:12 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jared Mauch , Peter Maydell , qemu-arm@nongnu.org, devel@lists.libvirt.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 7/7] hw/arm/raspi4b: Add the raspi4b-8g machine Date: Sat, 1 Feb 2025 10:15:28 +0100 Message-ID: <20250201091528.1177-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250201091528.1177-1-philmd@linaro.org> References: <20250201091528.1177-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.com 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_DNSWL_NONE=-0.0001, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Add the raspi4b-8g machine, a raspi4b rev1.5 with 8GB of RAM. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/raspi4b.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 2cf8bc467c5..2120bc1a6f8 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -144,6 +144,17 @@ static void raspi4b_4g_machine_class_init(ObjectClass *oc, void *data) raspi_machine_class_common_init(mc, rmc->board_rev); mc->init = raspi4b_machine_init; } + +static void raspi4b_8g_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc); + + + rmc->board_rev = 0xd03115; /* Revision 1.5, 8 GiB RAM */ + raspi_machine_class_common_init(mc, rmc->board_rev); + mc->init = raspi4b_machine_init; +} #endif /* HOST_LONG_BITS > 32 */ static const TypeInfo raspi4_machine_types[] = { @@ -163,6 +174,11 @@ static const TypeInfo raspi4_machine_types[] = { .parent = TYPE_RASPI4_MACHINE, .class_init = raspi4b_4g_machine_class_init, }, + { + .name = MACHINE_TYPE_NAME("raspi4b-8g"), + .parent = TYPE_RASPI4_MACHINE, + .class_init = raspi4b_8g_machine_class_init, + }, #endif /* HOST_LONG_BITS > 32 */ { .name = TYPE_RASPI4_MACHINE,