From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-arm@nongnu.org, qemu-devel@nongnu.org
Cc: "Jamin Lin" <jamin_lin@aspeedtech.com>,
"Cédric Le Goater" <clg@redhat.com>
Subject: [PULL 17/30] hw/arm/aspeed: Move ASPEED_RAM_SIZE() macro to common header for reuse
Date: Tue, 4 Nov 2025 09:31:31 +0100 [thread overview]
Message-ID: <20251104083144.187806-18-clg@redhat.com> (raw)
In-Reply-To: <20251104083144.187806-1-clg@redhat.com>
From: Jamin Lin <jamin_lin@aspeedtech.com>
Moving it into aspeed.h allows all Aspeed machine source files
(AST2400, AST2500, AST2600, AST2700, etc.) to reuse the same macro
definition for consistent behavior and maintainability.
No functional changes.
Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Link: https://lore.kernel.org/qemu-devel/20251104031325.146374-18-jamin_lin@aspeedtech.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
include/hw/arm/aspeed.h | 7 +++++++
hw/arm/aspeed.c | 7 -------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/hw/arm/aspeed.h b/include/hw/arm/aspeed.h
index 16b24e68870a..84620f49ed2d 100644
--- a/include/hw/arm/aspeed.h
+++ b/include/hw/arm/aspeed.h
@@ -25,6 +25,13 @@ DECLARE_OBJ_CHECKERS(AspeedMachineState, AspeedMachineClass,
#define ASPEED_MAC2_ON (1 << 2)
#define ASPEED_MAC3_ON (1 << 3)
+/* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */
+#if HOST_LONG_BITS == 32
+#define ASPEED_RAM_SIZE(sz) MIN((sz), 1 * GiB)
+#else
+#define ASPEED_RAM_SIZE(sz) (sz)
+#endif
+
struct AspeedMachineState {
MachineState parent_obj;
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 15d3b045ac44..ba0c9a62ff66 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -36,13 +36,6 @@ static struct arm_boot_info aspeed_board_binfo = {
.board_id = -1, /* device-tree-only board */
};
-/* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */
-#if HOST_LONG_BITS == 32
-#define ASPEED_RAM_SIZE(sz) MIN((sz), 1 * GiB)
-#else
-#define ASPEED_RAM_SIZE(sz) (sz)
-#endif
-
/* AST2600 evb hardware value */
#define AST2600_EVB_HW_STRAP1 0x000000C0
#define AST2600_EVB_HW_STRAP2 0x00000003
--
2.51.1
next prev parent reply other threads:[~2025-11-04 8:35 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-04 8:31 [PULL 00/30] aspeed queue Cédric Le Goater
2025-11-04 8:31 ` [PULL 01/30] hw/arm/aspeed: Move AspeedMachineState definition to common header for reuse Cédric Le Goater
2025-11-04 8:31 ` [PULL 02/30] hw/arm/aspeed: Make aspeed_machine_class_init_cpus_defaults() globally accessible Cédric Le Goater
2025-11-04 8:31 ` [PULL 03/30] hw/arm/aspeed: Export and rename create_pca9552() for reuse Cédric Le Goater
2025-11-04 8:31 ` [PULL 04/30] hw/arm/aspeed: Rename and export create_pca9554() as aspeed_create_pca9554() Cédric Le Goater
2025-11-04 8:31 ` [PULL 05/30] hw/arm/aspeed: Split FP5280G2 machine into a separate source file for maintenance Cédric Le Goater
2025-11-04 8:31 ` [PULL 06/30] hw/arm/aspeed: Split G220A machine into a separate source file for better maintenance Cédric Le Goater
2025-11-04 8:31 ` [PULL 07/30] hw/arm/aspeed: Split Tiogapass machine into a separate source file for cleanup Cédric Le Goater
2025-11-04 8:31 ` [PULL 08/30] hw/arm/aspeed: Split YosemiteV2 machine into a separate source file for maintainability Cédric Le Goater
2025-11-04 8:31 ` [PULL 09/30] hw/arm/aspeed: Split Witherspoon " Cédric Le Goater
2025-11-04 8:31 ` [PULL 10/30] hw/arm/aspeed: Split Sonorapass " Cédric Le Goater
2025-11-04 8:31 ` [PULL 11/30] hw/arm/aspeed: Split Romulus " Cédric Le Goater
2025-11-04 8:31 ` [PULL 12/30] hw/arm/aspeed: Split Supermicro X11SPI machine into a separate " Cédric Le Goater
2025-11-04 8:31 ` [PULL 13/30] hw/arm/aspeed: Split AST2500 EVB machine into a separate source " Cédric Le Goater
2025-11-04 8:31 ` [PULL 14/30] hw/arm/aspeed: Split Quanta-Q71L " Cédric Le Goater
2025-11-04 8:31 ` [PULL 15/30] hw/arm/aspeed: Split Supermicro X11 " Cédric Le Goater
2025-11-04 8:31 ` [PULL 16/30] hw/arm/aspeed: Split Palmetto " Cédric Le Goater
2025-11-04 8:31 ` Cédric Le Goater [this message]
2025-11-04 8:31 ` [PULL 18/30] hw/arm/aspeed: Split Bletchley " Cédric Le Goater
2025-11-04 8:31 ` [PULL 19/30] hw/arm/aspeed: Split FBY35 BMC " Cédric Le Goater
2025-11-04 8:31 ` [PULL 20/30] hw/arm/aspeed: Split Fuji " Cédric Le Goater
2025-11-04 8:31 ` [PULL 21/30] hw/arm/aspeed: Split QCOM Firework " Cédric Le Goater
2025-11-04 8:31 ` [PULL 22/30] hw/arm/aspeed: Split QCOM DC-SCM V1 " Cédric Le Goater
2025-11-04 8:31 ` [PULL 23/30] hw/arm/aspeed: Make aspeed_machine_ast2600_class_emmc_init() a common API for eMMC boot setup Cédric Le Goater
2025-11-04 8:31 ` [PULL 24/30] hw/arm/aspeed: Split GB200NVL machine into a separate source file for maintainability Cédric Le Goater
2025-11-04 8:31 ` [PULL 25/30] hw/arm/aspeed: Split Rainier " Cédric Le Goater
2025-11-04 8:31 ` [PULL 26/30] hw/arm/aspeed: Split Catalina " Cédric Le Goater
2025-11-04 8:31 ` [PULL 27/30] hw/arm/aspeed: Split AST2600 EVB " Cédric Le Goater
2025-11-04 8:31 ` [PULL 28/30] hw/arm/aspeed: Split AST2700 " Cédric Le Goater
2025-11-04 8:31 ` [PULL 29/30] hw/arm/aspeed: Rename and export connect_serial_hds_to_uarts() as aspeed_connect_serial_hds_to_uarts() Cédric Le Goater
2025-11-04 8:31 ` [PULL 30/30] hw/arm/aspeed: Split AST1030 EVB machine into a separate source file for maintainability Cédric Le Goater
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251104083144.187806-18-clg@redhat.com \
--to=clg@redhat.com \
--cc=jamin_lin@aspeedtech.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).