From patchwork Fri Nov 12 19:15:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1554532 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=g/fIRFbI; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HrSx71VtRz9s0r for ; Sat, 13 Nov 2021 06:16:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 27C4C8302D; Fri, 12 Nov 2021 20:15:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="g/fIRFbI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2696883025; Fri, 12 Nov 2021 20:15:41 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2060e.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::60e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CA7EC83027 for ; Fri, 12 Nov 2021 20:15:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wr+K4mIXAYVITU466dZfbOZeFSGDYm8VetlY0vfrJlnuUwnDdqnrhSQmsfPttfq8UIkbECZZLq5pIpj3D6p/q8PUvRalZSQWE6m8JGyz6sV6FiCSoUHvmXiVxDjwodpxrU2MbujhCzMlf0TiqNMqFjRsI07AvVCfrFK5TFUOCy7A1RfTECOyu9MTV86cqGF4YfDm6a01dzlMstjmKx5YTtN5o7ZZjlRbzBcyV6ZiAoTD1Jw862iet0WeFvST8X0LhHgGrafzK+JzUco+AVehPpeH87fGZle8huf2jZbbYLRwg2/P6nMMGw+ciR33mWmNBoTC5r2xjbf+WnHnAvwZ7g== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jrtFUo6NQ8mlml3zqNrqNgo9+ha04ZFcA0bHk+LSwgw=; b=EG6khGQouzfPosW8motPV9KBQgnfM0y3LJSXFfmv3MaJOPFyXtpOzXLHj9oPKYC2uaK5Yi2MSHvujBesWFxy94WupKLZTPtC8+pxPFPlM3QPPeEQMHXGGXeNsxfO5ZUtSMhRW+f2mJg3LpYn4bd8bGYQyIpQ2XknR9nXKrPPFxekUrJRxE+p+9qoNEX+/zbqk/7dg7eWJCdTx4l+/O459wH8jIPdT1MdR4JdjPvXV5vqla5bkRHUzxVQLHY7lDNCqE6wf1ureM4JdDUtm488BGJ5iMb+U/U7rr/3jYVtSDExzZewsOqS85IhNImMMBAjJYe0+fmRooV9uP5cGHgbrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jrtFUo6NQ8mlml3zqNrqNgo9+ha04ZFcA0bHk+LSwgw=; b=g/fIRFbIR1eCDCauR9DnuHy+V/oPqSrOxV2NEmDSgnjga9rfhnHIbVtMTbY637hWYP2Oc776V/edfkuJZGwv7avM7ews23zB0S7umo02iTpPTwGYhJbvPleJCTkCaIgOBsI3PZ/5NIrnpHY3+wsgfYlGcdgFjZhfYvI5ec2ORaM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB6PR0302MB2629.eurprd03.prod.outlook.com (2603:10a6:4:aa::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.25; Fri, 12 Nov 2021 19:15:35 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf%6]) with mapi id 15.20.4669.015; Fri, 12 Nov 2021 19:15:35 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Michael Walle , Yangbo Lu , Fabio Estevam , Sean Anderson Subject: [PATCH v2 01/11] mmc: fsl_esdhc_imx: make BLK as hard requirement of DM_MMC Date: Fri, 12 Nov 2021 14:15:13 -0500 Message-Id: <20211112191523.1943825-2-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112191523.1943825-1-sean.anderson@seco.com> References: <20211112191523.1943825-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 Received: from plantagenet.inhand.com (50.195.82.171) by MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Fri, 12 Nov 2021 19:15:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7c4c2f44-abbc-42be-c137-08d9a610ce13 X-MS-TrafficTypeDiagnostic: DB6PR0302MB2629: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:218; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7q7KAaXihh7XEAOj5xnngkp+rkM9g1T+XRH7FewXlZ/3yokT2xy6B9xXMa8LDsoy2Ybud5JNIjIqqvSJxzTulvieKVDWLSfXqczuZVcY+oFBodAqzFBQ92n/6dojSmEqmnrEOE2/1DPvuPObls+dY8dd8whFGWo4gOWhIClkyAqSb8W4lsuKEAClfmnZD5HzmlTdpw1zK1zAHM/cRaONEsGqCCcCgXSdJoEpk3hXBXAE5KVFl399hFa1Yt/XVAu/ERg6KSMYDgIdJKb1xRSggHmxZK2skBqOnF2joMfq3KfpvcT6SBan9q+LvGMhrb8r5/WMny3B873LJMo1HtVbKWLiTwvgJ+UljRvrsmo/fT/xTDVxlw2Qb5+9BXzY1IgqjXSU4BwWqurm7Jv/NLR+tQOwdjWDbUYc/xuqc+/bKEcoEJOmiU+ozhHYF8EI2gxkXZS4M45ZJfBUE0+lIPyLoS4xmxKiEPqmrwF3jxOleubOkA+j2vC4hzmg0hTHol/lT+kH7FWxOLbnD/me/n/JdUoBDyjHOmmyPie+/ckhk9n4u2FG9kAiJl2vTSetcLUXHuRhZQ10SD4H/2otU6EJWRzc3DLpZ5hWYB42fe09mSmIsgwhmG1etTlk9XcKNJVV3KtZ8shDmpkOBJxLhIO5hMtXKK6OZ6Sxxmo/dx5bAb2pmqbU4bQdbJLYHe6F8hWbirEVv7Bs0AiFQ967DuedGQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(956004)(186003)(6486002)(26005)(66476007)(38100700002)(2906002)(66556008)(36756003)(2616005)(38350700002)(44832011)(52116002)(66946007)(8936002)(8676002)(6666004)(5660300002)(86362001)(508600001)(1076003)(6512007)(110136005)(6506007)(54906003)(107886003)(83380400001)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ovg+BK50z+AB+in08wE5xScG5hd3J/sF8r1vDnwTq89Jkc2eQb+DQCU4viFD1A2a8+Gyj0cgjCmEyEXVOvGNMal5T6DJJfIvO4mc9hd4YwUM1r0YhTmNX9nek7n87/Se7fLEbaH+nwKRM3cCUKFtlJriNwa0nF7Fvm+NZzCrpDcUOURSNKVedqVAq5pin/lpxhUEq/Mj1QpEktN5vkjZ/GNQO12OMNhLUlrDigymQqONkIvCbDTMUFxyCCnvlphNSpdKs9SS82cLgKn1KLvAuvqxYGK9eprlRFqbqIpFY+Ht5GWd5/PNpkyfGgY7JBrS8iRdwtfWj7ggeYukgvPXFf0ZqZdCI2R34V1gDeUR1zWkwRspSmhbZrHfRwyNVivt/Xi2iBKEq8U/lNYJiyCtHoATruGOIbXtD2CJx220EPACTa3LzrUkvpRX+qBNy3vs37oztV/ecAUkQx/KMv9+bTCYxTWJ5HS+gTNgnGDRg82n3ALYvsvUU2zX0PqYF+h8ZjCXEOPn+gTR1QejTvfIk+NOEMpaD8Ei/brPDjw16djMjmw4N04w0o/jf1lEDfQRiqlYgUzIjGUm1cyk3fBc7i4dGsRy8eXtXeYPIf0OGi0bE8FM5era57x0t6Xm5MaqfEUOSlNIMDg2MUstx8if1n9N2S0fhvBEM66c/PT5Bfxj3n9mnCjRVsVR4nzzX+/1JrRlZkroDCMSgbFKzTWjTdQI/zIazHNy3fjyOXT+viAAetXzusWz5lH/Enmvzp2g/i/S498yMUS0lsHn1DfOOFRR1gSvP7Yl1r9IzLQtyKLSEn/lQuc4l63hYA+8sggINuYA9G/1gqPNyHWplT/BCBWFxp8UnwGK0rMiaz4xvA/gLwd5np9Baf4/ms/jqm25ZgIIiHXZl7x5Vkv5/cOJn1JrFojSsjdpK5x6YDSc7SRdxhxk4jFRuHgwXLDllBTOTPM4bMjX6mc5gwCCbDcA8qwdb0GAgZpfm2YEQgxBA5zZAbJOHXOM41reooZ4GoSfFiFFwwyAIB2UIaNzvBPPo5lYNcQmHadHo+sZhHPRIcVwmNeHH5o1w45lNNs00EF+le20SqO1zyzXrZs2bOwASXy3M4AwO0hhb57yRKougxq1+ayhHmPVxD8yxXGUHuHLbHxUnCmuhauLtuj3+S+JgMJs6gEzkaVHh1m2lehsAVH+JbYiZ7T1LgMUG4Iu8NeqzmXDQiD/I3my44NIqa1b9ullsnLwL3pXXZ4cbtrHTMJy7gDGK7oWpkkJnxX/lIWbZiXHwfyrU6l6LNdknrPR3ijFcSgN3KUVQJxJ0IQG2Xb8C/TcKYid9g0ow5TgyWPb+OqAgzAtMwqzTWL3QyLo+KV/5NhqtDn73JW0EGl/5Py0BqmJl0TP4o34frjlIQVrIxVLfkAHEF6ATEk+9MBi5K3KaZXsOzG1C7k0ahAGoP9EviornJ4ldBAXust808w3djxS3iZGDqFRGIGqfeYGnbcgOnvtUgjmP6qP7IHh/tWIp/xE/uyGaQ8mSQJkRcUXSHW6edJu6B4cnG0KQb2IU+xXTxbSI2V8EPkJNFiBAjdnTf3tf4+H6E60I0z24Za0aUF2WJvHEGcGo/rHfW6qcwLqgeT3ABBa/QneuG4oIKI= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c4c2f44-abbc-42be-c137-08d9a610ce13 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 19:15:35.9055 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UAFRyQqchIuilcASbJoBHohRhUSeNYCYXTtJc5cukttbYZ23m7nNmWKuVstywMp2NjjBfXid9ZTulYvji223OQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0302MB2629 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.35 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean [ fsl_esdhc commit 41dec2fe99512e941261594f522b2e7d485c314b ] U-boot prefers DM_MMC + BLK for MMC. Now eSDHC driver has already support it, so let's force to use it. - Drop non-BLK support for DM_MMC introduced by below patch. 66fa035 mmc: fsl_esdhc: fix probe issue without CONFIG_BLK enabled - Support only DM_MMC + BLK (assuming BLK is always enabled for DM_MMC). - Use DM_MMC instead of BLK for conditional compile. Signed-off-by: Yangbo Lu Signed-off-by: Sean Anderson Reviewed-by: Jaehoon Chung --- (no changes since v1) drivers/mmc/Kconfig | 2 ++ drivers/mmc/fsl_esdhc_imx.c | 33 +-------------------------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 1569e8c44a..313244682a 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -790,6 +790,7 @@ endif config FSL_ESDHC bool "Freescale/NXP eSDHC controller support" + depends on BLK help This selects support for the eSDHC (Enhanced Secure Digital Host Controller) found on numerous Freescale/NXP SoCs. @@ -826,6 +827,7 @@ config FSL_ESDHC_VS33_NOT_SUPPORT config FSL_ESDHC_IMX bool "Freescale/NXP i.MX eSDHC controller support" + depends on BLK help This selects support for the i.MX eSDHC (Enhanced Secure Digital Host Controller) found on numerous Freescale/NXP SoCs. diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index aabf39535f..0a7f7e61cb 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -39,10 +39,6 @@ #include #include -#if !CONFIG_IS_ENABLED(BLK) -#include "mmc_private.h" -#endif - #ifndef ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE #ifdef CONFIG_FSL_USDHC #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE 1 @@ -58,7 +54,6 @@ DECLARE_GLOBAL_DATA_PTR; IRQSTATEN_DEBE | IRQSTATEN_BRR | IRQSTATEN_BWR | \ IRQSTATEN_DINT) #define MAX_TUNING_LOOP 40 -#define ESDHC_DRIVER_STAGE_VALUE 0xffffffff struct fsl_esdhc { uint dsaddr; /* SDMA system address register */ @@ -157,7 +152,7 @@ struct fsl_esdhc_priv { unsigned int clock; unsigned int mode; unsigned int bus_width; -#if !CONFIG_IS_ENABLED(BLK) +#if !CONFIG_IS_ENABLED(DM_MMC) struct mmc *mmc; #endif struct udevice *dev; @@ -1506,9 +1501,6 @@ static int fsl_esdhc_probe(struct udevice *dev) struct esdhc_soc_data *data = (struct esdhc_soc_data *)dev_get_driver_data(dev); struct mmc *mmc; -#if !CONFIG_IS_ENABLED(BLK) - struct blk_desc *bdesc; -#endif int ret; #if CONFIG_IS_ENABLED(OF_PLATDATA) @@ -1607,25 +1599,6 @@ static int fsl_esdhc_probe(struct udevice *dev) mmc = &plat->mmc; mmc->cfg = &plat->cfg; mmc->dev = dev; -#if !CONFIG_IS_ENABLED(BLK) - mmc->priv = priv; - - /* Setup dsr related values */ - mmc->dsr_imp = 0; - mmc->dsr = ESDHC_DRIVER_STAGE_VALUE; - /* Setup the universal parts of the block interface just once */ - bdesc = mmc_get_blk_desc(mmc); - bdesc->if_type = IF_TYPE_MMC; - bdesc->removable = 1; - bdesc->devnum = mmc_get_next_devnum(); - bdesc->block_read = mmc_bread; - bdesc->block_write = mmc_bwrite; - bdesc->block_erase = mmc_berase; - - /* setup initial part type */ - bdesc->part_type = mmc->cfg->part_type; - mmc_list_add(mmc); -#endif upriv->mmc = mmc; @@ -1730,14 +1703,12 @@ static const struct udevice_id fsl_esdhc_ids[] = { { /* sentinel */ } }; -#if CONFIG_IS_ENABLED(BLK) static int fsl_esdhc_bind(struct udevice *dev) { struct fsl_esdhc_plat *plat = dev_get_plat(dev); return mmc_bind(dev, &plat->mmc, &plat->cfg); } -#endif U_BOOT_DRIVER(fsl_esdhc) = { .name = "fsl_esdhc", @@ -1745,9 +1716,7 @@ U_BOOT_DRIVER(fsl_esdhc) = { .of_match = fsl_esdhc_ids, .of_to_plat = fsl_esdhc_of_to_plat, .ops = &fsl_esdhc_ops, -#if CONFIG_IS_ENABLED(BLK) .bind = fsl_esdhc_bind, -#endif .probe = fsl_esdhc_probe, .plat_auto = sizeof(struct fsl_esdhc_plat), .priv_auto = sizeof(struct fsl_esdhc_priv),