From patchwork Tue Dec 15 08:35:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Alice Guo (OSS)" X-Patchwork-Id: 11974229 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C1B1C4361B for ; Tue, 15 Dec 2020 08:39:32 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3463C20855 for ; Tue, 15 Dec 2020 08:39:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3463C20855 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=lt0CEv3lJhhPx/iyQxOM1cSdyIfwXGdbKnLSgHmQIWY=; b=sBj7p6kHQ2ORh9vvgMEI76bkl cDP+NIBg1tDcgolM8+jxaxW0aVO7PRQuAqf8773u936rzmtlSoQV9uaYjMKpaiHI/+dRAFXFPlS93 Y8WrDBPdYH5N+QqLt2sYJOxpxU0twbmVJbAyzil7kzui2roTogW3NosG9GqbJlix404AfP4B0lb5I moYUFFdBv1rg2OYi0/HNzqY4y5qdoB+/BVyiIDl3uq4pIaTqEUeXVIvIKZ4FohsAba2VuCirV0juI ZQwhQDDVnmKf7h0a/JAeLGt0S72c9F8aox+jsxw6gW+msm36e6MPNSYIOuKcQFLUkedtW0r0JRWet aNDVFiDjw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kp5qc-00022a-Hq; Tue, 15 Dec 2020 08:38:18 +0000 Received: from mail-eopbgr140047.outbound.protection.outlook.com ([40.107.14.47] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kp5qZ-00020I-ED for linux-arm-kernel@lists.infradead.org; Tue, 15 Dec 2020 08:38:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TOaE+WNck/MKv1z+7bNN9/6vhmBF02VByOk5rBb4DR4OCN0165LRKKbgxmJU6dX0+tbhz8XPmV7EHzdf1r4Am6Nw/99zjNDJrRoOw0766rUwPp2A8k+YHLNomF/bFgUYSBXLC7vSFXcROZuKCMCPumVYp5s/qSFJg+A4ZGOv8AokhNVNZPrZZmqc3ncvPDqCL2tjAqOqneSGB5gSQ0jg9P4gQLGJYBcCkA47P7D7n9aLW6u1SOj3AGaPlg1dIxeQsDT6pa6HfWR8NTjY1eE2MPrCkyLHDGjEKqfsvuce6IUd/u6GoC6OubnQzku3EbksOR3a+yrXAhKgdT0SlbwS0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=neTcX9m2uIo0xutsc3LeLYer4wUv60DvK0WOje+vipE=; b=V9ne4iiV7FjV1A1lP84lsl/DHZhBatNtixNavmqeoOreEtgBICPx8VSX4cIMpsPe4TTBROr0Bnanr45k5vvsIYHjgb9uik1X4SrYMgDvrhdWIg/y7fg/zhcHS7EHSFWkQBUSbEnoeGcgZEp4PPgBq01l6NFw1Xd2kbSJ+FiiuQGCttjiw3CWykS8G7QaXgKLb83nAR7R5SWGQNRx/SW2iIp48nom1dwpyRG6HGAdmkGMS9GQztrUsfi0bCrTugjtt2W2aS3OIAtklXc0GYvnyTMAG6ouQAoZggVbAGcVh5FQwck6xLmLmFhB+uMpnpuDco91TR1PBgVbuYB8+BbZAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=neTcX9m2uIo0xutsc3LeLYer4wUv60DvK0WOje+vipE=; b=lWwSBtLJXIN+hrtTyQiOng79faSH1A8+xubYexZKJnRLBeHfY9AXFgZ+RD1PskV5ZPbUSWHK4DOexDuAaNe3sAvu7q1vt4q6gp8iBX2eY4FQegQwVS7aGrQ1zb1NYVB5jCHhRnKqipY5Joz1VuzXRvNF8JBGABaPZ8dqb5rC3B8= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=oss.nxp.com; Received: from AM6PR04MB6053.eurprd04.prod.outlook.com (2603:10a6:20b:b9::10) by AM7PR04MB6807.eurprd04.prod.outlook.com (2603:10a6:20b:104::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.14; Tue, 15 Dec 2020 08:38:11 +0000 Received: from AM6PR04MB6053.eurprd04.prod.outlook.com ([fe80::78fe:9b7a:a2ac:9631]) by AM6PR04MB6053.eurprd04.prod.outlook.com ([fe80::78fe:9b7a:a2ac:9631%7]) with mapi id 15.20.3654.025; Tue, 15 Dec 2020 08:38:11 +0000 From: "Alice Guo (OSS)" To: robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, krzk@kernel.org Subject: [PATCH v7 4/4] soc: imx8m: change to use platform driver Date: Tue, 15 Dec 2020 16:35:51 +0800 Message-Id: <20201215083551.6067-4-alice.guo@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201215083551.6067-1-alice.guo@oss.nxp.com> References: <20201215083551.6067-1-alice.guo@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR06CA0250.apcprd06.prod.outlook.com (2603:1096:4:ac::34) To AM6PR04MB6053.eurprd04.prod.outlook.com (2603:10a6:20b:b9::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from nxf55104-OptiPlex-7060.ap.freescale.net (119.31.174.71) by SG2PR06CA0250.apcprd06.prod.outlook.com (2603:1096:4:ac::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Tue, 15 Dec 2020 08:38:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 06f6d4e1-24fd-4a97-8588-08d8a0d4c185 X-MS-TrafficTypeDiagnostic: AM7PR04MB6807: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mfDluSvj57sOz2JeMMcG+cb6eE0vwJ3MwWRH8conElJEYkuy/pYi2jygFMMnfZSGCmOXx+IfxVI/wdAzNbpQu0tmVmOk2tqGxi9Q4jKQY19YfNXd2T/9OTJ0IhlbsUFSPIwrWjrBQJ09N7sh6/IfXq0MGPI3QPx9vo8ResBwIPBEuj/TVHuCXE4EgwIi6vz/pPHsCeSWNSwtqYX+x4eYISLbVsT/y5WMFl3IMp8xUZ1UvYRtkYJ3pbEHdD8YYF5cdBj9zwJeFjcTqqqGfFfcVH9OvlKJCN2MESqNy0/0f+UXXc5MwR41zCnVR9+2VzIXZVNAQ1DFlTEiYOIQNofyMIP3gvmfO1IUDg/5UTsdhh/CJRbaNPnK+WpIpMeK2wUZ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB6053.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(376002)(346002)(366004)(396003)(39860400002)(83380400001)(6666004)(16526019)(186003)(66476007)(86362001)(26005)(8676002)(5660300002)(6486002)(8936002)(316002)(66556008)(66946007)(2906002)(4326008)(1076003)(6512007)(478600001)(2616005)(956004)(52116002)(6506007)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: XuOlHbU1cFWn+zJ/zFVzR9giRz30Im5TGUs3+Ctm4z7TEaEGUjn/jE0yjYHgJ1x2iECslhAk3SB1oj5/BSodLmtilDnr8rT4OS9BlO2vc0U7pFuphNT2+YL1nM0AgnBT2zcs01XzuHV/CDUcXH07deSwdWvgaWWJsn7uuB6nR3KcrSLqrc1sqGeb+a+ucx04WjSuKnMuGJl47ftHOs1GEinT4vD3a9K+Iscr7Mzd9HveGXsTjJEdblwjTC2i++HpTOssElSKRr4Vb6fjI7Kgyp09hwQDfcwlyp5IcyCQ2y4e6gecx464v4wqHS0uYUAEpMV/aZLyuX0lSgbPWurkBvwyZ5LkY0uwnv8wpjZw9pDAjTDBCugdyDl8GaNFkmgJz0jp+epYWgVSIMXHjepq+zMb1Zj7UnQ2jupm0MgJDwBcAzQpGUpTzHq0Or590ctH4RQ9YH5rSoSUoAmOga/T1CblJdtIpRQTH+ht40U3Jji9M2ABKbgW/hTHagLYr1QYjyFwLuCxXr3+FIlyNkGsiDNu2BGCSu7xaUVROdBH8Qmp6kCSrhJA1rGBbLY4c+Aa0to01We7oN6b7T8z9FAY+ZO4XtbsDaWToSFfOLpb+fbUsKm7WzxWXXRjFhT0dLBqbLw34jNWpgFA8Gqs9+an/t/+TbJgiwWlH+Ci9XDFUu8zGxixaP8zLsnrha6lq1umU4PoguuRANW9uJDTOxBvhPiOZ+A8kJUQf8toW5u4EkEhFcn+U1mqR0JOQ4ERHSxCYstK+NFjBIWx87BjSArvj1ClU6P5tcPCZMZxvU7ixLs+69omx4iWnGV1oZll6Hio2y3a26NFN+c5NPLL+f0TLyGTeWYGHe+D44Er6pFquI5275ocXIki5VO7m5D8wAU/ibb8u6DinPgHVLQSTj9uwm5fBz3lZ2+AC12rEiKlerpknWN5YvQmfwPBFodcL1FMfWWMKtuW2pnwjRQeOqzrXByg+Vp8aMPGrcdvIjwW268wycqK1KCcV9fNoiXz/wTN X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6053.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2020 08:38:11.2289 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-Network-Message-Id: 06f6d4e1-24fd-4a97-8588-08d8a0d4c185 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: I7vnGlGkGjoMqtOKZhOVt19xWWh5NhO+eqXVHc1qppcxBIojwKMQ1+oaxSk8zOVug1ekRhyWtGCrannsP7fU8A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB6807 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201215_033815_667534_E03BBFBD X-CRM114-Status: GOOD ( 26.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Alice Guo Directly reading ocotp register depends on that bootloader enables ocotp clk, which is not always effective, so change to use nvmem API. Using nvmem API requires to support driver defer probe and thus change soc-imx8m.c to use platform driver. The other reason is that directly reading ocotp register causes kexec kernel hang because the 1st kernel running will disable unused clks after kernel boots up, and then ocotp clk will be disabled even if bootloader enables it. When kexec kernel, ocotp clk needs to be enabled before reading ocotp registers, and nvmem API with platform driver supported can accomplish this. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Alice Guo --- Changes for v7: - add "__maybe_unused" to solve the problem "drivers/soc/imx/soc-imx8m.c:174:34: warning: unused variable" - add Reviewed-by Changes for v6: - leave only the changelog under '---' Changes for v5: - add cleanup part "of_node_put" - add note to explain that why device_initcall still exists Changes for v4: - delete "__maybe_unused" - delete MODULE_DEVICE_TABLE(of, imx8m_soc_match); - rename match table "fsl,imx8m*"is actually a machine compabile and "fsl,imx8m*-soc" is a compabile of soc@0 - delete "flag" and change to determine whether the pointer is NULL - ues of_find_matching_node_and_match() - delete of_match_ptr() Changes for v3: - keep the original way which uses device_initcall to read soc unique ID - add the other way which uses module_platform_driver and nvmem API, so that it will not break the old version DTBs Changes for v2: - remove the subject prefix "LF-2571-4" drivers/soc/imx/soc-imx8m.c | 87 ++++++++++++++++++++++++++++++++----- 1 file changed, 75 insertions(+), 12 deletions(-) -- 2.17.1 diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c index cc57a384d74d..d5c86ae32903 100644 --- a/drivers/soc/imx/soc-imx8m.c +++ b/drivers/soc/imx/soc-imx8m.c @@ -5,6 +5,8 @@ #include #include +#include +#include #include #include #include @@ -29,7 +31,7 @@ struct imx8_soc_data { char *name; - u32 (*soc_revision)(void); + u32 (*soc_revision)(struct device *dev); }; static u64 soc_uid; @@ -50,7 +52,7 @@ static u32 imx8mq_soc_revision_from_atf(void) static inline u32 imx8mq_soc_revision_from_atf(void) { return 0; }; #endif -static u32 __init imx8mq_soc_revision(void) +static u32 __init imx8mq_soc_revision(struct device *dev) { struct device_node *np; void __iomem *ocotp_base; @@ -75,9 +77,20 @@ static u32 __init imx8mq_soc_revision(void) rev = REV_B1; } - soc_uid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH); - soc_uid <<= 32; - soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW); + if (dev) { + int ret = 0; + + ret = nvmem_cell_read_u64(dev, "soc_unique_id", &soc_uid); + if (ret) { + iounmap(ocotp_base); + of_node_put(np); + return ret; + } + } else { + soc_uid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH); + soc_uid <<= 32; + soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW); + } iounmap(ocotp_base); of_node_put(np); @@ -107,7 +120,7 @@ static void __init imx8mm_soc_uid(void) of_node_put(np); } -static u32 __init imx8mm_soc_revision(void) +static u32 __init imx8mm_soc_revision(struct device *dev) { struct device_node *np; void __iomem *anatop_base; @@ -125,7 +138,15 @@ static u32 __init imx8mm_soc_revision(void) iounmap(anatop_base); of_node_put(np); - imx8mm_soc_uid(); + if (dev) { + int ret = 0; + + ret = nvmem_cell_read_u64(dev, "soc_unique_id", &soc_uid); + if (ret) + return ret; + } else { + imx8mm_soc_uid(); + } return rev; } @@ -150,7 +171,7 @@ static const struct imx8_soc_data imx8mp_soc_data = { .soc_revision = imx8mm_soc_revision, }; -static __maybe_unused const struct of_device_id imx8_soc_match[] = { +static __maybe_unused const struct of_device_id imx8_machine_match[] = { { .compatible = "fsl,imx8mq", .data = &imx8mq_soc_data, }, { .compatible = "fsl,imx8mm", .data = &imx8mm_soc_data, }, { .compatible = "fsl,imx8mn", .data = &imx8mn_soc_data, }, @@ -158,12 +179,20 @@ static __maybe_unused const struct of_device_id imx8_soc_match[] = { { } }; +static __maybe_unused const struct of_device_id imx8_soc_match[] = { + { .compatible = "fsl,imx8mq-soc", .data = &imx8mq_soc_data, }, + { .compatible = "fsl,imx8mm-soc", .data = &imx8mm_soc_data, }, + { .compatible = "fsl,imx8mn-soc", .data = &imx8mn_soc_data, }, + { .compatible = "fsl,imx8mp-soc", .data = &imx8mp_soc_data, }, + { } +}; + #define imx8_revision(soc_rev) \ soc_rev ? \ kasprintf(GFP_KERNEL, "%d.%d", (soc_rev >> 4) & 0xf, soc_rev & 0xf) : \ "unknown" -static int __init imx8_soc_init(void) +static int imx8_soc_info(struct platform_device *pdev) { struct soc_device_attribute *soc_dev_attr; struct soc_device *soc_dev; @@ -182,7 +211,10 @@ static int __init imx8_soc_init(void) if (ret) goto free_soc; - id = of_match_node(imx8_soc_match, of_root); + if (pdev) + id = of_match_node(imx8_soc_match, pdev->dev.of_node); + else + id = of_match_node(imx8_machine_match, of_root); if (!id) { ret = -ENODEV; goto free_soc; @@ -191,8 +223,16 @@ static int __init imx8_soc_init(void) data = id->data; if (data) { soc_dev_attr->soc_id = data->name; - if (data->soc_revision) - soc_rev = data->soc_revision(); + if (data->soc_revision) { + if (pdev) { + soc_rev = data->soc_revision(&pdev->dev); + ret = soc_rev; + if (ret < 0) + goto free_soc; + } else { + soc_rev = data->soc_revision(NULL); + } + } } soc_dev_attr->revision = imx8_revision(soc_rev); @@ -230,4 +270,27 @@ static int __init imx8_soc_init(void) kfree(soc_dev_attr); return ret; } + +/* Retain device_initcall is for backward compatibility with DTS. */ +static int __init imx8_soc_init(void) +{ + int ret = 0; + + if (of_find_matching_node_and_match(NULL, imx8_soc_match, NULL)) + return 0; + + ret = imx8_soc_info(NULL); + return ret; +} device_initcall(imx8_soc_init); + +static struct platform_driver imx8_soc_info_driver = { + .probe = imx8_soc_info, + .driver = { + .name = "imx8_soc_info", + .of_match_table = imx8_soc_match, + }, +}; + +module_platform_driver(imx8_soc_info_driver); +MODULE_LICENSE("GPL v2");