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: 861223 Delivered-To: patch@linaro.org Received: by 2002:adf:fb05:0:b0:385:e875:8a9e with SMTP id c5csp1113181wrr; Sat, 1 Feb 2025 01:16:36 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXouXZQmJNO8kj3o6EbgC3CzkNUmEAPK7IIx5935SIaiilCb72C+e+6BwjXU0oF9rCrwBryCg==@linaro.org X-Google-Smtp-Source: AGHT+IHqXKL3owDLjtb8O7qQd5RClfve01zuOsBDeuYV9r3Jq6Dn/5GqEzLoZPpciAXtC8JHAntF X-Received: by 2002:a05:620a:1d0a:b0:7b1:48ff:6b56 with SMTP id af79cd13be357-7bffcd957c2mr2241857485a.43.1738401395908; Sat, 01 Feb 2025 01:16:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738401395; cv=none; d=google.com; s=arc-20240605; b=St79DGVFJv115AICd3T0LkkysyKstqncv3+DhdZehR7eypWXhGFUY9wrShYaVTiP/3 fct2pHPZoZuSxg/REz8ObzSizqtBbJiUbSMk6XeEZEIOHYJx7ksr/ynIlPiDItvTNL3p W8K9lm07I/AmtwQ4gMx4398sfVRaPcyG2MA5HMPzMjIKzgH1wcXHM1ehyZ2V4A3hluyc iAhuGXDeEG3tVqT/dVBkKFA5AaVWKpIc3SKZLy0cGFPgwUU/xbLThifQad81kjMEphPj 9MzYT7Esto+hlC+gDKhmS3zj/Cr9kVMad7dEEjI+JDMbK9fik5QfTUcEfKNWSLsrxhk9 xdWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8SVQMLAYnWYkem+1LN8L06NityQ8o7wifm7JnMwf0uI=; fh=H4GbwdQ/2oIyPNlbjSTr+s+fsGzXnEOR03aP94txBto=; b=GHiV4eyTCJL6RTiKO7VnO1Bqmj0ZeWd8tKCTVrn1NImC/vgnarV1c/lkz3IhvTMy3J iFK38R4Hr4N/54Ue9xGFGbq/MY8gHmvvgyU5MWlSKYiRMTNvGE7DRSIkEWw35DkXeSHY qbo6y4Es8wTT8jXgRio8OJT4DXyhsXfJQXtsE1QK7BGrzp7sQKAIHhAslb/4VnFl7rDP 11he8cUkLZ6nmXhqjtQn4lj0Zv7kLMYV+MirUfav/mXfR/h8F7MN95yqoxlq8WsThK5m +Tne2aVSlxV6qnKftjjzSV9H3rAXHT7FKRs0W7G7KSTJs6iRr4MJUGGoUDHkvAM8VDQg 9Kdg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lPGuPTiJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c00a903f7fsi579441885a.228.2025.02.01.01.16.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 01 Feb 2025 01:16:35 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lPGuPTiJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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: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: 861225 Delivered-To: patch@linaro.org Received: by 2002:adf:fb05:0:b0:385:e875:8a9e with SMTP id c5csp1113312wrr; Sat, 1 Feb 2025 01:17:06 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUnxmx3qkMGAwD9fNk3/EzU46NaJFavHXCJ2M9+SyxYSjgEp3tIhyjdxXF1NuE0B5yZth5upQ==@linaro.org X-Google-Smtp-Source: AGHT+IEBSUtOAUWfa1HsjRf6Dn+btgKQQKH4gqGBzxBhdquBqNGblsJwBV77KXPOhUCSrNMP63Pq X-Received: by 2002:a05:6214:570d:b0:6d4:1680:612d with SMTP id 6a1803df08f44-6e243a84536mr218250416d6.0.1738401426584; Sat, 01 Feb 2025 01:17:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738401426; cv=none; d=google.com; s=arc-20240605; b=FhzZtT8AdxEF5cywN5ZhJBaTfSld9GL1kQYoyA4PQQEwJWTocOz0YQcSEhML8/chof KXcvviVJA9QJj07AuwS6N98zLBlkvq5I4gSwiGCwuMmfReY221YW7yiOi7LRUI7XOfb0 igjW/P9WMzbwcF9UlOW8CrNURu+hlEVcbY/boG6uTa2PtudoTKa5qCKODXR7tfqEA3jV gz4Tz515JF43o4ugbYCDJW4BOudOcaEINYOquye7naQmYFGIx/tx+KMyz7Ia0b7SV4J7 PUCgXJi9PoZH45rkZsnwu6QddhDQRxBC2WilfEYyUDvnk/yn13MZfFL+MlThKEVVDV96 Frlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jNWPuDa8TGdgIkgMQ7fmGixmIo8d3RAnXJJCGYAmUDI=; fh=H4GbwdQ/2oIyPNlbjSTr+s+fsGzXnEOR03aP94txBto=; b=HC5wTMA7bezTaASKxdilNPRzMXyMJWaZl0ytHgFpQU41DSxfh4c8h0nRXZgm3mXRvE j6rpz8POraYHtg6Xi2HWn4TO6EbANq4LKjWplf8VggZ+n+fxOLUdjFWpWArUcFRPCqvB LelfqoKzPbrSjmUZL0ESGRO2XGYmToWzl0FpemCtr0tr7XAaGciO7z17Bt4JaNAeVdQ5 Ewl3CZKrKLyUOcEJ3uBVomxZc+HVRwI2DZjjtRHO/4gtxb3dyr+/oAVzirZeVP8RQ0hD KJdppA26L57Bw0wfotxzRo5J/B5Gzg5WDRTUdRLZktRTE9hbEb1xs6i9A1HywIos2AnT LfbA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q6Nuu4IZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e2549c43c6si50970896d6.374.2025.02.01.01.17.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 01 Feb 2025 01:17:06 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q6Nuu4IZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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: 861227 Delivered-To: patch@linaro.org Received: by 2002:adf:fb05:0:b0:385:e875:8a9e with SMTP id c5csp1113364wrr; Sat, 1 Feb 2025 01:17:18 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWXXjNqhz0Fqh50/09FjTs6judz+vtpS+acNGhEdZrY03yUeBoFHS9pCEYQtA/nLml63aQAOA==@linaro.org X-Google-Smtp-Source: AGHT+IH5/LNwYRl1GbS5ApUP6Vd8MD96Oij8YiIjdcHiCKF1Sx7tFZVT0lXn72nMkKaJ7Dg4aLJZ X-Received: by 2002:a05:620a:2552:b0:7b6:d643:599c with SMTP id af79cd13be357-7bffcd999afmr1964398885a.43.1738401438719; Sat, 01 Feb 2025 01:17:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738401438; cv=none; d=google.com; s=arc-20240605; b=fgo+nrXBpVsdH0KQ3Kb+Kr09JXm5m6RsHBl6GVypl92xrtQI2G9KWcdUdpJJgiH3uC GExhNwlxvXT1qLf0krxDOHQQ5/FR5T5IXVBOzH5CLneqO+pVihSx9zkyXCyDKZs9svtp xt7BhCwjGc/7cAYP/SeXOQdR2yo24b82RMUjXHIhqACBzTYIwyLdjC0oLKTCXeV7deYH jdvuxwPkJKNhPpSvOvHTn2cgz72tLN3ij/BVEm01WLTg/ihR9E7d/wPR6bAqfAWEgo+6 sytpiwmS1DHJsY0kEOOYX7PKFK0K0uCpcYSNmfvvRDCweMHk2Gq+/uZqE4a6w0Lr0Slr eXwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=h0KOfqY1jZzuDBLOoyIvqjDh4dLpYlCKlbjmZKCpncY=; fh=H4GbwdQ/2oIyPNlbjSTr+s+fsGzXnEOR03aP94txBto=; b=KSVfGcF9h0w503uCJl+ajzp4Z9ck9ILunq/3TIfAok7hL0MRnoM/TE2k452vaRqPdh 9ywIk5mOUHld9CH+2u2MslCdrJQd3MtZsFCXA6bOj82kNNxR/lsN9VccTiBuCrdcOOXi rd9FXAXp87lvI04ETLxvW11769hs78m1HMUYD05WrUjFK5XVfLeO4SrwJP+RMB1bhvVy KoBEHTG9bpezLT5ZKr473osA552VG8rUv9K2SauJgdheNUkVhc0hhDDw/dYcj6sUBejH JpldDBVAvUFs9lQP7QXC5L4FVpRbDPaaVOP1Zx9J7i1EynAaaUt1en1M0GfnZa2cYh3H V40w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Cgql6/Qt"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c00a903d27si552476285a.227.2025.02.01.01.17.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 01 Feb 2025 01:17:18 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Cgql6/Qt"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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: 861226 Delivered-To: patch@linaro.org Received: by 2002:adf:fb05:0:b0:385:e875:8a9e with SMTP id c5csp1113328wrr; Sat, 1 Feb 2025 01:17:11 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVnFZm9vKzvfYAkKp6k/ACVd2yKFeCqk/lQrAMEuopAM1MD+FKHHWBJLisbX7x+1+NwGUbtAQ==@linaro.org X-Google-Smtp-Source: AGHT+IESvn864M8cKhqygtJx64tYk3dlGXWkUmoWMRWOW+fa2NJjQ1CWBYAsEsPLIIuxcX1YKL5X X-Received: by 2002:a05:6214:d8a:b0:6d8:a7f7:c39d with SMTP id 6a1803df08f44-6e243c77ecamr172743706d6.40.1738401430834; Sat, 01 Feb 2025 01:17:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738401430; cv=none; d=google.com; s=arc-20240605; b=JN0MEaCZwJBNAvuDVFblcvitZuEeNyssezpee/Ij5MnLDeH1ULyHfDgxklAH5WztBJ FxWqUV6NrJ1aqTxfaiyTl26pQ1bVtt7KU8x7N19bHA/OEAoj1WtJ25MVzFFJEpJs1D7/ T28SLyIjkn3QcAvxelRoFv1LRy4gkeStuEpXA6tqok1RD0xcAAlyEzgN0ZgfmLgCY9gp okEwa5ZEH6v0j1QWQ9ZNK2CSoGfh4fpeEmVMJWG8qg2kiNALws3ZivlsOQsYs1Th2O22 GomM/tyYit8WaWriaBAJHZjJEUadq2Fe7idgwClVbExaz5VFZCh7aDTOyABljxOldPQ9 hwMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=T1LJZGDPBmQwNGoIT0EBNTzucOYXIeT9I+AbkFPx5nk=; fh=H4GbwdQ/2oIyPNlbjSTr+s+fsGzXnEOR03aP94txBto=; b=ZE5muB0/oEubxtrvUIxypmClhE4QJSGIVQr0LRI9o2NRuHK28NffZ3VwlNO7hyPhE5 a/ppgVt/7yf5H9Md9BQuybi5K2xqElHKqdh3LWeRzQCHh9HWVD9EMBVftMBNnxo9v09e CCQReHc/eJEakcpKtbv3rl3DZHl1QAbyV2iSgbHROvdHIb/TmSctUQxBTDXtEl5nLuRf X941qy2xaav1FwD1xtOn7qHBbU22rwtibBnlEY7e7rpn2SF9bI9KHRTl2VeBuxkkmW9W buYNdH1hjh1E3FNJXz2nHzeiWj67UoYCmyg/QBt5jVAgNraiFsM73SZQ3kmqCAtgLiqp ycdQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q1cDpUPV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e254811269si51109616d6.50.2025.02.01.01.17.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 01 Feb 2025 01:17:10 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q1cDpUPV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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: 861224 Delivered-To: patch@linaro.org Received: by 2002:adf:fb05:0:b0:385:e875:8a9e with SMTP id c5csp1113232wrr; Sat, 1 Feb 2025 01:16:47 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXiqhlAEQZrWPgIZEUlIw3E/LGNyR2YYKuArzTo1/3WstemiiIuPiJBRXmQ89DIAe8jatiNlw==@linaro.org X-Google-Smtp-Source: AGHT+IH91rd260HyMwdeqO8dINgH7mw9mW4SzWBuMM5qXbwG3WoccjvA3JaeMdXUf69a70YMU9vi X-Received: by 2002:a05:620a:2710:b0:7b1:3f19:b81a with SMTP id af79cd13be357-7bffcd99a37mr2485841685a.53.1738401407581; Sat, 01 Feb 2025 01:16:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738401407; cv=none; d=google.com; s=arc-20240605; b=WbZZ1ZpZk1phOX4nZdTSu/qJ07AFjLcb4DMQpcKCUIMLBqmRqXQ9QxYScJl3AgIV3d jlIhlJs35eQY0uraAQ0EQVRb4my9iayUU6FLN5ekzyQRI7blN9Vuch+gWczCEgdMjAfZ G6r3RmppcqiT6SJxkwgEBOKoRdEgVue7Kwj7ge2AnRUoZxp3jr0HonItDfik2Sf4dy7u s0t+qBvRd3H72bPePI5rAEkR3O7bq4GxQkL8ac/OSHN4j/WZkRUSYffXTQbAiGSlsKtA frHvG8zXU5n7iEf+RthHIZPgPkBkaEiwQa88WTLOZMCf3htUy2whgEGgaUH6p9nCi+OY 21FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=66gXMVjCY3cMcHioA5BCOH2x7vAMmwWjDCHfHbiYPrs=; fh=H4GbwdQ/2oIyPNlbjSTr+s+fsGzXnEOR03aP94txBto=; b=ipKSnHMmlk02u5Y8an+SbhWXX0xpj52HweNehs9sV+7Rlhi+XpCC23tNT2LxuW5WEe 1aheNQEU9SBQBA0obmuEivI4ylWDb0ARaBMATF/vCRt5b1By3Xcm9yZZs/0S1meNygpG g6z9iATpbl/szKsNctVF11SA5lpeerraGwpB6AyNtLslheyzBHe4b6DwxX57mnhXXeja ct8UBCFgCsMEnURsaZolj+v1YG2MexUeycQyWbTiEGBOX/Obku/kwlj0qC86VLjIQdYa kdhDG2+qn02NCBsnNfaHqctIHdaiSGXUNXpAlO5nULX3V0DBoQfVz0hJBIxzhMtzJAOt 1GKg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d1wBjv91; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e25499ee8esi55105596d6.288.2025.02.01.01.16.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 01 Feb 2025 01:16:47 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d1wBjv91; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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,