* Re: [PATCH] rockchip: dts: rk3328: fix sdram params
2023-02-10 18:30 [PATCH] rockchip: dts: rk3328: fix sdram params Jonas Karlman
@ 2023-02-13 4:27 ` Simon Glass
2023-02-13 6:58 ` Kever Yang
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Simon Glass @ 2023-02-13 4:27 UTC (permalink / raw)
To: Jonas Karlman
Cc: Philipp Tomsich, Kever Yang, Jagan Teki, YouMin Chen, u-boot
On Fri, 10 Feb 2023 at 11:30, Jonas Karlman <jonas@kwiboo.se> wrote:
>
> The rk3328 sdram driver read sdram parameters from the devicetree into a
> struct rk3328_sdram_params using dev_read_u32_array.
>
> After commit 5ab30c3176bf ("ram: rockchip: Update ddr pctl regs for px30")
> changed the size of struct ddr_pctl_regs, a member of struct
> rk3328_sdram_params, U-Boot TPL can no longer initialize DRAM on RK3328.
>
> Add ten u32 to the sdram parameter array in devicetree to align with
> this size change. This fixes DRAM initialization on RK3328.
>
> Fixes: 5ab30c3176bf ("ram: rockchip: Update ddr pctl regs for px30")
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
> ---
> arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 10 ++++++++++
> arch/arm/dts/rk3328-sdram-ddr4-666.dtsi | 10 ++++++++++
> arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 10 ++++++++++
> arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 10 ++++++++++
> 4 files changed, 40 insertions(+)
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] rockchip: dts: rk3328: fix sdram params
2023-02-10 18:30 [PATCH] rockchip: dts: rk3328: fix sdram params Jonas Karlman
2023-02-13 4:27 ` Simon Glass
@ 2023-02-13 6:58 ` Kever Yang
2023-02-17 18:07 ` Jagan Teki
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Kever Yang @ 2023-02-13 6:58 UTC (permalink / raw)
To: Jonas Karlman, Simon Glass, Philipp Tomsich
Cc: Jagan Teki, YouMin Chen, u-boot
On 2023/2/11 02:30, Jonas Karlman wrote:
> The rk3328 sdram driver read sdram parameters from the devicetree into a
> struct rk3328_sdram_params using dev_read_u32_array.
>
> After commit 5ab30c3176bf ("ram: rockchip: Update ddr pctl regs for px30")
> changed the size of struct ddr_pctl_regs, a member of struct
> rk3328_sdram_params, U-Boot TPL can no longer initialize DRAM on RK3328.
>
> Add ten u32 to the sdram parameter array in devicetree to align with
> this size change. This fixes DRAM initialization on RK3328.
>
> Fixes: 5ab30c3176bf ("ram: rockchip: Update ddr pctl regs for px30")
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 10 ++++++++++
> arch/arm/dts/rk3328-sdram-ddr4-666.dtsi | 10 ++++++++++
> arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 10 ++++++++++
> arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 10 ++++++++++
> 4 files changed, 40 insertions(+)
>
> diff --git a/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi
> index 3e88ed443ba0..c5acfe4ac2a0 100644
> --- a/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi
> +++ b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi
> @@ -92,6 +92,16 @@
> 0xffffffff
> 0xffffffff
> 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
>
> 0x00000004
> 0x0000000a
> diff --git a/arch/arm/dts/rk3328-sdram-ddr4-666.dtsi b/arch/arm/dts/rk3328-sdram-ddr4-666.dtsi
> index 0859649a6905..c5fa2903c5c1 100644
> --- a/arch/arm/dts/rk3328-sdram-ddr4-666.dtsi
> +++ b/arch/arm/dts/rk3328-sdram-ddr4-666.dtsi
> @@ -89,6 +89,16 @@
> 0xffffffff
> 0xffffffff
> 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
>
> 0x00000004
> 0x0000000c
> diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi
> index d63c761a0283..07f27b2b7bab 100644
> --- a/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi
> +++ b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi
> @@ -92,6 +92,16 @@
> 0xffffffff
> 0xffffffff
> 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
>
> 0x00000004
> 0x0000000b
> diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi
> index df42bb29ce88..d53d3a0fdfb2 100644
> --- a/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi
> +++ b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi
> @@ -92,6 +92,16 @@
> 0xffffffff
> 0xffffffff
> 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
>
> 0x00000004
> 0x0000000b
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] rockchip: dts: rk3328: fix sdram params
2023-02-10 18:30 [PATCH] rockchip: dts: rk3328: fix sdram params Jonas Karlman
2023-02-13 4:27 ` Simon Glass
2023-02-13 6:58 ` Kever Yang
@ 2023-02-17 18:07 ` Jagan Teki
2023-02-17 18:09 ` Jagan Teki
2023-02-22 21:42 ` Vagrant Cascadian
4 siblings, 0 replies; 7+ messages in thread
From: Jagan Teki @ 2023-02-17 18:07 UTC (permalink / raw)
To: Jonas Karlman
Cc: Simon Glass, Philipp Tomsich, Kever Yang, Jagan Teki, YouMin Chen,
u-boot
On Sat, Feb 11, 2023 at 12:00 AM Jonas Karlman <jonas@kwiboo.se> wrote:
>
> The rk3328 sdram driver read sdram parameters from the devicetree into a
> struct rk3328_sdram_params using dev_read_u32_array.
>
> After commit 5ab30c3176bf ("ram: rockchip: Update ddr pctl regs for px30")
> changed the size of struct ddr_pctl_regs, a member of struct
> rk3328_sdram_params, U-Boot TPL can no longer initialize DRAM on RK3328.
>
> Add ten u32 to the sdram parameter array in devicetree to align with
> this size change. This fixes DRAM initialization on RK3328.
>
> Fixes: 5ab30c3176bf ("ram: rockchip: Update ddr pctl regs for px30")
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
> ---
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
Tested-by: Jagan Teki <jagan@amarulasolutions.com> # roc-rk3328-cc
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] rockchip: dts: rk3328: fix sdram params
2023-02-10 18:30 [PATCH] rockchip: dts: rk3328: fix sdram params Jonas Karlman
` (2 preceding siblings ...)
2023-02-17 18:07 ` Jagan Teki
@ 2023-02-17 18:09 ` Jagan Teki
2023-02-17 18:30 ` Tom Rini
2023-02-22 21:42 ` Vagrant Cascadian
4 siblings, 1 reply; 7+ messages in thread
From: Jagan Teki @ 2023-02-17 18:09 UTC (permalink / raw)
To: Kever Yang, Tom Rini
Cc: Simon Glass, Philipp Tomsich, Jagan Teki, YouMin Chen, u-boot,
Jonas Karlman
Hi Kever and Tom,
On Sat, Feb 11, 2023 at 12:00 AM Jonas Karlman <jonas@kwiboo.se> wrote:
>
> The rk3328 sdram driver read sdram parameters from the devicetree into a
> struct rk3328_sdram_params using dev_read_u32_array.
>
> After commit 5ab30c3176bf ("ram: rockchip: Update ddr pctl regs for px30")
> changed the size of struct ddr_pctl_regs, a member of struct
> rk3328_sdram_params, U-Boot TPL can no longer initialize DRAM on RK3328.
>
> Add ten u32 to the sdram parameter array in devicetree to align with
> this size change. This fixes DRAM initialization on RK3328.
>
> Fixes: 5ab30c3176bf ("ram: rockchip: Update ddr pctl regs for px30")
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
> ---
Can someone merge this soon, rk3328 platform has broken in the last two RCs.
Thanks,
Jagan.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] rockchip: dts: rk3328: fix sdram params
2023-02-17 18:09 ` Jagan Teki
@ 2023-02-17 18:30 ` Tom Rini
0 siblings, 0 replies; 7+ messages in thread
From: Tom Rini @ 2023-02-17 18:30 UTC (permalink / raw)
To: Jagan Teki
Cc: Kever Yang, Simon Glass, Philipp Tomsich, Jagan Teki, YouMin Chen,
u-boot, Jonas Karlman
[-- Attachment #1: Type: text/plain, Size: 1057 bytes --]
On Fri, Feb 17, 2023 at 11:39:35PM +0530, Jagan Teki wrote:
> Hi Kever and Tom,
>
> On Sat, Feb 11, 2023 at 12:00 AM Jonas Karlman <jonas@kwiboo.se> wrote:
> >
> > The rk3328 sdram driver read sdram parameters from the devicetree into a
> > struct rk3328_sdram_params using dev_read_u32_array.
> >
> > After commit 5ab30c3176bf ("ram: rockchip: Update ddr pctl regs for px30")
> > changed the size of struct ddr_pctl_regs, a member of struct
> > rk3328_sdram_params, U-Boot TPL can no longer initialize DRAM on RK3328.
> >
> > Add ten u32 to the sdram parameter array in devicetree to align with
> > this size change. This fixes DRAM initialization on RK3328.
> >
> > Fixes: 5ab30c3176bf ("ram: rockchip: Update ddr pctl regs for px30")
> > Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
> > ---
>
> Can someone merge this soon, rk3328 platform has broken in the last two RCs.
I would really like to see a rockchip PR of fixes at this point, yes. I
believe we'll need one of the TPL/binary-blob related series as well?
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] rockchip: dts: rk3328: fix sdram params
2023-02-10 18:30 [PATCH] rockchip: dts: rk3328: fix sdram params Jonas Karlman
` (3 preceding siblings ...)
2023-02-17 18:09 ` Jagan Teki
@ 2023-02-22 21:42 ` Vagrant Cascadian
4 siblings, 0 replies; 7+ messages in thread
From: Vagrant Cascadian @ 2023-02-22 21:42 UTC (permalink / raw)
To: Jonas Karlman, Simon Glass, Philipp Tomsich, Kever Yang
Cc: Jagan Teki, YouMin Chen, u-boot, Jonas Karlman
[-- Attachment #1: Type: text/plain, Size: 3465 bytes --]
On 2023-02-10, Jonas Karlman wrote:
> The rk3328 sdram driver read sdram parameters from the devicetree into a
> struct rk3328_sdram_params using dev_read_u32_array.
>
> After commit 5ab30c3176bf ("ram: rockchip: Update ddr pctl regs for px30")
> changed the size of struct ddr_pctl_regs, a member of struct
> rk3328_sdram_params, U-Boot TPL can no longer initialize DRAM on RK3328.
>
> Add ten u32 to the sdram parameter array in devicetree to align with
> this size change. This fixes DRAM initialization on RK3328.
>
> Fixes: 5ab30c3176bf ("ram: rockchip: Update ddr pctl regs for px30")
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
> Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
> Tested-by: Jagan Teki <jagan@amarulasolutions.com> # roc-rk3328-cc
Thanks! This allows booting the rock64-rk3328 with v2023.04-rc2, which
otherwise just hangs after loading TPL (or SPL?).
Tested-by: Vagrant Cascadian <vagrant@debian.org>
> ---
> arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 10 ++++++++++
> arch/arm/dts/rk3328-sdram-ddr4-666.dtsi | 10 ++++++++++
> arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 10 ++++++++++
> arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 10 ++++++++++
> 4 files changed, 40 insertions(+)
>
> diff --git a/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi
> index 3e88ed443ba0..c5acfe4ac2a0 100644
> --- a/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi
> +++ b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi
> @@ -92,6 +92,16 @@
> 0xffffffff
> 0xffffffff
> 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
>
> 0x00000004
> 0x0000000a
> diff --git a/arch/arm/dts/rk3328-sdram-ddr4-666.dtsi b/arch/arm/dts/rk3328-sdram-ddr4-666.dtsi
> index 0859649a6905..c5fa2903c5c1 100644
> --- a/arch/arm/dts/rk3328-sdram-ddr4-666.dtsi
> +++ b/arch/arm/dts/rk3328-sdram-ddr4-666.dtsi
> @@ -89,6 +89,16 @@
> 0xffffffff
> 0xffffffff
> 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
>
> 0x00000004
> 0x0000000c
> diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi
> index d63c761a0283..07f27b2b7bab 100644
> --- a/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi
> +++ b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi
> @@ -92,6 +92,16 @@
> 0xffffffff
> 0xffffffff
> 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
>
> 0x00000004
> 0x0000000b
> diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi
> index df42bb29ce88..d53d3a0fdfb2 100644
> --- a/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi
> +++ b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi
> @@ -92,6 +92,16 @@
> 0xffffffff
> 0xffffffff
> 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
> + 0xffffffff
>
> 0x00000004
> 0x0000000b
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread