Support the Frequency Counter Control register for AST2700
cover Support the Frequency Counter Control register for AST2700
v1:
- Skipping dram_init in u-boot for AST2700
- Support the Frequency Counter Control register for AST2700
Jamin Lin (2):
hw/misc/aspeed_sdmc: Skipping dram_init in u-boot for AST2700 hw/misc/aspeed_scu: Support the Frequency Counter Control register for
AST2700
hw/misc/aspeed_scu.c | 6 ++++++ hw/misc/aspeed_sdmc.c | 3 +++ 2 files changed, 9 insertions(+)
Signature · 1 line
2.43.0
PATCH 2/2 hw/misc/aspeed_scu: Support the Frequency Counter Control register for AST2700
According to the datasheet:
BIT[1] (SCU_FREQ_OSC_EN) enables the oscillator frequency measurement counter. BIT[6] (SCU_FREQ_DONE) indicates the measurement is finished. Firmware polls BIT[6] to determine when measurement is complete. The flag can be cleared by writing BIT[1] to 0.
To simulate this hardware behavior in QEMU:
If BIT[1] is set to 1, BIT[6] is immediately set to 1 to avoid firmware hanging during polling.
If BIT[1] is cleared to 0, BIT[6] is also cleared to 0 to match hardware semantics.
The initial value of this register is initialized to 0x80, reflecting the default value confirmed from an EVB register dump.
--- hw/misc/aspeed_scu.c | 6 ++++++ 1 file changed, 6 insertions(+)
hw/misc/aspeed_scu.c +6 -0
@@ -176,6 +176,7 @@#define AST2700_SCUIO_UARTCLK_GEN TO_REG(0x330)#define AST2700_SCUIO_HUARTCLK_GEN TO_REG(0x334)#define AST2700_SCUIO_CLK_DUTY_MEAS_RST TO_REG(0x388) +#define AST2700_SCUIO_FREQ_CNT_CTL TO_REG(0x3A0)#define SCU_IO_REGION_SIZE 0x1000
@@ -1022,6 +1023,10 @@ static void aspeed_ast2700_scuio_write(void *opaque, hwaddr offset, s->regs[reg -1 ] ^= data; updated = true;break ; +case AST2700_SCUIO_FREQ_CNT_CTL : + s->regs[reg] =deposit32 (s->regs[reg],6 ,1 , !!(data &BIT (1 ))); + updated = true; +break ;default : qemu_log_mask(LOG_GUEST_ERROR, "%s: Unhandled write at offset 0x%" HWADDR_PRIx "\n",
@@ -1066,6 +1071,7 @@ static const uint32_t ast2700_a0_resets_io[ASPEED_AST2700_SCU_NR_REGS] = { [AST2700_SCUIO_UARTCLK_GEN] = 0x00014506, [AST2700_SCUIO_HUARTCLK_GEN] = 0x000145c0, [AST2700_SCUIO_CLK_DUTY_MEAS_RST] = 0x0c9100d2, + [AST2700_SCUIO_FREQ_CNT_CTL] = 0x00000080, };static void aspeed_2700_scuio_class_init (ObjectClass *klass,const void *data)
Signature · 1 line
2.43.0
PATCH 1/2 hw/misc/aspeed_sdmc: Skipping dram_init in u-boot for AST2700
In reply to Jamin Lin viaOn AST2700 SoC, QEMU now sets BIT6 in VGA0 SCRATCH register to indicate that DDR training has completed, thus skipping the dram_init().
To align with the recent U-Boot changes, where the Main Control Register's BIT16 is checked to skip the dram_init() process, this patch sets BIT16 in the SDMC Main Control Register at reset time.
This allows both the main U-Boot stage to correctly detect and bypass DRAM initialization when running under QEMU.
Reference:
- QEMU: https://github.com/qemu/qemu/commit/2d082fea485ee455a70ed3e963cdf9a70f34858a
- U-Boot: https://github.com/AspeedTech-BMC/u-boot/commit/94e5435504fb0d8888f5c1bfd3fa284cdd6aaf9b
--- hw/misc/aspeed_sdmc.c | 3 +++ 1 file changed, 3 insertions(+)
hw/misc/aspeed_sdmc.c +3 -0
@@ -570,6 +570,9 @@ static void aspeed_2700_sdmc_reset(DeviceState *dev)/* Set ram size bit and defaults values */ s->regs[R_MAIN_CONF ] = asc->compute_conf (s,0 ); +/* Skipping dram init */ + s->regs[R_MAIN_CONTROL ] =BIT (16 ); +if (s->unlocked) { s->regs[R_2700_PROT ] =PROT_UNLOCKED ; }
Signature · 1 line
2.43.0
Re: [PATCH v1 2/2] hw/misc/aspeed_scu: Support the Frequency Counter Control register for AST2700
In reply to Jamin Lin viaQuoted 12 lines · Jamin Lin
According to the datasheet:
BIT[1] (SCU_FREQ_OSC_EN) enables the oscillator frequency measurement counter. BIT[6] (SCU_FREQ_DONE) indicates the measurement is finished. Firmware polls BIT[6] to determine when measurement is complete. The flag can be cleared by writing BIT[1] to 0.To simulate this hardware behavior in QEMU:
If BIT[1] is set to 1, BIT[6] is immediately set to 1 to avoid firmware hanging during polling.
If BIT[1] is cleared to 0, BIT[6] is also cleared to 0 to match hardware semantics.
Quoted 4 lines
The initial value of this register is initialized to
0x80, reflecting the default value confirmed from an EVB register dump.Signed-off-by Jamin Lin <[email protected]>
Thanks,
C.
Quoted 35 lines
--- hw/misc/aspeed_scu.c | 6 ++++++ 1 file changed, 6 insertions(+)hw/misc/aspeed_scu.c +6
-0@@ -176,6 +176,7 @@#define AST2700_SCUIO_UARTCLK_GEN TO_REG(0x330)#define AST2700_SCUIO_HUARTCLK_GEN TO_REG(0x334)#define AST2700_SCUIO_CLK_DUTY_MEAS_RST TO_REG(0x388) +#define AST2700_SCUIO_FREQ_CNT_CTL TO_REG(0x3A0)#define SCU_IO_REGION_SIZE 0x1000@@ -1022,6 +1023,10 @@ static void aspeed_ast2700_scuio_write(void *opaque, hwaddr offset, s->regs[reg -1 ] ^= data; updated = true;break ; +case AST2700_SCUIO_FREQ_CNT_CTL : + s->regs[reg] =deposit32 (s->regs[reg],6 ,1 , !!(data &BIT (1 ))); + updated = true; +break ;default : qemu_log_mask(LOG_GUEST_ERROR, "%s: Unhandled write at offset 0x%" HWADDR_PRIx "\n",@@ -1066,6 +1071,7 @@ static const uint32_t ast2700_a0_resets_io[ASPEED_AST2700_SCU_NR_REGS] = { [AST2700_SCUIO_UARTCLK_GEN] = 0x00014506, [AST2700_SCUIO_HUARTCLK_GEN] = 0x000145c0, [AST2700_SCUIO_CLK_DUTY_MEAS_RST] = 0x0c9100d2, + [AST2700_SCUIO_FREQ_CNT_CTL] = 0x00000080, };static void aspeed_2700_scuio_class_init (ObjectClass *klass,const void *data)
Re: [PATCH v1 1/2] hw/misc/aspeed_sdmc: Skipping dram_init in u-boot for AST2700
In reply to Jamin Lin viaQuoted 7 lines · Jamin Lin
On AST2700 SoC, QEMU now sets BIT6 in VGA0 SCRATCH register to indicate that DDR training has completed, thus skipping the
dram_init().To align with the recent U-Boot changes, where the Main Control Register's BIT16 is checked to skip the
dram_init()process, this patch sets BIT16 in the SDMC Main Control Register at reset time.
Quoted 8 lines
This allows both the main U-Boot stage to correctly detect and bypass DRAM initialization when running under QEMU.
Reference:
- QEMU: https://github.com/qemu/qemu/commit/2d082fea485ee455a70ed3e963cdf9a70f34858a
- U-Boot: https://github.com/AspeedTech-BMC/u-boot/commit/94e5435504fb0d8888f5c1bfd3fa284cdd6aaf9bSigned-off-by Jamin Lin <[email protected]>
Thanks,
C.
Quoted 18 lines
--- hw/misc/aspeed_sdmc.c | 3 +++ 1 file changed, 3 insertions(+)hw/misc/aspeed_sdmc.c +3
-0@@ -570,6 +570,9 @@ static void aspeed_2700_sdmc_reset(DeviceState *dev)/* Set ram size bit and defaults values */ s->regs[R_MAIN_CONF ] = asc->compute_conf (s,0 ); +/* Skipping dram init */ + s->regs[R_MAIN_CONTROL ] =BIT (16 ); +if (s->unlocked) { s->regs[R_2700_PROT ] =PROT_UNLOCKED ; }