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 Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D5C83C433EF for ; Tue, 23 Nov 2021 20:04:52 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D056F83720; Tue, 23 Nov 2021 21:04:31 +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="B0oRevkc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EB39182DF6; Tue, 23 Nov 2021 21:04:19 +0100 (CET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::61e]) (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 4BB4D82F8B for ; Tue, 23 Nov 2021 21:04:11 +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=BK/7HOBGs0b0yKM/Aoep6UV7pu675nco1qzvKePVFY36Fv80bGu93BK/lELj4P1u0OkiWwl7QnvJKWxsJ/ugB9STzEn8qWuUwV41+s7zxywfQBXZ87IArdjdGUYRWYhfzkva+IdmR7RuZ0j9vIG2Aj1VDO/ubNQkNZKEXUgnx2zHSVUTCe+I1yzTcCT+dUYYdh6da2tq87966lR/qtzhs6oxEgg2kY/qksiw/G0sNAn7j1sBzi0aRpgVMescP/gTrzJyoyGJROwCCghuyotC1KQ1pd2Qr4moKMHcRSJwzITqoAtsUI+zb+4w4N2A2oI1hMxCAH4X3FZlOkfvOiQseg== 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=i7JtGJYKyJJaK5uRs3XvcgLd7A/FjsG4BJnCBpTmWgI=; b=OkoonLHtIQLenipOie/+pItEm1BJ7CbTeAsL8lcg/XgERUfH1AzJzuCOJLD5g4sOK/+YG5Aut1wuNBoB+tVc4hF5ONCzB96WIwra3W8a3VJge6dY8z2utqInQYCvc7kdLcHoY5t1EfidM04JOKebE9gHFy3WmdBx+8ogB6ohwD0UztyJUFnqm+EgMLdOqmTWj6TRGoJs4zwbVFGtP5mE6nTMzSiMj4RQCi0hwIaHDOcNLiqsCJw8xHcSJygQu8aWXCPp2NeP2a4waNwVpGFXuyMtsL14Q7fe/4TqKivuh0bDsD6KbVspB4z1dPg4ilI+BaX7zm3+9eS2G+OyX+VpUg== 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=i7JtGJYKyJJaK5uRs3XvcgLd7A/FjsG4BJnCBpTmWgI=; b=B0oRevkc1EYKQuiZWpD+5SB1FLxhu5mZZS9subjaQxpRVeIEpqIVsgX47OUKc8oiA+S4xsOsYyGvLynKml/lN/Nx7iqBCHZZu4sWs9S6NpZezRfo1pxxeo2U9m2aeUhJWvawLzz1Tg4dwCpv6SMk8Xqw5nvoVgDu+eOvF1IDDFc= 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 DBBPR03MB7097.eurprd03.prod.outlook.com (2603:10a6:10:1f5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Tue, 23 Nov 2021 20:04:10 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee%4]) with mapi id 15.20.4713.025; Tue, 23 Nov 2021 20:04:10 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Fabio Estevam , Yangbo Lu , Michael Walle , Sean Anderson Subject: [PATCH v3 03/12] mmc: fsl_esdhc_imx: fix voltage validation Date: Tue, 23 Nov 2021 15:03:38 -0500 Message-Id: <20211123200347.3772343-4-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123200347.3772343-1-sean.anderson@seco.com> References: <20211123200347.3772343-1-sean.anderson@seco.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) 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 MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.19 via Frontend Transport; Tue, 23 Nov 2021 20:04:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 05155fe2-a7f7-4cf4-5d2c-08d9aebc69c9 X-MS-TrafficTypeDiagnostic: DBBPR03MB7097: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:114; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qgt63uuVqVd9ZY++/p3/atYNQ7GctaFnfOhDR5PnTEIc5inL55k3Og0lHKg5T8SuYr+tgnT+tdTrDlRYg/J3NltqO3iutg7nPNkgSgXJHUnrlrErCaRQ38TPQYgV7X0GABibiaDTDZzhAxBUxfUs00Zpy+dcsoSidcF5RmzR6+YnXIyqGpkbylyFJhAqtTcSSDmJZT1l+b4nzVqU/y7JjT9WFHSbKP8bdpQ025ki4noHt1Qx9ch+9cDDxtjqYrf5sBxImdyn0Vy+DG2NFeetBfM6kmtlvY3dLIMbu+0ijTbuZtkNKqjB+gtnupFvE2THKDclUdH++mlw/04M5sLpURuOL6s45JiLm1rWYNwMCLT5vFIjpWYv4EV7/h5tJtfDxjJ1G3FiMz1GMilTkaC1h4MrFlfhRgIDgn2VoeQ1RPsU6sPURZP2O40K07adtQTM/sAha2mawhFBEaTkp/zkyqvUP8sjUpGJVClB5XCtQng95hXInHtKQ1ffFQz4YNm9eO57L2lp6ew1bMgoaEX8kYbi7BP1h1goIVeg5tamCSWYSLtzlJrcZyBHu4QYCEv2r7FoG6CNGhmVEglf6c7be6+iupE83DGQJVLtJPHRMageWBhzLQGmV+7RJMjxAuZmSqKhpG35yaKlRAMQ4Vf6gTa2Iy0BMWShK/QTXjU5CK8Lt78mIHLSQTkAYxMcLImBBabQzkJ2usyCh5uLA8cEgw== 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)(26005)(8676002)(4326008)(107886003)(186003)(8936002)(38350700002)(38100700002)(6506007)(86362001)(1076003)(2906002)(52116002)(5660300002)(6666004)(54906003)(6486002)(110136005)(316002)(2616005)(83380400001)(66476007)(6512007)(44832011)(956004)(36756003)(66946007)(66556008)(508600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3kav3qmtxBbYiHQ+bVecQ4QKyQ+B0yTdEMtMey+sVVBPmCkFcB5cBeS1fgmT?= =?us-ascii?Q?3gJ6/ebpRunuvwIZ9HksLuW2rBZLFcEFddOmz2v7A5drAffWlLCr5Z2wXbN5?= =?us-ascii?Q?ri8emjWs/GlfaCxJ2Iok8MX25GyOWSlqNNCkT9pOLKViHx5Aer/faWF2FLAx?= =?us-ascii?Q?JY+q90uk0lQS7BZYI3avryJKfbOs0QCS1AdDHlA67qFquZgJnznIgxK/C1+O?= =?us-ascii?Q?sBSR5fJ+jq+AiD6A2u1JmI0TBFL4S5HIP/rs3P+V1lqZqsNh0Vv113/oli/g?= =?us-ascii?Q?m6GZPmaMMHd22iR3LIShXmH6yMb0w5sTQichCYreU3YN491Nlz3ydemrdEBF?= =?us-ascii?Q?VNQ9kOcIsuGsqH3SikfKOt62LxpMqOjNuBwrn36G6r/6fCTLbR9EeX8tUh/t?= =?us-ascii?Q?iqndj0AEU/oAwiJgSK4d1UgshyOo0oM0/keS9VU5DHrnDyx/KC/K3CMPgrVz?= =?us-ascii?Q?13i82D5dARoqN6lPtJ/0Am4JBS7rOdmJ9Y6SIOiKmvREz8Y0G3oK3bMr+Xst?= =?us-ascii?Q?tY+YI6PQm5YLmOM4klhiFl5eE43/CdxxTlCgn0QXrKpBZbwNn5Fgs8ezslBQ?= =?us-ascii?Q?vPpwQvnwd/DaKBM8yJIthqVJCeSO7s2u2zUHHaZSAIMY5k4p/yvWjoH/MxBZ?= =?us-ascii?Q?q6PYPrE+ygRFygfei7g3aH/N4TLptQsojkJ4h+b1FrM3G2ROpOurhBZjZz3n?= =?us-ascii?Q?wqgk1mB/EkdvKnAEw6JPAFvyxsyE48w4h7OOBI2yt9HDdT64ZCZ6OAnulPPf?= =?us-ascii?Q?S0Vmb5LqVT/sugFTRL3Rni0gcqf51dgT/3rPnw8xZnP6wD0lIqlEdNLUv/k+?= =?us-ascii?Q?DysAz2H0i9ntEbDJy4xvkjrSL+tdfcxmpz6oZPui7dVE2DiR/reD0pRymSYd?= =?us-ascii?Q?QVuf7nmjzP2NqgMGFsQxpJllyO39d5EhrfR0rPk/pXoVwkcHILS8DJnroQrG?= =?us-ascii?Q?RBjiWH9vYjb0UGGTQCXKiWugKeqOc1WXNYYXSwAK7PI4zrmn3g/qc33Z/VQ0?= =?us-ascii?Q?+qoXBHGg+hZsyZZLIZiMVSl9uuAjJxyDV3MnGNFXBY9HMYLgUzdmJODFnTge?= =?us-ascii?Q?L9047pfaBCo0D8PZkOvruyp5BDk/RoUQizMPR8/hR6mzAJVoQNJyWcUL1lGF?= =?us-ascii?Q?gtLI5acEbuAdwRMRdsvgJEYZ6YNgULVEe/kAm9//XIPPJIcPGKK6wGYksFtV?= =?us-ascii?Q?34RgPNpXJQQNnbW9sX74jpavRIQKoEPYOR7gEu0zRzud2SjUxOzgBEc2ykNS?= =?us-ascii?Q?7Dt6w6BWUqtc9XH/g7UY53pA3IE9/o4Xv4On0na2MSyKl3qYhgy4tzfOuXfb?= =?us-ascii?Q?8x3ilKY10IuHRfbq3/t2H1/GJmXZMysb+hF3UPtre7ydTlddWwU839NspI1Q?= =?us-ascii?Q?CtcCOLIkXsas2Lrh1ZHK4eX4Mo7TcC9fsZTZPvwXi1yzr3hA1VYnvfDbi3Dy?= =?us-ascii?Q?h3Q4EgWMK+oz0ESkTQRLXXKqNi2V7XIhhXW0AO2OFCTWhYmhOXDPNqibJ3ub?= =?us-ascii?Q?XbfemnPed/7P7gH/YVMUDWR35Wg9D4R3QL5dSGctAiwxAlM4WfmbI9DCvv0I?= =?us-ascii?Q?KCiUYJa9i0CEzfIiD8a5YiFFclM0w86rXfGSeT92vPVX9ELZClP/Phkk7m+3?= =?us-ascii?Q?vR1j0BopOIvA+xfOntu0eMk=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05155fe2-a7f7-4cf4-5d2c-08d9aebc69c9 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 20:04:10.2584 (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: JBnheQgva5MHulVwYwgSY83j4MDb5Tqehd+TIAfy3yY+rz1e8u56g1KuoZotqoJ6T6K64ZLDIC+OtFHDG7XEKg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7097 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 5b05fc0310cd933acf76ee661577c6b07a95e684 ] Voltage validation should be done by CMD8. Current comparison between mmc_cfg voltages and host voltage capabilities is meaningless. So drop current comparison and let voltage validation is through CMD8. Signed-off-by: Yangbo Lu Signed-off-by: Sean Anderson Reviewed-by: Jaehoon Chung --- (no changes since v1) drivers/mmc/fsl_esdhc_imx.c | 35 +++++++++++++---------------------- include/fsl_esdhc_imx.h | 12 ++++++------ 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 121f9182f6..f4ccb19d9f 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -1167,7 +1167,7 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, { struct mmc_config *cfg; struct fsl_esdhc *regs; - u32 caps, voltage_caps; + u32 caps; int ret; if (!priv) @@ -1206,9 +1206,7 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, memset(cfg, '\0', sizeof(*cfg)); #endif - voltage_caps = 0; caps = esdhc_read32(®s->hostcapblt); - #ifdef CONFIG_MCF5441x /* * MCF5441x RM declares in more points that sdhc clock speed must @@ -1219,31 +1217,24 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, #endif #ifdef CONFIG_SYS_FSL_ERRATUM_ESDHC135 - caps = caps & ~(ESDHC_HOSTCAPBLT_SRS | - ESDHC_HOSTCAPBLT_VS18 | ESDHC_HOSTCAPBLT_VS30); + caps &= ~(HOSTCAPBLT_SRS | HOSTCAPBLT_VS18 | HOSTCAPBLT_VS30); #endif - if (caps & ESDHC_HOSTCAPBLT_VS18) - voltage_caps |= MMC_VDD_165_195; - if (caps & ESDHC_HOSTCAPBLT_VS30) - voltage_caps |= MMC_VDD_29_30 | MMC_VDD_30_31; - if (caps & ESDHC_HOSTCAPBLT_VS33) - voltage_caps |= MMC_VDD_32_33 | MMC_VDD_33_34; +#ifdef CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 + caps |= HOSTCAPBLT_VS33; +#endif + + if (caps & HOSTCAPBLT_VS18) + cfg->voltages |= MMC_VDD_165_195; + if (caps & HOSTCAPBLT_VS30) + cfg->voltages |= MMC_VDD_29_30 | MMC_VDD_30_31; + if (caps & HOSTCAPBLT_VS33) + cfg->voltages |= MMC_VDD_32_33 | MMC_VDD_33_34; cfg->name = "FSL_SDHC"; #if !CONFIG_IS_ENABLED(DM_MMC) cfg->ops = &esdhc_ops; #endif -#ifdef CONFIG_SYS_SD_VOLTAGE - cfg->voltages = CONFIG_SYS_SD_VOLTAGE; -#else - cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34; -#endif - if ((cfg->voltages & voltage_caps) == 0) { - printf("voltage not supported by controller\n"); - return -1; - } - if (priv->bus_width == 8) cfg->host_caps = MMC_MODE_4BIT | MMC_MODE_8BIT; else if (priv->bus_width == 4) @@ -1261,7 +1252,7 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, cfg->host_caps &= ~MMC_MODE_4BIT; } - if (caps & ESDHC_HOSTCAPBLT_HSS) + if (caps & HOSTCAPBLT_HSS) cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS; #ifdef CONFIG_ESDHC_DETECT_8_BIT_QUIRK diff --git a/include/fsl_esdhc_imx.h b/include/fsl_esdhc_imx.h index 12e9163382..4ae932858e 100644 --- a/include/fsl_esdhc_imx.h +++ b/include/fsl_esdhc_imx.h @@ -164,12 +164,12 @@ #define BLKATTR_SIZE(x) (x & 0x1fff) #define MAX_BLK_CNT 0x7fff /* so malloc will have enough room with 32M */ -#define ESDHC_HOSTCAPBLT_VS18 0x04000000 -#define ESDHC_HOSTCAPBLT_VS30 0x02000000 -#define ESDHC_HOSTCAPBLT_VS33 0x01000000 -#define ESDHC_HOSTCAPBLT_SRS 0x00800000 -#define ESDHC_HOSTCAPBLT_DMAS 0x00400000 -#define ESDHC_HOSTCAPBLT_HSS 0x00200000 +#define HOSTCAPBLT_VS18 0x04000000 +#define HOSTCAPBLT_VS30 0x02000000 +#define HOSTCAPBLT_VS33 0x01000000 +#define HOSTCAPBLT_SRS 0x00800000 +#define HOSTCAPBLT_DMAS 0x00400000 +#define HOSTCAPBLT_HSS 0x00200000 #define ESDHC_VENDORSPEC_VSELECT 0x00000002 /* Use 1.8V */ -- 2.25.1