From patchwork Fri Nov 12 19:15:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1554534 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=pUbGufa/; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HrSxN0dtQz9s0r for ; Sat, 13 Nov 2021 06:16:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DF1A983045; Fri, 12 Nov 2021 20:16:03 +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="pUbGufa/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9DDD88302D; Fri, 12 Nov 2021 20:15:46 +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 EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0626.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1f::626]) (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 4D6A983027 for ; Fri, 12 Nov 2021 20:15:41 +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=bfMg9uOcwhCsqjwCHZgwAguuLFy6vLnS8A29qdAIJ7rajXqXT9o5Lme8InAUaMNw4vCqQYSyY02bJYGnfB+WU6AWqbAS5WGPXZVHIySlp0/2EIbV69SXqMCCOWoyWRxJsDsBGi+ttmR0GGaHVa3/q95bxwHSFdWrUhh8aTrHqlvwxuMHpsXJXEvA8XuBMSL/WqRY5p8+AzGoJkVjo2gdrNFojLvgFARoBtrw2E9xegpi9yAFOFIgWH5AU1nvUqTzw84Kry4aK6N7XJXT+LyxEQKaldl2U+KDFRKOHWqeMmtr5Ky4Ip/aiHnTDPVDybpevKj8kUuC3nGFR8uW2835RQ== 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=gjEdnqVttYodLmoFpGPBNihFmTam29Sb3DFMS4gAm7w=; b=Ik5yFG2QqgUI1CJRAyJyj0ohSfN2ULj6ZUQwmXI/xSR7lq5NCRx2s6KWpFw+GaIQVA8RIc/H3QR4iwu02OtimbSmYqg4BX3/nKrmmFNWNzaZ3BePiB0gwpIRVZFebUGqKxEYGgAiNrUETuiNc8UuM1sLpzSPfP8v38IYMkhf+xSb3NumGNATAs8kV6ehyGD7MvdOO/+rlDZBu2g2B+2P0/1vgRtaA/4VcFT5Z9ggY5Fq535FsD90XNZpRORynCqjlHZ13ZMWL9iX8Mf1kzPHuaJv6aLkpC0pUNWVFLIGW63bl6eoUOAwHBt+wxbpPd88wTT0JhUBjTXYTHMMR/2+pA== 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=gjEdnqVttYodLmoFpGPBNihFmTam29Sb3DFMS4gAm7w=; b=pUbGufa/gDIdUr0knLf5jG673ZvmHQzFyHuk6pm7G5bqZ6/UykcMTIrsWOId04A8NG4WddL/z5JgYnZhe7062iGo73W8b8A3pXKG36LwLT3G6piX0gIR5lBPA90+VTKT1AB8RWqtz5IK32XSO/V3+NOjR7oZcmfxB0DMagUxs64= 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:40 +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:40 +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 04/11] mmc: fsl_esdhc_imx: clean up bus width configuration code Date: Fri, 12 Nov 2021 14:15:16 -0500 Message-Id: <20211112191523.1943825-5-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:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0d6dcfa2-3824-4312-12fc-08d9a610d0bf X-MS-TrafficTypeDiagnostic: DB6PR0302MB2629: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:93; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g1eosMgG2YxMMhrFeVEZEl5wEd8BaVfQ7/+7rsX0cEVoYd3eBQoQ0dWk4D7ZCbjRXvWPU8Q6Iu0mAjwOouSPUYFZeAvDivqQ+62lD7+GnyS9zhv7OfN0LBccAMuPAErYcWHL9akxwgiLhAq4h7cfGgr5I8CCXkMcnXlgDDKk1p/oLnZRJRsMkwY9K7AsUmvvDBDDuruc6a4MdFvaAnSzVQhmmS14lIpL+ass1SizDj19ZK+BbrHBvrvrXVZkHgXGfeHnCZq0sPtCEL4bb8PqB7tJiPBcJ0DO+N5CPTsaKT6ZvnQW5xP2alP6iQYTkVIfPkwCUfMeZXHq3OYqzB8HTTyNecYTPMtmHZ/KRvBcoX6YPJ5cysFHBL3Yar/pzhQVdNtA1SeHbrCclk+T/un++j1attXFExjwdNe7KkCgQlOWjyRkPWHXEdariGNSQI/VCHzohA5VXAB1Sshj+aWKwyMyjZphwpLdEoG9tdxG5PkqO4eWxzoXmnrfFYn3skrpSD3CLLHl+/WhMY1Ije/J3dLC+7Bl9B7gkO4omA8Tj6aB+OjDSTfAENAf/NEKGKIyA3wwqI3gK8BZGkQLZdDSwqSwD21sWJviyeLOF496/OiYcI6vYgMfaoOeQk+lSUFizFn3L4sAM7zccP9WRRSgBkBWznVhP/beUtBJat2q8IxbcUNyTw6LXpmfwHOs4o3fLjR50nZDOW7Bwc3z1c4VCQ== 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: m9pfHb8mPfDlxvl+GlhcVt5TN5CH/a7V4vIPMCADG+GjNE97dDnk7zSz/enmxgYTv1ZiYbtKc9TBaXC6GKyoea2WFfioua+YFMQZJLx0TnIo+lc1STRwE/JXQ8OKxpCWJOQ7SmZxO6UavUAdMzon5DathXPfDP0X6owwzUsiGQKIlTng3jAfq9G537wCbiF1AKvbUwKFLHggdiFB0F5YcuKj7WlhiB0TSN31vePYyZuk1/6mn+US5Y5vtb6Zc+/aVKUdHpEnGqslXXoIkzNeU/6JO7NYhruPkvMsRo8qcO0bBfTWy7bulW5TJpBCbaPZDMEfnlOo7GiNN3lOW42URW22Mic5kVCpyU8KytTCqXyYRkgxb39Tz2lLqsA4kXOLqRwTt9573Zx+U5x3VeFpj7vivIpUUJp0Z67l3JTOZXBSbkfBVa49DM3U/e4d1ApoMx6WaD3z7zHbJL3Gst/2UbXLSExSFHF7+6oiPVeODwSpJ2iBeihdXl4LhiM5VdWGn7ONvCGfRRzJl5Dl7nBwKxGPdUVxmDgJ2jpnICl07lMyJ5MSKv9fl4JZWWAiBGAIzv/CNKlMGzsUFbad++gLGGPr13JOTgmC0Xmz23kNLA/uKmYQhyPtEwNB70v9LfHX4jpK6w4fWFfAY12yk3mPhJJLe7h8mIJxgP0xrMt9w7v6Xdj6BAttDPvEzsNj1xAlBwE6Fb3OUQNVPg3KzoyLFofTLbNz1ufqVaus15lY9voZaOsxpVY+zORN/BkM/gIsrBPMBXdZdLJAMaFsOxubCq2IlL0RzVedGes+IEwVVmuqHL/O2156eeZ0brG8BVyksu6Jvc/tM18h7DhxjdStvUwQ1oiZf7t6KIvz96Kch1ofMM7pafJW6+GYQFIOMRThyNPROw6vvdlgv7qCQ/nS5dugqznvcsw6+IFnSidF2qKic9+7u4Cr4PhIXWBjReSGGCFtiC8I892/mp7o13LltJedM6mV4U6EqID0EZkv5m1FpyHPSHhZQwdLuu5BwfQsPxP+8qwqFh+PXMYXgBiD8BRUBq5bO35QPgvFAWc71awYF+E3yyU16kVmGe+Rfhwx52omQQyw18VjnxWLC6W4504vf3f8mGWzz0WSvtq+u97TJcsjtplfcRkRD0n+XydZhr7lXwuLXbBpDKBwr5lQGqY/Gq3fHngpwIVddBTL6VkBjCvfogmai925VAxHdNkoT1QTSSEcdxOXwiEUe90JWnF2+uRRgVz/4JM5zhXyMXBDcdbaeitiTO2lVaCjhl+PrwbFl9dh7qeQgTC6//wFnZxQi5/b6CZ2NaUgV/MYRPcLLavmhcZej64eOrOxJogKJ1q9p9Iu8AHg5U3hc/iRPr+1TpsU7qVgybxZTdwuR2FBVoG1UNAybLHYXjsQpI9uWT0C+Gx6/zL4w1QIPZxq7r+lahorGCg6ux+E9mqgau4Xq2KtDP/AoRoBLunuH5mx2U2ERso0FDvIQd+GL90YtwwMhz16eLepWmzkiWHpbLVbpvNkTdCtveXWeZAh2xIq43ErYU3wEjlTue7z/LswfDyAngOpihkEZY7nXshNE4RsVqzOHj4JL3mnS7zQTfPJHf1vtY4ieGM2iUqu/S2G3reGMVPiL0oXfe7PySU5qBY= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d6dcfa2-3824-4312-12fc-08d9a610d0bf 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:40.3153 (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: OGV97RZ54ad6gpGKuJgh5CGnbI7QzmlubCCa2Di68zL5fppafBWThOnC7jx9PXB6+1fngdMcoSM0DDVesISDQw== 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 07bae1de382723b94244096953b05225572728cd ] This patch is to clean up bus width setting code. - For DM_MMC, remove getting "bus-width" from device tree. This has been done in mmc_of_parse(). - For non-DM_MMC, move bus width configuration from fsl_esdhc_init() to fsl_esdhc_initialize() which is non-DM_MMC specific. And fix up bus width configuration to support only 1-bit, 4-bit, or 8-bit. Keep using 8-bit if it's not set because many platforms use driver without providing max bus width. - Remove bus_width member from fsl_esdhc_priv structure. Signed-off-by: Yangbo Lu [ converted if statement to switch ] Signed-off-by: Sean Anderson Reviewed-by: Jaehoon Chung --- Changes in v2: - Use a switch statement instead of ifs for max_bus_width - Only default to 8 bit width when max_bus_width is not set drivers/mmc/fsl_esdhc_imx.c | 83 ++++++++++++------------------------- 1 file changed, 26 insertions(+), 57 deletions(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index b91dda27f9..b604729750 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -126,7 +126,6 @@ struct esdhc_soc_data { * * @esdhc_regs: registers of the sdhc controller * @sdhc_clk: Current clk of the sdhc controller - * @bus_width: bus width, 1bit, 4bit or 8bit * @cfg: mmc config * @mmc: mmc * Following is used when Driver Model is enabled for MMC @@ -151,7 +150,6 @@ struct fsl_esdhc_priv { struct clk per_clk; unsigned int clock; unsigned int mode; - unsigned int bus_width; #if !CONFIG_IS_ENABLED(DM_MMC) struct mmc *mmc; #endif @@ -1232,31 +1230,13 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, #if !CONFIG_IS_ENABLED(DM_MMC) cfg->ops = &esdhc_ops; #endif - if (priv->bus_width == 8) - cfg->host_caps = MMC_MODE_4BIT | MMC_MODE_8BIT; - else if (priv->bus_width == 4) - cfg->host_caps = MMC_MODE_4BIT; - - cfg->host_caps = MMC_MODE_4BIT | MMC_MODE_8BIT; #ifdef CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE cfg->host_caps |= MMC_MODE_DDR_52MHz; #endif - if (priv->bus_width > 0) { - if (priv->bus_width < 8) - cfg->host_caps &= ~MMC_MODE_8BIT; - if (priv->bus_width < 4) - cfg->host_caps &= ~MMC_MODE_4BIT; - } - if (caps & HOSTCAPBLT_HSS) cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS; -#ifdef CONFIG_ESDHC_DETECT_8_BIT_QUIRK - if (CONFIG_ESDHC_DETECT_8_BIT_QUIRK) - cfg->host_caps &= ~MMC_MODE_8BIT; -#endif - cfg->host_caps |= priv->caps; cfg->f_min = 400000; @@ -1294,25 +1274,11 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, } #if !CONFIG_IS_ENABLED(DM_MMC) -static int fsl_esdhc_cfg_to_priv(struct fsl_esdhc_cfg *cfg, - struct fsl_esdhc_priv *priv) -{ - if (!cfg || !priv) - return -EINVAL; - - priv->esdhc_regs = (struct fsl_esdhc *)(unsigned long)(cfg->esdhc_base); - priv->bus_width = cfg->max_bus_width; - priv->sdhc_clk = cfg->sdhc_clk; - priv->wp_enable = cfg->wp_enable; - priv->vs18_enable = cfg->vs18_enable; - - return 0; -}; - int fsl_esdhc_initialize(struct bd_info *bis, struct fsl_esdhc_cfg *cfg) { struct fsl_esdhc_plat *plat; struct fsl_esdhc_priv *priv; + struct mmc_config *mmc_cfg; struct mmc *mmc; int ret; @@ -1328,14 +1294,33 @@ int fsl_esdhc_initialize(struct bd_info *bis, struct fsl_esdhc_cfg *cfg) return -ENOMEM; } - ret = fsl_esdhc_cfg_to_priv(cfg, priv); - if (ret) { - debug("%s xlate failure\n", __func__); - free(plat); - free(priv); - return ret; + priv->esdhc_regs = (struct fsl_esdhc *)(unsigned long)(cfg->esdhc_base); + priv->sdhc_clk = cfg->sdhc_clk; + priv->wp_enable = cfg->wp_enable; + + mmc_cfg = &plat->cfg; + + switch (cfg->max_bus_width) { + case 0: /* Not set in config; assume everything is supported */ + case 8: + mmc_cfg->host_caps |= MMC_MODE_8BIT; + fallthrough; + case 4: + mmc_cfg->host_caps |= MMC_MODE_4BIT; + fallthrough; + case 1: + mmc_cfg->host_caps |= MMC_MODE_1BIT; + break; + default: + printf("invalid max bus width %u\n", cfg->max_bus_width); + return -EINVAL; } +#ifdef CONFIG_ESDHC_DETECT_8_BIT_QUIRK + if (CONFIG_ESDHC_DETECT_8_BIT_QUIRK) + mmc_cfg->host_caps &= ~MMC_MODE_8BIT; +#endif + ret = fsl_esdhc_init(priv, plat); if (ret) { debug("%s init failure\n", __func__); @@ -1416,14 +1401,6 @@ static int fsl_esdhc_of_to_plat(struct udevice *dev) priv->dev = dev; priv->mode = -1; - val = dev_read_u32_default(dev, "bus-width", -1); - if (val == 8) - priv->bus_width = 8; - else if (val == 4) - priv->bus_width = 4; - else - priv->bus_width = 1; - val = fdtdec_get_int(fdt, node, "fsl,tuning-step", 1); priv->tuning_step = val; val = fdtdec_get_int(fdt, node, "fsl,tuning-start-tap", @@ -1496,16 +1473,8 @@ static int fsl_esdhc_probe(struct udevice *dev) #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_fsl_esdhc *dtplat = &plat->dtplat; - unsigned int val; priv->esdhc_regs = map_sysmem(dtplat->reg[0], dtplat->reg[1]); - val = plat->dtplat.bus_width; - if (val == 8) - priv->bus_width = 8; - else if (val == 4) - priv->bus_width = 4; - else - priv->bus_width = 1; if (dtplat->non_removable) priv->non_removable = 1;