From: Thejasvi Konduru <t-konduru@ti.com>
To: <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>
Cc: Nishanth Menon <nm@ti.com>,
Santosh Shilimkar <ssantosh@kernel.org>,
"Tero Kristo" <t-kristo@ti.com>,
Grygorii Strashko <grygorii.strashko@ti.com>,
Lokesh Vutla <lokeshvutla@ti.com>,
Apurva Nandan <a-nandan@ti.com>, "Udit Kumar" <u-kumar1@ti.com>,
Thejasvi Konduru <t-konduru@ti.com>
Subject: [PATCH] soc: ti: k3-socinfo: Fix the silicon revision misprint
Date: Wed, 7 Jun 2023 13:33:49 +0530 [thread overview]
Message-ID: <20230607080349.26671-1-t-konduru@ti.com> (raw)
For J721E PG1.1 the silicon revision is reported as 2.0 instead of
1.1. This is because the k3-socinfo.c code assumes the silicon revisions
are 1.0, 2.0 for every platform.
Fixed this by creating a separate list of silicon revisions for J721E.
Fixes: 907a2b7e2fc7 ("soc: ti: add k3 platforms chipid module driver")
Signed-off-by: Thejasvi Konduru <t-konduru@ti.com>
---
drivers/soc/ti/k3-socinfo.c | 33 +++++++++++++++++++++++++--------
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/drivers/soc/ti/k3-socinfo.c b/drivers/soc/ti/k3-socinfo.c
index d15764e19d96..365bc37793a1 100644
--- a/drivers/soc/ti/k3-socinfo.c
+++ b/drivers/soc/ti/k3-socinfo.c
@@ -46,6 +46,8 @@ static const struct k3_soc_id {
{ 0xBB8D, "AM62AX" },
};
+static char *soc_revision_j721e[] = {"1.0", "1.1"};
+
static int
k3_chipinfo_partno_to_names(unsigned int partno,
struct soc_device_attribute *soc_dev_attr)
@@ -61,6 +63,21 @@ k3_chipinfo_partno_to_names(unsigned int partno,
return -EINVAL;
}
+void
+k3_chipinfo_silicon_rev(unsigned int variant,
+ struct soc_device_attribute *soc_dev_attr)
+{
+ const char *family_name = soc_dev_attr->family;
+ int j721e_lookup_arr_size = ARRAY_SIZE(soc_revision_j721e);
+
+ if (!strcmp(family_name, "J721E") && variant < j721e_lookup_arr_size) {
+ soc_dev_attr->revision = kasprintf(GFP_KERNEL, "SR%s", soc_revision_j721e[variant]);
+ } else {
+ variant++;
+ soc_dev_attr->revision = kasprintf(GFP_KERNEL, "SR%x.0", variant);
+ }
+}
+
static int k3_chipinfo_probe(struct platform_device *pdev)
{
struct device_node *node = pdev->dev.of_node;
@@ -92,7 +109,6 @@ static int k3_chipinfo_probe(struct platform_device *pdev)
variant = (jtag_id & CTRLMMR_WKUP_JTAGID_VARIANT_MASK) >>
CTRLMMR_WKUP_JTAGID_VARIANT_SHIFT;
- variant++;
partno_id = (jtag_id & CTRLMMR_WKUP_JTAGID_PARTNO_MASK) >>
CTRLMMR_WKUP_JTAGID_PARTNO_SHIFT;
@@ -101,17 +117,18 @@ static int k3_chipinfo_probe(struct platform_device *pdev)
if (!soc_dev_attr)
return -ENOMEM;
- soc_dev_attr->revision = kasprintf(GFP_KERNEL, "SR%x.0", variant);
- if (!soc_dev_attr->revision) {
- ret = -ENOMEM;
- goto err;
- }
-
ret = k3_chipinfo_partno_to_names(partno_id, soc_dev_attr);
if (ret) {
dev_err(dev, "Unknown SoC JTAGID[0x%08X]\n", jtag_id);
ret = -ENODEV;
- goto err_free_rev;
+ goto err;
+ }
+
+ k3_chipinfo_silicon_rev(variant, soc_dev_attr);
+
+ if (!soc_dev_attr->revision) {
+ ret = -ENOMEM;
+ goto err;
}
node = of_find_node_by_path("/");
--
2.40.1
next reply other threads:[~2023-06-07 8:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 8:03 Thejasvi Konduru [this message]
2023-06-07 10:43 ` Nishanth Menon
2023-09-12 6:37 ` Neha Malcom Francis
2023-09-13 11:28 ` Nishanth Menon
2023-09-14 4:05 ` Neha Malcom Francis
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=20230607080349.26671-1-t-konduru@ti.com \
--to=t-konduru@ti.com \
--cc=a-nandan@ti.com \
--cc=grygorii.strashko@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lokeshvutla@ti.com \
--cc=nm@ti.com \
--cc=ssantosh@kernel.org \
--cc=t-kristo@ti.com \
--cc=u-kumar1@ti.com \
/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
all inboxes | Powered by JetHome®