From mboxrd@z Thu Jan 1 00:00:00 1970 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=-14.4 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,SPF_HELO_NONE,SPF_PASS 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 BACDAC07E99 for ; Fri, 9 Jul 2021 09:55:04 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 7648461369 for ; Fri, 9 Jul 2021 09:55:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7648461369 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=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Uce1nL48bhrPYbtq81S7wnXpDZvtmVo1+dZfJj6eFbs=; b=HADPmKzsj/HmAr GiKSqmj42c0+jA6KVA/yuIjgl6i/kRdQpvESo7idmh01OftQHpw0iB9nk8m/VgOELHOPIzousoJeO MGHDqVV4Dl4hMY7W2OekpsjfaQwRMcu+e3hrnj/rW1SlQ8s5P6bsTWtlw1HyPUsdV5gO+LPYP2yvb hbM4Rm9wIIq4ky4jpGnfIX2z5D84IqWkDqtQV6+vFQdHyW+vqXnRFAGXHy7eYD0C7nwGA4XF7yoTe PEgqJP67vynOvtR9vRQA/0YoEJtfWpQ8yx3QLtSFjLO4ojIV43+/yZ4A5vA6DBcAFTWI3EIBz0xI+ 8C5M4rdU6R413FsOa0Kg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m1nCQ-001PS5-6M; Fri, 09 Jul 2021 09:53:34 +0000 Received: from mail-eopbgr80052.outbound.protection.outlook.com ([40.107.8.52] helo=EUR04-VI1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m1nCL-001PRT-Ha for linux-arm-kernel@lists.infradead.org; Fri, 09 Jul 2021 09:53:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kWfMQmkF8+N4DGhaoBp6Mpttl5qRPJGPcUHR7x8m3daXW3orfy7OrI33PSCPgQeNvG4hi/CLC1mFNywhik3KXcPdhk0lVn3iWLlOJlyEn1KhY0Ti6qR8nyq7Ou0oDeFKtua0Dc0yvd1FZxKaNXllAEhIoytoXu9yOn6eOoJa3Swb2WMM2yVcrlGEl25SYnEl1SZo0OSDys8SRkbDwgqdOEpXOmWWOUpEx5g3DP70VIFb0OUy2fN6Bih/GnRkNoSdrizvQBy+4HN0Lr1s1Sxbi8pQT7D/YpK35elkrVDzGY8RhMzsB7WBprj9l4s7gDMc0w+3z+NIn+ORFhjQoSaeOQ== 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=XRAkCU+AfFui5Syzyf4kLl7cEELZkVhgYAmoeLc6dKU=; b=M6bP13sdmEXxk7nEGSlGToTWASyTnTjEvXrkWUwmBzaW9vGrVDhM2GpP/KCSNAPnIEJA+dK6/UaEkIJKPNX1SZYa5eJJiUiop87EMXnJyx9MxwsKphUnsvAyZS19jB6X5/IRPilngLMwtJh1SLLrYcM5LyIWO8vpCKFz0Mo+Nam8bcoD1j+jtL37TfnlBpEUadNWbESuQfVotqhrWCgs/V/uYkg6a3pRXXPeZh928IJXoyxkiGcwPPwU+75XPXcr541oPLRy+TdcfK6ZyphR/rkwu47p3uc0lmObH87z/zey+9SfI9xtFh/OC7KizTwGNBDeykqezwrtIXMWnLOQLw== 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=XRAkCU+AfFui5Syzyf4kLl7cEELZkVhgYAmoeLc6dKU=; b=YQxfaOU0f6N0MW5N5UIVd+9bG3SdYOAr/5gyeNeCNAYi0Jo8P/BYYor0EFl0zAaZIEwN76S8+uPHfuOC0eddFU0NDgvn68mDsNo+DV+fDxf/+mqGagLVvP6gjV9xt0YRoqtsB6AlpolMNv1iWE6+3QZa/+bHbdBbyAPWUxhD2/k= Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB3PR0402MB3913.eurprd04.prod.outlook.com (2603:10a6:8:3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.20; Fri, 9 Jul 2021 09:53:22 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c445:d742:eb76:86dd]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c445:d742:eb76:86dd%9]) with mapi id 15.20.4287.035; Fri, 9 Jul 2021 09:53:22 +0000 From: "Peng Fan (OSS)" To: Lucas Stach , Shawn Guo CC: Fabio Estevam , dl-linux-imx , "linux-arm-kernel@lists.infradead.org" , "kernel@pengutronix.de" , "patchwork-lst@pengutronix.de" Subject: RE: [PATCH] Revert "soc: imx8m: change to use platform driver" Thread-Topic: [PATCH] Revert "soc: imx8m: change to use platform driver" Thread-Index: AQHXbGHzErYtkL0sq0yC+XU2BpGZk6s6d4zw Date: Fri, 9 Jul 2021 09:53:22 +0000 Message-ID: References: <20210628210955.2509380-1-l.stach@pengutronix.de> In-Reply-To: <20210628210955.2509380-1-l.stach@pengutronix.de> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: pengutronix.de; dkim=none (message not signed) header.d=none; pengutronix.de; dmarc=none action=none header.from=oss.nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9bbe4a5a-a36d-4d87-897c-08d942bf63ae x-ms-traffictypediagnostic: DB3PR0402MB3913: x-ms-exchange-sharedmailbox-routingagent-processed: True x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7691; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: eUydWqfILprIfM7ImiJXSPVZ+TjkMB1a2fhiq0SxqV4T1hTe3a3f8IOMFjhoA2jC458SexUXSDaR7YpPD0IY7+ngOklMorUbl3aF9BTY+tf+Z6pGa6gQNsrEOWNuisah9O3guHU2jHPdCPeqsyifH1LWqqszzMtXrD3IBr/LcfDo+fY2kPLOmfRGDv6rD09ivHUuYO2msMa4/awQck2kovspevGOBckTxovwBttJladEh2Zu9UuWSWl7DQMQHCcqmSufX72zJxOZoSHaqqA6RD2ZOx6zZJP1WiwMY3MToQ1RXT2bHOhbvAC+lNZuS1khdTnPqRzarz/uNejK6CukwiKJ/A5RqMwNfwulfelswrfRMsofbHcFuWpmqmHxXDx4xmeY4lD1O9tu2tcrgQs9A4yeCpYtPjVsZH5NiUSq6e4YPfpogv/PpVZZsYanMQXvD5bEEqy0qKVlFj8QPGftPHPswpcxAUGAUYi/H6cn6qe9qKRvL8KB3AEcw/kdVnDP1K+eD3PDkN5Km5/SHuxzSnzCI3nDf6ORNM7kEt7a56qs29V2igi1rNIXOeB8eA9IVA4k3nQIx3kdebRgFWqPgWnWFTo+dvvplRocJXOUYxPgyv2vAmyX+d4HLQQXj3ZrW20rZPqpnsW1CZOmrtSULw+cx8Bt8v4lFBw2qRrkRKQjlnaWiuw4H1N1RHbEqu3HZQUAZvnjQmiIoYa5LgFiJg== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0402MB2760.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39860400002)(366004)(346002)(396003)(376002)(136003)(26005)(7696005)(83380400001)(66556008)(66476007)(38100700002)(64756008)(316002)(66446008)(5660300002)(76116006)(122000001)(6506007)(66946007)(8936002)(86362001)(33656002)(9686003)(186003)(71200400001)(55016002)(2906002)(8676002)(4326008)(110136005)(54906003)(478600001)(52536014)(32563001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?dN3sAZ6w7VecrzB3kYtL9QZIGpJuKoDcackB9bbYVO+dWUFiFfX1RG7hOWvb?= =?us-ascii?Q?6hnDNJXKke1z2OLuZho+p4mMoJKWBtygHAtYMkvwS2DfsMN1ePsnWDHJuSYQ?= =?us-ascii?Q?MvgvVVKDvNwA/xeyD2NU89sJKjGMNaPgylJW3ofQG7hRdghyN4imRq1M5iXX?= =?us-ascii?Q?F3s12QVpGqM1V3FB5qrBgCh6q8LAfSYR57YbA3HakbPSlp6IPyq/MJUb9rqH?= =?us-ascii?Q?DJ/LlMzoxyOtTAhzHU1xmMi/q2VlI3DrBr54/yKboKv0Oy85nsBIdF8WBu1z?= =?us-ascii?Q?HS3zQIOJncKSxehEfSfWK3SGP7l5Y3mvaQFQ7s9SEMrK6oKfWcoz3VW+F0t4?= =?us-ascii?Q?/iCukyuBcgbTLkLPepmPGqICUOo51LvV1qV7okD1AhBxgAkHO3S3aWaDcC/P?= =?us-ascii?Q?MOhHJKekdBHFqYhe9fJwnMzdRJaD8lu+xF0OyJ4bR512o5Z8SN456ktQYO73?= =?us-ascii?Q?kugHT7r5J6oqL1o2TKPGIXAsaMLFIUhis1sDGXu5rQYIpCoxq5TlPwBo/Ius?= =?us-ascii?Q?mI1TBeEVQA2eBOLLaDer6JmchczEGJ+hSPRS7LBdhPFIbZLb/nKu4TBCQ/TA?= =?us-ascii?Q?9OYYy9grkC46zSaMo9DkRyfpEOZf/60bBDLDIUOuWHO9I52b5Sh2G+us3fpP?= =?us-ascii?Q?CMk5t9/eICPxrrdQr1G2eZk7B+wRioUoNK0HU3BMzE1feU+2V/A0AI934ZLH?= =?us-ascii?Q?cl3HbkyEXd1ivxIukF5qNibl1hdH6cysOWwD1ir5w8wC2lDbKFDeL3YvH4GZ?= =?us-ascii?Q?JkG872a10SdWcok5TATCSijXRpYo86aoAQC8mdMWLxO4x1QPEte88MHZLdRG?= =?us-ascii?Q?72R1QpjJMc6ydNk1UJX3COS7wHt3q9c0KhvoK7in8N5pLo9N1k94T+ZERsUW?= =?us-ascii?Q?2CDp3/m+mIwNe9mzEAixxZhGdjy7hfy+c/pV3GzQyJ6Yygbb1Aq4GPTPoLc7?= =?us-ascii?Q?bA0R/+6HS8dkbl6NO5oqF4rAOcvn+9Htm86buTcMBZ2mcKVMLMKlXNbp3g5+?= =?us-ascii?Q?zHwhcbhHW2vtRIQAhmSHWgo2FtBinKRuMDv3rPpCvGaNW0D4ralwg6Rs6Fsn?= =?us-ascii?Q?FTQgQPiYlS+z2KY6AzbA/ZmhX4Cxx7Tw0HWmBi6PRkzgqjvpPNP6gOGqq7ER?= =?us-ascii?Q?SegmUHtIpDp2i30Ar8e82/hDwXV+CHETXHyETdHhHhYMQJEbu1ZsNM6ta0ez?= =?us-ascii?Q?z2PVzDjDMVABQiigffmRxZQmxJU/0yPmIIJ/4G0UKBJW9XBB/4n7QrZmVYIe?= =?us-ascii?Q?qJZ8PpJ5npbEDesJxr/rBQhOuZV1MmDgp6+7TE6Btj7iU1fWf4S+7zzE1Ca6?= =?us-ascii?Q?GfG0gcRohl5O0lfvWO32rUzK?= MIME-Version: 1.0 X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9bbe4a5a-a36d-4d87-897c-08d942bf63ae X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jul 2021 09:53:22.7325 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: XMWut/m8kzYyAvy5Kshd52OGLT4eNCCXh2ZPonqemd8I3VYeR3KaUCz4fYGieQrbxSoLqI69ezGyZVn3SQ8t5g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3913 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210709_025329_634480_D64D158D X-CRM114-Status: GOOD ( 27.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org > Subject: [PATCH] Revert "soc: imx8m: change to use platform driver" > > With the SoC matching changed to a platform driver the match data is > available only after other drivers, which may rely on it are already probed. > This breaks at least the CAAM driver on i.MX8M. > Revert the change until all those drivers have been audited and changed to be > able to eal with match data being available later in the boot process. > > Fixes: 7d981405d0fd ("soc: imx8m: change to use platform driver"") > Signed-off-by: Lucas Stach Acked-by: Peng Fan BTW: we need a better way to support kexec. Regards, Peng. > --- > drivers/soc/imx/soc-imx8m.c | 84 ++++++------------------------------- > 1 file changed, 12 insertions(+), 72 deletions(-) > > diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c > index 071e14496e4b..cc57a384d74d 100644 > --- a/drivers/soc/imx/soc-imx8m.c > +++ b/drivers/soc/imx/soc-imx8m.c > @@ -5,8 +5,6 @@ > > #include > #include > -#include > -#include > #include > #include > #include > @@ -31,7 +29,7 @@ > > struct imx8_soc_data { > char *name; > - u32 (*soc_revision)(struct device *dev); > + u32 (*soc_revision)(void); > }; > > static u64 soc_uid; > @@ -52,7 +50,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(struct device *dev) > +static u32 __init imx8mq_soc_revision(void) > { > struct device_node *np; > void __iomem *ocotp_base; > @@ -77,20 +75,9 @@ static u32 __init imx8mq_soc_revision(struct device > *dev) > rev = REV_B1; > } > > - if (dev) { > - int ret; > - > - 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); > - } > + 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); > @@ -120,7 +107,7 @@ static void __init imx8mm_soc_uid(void) > of_node_put(np); > } > > -static u32 __init imx8mm_soc_revision(struct device *dev) > +static u32 __init imx8mm_soc_revision(void) > { > struct device_node *np; > void __iomem *anatop_base; > @@ -138,15 +125,7 @@ static u32 __init imx8mm_soc_revision(struct > device *dev) > iounmap(anatop_base); > of_node_put(np); > > - if (dev) { > - int ret; > - > - ret = nvmem_cell_read_u64(dev, "soc_unique_id", &soc_uid); > - if (ret) > - return ret; > - } else { > - imx8mm_soc_uid(); > - } > + imx8mm_soc_uid(); > > return rev; > } > @@ -171,7 +150,7 @@ static const struct imx8_soc_data imx8mp_soc_data > = { > .soc_revision = imx8mm_soc_revision, > }; > > -static __maybe_unused const struct of_device_id imx8_machine_match[] = { > +static __maybe_unused const struct of_device_id imx8_soc_match[] = { > { .compatible = "fsl,imx8mq", .data = &imx8mq_soc_data, }, > { .compatible = "fsl,imx8mm", .data = &imx8mm_soc_data, }, > { .compatible = "fsl,imx8mn", .data = &imx8mn_soc_data, }, @@ -179,20 > +158,12 @@ static __maybe_unused const struct of_device_id > imx8_machine_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 imx8_soc_info(struct platform_device *pdev) > +static int __init imx8_soc_init(void) > { > struct soc_device_attribute *soc_dev_attr; > struct soc_device *soc_dev; > @@ -211,10 +182,7 @@ static int imx8_soc_info(struct platform_device > *pdev) > if (ret) > goto free_soc; > > - if (pdev) > - id = of_match_node(imx8_soc_match, pdev->dev.of_node); > - else > - id = of_match_node(imx8_machine_match, of_root); > + id = of_match_node(imx8_soc_match, of_root); > if (!id) { > ret = -ENODEV; > goto free_soc; > @@ -223,16 +191,8 @@ static int imx8_soc_info(struct platform_device > *pdev) > data = id->data; > if (data) { > soc_dev_attr->soc_id = data->name; > - 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); > - } > - } > + if (data->soc_revision) > + soc_rev = data->soc_revision(); > } > > soc_dev_attr->revision = imx8_revision(soc_rev); @@ -270,24 +230,4 > @@ static int imx8_soc_info(struct platform_device *pdev) > kfree(soc_dev_attr); > return ret; > } > - > -/* Retain device_initcall is for backward compatibility with DTS. */ -static int > __init imx8_soc_init(void) -{ > - if (of_find_matching_node_and_match(NULL, imx8_soc_match, NULL)) > - return 0; > - > - return imx8_soc_info(NULL); > -} > 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"); > -- > 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel