* [PULL 0/2] aspeed queue
@ 2022-08-01 16:29 Cédric Le Goater
2022-08-01 16:29 ` [PULL 1/2] aspeed: Remove unused fields from AspeedMachineState Cédric Le Goater
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Cédric Le Goater @ 2022-08-01 16:29 UTC (permalink / raw)
To: qemu-arm, qemu-devel
Cc: Peter Maydell, Richard Henderson, Cédric Le Goater
The following changes since commit 3916603e0c1d909e14e09d5ebcbdaa9c9e21adf3:
Merge tag 'pull-la-20220729' of https://gitlab.com/rth7680/qemu into staging (2022-07-29 17:39:17 -0700)
are available in the Git repository at:
https://github.com/legoater/qemu/ tags/pull-aspeed-20220801
for you to fetch changes up to 398c01da9c8c8af5db0b2b4b4888c2bd27218230:
aspeed/fby35: Fix owner of the BMC RAM memory region (2022-08-01 15:24:15 +0200)
----------------------------------------------------------------
aspeed queue:
* Fix ownership of RAM regions on the fby35 machine
----------------------------------------------------------------
Cédric Le Goater (2):
aspeed: Remove unused fields from AspeedMachineState
aspeed/fby35: Fix owner of the BMC RAM memory region
hw/arm/aspeed.c | 2 --
hw/arm/fby35.c | 14 +++++++++-----
2 files changed, 9 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PULL 1/2] aspeed: Remove unused fields from AspeedMachineState
2022-08-01 16:29 [PULL 0/2] aspeed queue Cédric Le Goater
@ 2022-08-01 16:29 ` Cédric Le Goater
2022-08-01 16:29 ` [PULL 2/2] aspeed/fby35: Fix owner of the BMC RAM memory region Cédric Le Goater
2022-08-02 2:04 ` [PULL 0/2] aspeed queue Richard Henderson
2 siblings, 0 replies; 6+ messages in thread
From: Cédric Le Goater @ 2022-08-01 16:29 UTC (permalink / raw)
To: qemu-arm, qemu-devel
Cc: Peter Maydell, Richard Henderson, Cédric Le Goater
Fixes: 346160cbf2af ("aspeed: Set the dram container at the SoC level")
Message-Id: <20220727102714.803041-2-clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/arm/aspeed.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 4193a3d23d1d..b3bbe06f8fa4 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -38,8 +38,6 @@ struct AspeedMachineState {
/* Public */
AspeedSoCState soc;
- MemoryRegion ram_container;
- MemoryRegion max_ram;
bool mmio_exec;
char *fmc_model;
char *spi_model;
--
2.37.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PULL 2/2] aspeed/fby35: Fix owner of the BMC RAM memory region
2022-08-01 16:29 [PULL 0/2] aspeed queue Cédric Le Goater
2022-08-01 16:29 ` [PULL 1/2] aspeed: Remove unused fields from AspeedMachineState Cédric Le Goater
@ 2022-08-01 16:29 ` Cédric Le Goater
2022-08-02 2:04 ` [PULL 0/2] aspeed queue Richard Henderson
2 siblings, 0 replies; 6+ messages in thread
From: Cédric Le Goater @ 2022-08-01 16:29 UTC (permalink / raw)
To: qemu-arm, qemu-devel
Cc: Peter Maydell, Richard Henderson, Cédric Le Goater,
Peter Delevoryas
A MachineState object is used as a owner of the RAM region and this
asserts in memory_region_init_ram() when QEMU is built with
CONFIG_QOM_CAST_DEBUG :
/* This will assert if owner is neither NULL nor a DeviceState.
* We only want the owner here for the purposes of defining a
* unique name for migration. TODO: Ideally we should implement
* a naming scheme for Objects which are not DeviceStates, in
* which case we can relax this restriction.
*/
owner_dev = DEVICE(owner);
Use the BMC and BIC objects as the owners of their memory regions.
Cc: Peter Delevoryas <peter@pjd.dev>
Fixes: 778e14cc5cd5 ("aspeed: Add AST2600 (BMC) to fby35")
Reviewed-by: Peter Delevoryas <peter@pjd.dev>
Message-Id: <20220727102714.803041-3-clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/arm/fby35.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/hw/arm/fby35.c b/hw/arm/fby35.c
index 79605f306462..90c04bbc3389 100644
--- a/hw/arm/fby35.c
+++ b/hw/arm/fby35.c
@@ -72,11 +72,13 @@ static void fby35_bmc_init(Fby35State *s)
{
DriveInfo *drive0 = drive_get(IF_MTD, 0, 0);
- memory_region_init(&s->bmc_memory, OBJECT(s), "bmc-memory", UINT64_MAX);
- memory_region_init_ram(&s->bmc_dram, OBJECT(s), "bmc-dram",
+ object_initialize_child(OBJECT(s), "bmc", &s->bmc, "ast2600-a3");
+
+ memory_region_init(&s->bmc_memory, OBJECT(&s->bmc), "bmc-memory",
+ UINT64_MAX);
+ memory_region_init_ram(&s->bmc_dram, OBJECT(&s->bmc), "bmc-dram",
FBY35_BMC_RAM_SIZE, &error_abort);
- object_initialize_child(OBJECT(s), "bmc", &s->bmc, "ast2600-a3");
object_property_set_int(OBJECT(&s->bmc), "ram-size", FBY35_BMC_RAM_SIZE,
&error_abort);
object_property_set_link(OBJECT(&s->bmc), "memory", OBJECT(&s->bmc_memory),
@@ -120,9 +122,11 @@ static void fby35_bic_init(Fby35State *s)
s->bic_sysclk = clock_new(OBJECT(s), "SYSCLK");
clock_set_hz(s->bic_sysclk, 200000000ULL);
- memory_region_init(&s->bic_memory, OBJECT(s), "bic-memory", UINT64_MAX);
-
object_initialize_child(OBJECT(s), "bic", &s->bic, "ast1030-a1");
+
+ memory_region_init(&s->bic_memory, OBJECT(&s->bic), "bic-memory",
+ UINT64_MAX);
+
qdev_connect_clock_in(DEVICE(&s->bic), "sysclk", s->bic_sysclk);
object_property_set_link(OBJECT(&s->bic), "memory", OBJECT(&s->bic_memory),
&error_abort);
--
2.37.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PULL 0/2] aspeed queue
2022-08-01 16:29 [PULL 0/2] aspeed queue Cédric Le Goater
2022-08-01 16:29 ` [PULL 1/2] aspeed: Remove unused fields from AspeedMachineState Cédric Le Goater
2022-08-01 16:29 ` [PULL 2/2] aspeed/fby35: Fix owner of the BMC RAM memory region Cédric Le Goater
@ 2022-08-02 2:04 ` Richard Henderson
2 siblings, 0 replies; 6+ messages in thread
From: Richard Henderson @ 2022-08-02 2:04 UTC (permalink / raw)
To: Cédric Le Goater, qemu-arm, qemu-devel; +Cc: Peter Maydell
On 8/1/22 09:29, Cédric Le Goater wrote:
> The following changes since commit 3916603e0c1d909e14e09d5ebcbdaa9c9e21adf3:
>
> Merge tag 'pull-la-20220729' of https://gitlab.com/rth7680/qemu into staging (2022-07-29 17:39:17 -0700)
>
> are available in the Git repository at:
>
> https://github.com/legoater/qemu/ tags/pull-aspeed-20220801
>
> for you to fetch changes up to 398c01da9c8c8af5db0b2b4b4888c2bd27218230:
>
> aspeed/fby35: Fix owner of the BMC RAM memory region (2022-08-01 15:24:15 +0200)
>
> ----------------------------------------------------------------
> aspeed queue:
>
> * Fix ownership of RAM regions on the fby35 machine
Applied, thanks. Please update https://wiki.qemu.org/ChangeLog/7.1 as appropriate.
r~
>
> ----------------------------------------------------------------
> Cédric Le Goater (2):
> aspeed: Remove unused fields from AspeedMachineState
> aspeed/fby35: Fix owner of the BMC RAM memory region
>
> hw/arm/aspeed.c | 2 --
> hw/arm/fby35.c | 14 +++++++++-----
> 2 files changed, 9 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PULL 0/2] aspeed queue
2024-02-27 12:51 Cédric Le Goater
@ 2024-02-27 17:21 ` Peter Maydell
0 siblings, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2024-02-27 17:21 UTC (permalink / raw)
To: Cédric Le Goater; +Cc: qemu-arm, qemu-devel
On Tue, 27 Feb 2024 at 12:53, Cédric Le Goater <clg@kaod.org> wrote:
>
> The following changes since commit 1b330dafcdc34315f6837ff3af34dbb4b3106373:
>
> Merge tag 'edk2-stable202402-20240226-pull-request' of https://gitlab.com/kraxel/qemu into staging (2024-02-26 21:28:11 +0000)
>
> are available in the Git repository at:
>
> https://github.com/legoater/qemu/ tags/pull-aspeed-20240227
>
> for you to fetch changes up to db052d0eafe86c336d512dba99a1ec7c5c553f63:
>
> aspeed: fix hardcode boot address 0 (2024-02-27 13:47:05 +0100)
>
> ----------------------------------------------------------------
> aspeed queue:
>
> * Add support for UART0, in preparation of AST2700 models
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/9.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PULL 0/2] aspeed queue
@ 2024-02-27 12:51 Cédric Le Goater
2024-02-27 17:21 ` Peter Maydell
0 siblings, 1 reply; 6+ messages in thread
From: Cédric Le Goater @ 2024-02-27 12:51 UTC (permalink / raw)
To: qemu-arm, qemu-devel; +Cc: Cédric Le Goater
The following changes since commit 1b330dafcdc34315f6837ff3af34dbb4b3106373:
Merge tag 'edk2-stable202402-20240226-pull-request' of https://gitlab.com/kraxel/qemu into staging (2024-02-26 21:28:11 +0000)
are available in the Git repository at:
https://github.com/legoater/qemu/ tags/pull-aspeed-20240227
for you to fetch changes up to db052d0eafe86c336d512dba99a1ec7c5c553f63:
aspeed: fix hardcode boot address 0 (2024-02-27 13:47:05 +0100)
----------------------------------------------------------------
aspeed queue:
* Add support for UART0, in preparation of AST2700 models
----------------------------------------------------------------
Jamin Lin (2):
aspeed: introduce a new UART0 device name
aspeed: fix hardcode boot address 0
include/hw/arm/aspeed_soc.h | 19 +++++++++++++++++--
hw/arm/aspeed.c | 17 +++++++++++------
hw/arm/aspeed_ast10x0.c | 1 +
hw/arm/aspeed_ast2400.c | 6 ++++--
hw/arm/aspeed_ast2600.c | 3 ++-
hw/arm/aspeed_soc_common.c | 6 ++++--
6 files changed, 39 insertions(+), 13 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-02-27 17:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-01 16:29 [PULL 0/2] aspeed queue Cédric Le Goater
2022-08-01 16:29 ` [PULL 1/2] aspeed: Remove unused fields from AspeedMachineState Cédric Le Goater
2022-08-01 16:29 ` [PULL 2/2] aspeed/fby35: Fix owner of the BMC RAM memory region Cédric Le Goater
2022-08-02 2:04 ` [PULL 0/2] aspeed queue Richard Henderson
2024-02-27 12:51 Cédric Le Goater
2024-02-27 17:21 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.