| Message ID | 20211220170357.7899-1-prabhakar.mahadev-lad.rj@bp.renesas.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | soc: renesas: Add support for reading product revision for RZ/G2L family | expand |
Hi Prabhakar, On Mon, Dec 20, 2021 at 6:04 PM Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> wrote: > From: Biju Das <biju.das.jz@bp.renesas.com> > > As per RZ/G2L HW manual (Rev.1.00 Sep, 2021) DEV_ID [31:28] indicates > product revision. Use this information to populate the revision info > for RZ/G2L family. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Thanks for your patch! > Below is the log from Renesas RZ/G2L SMARC EVK: > > root@smarc-rzg2l:~# > at /sys/devices/soc0/$i; donemachine family soc_id revision; do echo -n "$i: ";ca This looks a bit mangled ;-) > machine: Renesas SMARC EVK based on r9a07g044l2 > family: RZ/G2L > soc_id: r9a07g044 > revision: Rev 1 > root@smarc-rzg2l:~# > > Cheers, > Prabhakar > --- > drivers/soc/renesas/renesas-soc.c | 31 +++++++++++++++++-------------- > 1 file changed, 17 insertions(+), 14 deletions(-) > > diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c > index 8f82749f182f..6ecd2763d100 100644 > --- a/drivers/soc/renesas/renesas-soc.c > +++ b/drivers/soc/renesas/renesas-soc.c > @@ -416,6 +416,17 @@ static int __init renesas_soc_init(void) > chipid = ioremap(family->reg, 4); > } > > + soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); This is not freed in case of SoC mismatch error below. > + if (!soc_dev_attr) > + return -ENOMEM; > + > + np = of_find_node_by_path("/"); > + of_property_read_string(np, "model", &soc_dev_attr->machine); > + of_node_put(np); > + > + soc_dev_attr->family = kstrdup_const(family->name, GFP_KERNEL); > + soc_dev_attr->soc_id = kstrdup_const(soc_id, GFP_KERNEL); > + > if (chipid) { > product = readl(chipid + id->offset); > iounmap(chipid); > @@ -430,6 +441,12 @@ static int __init renesas_soc_init(void) > > eshi = ((product >> 4) & 0x0f) + 1; > eslo = product & 0xf; > + soc_dev_attr->revision = kasprintf(GFP_KERNEL, "ES%u.%u", > + eshi, eslo); > + } else if (id == &id_rzg2l) { > + eshi = ((product >> 28) & 0x0f); > + soc_dev_attr->revision = kasprintf(GFP_KERNEL, "Rev %u", > + eshi); These are not freed in case of SoC mismatch error below. > } > > if (soc->id && > @@ -439,20 +456,6 @@ static int __init renesas_soc_init(void) > } > } > > - soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); > - if (!soc_dev_attr) > - return -ENOMEM; > - > - np = of_find_node_by_path("/"); > - of_property_read_string(np, "model", &soc_dev_attr->machine); > - of_node_put(np); > - > - soc_dev_attr->family = kstrdup_const(family->name, GFP_KERNEL); > - soc_dev_attr->soc_id = kstrdup_const(soc_id, GFP_KERNEL); > - if (eshi) > - soc_dev_attr->revision = kasprintf(GFP_KERNEL, "ES%u.%u", eshi, > - eslo); > - > pr_info("Detected Renesas %s %s %s\n", soc_dev_attr->family, > soc_dev_attr->soc_id, soc_dev_attr->revision ?: ""); Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Geert, Thank you for the review. > -----Original Message----- > From: Geert Uytterhoeven <geert@linux-m68k.org> > Sent: 20 January 2022 08:45 > To: Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com> > Cc: Magnus Damm <magnus.damm@gmail.com>; Biju Das <biju.das.jz@bp.renesas.com>; Linux-Renesas <linux- > renesas-soc@vger.kernel.org>; Linux Kernel Mailing List <linux-kernel@vger.kernel.org> > Subject: Re: [PATCH] soc: renesas: Add support for reading product revision for RZ/G2L family > > Hi Prabhakar, > > On Mon, Dec 20, 2021 at 6:04 PM Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> wrote: > > From: Biju Das <biju.das.jz@bp.renesas.com> > > > > As per RZ/G2L HW manual (Rev.1.00 Sep, 2021) DEV_ID [31:28] indicates > > product revision. Use this information to populate the revision info > > for RZ/G2L family. > > > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > > Thanks for your patch! > > > Below is the log from Renesas RZ/G2L SMARC EVK: > > > > root@smarc-rzg2l:~# > > at /sys/devices/soc0/$i; donemachine family soc_id revision; do echo > > -n "$i: ";ca > > This looks a bit mangled ;-) > Typical Tera Term. > > machine: Renesas SMARC EVK based on r9a07g044l2 > > family: RZ/G2L > > soc_id: r9a07g044 > > revision: Rev 1 > > root@smarc-rzg2l:~# > > > > Cheers, > > Prabhakar > > --- > > drivers/soc/renesas/renesas-soc.c | 31 > > +++++++++++++++++-------------- > > 1 file changed, 17 insertions(+), 14 deletions(-) > > > > diff --git a/drivers/soc/renesas/renesas-soc.c > > b/drivers/soc/renesas/renesas-soc.c > > index 8f82749f182f..6ecd2763d100 100644 > > --- a/drivers/soc/renesas/renesas-soc.c > > +++ b/drivers/soc/renesas/renesas-soc.c > > @@ -416,6 +416,17 @@ static int __init renesas_soc_init(void) > > chipid = ioremap(family->reg, 4); > > } > > > > + soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); > > This is not freed in case of SoC mismatch error below. > Ouch. > > + if (!soc_dev_attr) > > + return -ENOMEM; > > + > > + np = of_find_node_by_path("/"); > > + of_property_read_string(np, "model", &soc_dev_attr->machine); > > + of_node_put(np); > > + > > + soc_dev_attr->family = kstrdup_const(family->name, GFP_KERNEL); > > + soc_dev_attr->soc_id = kstrdup_const(soc_id, GFP_KERNEL); > > + > > if (chipid) { > > product = readl(chipid + id->offset); > > iounmap(chipid); > > @@ -430,6 +441,12 @@ static int __init renesas_soc_init(void) > > > > eshi = ((product >> 4) & 0x0f) + 1; > > eslo = product & 0xf; > > + soc_dev_attr->revision = kasprintf(GFP_KERNEL, "ES%u.%u", > > + eshi, eslo); > > + } else if (id == &id_rzg2l) { > > + eshi = ((product >> 28) & 0x0f); > > + soc_dev_attr->revision = kasprintf(GFP_KERNEL, "Rev %u", > > + eshi); > > These are not freed in case of SoC mismatch error below. > Will fix that. Cheers, Prabhakar
diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c index 8f82749f182f..6ecd2763d100 100644 --- a/drivers/soc/renesas/renesas-soc.c +++ b/drivers/soc/renesas/renesas-soc.c @@ -416,6 +416,17 @@ static int __init renesas_soc_init(void) chipid = ioremap(family->reg, 4); } + soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); + if (!soc_dev_attr) + return -ENOMEM; + + np = of_find_node_by_path("/"); + of_property_read_string(np, "model", &soc_dev_attr->machine); + of_node_put(np); + + soc_dev_attr->family = kstrdup_const(family->name, GFP_KERNEL); + soc_dev_attr->soc_id = kstrdup_const(soc_id, GFP_KERNEL); + if (chipid) { product = readl(chipid + id->offset); iounmap(chipid); @@ -430,6 +441,12 @@ static int __init renesas_soc_init(void) eshi = ((product >> 4) & 0x0f) + 1; eslo = product & 0xf; + soc_dev_attr->revision = kasprintf(GFP_KERNEL, "ES%u.%u", + eshi, eslo); + } else if (id == &id_rzg2l) { + eshi = ((product >> 28) & 0x0f); + soc_dev_attr->revision = kasprintf(GFP_KERNEL, "Rev %u", + eshi); } if (soc->id && @@ -439,20 +456,6 @@ static int __init renesas_soc_init(void) } } - soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); - if (!soc_dev_attr) - return -ENOMEM; - - np = of_find_node_by_path("/"); - of_property_read_string(np, "model", &soc_dev_attr->machine); - of_node_put(np); - - soc_dev_attr->family = kstrdup_const(family->name, GFP_KERNEL); - soc_dev_attr->soc_id = kstrdup_const(soc_id, GFP_KERNEL); - if (eshi) - soc_dev_attr->revision = kasprintf(GFP_KERNEL, "ES%u.%u", eshi, - eslo); - pr_info("Detected Renesas %s %s %s\n", soc_dev_attr->family, soc_dev_attr->soc_id, soc_dev_attr->revision ?: "");