On Mon, 15 Sep 2025 21:20:35 +0200 Lukas Schmid <lukas.sch...@netcube.li> wrote:
Hi Lukas, John, so looking at the code again, table 0 is special in that it's all 0's, which apparently means no remapping, according to some comments. We already bail out earlier of this function for configurations that do not require remapping, so can you test whether this works here as well? Just do the chip ID test early, after the DRAM type check, and before the fuse is read. And if it's 0x7200, then just return; I think that would look better than the odd fuse special case. Thanks, Andre > Extend the DRAM initialisation code to add support for the T113-S4 aka > T113M4020DC0 by checking the SoC's CHIPID. > > The list of Chip-IDs came from > https://github.com/ua1arn/hftrx/blob/25d8cb9e4cfe1d7d0e4a2f641025c88a9ec5e758/inc/clocks.h#L250 > > And the chipid register address was something I heard through apritzel > altough it seems that, according to Jookia, the Tina Device Tree seems > to agree: > > sid@3006000 { > compatible = "allwinner,sun20iw1p1-sid", "allwinner,sunxi-sid"; > reg = <0x0 0x03006000 0 0x1000>; > #address-cells = <1>; > #size-cells = <1>; > > chipid { > reg = <0x0 0>; > offset = <0x200>; > size = <0x10>; > }; > ... > }; > > Signed-off-by: Lukas Schmid <lukas.sch...@netcube.li> > Tested-by: John Watts <cont...@jookia.org> > Reviewed-by: John Watts <cont...@jookia.org> > Reviewed-by: Jernej Skrabec <jernej.skra...@gmail.com> > --- > Changes in v2: > - Use uint32_t instead of u32 for sid_read_soc_chipid return type > - Add descriptive comment about source of Chip-ID list and register > > drivers/ram/sunxi/dram_sun20i_d1.c | 13 ++++++++++++- > drivers/ram/sunxi/dram_sun20i_d1.h | 7 +++++++ > 2 files changed, 19 insertions(+), 1 deletion(-) > > diff --git a/drivers/ram/sunxi/dram_sun20i_d1.c > b/drivers/ram/sunxi/dram_sun20i_d1.c > index a1794032f3b..381eeb87e2e 100644 > --- a/drivers/ram/sunxi/dram_sun20i_d1.c > +++ b/drivers/ram/sunxi/dram_sun20i_d1.c > @@ -54,6 +54,11 @@ static void sid_read_ldoB_cal(const dram_para_t *para) > clrsetbits_le32(0x3000150, 0xff00, reg << 8); > } > > +static uint32_t sid_read_soc_chipid(void) > +{ > + return readl(SUNXI_SID_BASE + 0x00) & 0xffff; > +} > + > static void dram_voltage_set(const dram_para_t *para) > { > int vol; > @@ -663,6 +668,7 @@ static void mctl_phy_ac_remapping(const dram_para_t *para, > > fuse = (readl(SUNXI_SID_BASE + 0x28) & 0xf00) >> 8; > debug("DDR efuse: 0x%x\n", fuse); > + debug("SoC Chip ID: 0x%08x\n", sid_read_soc_chipid()); > > if (para->dram_type == SUNXI_DRAM_TYPE_DDR2) { > if (fuse == 15) > @@ -675,7 +681,12 @@ static void mctl_phy_ac_remapping(const dram_para_t > *para, > switch (fuse) { > case 8: cfg = ac_remapping_tables[2]; break; > case 9: cfg = ac_remapping_tables[3]; break; > - case 10: cfg = ac_remapping_tables[5]; break; > + case 10: > + if (sid_read_soc_chipid() == > SUNXI_CHIPID_T113M4020DC0) > + cfg = ac_remapping_tables[0]; > + else > + cfg = ac_remapping_tables[5]; > + break; > case 11: cfg = ac_remapping_tables[4]; break; > default: > case 12: cfg = ac_remapping_tables[1]; break; > diff --git a/drivers/ram/sunxi/dram_sun20i_d1.h > b/drivers/ram/sunxi/dram_sun20i_d1.h > index 91383f6cf10..7bd8f67a77a 100644 > --- a/drivers/ram/sunxi/dram_sun20i_d1.h > +++ b/drivers/ram/sunxi/dram_sun20i_d1.h > @@ -19,6 +19,13 @@ enum sunxi_dram_type { > SUNXI_DRAM_TYPE_LPDDR3 = 7, > }; > > +enum sunxi_soc_chipid { > + SUNXI_CHIPID_F133A = 0x5C00, > + SUNXI_CHIPID_D1S = 0x5E00, > + SUNXI_CHIPID_T113S3 = 0x6000, > + SUNXI_CHIPID_T113M4020DC0 = 0x7200, > +}; > + > /* > * This structure contains a mixture of fixed configuration settings, > * variables that are used at runtime to communicate settings between
