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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,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 0E446C4338F for ; Tue, 17 Aug 2021 09:21:18 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 2B35D600CC for ; Tue, 17 Aug 2021 09:21:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2B35D600CC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2B6A582C45; Tue, 17 Aug 2021 11:21:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.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=nxp.com header.i=@nxp.com header.b="szOHBifh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6E58180C87; Tue, 17 Aug 2021 11:21:03 +0200 (CEST) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on062a.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe09::62a]) (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 4B6238032E for ; Tue, 17 Aug 2021 11:20:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ye.li@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EMQ79F5XZgkOKmyoW48V2IrPTbpdlEiw9ChqH8yNNMGl3k7znowPOA16ymDsRzKmEu+10zQ46htuPG2As+//aQHvTwEB7RR5A/4LoIDV9aijsjRf2kUR8X0GAiWLqaCd8NqInAV9pmCM46rSDQXiA/If9nbLliZKNFV7WeIVjrFYfoJksgTUUO5zyIzuYlOonzCgAUGmT3bh2xTASE56ODdfxyHhuvBL0Qwe3ie2ngyBME9GVtNiRLVkTQcSn+zSP606YdDEbpXm+OOFyvBmDUq9gB9CB90lj8ULBYqWnhprN59e9DY9s+/Q8wwJDZbmSDTE/qv95pW24Lawe98osg== 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=ic8IFOHcGBdN31WxdlJleFi8qQM0qsz+DWzuP05d8d4=; b=IejAtfBVRnHU4Y3DMqxBJ9tg0J4bYnO0yudU/1z1FFwFu2dcnvq0QcyBAmTt2zLIndzwNqaGM4t0aEtcplamJNH8vxA9eDAkm23y8UGo43PFlQwkPDp5RBNRMKJQirnAPBVTFFNT3Eaoo6YUBbC4MYNPuUBJKg/z4qXGfz5NfnoXRlxPqPX78khow48Zs7qWQMSQn14y3fzomnFOfOZqqLdVJDQFL1yzNSNV8c55MaeL4GP3bNINviPNIgSO6rIvp25asZtnAex6QMqlm0YyLebGoZr54zbGUIadDIfL62AnvgWKzNQL5NGz96229FAzCnjwnZ1Z9DF1CnOpdNd7jQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ic8IFOHcGBdN31WxdlJleFi8qQM0qsz+DWzuP05d8d4=; b=szOHBifhCR84k/jhs/Gh5796WbH1DTe/BPiJ2rOmOIGHM/+Q6VekhiwIU4UzlBJ8ji6+2A56lpNXpd29NPvyCBAPvW0uTNfgs1jUU84onblsUnRrT0G26ckFw6C81sjeYf3cD6xU+1DX4dIpcW6JRzTJhbo5il80s2bwvpGu2kk= Authentication-Results: samsung.com; dkim=none (message not signed) header.d=none;samsung.com; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB7069.eurprd04.prod.outlook.com (2603:10a6:800:127::19) by VI1PR04MB7168.eurprd04.prod.outlook.com (2603:10a6:800:129::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13; Tue, 17 Aug 2021 09:20:58 +0000 Received: from VI1PR04MB7069.eurprd04.prod.outlook.com ([fe80::5d8c:a6f9:c7db:56e4]) by VI1PR04MB7069.eurprd04.prod.outlook.com ([fe80::5d8c:a6f9:c7db:56e4%3]) with mapi id 15.20.4415.024; Tue, 17 Aug 2021 09:20:58 +0000 From: Ye Li To: jh80.chung@samsung.com, u-boot@lists.denx.de, peng.fan@nxp.com Cc: uboot-imx@nxp.com Subject: [PATCH 2/2] mmc: fix device_remove when HS400_ES is enabled Date: Tue, 17 Aug 2021 17:20:34 +0800 Message-Id: <1629192034-64056-2-git-send-email-ye.li@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1629192034-64056-1-git-send-email-ye.li@nxp.com> References: <1629192034-64056-1-git-send-email-ye.li@nxp.com> Content-Type: text/plain X-ClientProxiedBy: HK2PR0401CA0009.apcprd04.prod.outlook.com (2603:1096:202:2::19) To VI1PR04MB7069.eurprd04.prod.outlook.com (2603:10a6:800:127::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ubuntu.localdomain (115.198.187.246) by HK2PR0401CA0009.apcprd04.prod.outlook.com (2603:1096:202:2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.4415.13 via Frontend Transport; Tue, 17 Aug 2021 09:20:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 59032910-705b-454e-67e9-08d9616052c6 X-MS-TrafficTypeDiagnostic: VI1PR04MB7168: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PA8P+FNpKPXftUFoSlM2wB2JQ4Kc74EBS4XYC5DEKqGA4mxH2v5tlTrLE3braWV9e/ifkCuPM2GYAQkDhuHBCOK/BsiCU8ks4A67UEkSeCS/FLZ0zDnOYihjwCzDjoSxdDiC990oyL3Y9o2BT6MdrUkDGM7pQjNN3NGMKqFn/hEbcqKZUqebm1c214PBvQikcH/RAvOx9et6HhbFSc3Op+6pjop0ldgKLo1gcZOEKCK40znDjksm4sAco7lPImwIlHFvJZGkCcuJdzI/A/Mb8G0HYsaFN1EXxdjOiM3mNoC5lIBuP31asyrp2TK7WckICdOoRIsss9053fCa5KCjAwSpSPTqQSyJWn91zhonRlShgTomNjmMq8j97dZQlzfHcpthFJCuaCxmwZC4X6dbyqnDDt7bP8RUcRlh+q4EaWIBD5XXRF55RzbEcw+lSwJXrn1e94lM52JRs+laaPSnzHAVdvSYerr1HHx4CQnmbkIirfNj7ZikvDrIc/3LOTV1R4BMjzycJBTiys4LTnnVZP0AU8cw3wOiRXR612Xg4nrR4OkJV6aQIuH1FM8kDLdvlYKRnYwysTZWMj8WDkYUgIp9A74HwYEbJmtR34NDe2xK/0uoK7pJnwqb4XEfz7KgfOJl3Fb9tvO90mv36MDrSQU8ZNNGdD4oexh4xjkbLBGCvSK0HW7xw1keSiAonkiLpTNoY3sA+0O6j+E2deQmgA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB7069.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(38100700002)(38350700002)(44832011)(4326008)(36756003)(6666004)(6506007)(186003)(508600001)(26005)(83380400001)(6636002)(6512007)(6486002)(52116002)(66946007)(66476007)(66556008)(86362001)(8936002)(5660300002)(316002)(2906002)(8676002)(2616005)(956004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fdwRuD3WlK3rP5uUhYHQ0jDHKPaKDGt0e73ktsUfc+UeEM8eZLvUYMrNx3A7?= =?us-ascii?Q?S1BgHnAIidaWb4FfmU26JNd7YfMNbjYAF5ePcR9J2rxpUQjk6M5RaqVXVhhE?= =?us-ascii?Q?CmcTkRQeEfOuSI+1JrLE/+pLz7i7JY6VG/jVWpohMvYHJub3dN1V0gWEiCtQ?= =?us-ascii?Q?BZuOgHqaTzpcoHWs2bmRX8VxplwmRYkZjBMrFmOMgTPsgjhCTukx/BpGhXyA?= =?us-ascii?Q?pwEhJyhja9GA05xRgvs13+BZUG6g6oPVaxTbcy7QSKpN8ejtsnDuYSjU3pwE?= =?us-ascii?Q?QeNiXU63Q7lDzfmQv8xEkWWymg2IBuuI6sUhDuJfVIOYwpK6+w4IJJIdVj6L?= =?us-ascii?Q?HaL84mSwXEh3Q+RbDJxUcq2c2cU3bKLDJs/KpR5DE/0gjkdsoIVIBZzDPbNA?= =?us-ascii?Q?+Vv17pDsfhSquxgPMoUSevI6GTcUsxvgo1D5zfUM1kxO+IJmUJvqGfAoL0qx?= =?us-ascii?Q?oOALpJZXylTIisGs3omIKXsHh3GVT45eiA7UkFx8RRWyMKyVcJFLYAa01zh+?= =?us-ascii?Q?ezw5TJkdBtj+WYgSxd+QF9fPOKvvDc6c6yIDfZMc/fKAOJ2ixxccRxpTysSN?= =?us-ascii?Q?pGwmsxsiesb/4XHLrrald+q41dEMxH1PcqRvuhZU1g+pnqzPdK/Cl8L+IpZF?= =?us-ascii?Q?1kctaaiJhNPiNa4e6f2OKTq3aHBNOlxAi6kbs1lGCxJVah9O9UWgPyM/yRQ4?= =?us-ascii?Q?ROMJWVYLOVyUnnFsr/ReAM1M0SicnD6uEaF8ybsUhPrrrLei/h0mKrVfhhXd?= =?us-ascii?Q?w6sfTNFb0YpJckX7edwJPKp0QUFVGaCXPVjhJ9kl7YNq9OQRMwYWxL+kC74f?= =?us-ascii?Q?ktnxXUdB9EVORd40srPWe7sFB3e7ILmF1oAMWNnXGYxZs6w06MCLu6nT3oAD?= =?us-ascii?Q?qNJtS4StUv44ajSmI02RetLrUqOZHahTlvvmPik6be6dkeGxKOv/JqBkC21l?= =?us-ascii?Q?awqyzdKQzSnAve5BV24Cx5Dec9R4Fs2b586LT30kTjqt4z9aSgkcK7o/KxKk?= =?us-ascii?Q?H8LRtoVhye0I91zKAmgmk27fXGIf01DxxG3H8SGuAWhL0WvkRWqc/0vj6tKs?= =?us-ascii?Q?PzruGyNrkLdoIIuGSqyaeR9pUPPMR4xOXMmzvoSfCRSrCJdxRXXqPrbGw+3f?= =?us-ascii?Q?eBH04K1mV7qCKj00sxaNnxd60ISGT8M99IbkTBM64LSBg6HacLdbBPrlR+Bf?= =?us-ascii?Q?EqcpnqgX13CTsUZF7tKnQuNhNvfmPPt2PEQbEDk3f0zKgnFnJVDQiQvyDAJW?= =?us-ascii?Q?FtriUDzxGeijsPBmr1LsE9Jrvq4ieY4lqhIKc6y2wKcvZx/Y80kPoy9FDaVl?= =?us-ascii?Q?bZy6R8MXhJw0SyieFScNwq9B?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59032910-705b-454e-67e9-08d9616052c6 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB7069.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2021 09:20:58.4757 (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: unT6UieHYuoJmvN67rymCkhCTQbpF9MqGJ/A2v+VUQs8q3CG35gvBMtpF+MC/ZbF X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7168 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 HS400_ES is missed when down grade to HS mode during device_remove the mmc device Signed-off-by: Ye Li --- drivers/mmc/mmc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index a1fd533..3cb6fda 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -2092,14 +2092,16 @@ static int mmc_select_mode_and_width(struct mmc *mmc, uint card_caps) } #if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \ - CONFIG_IS_ENABLED(MMC_HS400_SUPPORT) + CONFIG_IS_ENABLED(MMC_HS400_SUPPORT) || \ + CONFIG_IS_ENABLED(MMC_HS400_ES_SUPPORT) /* * In case the eMMC is in HS200/HS400 mode, downgrade to HS mode * before doing anything else, since a transition from either of * the HS200/HS400 mode directly to legacy mode is not supported. */ if (mmc->selected_mode == MMC_HS_200 || - mmc->selected_mode == MMC_HS_400) + mmc->selected_mode == MMC_HS_400 || + mmc->selected_mode == MMC_HS_400_ES) mmc_set_card_speed(mmc, MMC_HS, true); else #endif @@ -2952,7 +2954,7 @@ int mmc_deinit(struct mmc *mmc) return sd_select_mode_and_width(mmc, caps_filtered); } else { caps_filtered = mmc->card_caps & - ~(MMC_CAP(MMC_HS_200) | MMC_CAP(MMC_HS_400)); + ~(MMC_CAP(MMC_HS_200) | MMC_CAP(MMC_HS_400) | MMC_CAP(MMC_HS_400_ES)); return mmc_select_mode_and_width(mmc, caps_filtered); } -- 2.7.4