From patchwork Fri Sep 15 06:46:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neha Malcom Francis X-Patchwork-Id: 140187 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp876898vqi; Fri, 15 Sep 2023 00:57:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEbIBVP84gvf2+tg4RUzF/Ar04c3S78qRlSErfV1v5NWJHepwLfXwvo4DqvgpZ6W1arV2oM X-Received: by 2002:a1f:4a41:0:b0:493:7c76:bbac with SMTP id x62-20020a1f4a41000000b004937c76bbacmr999992vka.2.1694764635550; Fri, 15 Sep 2023 00:57:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694764635; cv=none; d=google.com; s=arc-20160816; b=ZAqAAptUAmwaZeWpCBWB/HIu1/IQ97A1Dppe6QoY53YBrg/Q6lCz8mO+IA9ifuUZ37 ykL0yzAW9oFVgPW+PRSRIBtaMqp2HQL/nALBbJQAHzMeg5xd+fRcjy9sV8ws79w+o1f4 jRNNXPWbWM11T5Xh5ABDnm3BpwbhnaACqo4yVnQ5pgSfUcxugsJvpBOI727HcJRQOG/h ZABP8EzjVevuCWesuCNHIyXjvuz8Blb/qpstYvp/AIrZCXZ36J0FUz156ZObEdgAEmu5 3QeeHWyJ1+7A2aUEgsfixuag5ROVnQp8WV736JPTpFoEZyTwf/GcwqxdqRPjvuVxKxnW iPOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/RvhdqzvbWlRZowZI1olXzllsSEefhamT5zJVlhk5+E=; fh=zXIzpqU6fkcvkKYOWPETYAc8kHdGN5li0oSb9j2GXFE=; b=E2bD8VAE38kWS+C59h6DAbiAFIzGyE7gFZu/A1jquUCbuKP7cpsA+8ax0kbj6cNDsz EkRzwLH3xfItzLP4k/urOJoL8zZjw1wLdil7l9bhU7Ke7LfRw2UUvlUxv9SREZV+57Ej ymszG+LDvM16cc8cpiEXjIvZQOHfvnoCvZHsWr8WTEFiX7NOZgk32aBp3AyBViWtZnHs f9Zv/6SGYaUXRZQpkQZDd6gPPKtXBkOROE4R4rSFpiwMxgGiJyv+bBwZXvRZpCg5d0/I XrfYB6celazjWqpHbzq+kDfY7n+35au3/UQy69z8YQLNNdbEnhALvsU+yR4m+o5P2nxw QL2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=lHUmNT+B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id f19-20020a056a0022d300b0068b753d7061si2976418pfj.116.2023.09.15.00.57.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 00:57:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=lHUmNT+B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 9B5D3852D1F7; Thu, 14 Sep 2023 23:47:14 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232383AbjIOGrQ (ORCPT + 33 others); Fri, 15 Sep 2023 02:47:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232151AbjIOGrP (ORCPT ); Fri, 15 Sep 2023 02:47:15 -0400 Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63DDC2708 for ; Thu, 14 Sep 2023 23:47:06 -0700 (PDT) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 38F6kugw055862; Fri, 15 Sep 2023 01:46:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1694760416; bh=/RvhdqzvbWlRZowZI1olXzllsSEefhamT5zJVlhk5+E=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=lHUmNT+BzY9mTxRert7GHeNPRrJwDOJStH7RxpuC1O5S0qnOFwcHM4ECLosDgIAY0 Ht663MjBrivfv8qGhyC9+1FBAkcMNG6xrnoPIBgqEoxESGr5oZxMDbse8GEvRyD+ac hnNftydkLkuv02sSGgYm+hHWWuchdv85Kfi8BSPQ= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 38F6kuvv043861 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 15 Sep 2023 01:46:56 -0500 Received: from DLEE103.ent.ti.com (157.170.170.33) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 15 Sep 2023 01:46:55 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE103.ent.ti.com (157.170.170.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Fri, 15 Sep 2023 01:46:55 -0500 Received: from a0497641-HP-Z2-Tower-G9-Workstation-Desktop-PC.dhcp.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 38F6kotb071619; Fri, 15 Sep 2023 01:46:53 -0500 From: Neha Malcom Francis To: , , CC: , , , Subject: [PATCH v2 1/2] soc: ti: k3-socinfo: Revamp driver to accommodate different rev structs Date: Fri, 15 Sep 2023 12:16:49 +0530 Message-ID: <20230915064650.2287638-2-n-francis@ti.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230915064650.2287638-1-n-francis@ti.com> References: <20230915064650.2287638-1-n-francis@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 14 Sep 2023 23:47:14 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777089522133012157 X-GMAIL-MSGID: 1777089522133012157 k3-socinfo.c driver assumes silicon revisions to be 1.0, 2.0 etc. for every platform. However this typical style is not followed by J721E (1.0, 1.1) and need not be followed by upcoming silicon revisions as well. Adapt the driver to be similar to its U-Boot counterpart (drivers/soc/soc_ti_k3.c) that accounts for this difference on the basis of partno/family. Note that we change the order of invocation of k3_chipinfo_partno_to_names before k3_chipinfo_variant_to_sr so we have the family name in case error is returned. Signed-off-by: Thejasvi Konduru Signed-off-by: Neha Malcom Francis --- drivers/soc/ti/k3-socinfo.c | 71 +++++++++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 15 deletions(-) diff --git a/drivers/soc/ti/k3-socinfo.c b/drivers/soc/ti/k3-socinfo.c index 6ea9b8c7d335..6de1e3531af9 100644 --- a/drivers/soc/ti/k3-socinfo.c +++ b/drivers/soc/ti/k3-socinfo.c @@ -33,19 +33,37 @@ #define CTRLMMR_WKUP_JTAGID_MFG_TI 0x17 +#define JTAG_ID_PARTNO_AM65X 0xBB5A +#define JTAG_ID_PARTNO_J721E 0xBB64 +#define JTAG_ID_PARTNO_J7200 0xBB6D +#define JTAG_ID_PARTNO_AM64X 0xBB38 +#define JTAG_ID_PARTNO_J721S2 0xBB75 +#define JTAG_ID_PARTNO_AM62X 0xBB7E +#define JTAG_ID_PARTNO_J784S4 0xBB80 +#define JTAG_ID_PARTNO_AM62AX 0xBB8D +#define JTAG_ID_PARTNO_AM62PX 0xBB9D + static const struct k3_soc_id { unsigned int id; const char *family_name; } k3_soc_ids[] = { - { 0xBB5A, "AM65X" }, - { 0xBB64, "J721E" }, - { 0xBB6D, "J7200" }, - { 0xBB38, "AM64X" }, - { 0xBB75, "J721S2"}, - { 0xBB7E, "AM62X" }, - { 0xBB80, "J784S4" }, - { 0xBB8D, "AM62AX" }, - { 0xBB9D, "AM62PX" }, + { JTAG_ID_PARTNO_AM65X, "AM65X" }, + { JTAG_ID_PARTNO_J721E, "J721E" }, + { JTAG_ID_PARTNO_J7200, "J7200" }, + { JTAG_ID_PARTNO_AM64X, "AM64X" }, + { JTAG_ID_PARTNO_J721S2, "J721S2"}, + { JTAG_ID_PARTNO_AM62X, "AM62X" }, + { JTAG_ID_PARTNO_J784S4, "J784S4" }, + { JTAG_ID_PARTNO_AM62AX, "AM62AX" }, + { JTAG_ID_PARTNO_AM62PX, "AM62PX" }, +}; + +static char *j721e_rev_string_map[] = { + "1.0", "1.1", +}; + +static char *k3_rev_string_map[] = { + "1.0", "2.0", "3.0", }; static int @@ -63,6 +81,29 @@ k3_chipinfo_partno_to_names(unsigned int partno, return -EINVAL; } +static int +k3_chipinfo_variant_to_sr(unsigned int partno, unsigned int variant, + struct soc_device_attribute *soc_dev_attr) +{ + switch (partno) { + case JTAG_ID_PARTNO_J721E: + if (variant >= ARRAY_SIZE(j721e_rev_string_map)) + goto bail; + soc_dev_attr->revision = kasprintf(GFP_KERNEL, "SR%s", + j721e_rev_string_map[variant]); + break; + default: + if (variant >= ARRAY_SIZE(k3_rev_string_map)) + goto bail; + soc_dev_attr->revision = kasprintf(GFP_KERNEL, "SR%s", + k3_rev_string_map[variant]); + } + return 0; + +bail: + return -EINVAL; +} + static int k3_chipinfo_probe(struct platform_device *pdev) { struct device_node *node = pdev->dev.of_node; @@ -94,7 +135,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; @@ -103,15 +143,16 @@ 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; + 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; } - ret = k3_chipinfo_partno_to_names(partno_id, soc_dev_attr); + ret = k3_chipinfo_variant_to_sr(partno_id, variant, soc_dev_attr); if (ret) { - dev_err(dev, "Unknown SoC JTAGID[0x%08X]\n", jtag_id); + dev_err(dev, "Unknown revision for %s\n", soc_dev_attr->family); ret = -ENODEV; goto err_free_rev; }