mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
To: Sascha Hauer <s.hauer@pengutronix.de>,
	Barebox List <barebox@lists.infradead.org>
Cc: Ahmad Fatoum <ahmad@a3f.at>
Subject: Re: [PATCH 2/5] ARM: Rockchip: implement memory read out from controller
Date: Sun, 26 Mar 2023 10:34:55 +0200	[thread overview]
Message-ID: <b931ac9b682e0cf5130f428d22b2e3f42544f3a7.camel@pengutronix.de> (raw)
In-Reply-To: <20230324140327.2154039-3-s.hauer@pengutronix.de>

Hi,

On Fri, 2023-03-24 at 15:03 +0100, Sascha Hauer wrote:
> From: Ahmad Fatoum <ahmad@a3f.at>
> 
> Add a driver to read out the amount of memory from the DDR controller.
> The decoding of the registers has been taken from U-Boot. Currently
> supported are the RK3399 and the RK3568, but decoding should work on
> other Rockchip SoCs as well.
> 
> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  arch/arm/mach-rockchip/Makefile     |   1 +
>  arch/arm/mach-rockchip/dmc.c        | 232 ++++++++++++++++++++++++++++
>  include/linux/sizes.h               |   3 +
>  include/mach/rockchip/dmc.h         |  86 +++++++++++
>  include/mach/rockchip/rk3399-regs.h |   1 +
>  include/mach/rockchip/rk3568-regs.h |   1 +
>  6 files changed, 324 insertions(+)
>  create mode 100644 arch/arm/mach-rockchip/dmc.c
>  create mode 100644 include/mach/rockchip/dmc.h
> 
> diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile
> index 2529af7c7e..f6c575854e 100644
> --- a/arch/arm/mach-rockchip/Makefile
> +++ b/arch/arm/mach-rockchip/Makefile
> @@ -6,4 +6,5 @@ obj-$(CONFIG_ARCH_RK3188) += rk3188.o
>  obj-$(CONFIG_ARCH_RK3288) += rk3288.o
>  obj-pbl-$(CONFIG_ARCH_RK3568) += rk3568.o
>  obj-$(CONFIG_ARCH_ROCKCHIP_V8) += bootm.o
> +obj-pbl-$(CONFIG_ARCH_ROCKCHIP_V8) += dmc.o
>  obj-$(CONFIG_BAREBOX_UPDATE) += bbu.o
> diff --git a/arch/arm/mach-rockchip/dmc.c b/arch/arm/mach-rockchip/dmc.c
> new file mode 100644
> index 0000000000..3a0d835689
> --- /dev/null
> +++ b/arch/arm/mach-rockchip/dmc.c
> @@ -0,0 +1,232 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2017 Rockchip Electronics Co., Ltd.
> + */
> +
> +#define pr_fmt(fmt) "rockchip-dmc: " fmt
> +
> +#include <common.h>
> +#include <init.h>
> +#include <asm/barebox-arm.h>
> +#include <asm/memory.h>
> +#include <pbl.h>
> +#include <io.h>
> +#include <regmap.h>
> +#include <mfd/syscon.h>
> +#include <mach/rockchip/dmc.h>
> +#include <mach/rockchip/rk3399-regs.h>
> +#include <mach/rockchip/rk3568-regs.h>
> +
> +#define RK3399_PMUGRF_OS_REG2          0x308
> +#define RK3399_PMUGRF_OS_REG3          0x30C
> +
> +#define RK3568_PMUGRF_OS_REG2           0x208
> +#define RK3568_PMUGRF_OS_REG3           0x20c
> +
> +struct rockchip_dmc_region {
> +       resource_size_t base, size;
> +};
> +
> +struct rockchip_dmc_drvdata {
> +       unsigned int os_reg2;
> +       unsigned int os_reg3;
> +       const struct rockchip_dmc_region *regions;
> +};
> +
> +static resource_size_t rockchip_sdram_size(u32 sys_reg2, u32 sys_reg3)
> +{
> +       u32 rank, cs0_col, bk, cs0_row, cs1_row, bw, row_3_4;
> +       resource_size_t chipsize_mb, size_mb = 0;
> +       u32 ch;
> +       u32 cs1_col;
> +       u32 bg = 0;
> +       u32 dbw, dram_type;
> +       u32 ch_num = 1 + FIELD_GET(SYS_REG_NUM_CH, sys_reg2);
> +       u32 version = FIELD_GET(SYS_REG_VERSION, sys_reg3);
> +
> +       pr_debug("%s(reg2=%x, reg3=%x)\n", __func__, sys_reg2, sys_reg3);
> +
> +       dram_type = FIELD_GET(SYS_REG_DDRTYPE, sys_reg2);
> +
> +       if (version >= 3)
> +               dram_type |= FIELD_GET(SYS_REG_EXTEND_DDRTYPE, sys_reg3) << 3;
> +
> +       for (ch = 0; ch < ch_num; ch++) {
> +               rank = 1 + (sys_reg2 >> SYS_REG_RANK_SHIFT(ch) & SYS_REG_RANK_MASK);
> +               cs0_col = 9 + (sys_reg2 >> SYS_REG_COL_SHIFT(ch) & SYS_REG_COL_MASK);
> +               cs1_col = cs0_col;
> +
> +               bk = 3 - ((sys_reg2 >> SYS_REG_BK_SHIFT(ch)) & SYS_REG_BK_MASK);
> +
> +               cs0_row = sys_reg2 >> SYS_REG_CS0_ROW_SHIFT(ch) & SYS_REG_CS0_ROW_MASK;
> +               cs1_row = sys_reg2 >> SYS_REG_CS1_ROW_SHIFT(ch) & SYS_REG_CS1_ROW_MASK;
> +
> +               if (version >= 2) {
> +                       cs1_col = 9 + (sys_reg3 >> SYS_REG_CS1_COL_SHIFT(ch) &
> +                                 SYS_REG_CS1_COL_MASK);
> +
> +                       cs0_row |= (sys_reg3 >> SYS_REG_EXTEND_CS0_ROW_SHIFT(ch) &
> +                                       SYS_REG_EXTEND_CS0_ROW_MASK) << 2;
> +
> +                       if (cs0_row == 7)
> +                               cs0_row = 12;
> +                       else
> +                               cs0_row += 13;
> +
> +                       cs1_row |= (sys_reg3 >> SYS_REG_EXTEND_CS1_ROW_SHIFT(ch) &
> +                                       SYS_REG_EXTEND_CS1_ROW_MASK) << 2;
> +
> +                       if (cs1_row == 7)
> +                               cs1_row = 12;
> +                       else
> +                               cs1_row += 13;
> +               } else {
> +                       cs0_row += 13;
> +                       cs1_row += 13;
> +               }
> +
> +               bw = (2 >> ((sys_reg2 >> SYS_REG_BW_SHIFT(ch)) & SYS_REG_BW_MASK));
> +               row_3_4 = sys_reg2 >> SYS_REG_ROW_3_4_SHIFT(ch) & SYS_REG_ROW_3_4_MASK;
> +
> +               if (dram_type == DDR4) {
> +                       dbw = (sys_reg2 >> SYS_REG_DBW_SHIFT(ch)) & SYS_REG_DBW_MASK;
> +                       bg = (dbw == 2) ? 2 : 1;
> +               }
> +
> +               chipsize_mb = (1 << (cs0_row + cs0_col + bk + bg + bw - 20));
> +
> +               if (rank > 1)
> +                       chipsize_mb += chipsize_mb >> ((cs0_row - cs1_row) +
> +                                      (cs0_col - cs1_col));
> +               if (row_3_4)
> +                       chipsize_mb = chipsize_mb * 3 / 4;
> +
> +               size_mb += chipsize_mb;
> +
> +               if (rank > 1)
> +                       pr_debug("rank %d cs0_col %d cs1_col %d bk %d cs0_row %d "
> +                                "cs1_row %d bw %d row_3_4 %d\n",
> +                                rank, cs0_col, cs1_col, bk, cs0_row,
> +                                cs1_row, bw, row_3_4);
> +               else
> +                       pr_debug("rank %d cs0_col %d bk %d cs0_row %d "
> +                                "bw %d row_3_4 %d\n",
> +                                rank, cs0_col, bk, cs0_row,
> +                                bw, row_3_4);
> +       }
> +
> +       return (resource_size_t)size_mb << 20;
> +}
> +
> +resource_size_t rk3399_ram0_size(void)
> +{
> +       void __iomem *pmugrf = IOMEM(RK3399_PMUGRF_BASE);
> +       u32 sys_reg2, sys_reg3;
> +       resource_size_t size;
> +
> +       sys_reg2 = readl(pmugrf + RK3399_PMUGRF_OS_REG2);
> +       sys_reg3 = readl(pmugrf + RK3399_PMUGRF_OS_REG3);
> +
> +       size = rockchip_sdram_size(sys_reg2, sys_reg3);
> +       size = min_t(resource_size_t, SZ_4G - SZ_128M, size);
> +
> +       pr_debug("%s() = %llu\n", __func__, (u64)size);
> +
> +       return size;
> +}
> +
> +resource_size_t rk3568_ram0_size(void)
> +{
> +       void __iomem *pmugrf = IOMEM(RK3568_PMUGRF_BASE);
> +       u32 sys_reg2, sys_reg3;
> +       resource_size_t size;
> +
> +       sys_reg2 = readl(pmugrf + RK3568_PMUGRF_OS_REG2);
> +       sys_reg3 = readl(pmugrf + RK3568_PMUGRF_OS_REG3);
> +
> +       size = rockchip_sdram_size(sys_reg2, sys_reg3);
> +       size = min_t(resource_size_t, SZ_4G - SZ_128M, size);
                                           this ^
Should be SZ_256M, The frist memory region for RK356x is from 0x0 to
0xf000_0000, not 0xf800_0000. Tested on Radxa CM3 RK3566.

> +
> +       pr_debug("%s() = %llu\n", __func__, (u64)size);
> +
> +       return size;
> +}
> +
> +static int rockchip_dmc_probe(struct device *dev)
> +{
> +       const struct rockchip_dmc_drvdata *drvdata;
> +       const struct rockchip_dmc_region *region;
> +       resource_size_t membase, memsize;
> +       struct regmap *regmap;
> +       u32 sys_reg2, sys_reg3;
> +
> +       regmap = syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,pmu");
> +       if (IS_ERR(regmap))
> +               return PTR_ERR(regmap);
> +
> +       drvdata = device_get_match_data(dev);
> +       if (!drvdata)
> +               return -ENOENT;
> +
> +       regmap_read(regmap, drvdata->os_reg2, &sys_reg2);
> +       regmap_read(regmap, drvdata->os_reg3, &sys_reg3);
> +
> +       memsize = rockchip_sdram_size(sys_reg2, sys_reg3);
> +
> +       dev_info(dev, "Detected memory size: %pa\n", &memsize);
> +
> +       region = drvdata->regions;
> +
> +       if (memsize >= region[0].size) {
> +               if (region[1].size)
> +                       arm_add_mem_device("ram1", region[1].base,
> +                                          memsize - region[0].size);
> +               memsize = region[0].size;
> +       }
> +
> +       /* lowest 10M are shaved off for secure world firmware */
> +       membase = 0xa00000;
> +
> +       return arm_add_mem_device("ram0", membase, memsize - membase);
> +}
> +
> +static const struct rockchip_dmc_region rk3399_regions[] = {
> +       {
> +               .base = 0x0,
> +               .size = SZ_4G - SZ_128M,
> +       }, {
> +               .base = SZ_4G,
> +               .size = SZ_32G,
> +       }
> +};
> +
> +static const struct rockchip_dmc_drvdata rk3399_drvdata = {
> +       .os_reg2 = RK3399_PMUGRF_OS_REG2,
> +       .os_reg3 = RK3399_PMUGRF_OS_REG3,
> +       .regions = rk3399_regions,
> +};
> +
> +static const struct rockchip_dmc_drvdata rk3568_drvdata = {
> +       .os_reg2 = RK3568_PMUGRF_OS_REG2,
> +       .os_reg3 = RK3568_PMUGRF_OS_REG3,
> +       .regions = rk3399_regions,
> +};
> +
> +static struct of_device_id rockchip_dmc_dt_ids[] = {
> +       {
> +               .compatible = "rockchip,rk3399-dmc",
> +               .data = &rk3399_drvdata,
> +       },
> +       {
> +               .compatible = "rockchip,rk3568-dmc",
> +               .data = &rk3568_drvdata,
> +       },
> +       { /* sentinel */ }
> +};
> +
> +static struct driver rockchip_dmc_driver = {
> +       .name   = "rockchip-dmc",
> +       .probe  = rockchip_dmc_probe,
> +       .of_compatible = rockchip_dmc_dt_ids,
> +};
> +mem_platform_driver(rockchip_dmc_driver);
> diff --git a/include/linux/sizes.h b/include/linux/sizes.h
> index fbde0bc7e8..1d222daeab 100644
> --- a/include/linux/sizes.h
> +++ b/include/linux/sizes.h
> @@ -47,5 +47,8 @@
>  #define SZ_2G                          0x80000000
>  
>  #define SZ_4G                          _AC(0x100000000, ULL)
> +#define SZ_8G                          _AC(0x200000000, ULL)
> +#define SZ_16G                         _AC(0x400000000, ULL)
> +#define SZ_32G                         _AC(0x800000000, ULL)
>  
>  #endif /* __LINUX_SIZES_H__ */
> diff --git a/include/mach/rockchip/dmc.h b/include/mach/rockchip/dmc.h
> new file mode 100644
> index 0000000000..ff197d50a0
> --- /dev/null
> +++ b/include/mach/rockchip/dmc.h
> @@ -0,0 +1,86 @@
> +/* SPDX-License-Identifier: GPL-2.0+ */
> +/*
> + * Copyright (C) 2017 Rockchip Electronics Co., Ltd.
> + */
> +
> +#ifndef _MACH_ROCKCHIP_DMC_H
> +#define _MACH_ROCKCHIP_DMC_H
> +
> +#include <linux/compiler.h>
> +#include <linux/types.h>
> +#include <linux/bitfield.h>
> +
> +enum {
> +       DDR4 = 0,
> +       DDR3 = 0x3,
> +       LPDDR2 = 0x5,
> +       LPDDR3 = 0x6,
> +       LPDDR4 = 0x7,
> +       UNUSED = 0xFF
> +};
> +
> +/*
> + * sys_reg2 bitfield struct
> + * [31]                row_3_4_ch1
> + * [30]                row_3_4_ch0
> + * [29:28]     chinfo
> + * [27]                rank_ch1
> + * [26:25]     col_ch1
> + * [24]                bk_ch1
> + * [23:22]     low bits of cs0_row_ch1
> + * [21:20]     low bits of cs1_row_ch1
> + * [19:18]     bw_ch1
> + * [17:16]     dbw_ch1;
> + * [15:13]     ddrtype
> + * [12]                channelnum
> + * [11]                rank_ch0
> + * [10:9]      col_ch0,
> + * [8]         bk_ch0
> + * [7:6]       low bits of cs0_row_ch0
> + * [5:4]       low bits of cs1_row_ch0
> + * [3:2]       bw_ch0
> + * [1:0]       dbw_ch0
> + */
> +
> +#define SYS_REG_DDRTYPE                        GENMASK(15, 13)
> +#define SYS_REG_NUM_CH                 BIT(12)
> +#define SYS_REG_ROW_3_4_SHIFT(ch)      (30 + (ch))
> +#define SYS_REG_ROW_3_4_MASK           1
> +#define SYS_REG_CHINFO_SHIFT(ch)       (28 + (ch))
> +#define SYS_REG_RANK_SHIFT(ch)         (11 + (ch) * 16)
> +#define SYS_REG_RANK_MASK              1
> +#define SYS_REG_COL_SHIFT(ch)          (9 + (ch) * 16)
> +#define SYS_REG_COL_MASK               3
> +#define SYS_REG_BK_SHIFT(ch)           (8 + (ch) * 16)
> +#define SYS_REG_BK_MASK                        1
> +#define SYS_REG_CS0_ROW_SHIFT(ch)      (6 + (ch) * 16)
> +#define SYS_REG_CS0_ROW_MASK           3
> +#define SYS_REG_CS1_ROW_SHIFT(ch)      (4 + (ch) * 16)
> +#define SYS_REG_CS1_ROW_MASK           3
> +#define SYS_REG_BW_SHIFT(ch)           (2 + (ch) * 16)
> +#define SYS_REG_BW_MASK                        3
> +#define SYS_REG_DBW_SHIFT(ch)          ((ch) * 16)
> +#define SYS_REG_DBW_MASK               3
> +
> +/*
> + * sys_reg3 bitfield struct
> + * [7]         high bit of cs0_row_ch1
> + * [6]         high bit of cs1_row_ch1
> + * [5]         high bit of cs0_row_ch0
> + * [4]         high bit of cs1_row_ch0
> + * [3:2]       cs1_col_ch1
> + * [1:0]       cs1_col_ch0
> + */
> +#define SYS_REG_VERSION                                GENMASK(31, 28)
> +#define SYS_REG_EXTEND_DDRTYPE                 GENMASK(13, 12)
> +#define SYS_REG_EXTEND_CS0_ROW_SHIFT(ch)       (5 + (ch) * 2)
> +#define SYS_REG_EXTEND_CS0_ROW_MASK            1
> +#define SYS_REG_EXTEND_CS1_ROW_SHIFT(ch)       (4 + (ch) * 2)
> +#define SYS_REG_EXTEND_CS1_ROW_MASK            1
> +#define SYS_REG_CS1_COL_SHIFT(ch)              (0 + (ch) * 2)
> +#define SYS_REG_CS1_COL_MASK                   3
> +
> +resource_size_t rk3399_ram0_size(void);
> +resource_size_t rk3568_ram0_size(void);
> +
> +#endif
> diff --git a/include/mach/rockchip/rk3399-regs.h b/include/mach/rockchip/rk3399-regs.h
> index 57033b6510..6db082da9b 100644
> --- a/include/mach/rockchip/rk3399-regs.h
> +++ b/include/mach/rockchip/rk3399-regs.h
> @@ -10,6 +10,7 @@
>  #define RK3399_UART3_BASE      0xff1b0000
>  #define RK3399_UART4_BASE      0xff370000
>  
> +#define RK3399_PMUGRF_BASE     0xff320000
>  #define RK3399_IRAM_BASE       0xff8c0000
>  #define RK3399_STIMER_BASE     0xff8680a0
>  
> diff --git a/include/mach/rockchip/rk3568-regs.h b/include/mach/rockchip/rk3568-regs.h
> index edd5ee268d..55d28790dd 100644
> --- a/include/mach/rockchip/rk3568-regs.h
> +++ b/include/mach/rockchip/rk3568-regs.h
> @@ -16,5 +16,6 @@
>  #define RK3568_UART9_BASE      0xfe6d0000
>  
>  #define RK3568_IRAM_BASE       0xfdcc0000
> +#define RK3568_PMUGRF_BASE     0xfdc20000
>  
>  #endif /* __MACH_RK3568_REGS_H */


  reply	other threads:[~2023-03-26  8:36 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-24 14:03 [PATCH 0/5] ARM: Rockchip: Read amount of memory from DDR controller Sascha Hauer
2023-03-24 14:03 ` [PATCH 1/5] ARM: dts: rk356x: Add DMC controller node Sascha Hauer
2023-03-24 14:03 ` [PATCH 2/5] ARM: Rockchip: implement memory read out from controller Sascha Hauer
2023-03-26  8:34   ` Rouven Czerwinski [this message]
2023-03-27  7:32     ` Sascha Hauer
2023-03-24 14:03 ` [PATCH 3/5] ARM: Rockchip: Add rk3568 specific barebox entry function Sascha Hauer
2023-03-26  8:36   ` Rouven Czerwinski
2023-03-27  8:31     ` Sascha Hauer
2023-03-24 14:03 ` [PATCH 4/5] ARM: Rockchip: rk3568: use rk3568_barebox_entry() Sascha Hauer
2023-03-24 14:03 ` [PATCH 5/5] ARM: Rockchip: make bootsource logic generic to all SoCs Sascha Hauer

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=b931ac9b682e0cf5130f428d22b2e3f42544f3a7.camel@pengutronix.de \
    --to=r.czerwinski@pengutronix.de \
    --cc=ahmad@a3f.at \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@pengutronix.de \
    /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