Skip to contentSkip to conversation

hw/misc/zynq_slcr.c: drop duplicate reset value for DDRIOB_DCI_CTRL

PATCH Applied Corvin Köhne 3 participants 3 messages Jul 7 – Jul 9 Arm/Zynq architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/misc/zynq_slcr.c: drop duplicate reset value for DDRIOB_DCI_CTRL

From: Corvin Köhne <[email protected]>

When adding a reset value for DDRIOB_DCI_CTRL in c8ba862dbfdc, we haven't noticed that a reset value already exists. DDRIOB is a 32 bit register, so incrementing it by 12 will access the DDRIOB_DCI_CTRL register. According to the manual [1] the correct reset value is 0x00000020. Additionally, c8ba862dbfdc won't work with a reset value of 0x00000021 because it tries to detect a toggle of the reset bit (bit 0). Therefore, we drop the old reset value and keep the new one introduced in c8ba862dbfdc.

[1] https://docs.amd.com/r/en-US/ug585-zynq-7000-SoC-TRM/Register-slcr-DDRIOB_DCI_CTRL

Fixes c8ba862dbfdc ("hw/misc/zynq_slcr: Add logic for DCI configuration")
---
 hw/misc/zynq_slcr.c | 1 -
 1 file changed, 1 deletion(-)
hw/misc/zynq_slcr.c +0 -1
index 0ae5d607be9b..d0f899c3be4d 100644
@@ -427,7 +427,6 @@ static void zynq_slcr_reset_init(Object *obj, ResetType type)
                           = s->regs[R_DDRIOB + 3] = 0x00000e00;
     s->regs[R_DDRIOB + 4] = s->regs[R_DDRIOB + 5] = s->regs[R_DDRIOB + 6]
                           = 0x00000e00;
-    s->regs[R_DDRIOB + 12] = 0x00000021;
 
     s->regs[R_DDRIOB_DCI_CTRL] = 0x00000020;
 }
Signature · 1 line
2.47.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Corvin Köhne

From: Corvin Köhne <[email protected]>

When adding a reset value for DDRIOB_DCI_CTRL in c8ba862dbfdc, we haven't noticed that a reset value already exists. DDRIOB is a 32 bit register, so incrementing it by 12 will access the DDRIOB_DCI_CTRL register. According to the manual [1] the correct reset value is 0x00000020. Additionally, c8ba862dbfdc won't work with a reset value of 0x00000021 because it tries to detect a toggle of the reset bit (bit 0). Therefore, we drop the old reset value and keep the new one introduced in c8ba862dbfdc.

Quoted 4 lines

[1] https://docs.amd.com/r/en-US/ug585-zynq-7000-SoC-TRM/Register-slcr-DDRIOB_DCI_CTRL

Fixes c8ba862dbfdc ("hw/misc/zynq_slcr: Add logic for DCI configuration")

Alistair

Quoted 20 lines
---
 hw/misc/zynq_slcr.c | 1 -
 1 file changed, 1 deletion(-)
hw/misc/zynq_slcr.c +0 -2
index 0ae5d607be9b..d0f899c3be4d 100644
@@ -427,7 +427,6 @@ static void zynq_slcr_reset_init(Object *obj, ResetType type)
                           = s->regs[R_DDRIOB + 3] = 0x00000e00;
     s->regs[R_DDRIOB + 4] = s->regs[R_DDRIOB + 5] = s->regs[R_DDRIOB + 6]
                           = 0x00000e00;
-    s->regs[R_DDRIOB + 12] = 0x00000021;
 
     s->regs[R_DDRIOB_DCI_CTRL] = 0x00000020;
 }
--

2.47.3

#2 lore raw
In reply to Corvin Köhne
Quoted 11 lines · Corvin Köhne

From: Corvin Köhne <[email protected]>

When adding a reset value for DDRIOB_DCI_CTRL in c8ba862dbfdc, we haven't noticed that a reset value already exists. DDRIOB is a 32 bit register, so incrementing it by 12 will access the DDRIOB_DCI_CTRL register. According to the manual [1] the correct reset value is 0x00000020. Additionally, c8ba862dbfdc won't work with a reset value of 0x00000021 because it tries to detect a toggle of the reset bit (bit 0). Therefore, we drop the old reset value and keep the new one introduced in c8ba862dbfdc.

Quoted 4 lines

[1] https://docs.amd.com/r/en-US/ug585-zynq-7000-SoC-TRM/Register-slcr-DDRIOB_DCI_CTRL

Fixes c8ba862dbfdc ("hw/misc/zynq_slcr: Add logic for DCI configuration")

Applied to target-arm.next, thanks.

-- PMM