From patchwork Tue May 17 18:27:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12852853 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A8C0C433EF for ; Tue, 17 May 2022 18:27:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352115AbiEQS1y (ORCPT ); Tue, 17 May 2022 14:27:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240924AbiEQS1w (ORCPT ); Tue, 17 May 2022 14:27:52 -0400 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7E573A5EC; Tue, 17 May 2022 11:27:51 -0700 (PDT) Received: by mail-pf1-x432.google.com with SMTP id i24so17641433pfa.7; Tue, 17 May 2022 11:27:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KYtgIznm21TVQ7ViKJW4yH+KEfcmA7jYzNlTXWmB3cQ=; b=oaHCqgLaRl6UsDy08j3qFv7XdR1YqM13Lkzsa7Kq5n9noFoiVcDQIHgOMCH2iaMbWD 8lYFSo9KVs+d6pM32pUMirYkEXl43gIgmCows5n97Sh+UY2uv2VpICA99oea8RL/EFji PhtBDbjM02wySXxinEoUp6cIKQt1dxOQ0tF0eMH3YhfeCKsBwucPakGoFBjk5Z/u7Cml ETWuwg4ekzu6M+iB2aX6yZeC4SdbMEVg4nYVBKsvJmB7+XIuvZgoP4m8leOd92WABvZu 5zOYK9buwAtTEQa15/V39nAqZ1MkwkQaPnr3/IeScu0CXz3oRV5V8+MYhlgehWq1M+pZ 7oAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KYtgIznm21TVQ7ViKJW4yH+KEfcmA7jYzNlTXWmB3cQ=; b=p/+UgPMnmnmrpDxLU7eAZaMXJ8kusG6ejSUUJ4Xbnol3Avpn9QlJSbVC+8pfWmUeXx GttvQ5ilJkpPblRNYtjBp2a5/huX6k6n7cNvcoJRCbx1FLf8+c5+uXA2bE0cImNe7J2t kzVAn8KYEXAfHQrgoZB/JzxOL9LA1XpgCX6s79L05/NSnC3fFQ6B67qj35orL128vQHE o4HLlwo2UivqbcZxBQvAlunOLc9L5RiE2Op+QOvYZhVM4wrqKtQtOwc7Q1NSeXTIrbgo KTF/snjXuHFdQfl8yssgzSFVgTAtOuogMnDVxnN9fbgj428IMj414saH/pH0eGMis+a2 KS2g== X-Gm-Message-State: AOAM531UJUt64SKZpUWrt0RQeHYvgdoL4rtnYdPufjQ75fGHhVK2uceR ts6U6Q0JGRvwjj1nE5ZMyD+GYmrTYWI= X-Google-Smtp-Source: ABdhPJyU94RpW4zoa3mqcNKTQcrGOQipEy8ypld8BEQ8/eRPMIU0sdYEFkxD2GskeHX/trVhoFWvHw== X-Received: by 2002:a05:6a00:174f:b0:4fd:aed5:b5e4 with SMTP id j15-20020a056a00174f00b004fdaed5b5e4mr23895272pfc.39.1652812070948; Tue, 17 May 2022 11:27:50 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id b12-20020a170902d88c00b0015e8d4eb1fasm9538656plz.68.2022.05.17.11.27.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 11:27:50 -0700 (PDT) From: Florian Fainelli To: stable@vger.kernel.org Cc: Ulf Hansson , Florian Fainelli , Adrian Hunter , Greg Kroah-Hartman , Avri Altman , Bean Huo , Nishad Kamdar , =?utf-8?q?Christian_L=C3=B6hle?= , linux-mmc@vger.kernel.org (open list:MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND...), linux-kernel@vger.kernel.org (open list), alcooperx@gmail.com, kdasu.kdev@gmail.com Subject: [PATCH stable 4.14 1/3] mmc: core: Specify timeouts for BKOPS and CACHE_FLUSH for eMMC Date: Tue, 17 May 2022 11:27:44 -0700 Message-Id: <20220517182746.252893-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220517182746.252893-1-f.fainelli@gmail.com> References: <20220517182746.252893-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Ulf Hansson commit 24ed3bd01d6a844fd5e8a75f48d0a3d10ed71bf9 upstream The timeout values used while waiting for a CMD6 for BKOPS or a CACHE_FLUSH to complete, are not defined by the eMMC spec. However, a timeout of 10 minutes as is currently being used, is just silly for both of these cases. Instead, let's specify more reasonable timeouts, 120s for BKOPS and 30s for CACHE_FLUSH. Signed-off-by: Ulf Hansson Link: https://lore.kernel.org/r/20200122142747.5690-2-ulf.hansson@linaro.org Signed-off-by: Florian Fainelli --- drivers/mmc/core/mmc_ops.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index 54686ca4bfb7..44e90062c95a 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -23,7 +23,9 @@ #include "host.h" #include "mmc_ops.h" -#define MMC_OPS_TIMEOUT_MS (10 * 60 * 1000) /* 10 minute timeout */ +#define MMC_OPS_TIMEOUT_MS (10 * 60 * 1000) /* 10min*/ +#define MMC_BKOPS_TIMEOUT_MS (120 * 1000) /* 120s */ +#define MMC_CACHE_FLUSH_TIMEOUT_MS (30 * 1000) /* 30s */ static const u8 tuning_blk_pattern_4bit[] = { 0xff, 0x0f, 0xff, 0x00, 0xff, 0xcc, 0xc3, 0xcc, @@ -989,7 +991,7 @@ void mmc_start_bkops(struct mmc_card *card, bool from_exception) mmc_retune_hold(card->host); err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, - EXT_CSD_BKOPS_START, 1, timeout, 0, + EXT_CSD_BKOPS_START, 1, MMC_BKOPS_TIMEOUT_MS, 0, use_busy_signal, true, false); if (err) { pr_warn("%s: Error %d starting bkops\n", @@ -1022,7 +1024,8 @@ int mmc_flush_cache(struct mmc_card *card) (card->ext_csd.cache_size > 0) && (card->ext_csd.cache_ctrl & 1)) { err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, - EXT_CSD_FLUSH_CACHE, 1, 0); + EXT_CSD_FLUSH_CACHE, 1, + MMC_CACHE_FLUSH_TIMEOUT_MS); if (err) pr_err("%s: cache flush error %d\n", mmc_hostname(card->host), err); From patchwork Tue May 17 18:27:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12852854 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFB60C433F5 for ; Tue, 17 May 2022 18:28:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351900AbiEQS2A (ORCPT ); Tue, 17 May 2022 14:28:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352146AbiEQS1z (ORCPT ); Tue, 17 May 2022 14:27:55 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E84D3A5EC; Tue, 17 May 2022 11:27:53 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id nr2-20020a17090b240200b001df2b1bfc40so3288690pjb.5; Tue, 17 May 2022 11:27:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LGuxibFTHVjCAz0ybPT2MKSv3/jhO/zHqmdvIfRwZ+A=; b=F9TyYQ96A4YECxuy4UHHZKn0NrBhahBF+FJ7cZSNuGmwUmPyutnggxIxw0Rfr9pvCi ifaJEdEF8uERizrtaS0GTmRs71psef/tEg0qCjTrE2AQH31+Lz2UxRPNGj1PFrP9g3BL wvoXE9+h9mDklMcG58V0XQOfrUyk+mdRkLhlrSpHLQSKwmgPwaAtXlvlL7LnAasaJBn9 I1Iw0IEdcYFKPXNAWV1UclYpnc9hfSDL/Vd7hYO1iKRQKLJ8zBgpZtPWwNuuOs5q6N9N cPRCRLC0aPm5fqnn+WY6XExj4GeQRvA85vthywhB901vJ1BtEH2/Tp2BZP04MTfLQYYn mqiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LGuxibFTHVjCAz0ybPT2MKSv3/jhO/zHqmdvIfRwZ+A=; b=vivhPsLK5LjcfKTUVdYHm/VkErXv68JOLgX+BZIoZokyOs0X92XvGeItDR0ML6RyLn 8ynVrzzhRwnXaeqsr16OFX9Cf6B63J2TT6wQ8sYtksn93okKV4FO7+fcis8vpxhKrphl CDW+uhXBDHpe6c6flYHSwePgfZw7P5bMIUzWKM+hwlqPjx9vXCXed9zNnge8ylpJlIi1 HD9DEZzdwa0E66lednCBfDzN/y7dQnUzq/kfguAUi1qIcqFw8Qdu8+WKzIatBneeyz1g nOxjkEp1iAv3gIUlz8XjKxND7nih1lj80y67wtg6wJ6ef24RM8udxyFyIgCYeyJi1lwM pQ/g== X-Gm-Message-State: AOAM531wJeABxaW8KJfN1VB6/b4ndBqkPO14heqiv2qbuR+M7IQ1DrPe /rkqUTdSgB76PJg7PqdvorG1CdT+Nio= X-Google-Smtp-Source: ABdhPJwOv1pNKGsNZp5G0JbD4LbpzkxMX/9AAGEu20GB2XBdDTQi0IyGBt24c407TZf+BzyiElfXtQ== X-Received: by 2002:a17:902:700b:b0:15f:a51a:cdeb with SMTP id y11-20020a170902700b00b0015fa51acdebmr23178864plk.137.1652812072370; Tue, 17 May 2022 11:27:52 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id b12-20020a170902d88c00b0015e8d4eb1fasm9538656plz.68.2022.05.17.11.27.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 11:27:51 -0700 (PDT) From: Florian Fainelli To: stable@vger.kernel.org Cc: Ulf Hansson , Florian Fainelli , Adrian Hunter , Greg Kroah-Hartman , Avri Altman , Bean Huo , Nishad Kamdar , =?utf-8?q?Christian_L=C3=B6hle?= , linux-mmc@vger.kernel.org (open list:MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND...), linux-kernel@vger.kernel.org (open list), alcooperx@gmail.com, kdasu.kdev@gmail.com Subject: [PATCH stable 4.14 2/3] mmc: block: Use generic_cmd6_time when modifying INAND_CMD38_ARG_EXT_CSD Date: Tue, 17 May 2022 11:27:45 -0700 Message-Id: <20220517182746.252893-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220517182746.252893-1-f.fainelli@gmail.com> References: <20220517182746.252893-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Ulf Hansson commit ad91619aa9d78ab1c6d4a969c3db68bc331ae76c upstream The INAND_CMD38_ARG_EXT_CSD is a vendor specific EXT_CSD register, which is used to prepare an erase/trim operation. However, it doesn't make sense to use a timeout of 10 minutes while updating the register, which becomes the case when the timeout_ms argument for mmc_switch() is set to zero. Instead, let's use the generic_cmd6_time, as that seems like a reasonable timeout to use for these cases. Signed-off-by: Ulf Hansson Link: https://lore.kernel.org/r/20200122142747.5690-3-ulf.hansson@linaro.org Signed-off-by: Florian Fainelli --- drivers/mmc/core/block.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 36ea671c912e..79e5acc6e964 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1345,7 +1345,7 @@ static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req) arg == MMC_TRIM_ARG ? INAND_CMD38_ARG_TRIM : INAND_CMD38_ARG_ERASE, - 0); + card->ext_csd.generic_cmd6_time); } if (!err) err = mmc_erase(card, from, nr, arg); @@ -1387,7 +1387,7 @@ static void mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq, arg == MMC_SECURE_TRIM1_ARG ? INAND_CMD38_ARG_SECTRIM1 : INAND_CMD38_ARG_SECERASE, - 0); + card->ext_csd.generic_cmd6_time); if (err) goto out_retry; } @@ -1405,7 +1405,7 @@ static void mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq, err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, INAND_CMD38_ARG_EXT_CSD, INAND_CMD38_ARG_SECTRIM2, - 0); + card->ext_csd.generic_cmd6_time); if (err) goto out_retry; } From patchwork Tue May 17 18:27:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12852855 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 412DEC433FE for ; Tue, 17 May 2022 18:28:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352156AbiEQS2B (ORCPT ); Tue, 17 May 2022 14:28:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352151AbiEQS16 (ORCPT ); Tue, 17 May 2022 14:27:58 -0400 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2ECEB49F24; Tue, 17 May 2022 11:27:55 -0700 (PDT) Received: by mail-pl1-x630.google.com with SMTP id i1so18095418plg.7; Tue, 17 May 2022 11:27:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+6e4auPbEK9DxXd0V9+qfi6AbLb+sAnTsXinMSGP6W8=; b=qsmvBNN7PZ9IFU9rnCNf1FCSMJHglYnLVgRElSGox08wSOT/SH/RyPVYdl7OM5V88a SBBMGb3X5h8kDyeAgKInfHzTRUXDyu/5Sq7EFQlKuTo+kpzBg3Xzl65NrTxqXMGTYwzL xJh6FTOz9inkZ6D0VJvaamjy+UELqDzoBwhb1mlfv5hRgARQmGlFgDRKsmb97+YnQyp0 f5+rFB3by/pRi5LZ2uyto+PK+aYJFsE9SViruLmnviuD2x8N1OtX1QMf4ntaBDEKhPes C8/5ytJrjzonfGCFSQFY1yyuzXAel+fTTv56nJZJC78CzWi75coalEGVY2mv5KV5irph xXfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+6e4auPbEK9DxXd0V9+qfi6AbLb+sAnTsXinMSGP6W8=; b=piLrjRh92uaVRZZGJ2/tfS7XIbCxWHu0NZQDFstmVeyPJT0wG705noJ7OX+3XKDAyh 8m6C7/65vaa9vmT16O39xiehzaY1amYUcDk3Nv11r6x0a6JsYI4E+J3cWNo4v6mxuftk VprdxyB+LzMWp/74Wr5qiwJE9GYi8ZYGhJZWcLNruKCozPEZURIj+YZd8ITIHXt0yTyG RcwGTgoMZYLwuKDvDs9AbhD34k9yMcY8bBRAuh4gX/DNsapln3h+P29lgD9l+R1y8ra7 qx7y9dMRXmCN22AdGEbLV+VjQiMRqTuYWVs0ZoBGwCWdlkpK/+macNwzXSJ/xAfrRQt/ tdxA== X-Gm-Message-State: AOAM533vWIaSWfIxrHMdWTV1+4dMhlugPJOrbjPpgB/LtDWhoFiNuiNO TCVE0XqJ1rbB/LyCYWtwG0f9cAaocRU= X-Google-Smtp-Source: ABdhPJynwktvzrf7Li/Ht1Wg/Cm+kIzKWWSb0cMIb0X1ql9KH1ykyjANUr9vuT9+7GSUy20IK9JYDw== X-Received: by 2002:a17:90b:314e:b0:1dc:d143:a15d with SMTP id ip14-20020a17090b314e00b001dcd143a15dmr37234806pjb.111.1652812073739; Tue, 17 May 2022 11:27:53 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id b12-20020a170902d88c00b0015e8d4eb1fasm9538656plz.68.2022.05.17.11.27.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 11:27:53 -0700 (PDT) From: Florian Fainelli To: stable@vger.kernel.org Cc: Ulf Hansson , Florian Fainelli , Adrian Hunter , Greg Kroah-Hartman , Avri Altman , Bean Huo , Nishad Kamdar , =?utf-8?q?Christian_L=C3=B6hle?= , linux-mmc@vger.kernel.org (open list:MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND...), linux-kernel@vger.kernel.org (open list), alcooperx@gmail.com, kdasu.kdev@gmail.com Subject: [PATCH stable 4.14 3/3] mmc: core: Default to generic_cmd6_time as timeout in __mmc_switch() Date: Tue, 17 May 2022 11:27:46 -0700 Message-Id: <20220517182746.252893-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220517182746.252893-1-f.fainelli@gmail.com> References: <20220517182746.252893-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Ulf Hansson commit 533a6cfe08f96a7b5c65e06d20916d552c11b256 upstream All callers of __mmc_switch() should now be specifying a valid timeout for the CMD6 command. However, just to be sure, let's print a warning and default to use the generic_cmd6_time in case the provided timeout_ms argument is zero. In this context, let's also simplify some of the corresponding code and clarify some related comments. Signed-off-by: Ulf Hansson Link: https://lore.kernel.org/r/20200122142747.5690-4-ulf.hansson@linaro.org Signed-off-by: Florian Fainelli --- drivers/mmc/core/mmc_ops.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index 44e90062c95a..0767ed1b820f 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -458,10 +458,6 @@ static int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, bool expired = false; bool busy = false; - /* We have an unspecified cmd timeout, use the fallback value. */ - if (!timeout_ms) - timeout_ms = MMC_OPS_TIMEOUT_MS; - /* * In cases when not allowed to poll by using CMD13 or because we aren't * capable of polling by using ->card_busy(), then rely on waiting the @@ -534,14 +530,20 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, mmc_retune_hold(host); + if (!timeout_ms) { + pr_warn("%s: unspecified timeout for CMD6 - use generic\n", + mmc_hostname(host)); + timeout_ms = card->ext_csd.generic_cmd6_time; + } + /* * If the cmd timeout and the max_busy_timeout of the host are both * specified, let's validate them. A failure means we need to prevent * the host from doing hw busy detection, which is done by converting * to a R1 response instead of a R1B. */ - if (timeout_ms && host->max_busy_timeout && - (timeout_ms > host->max_busy_timeout)) + if (host->max_busy_timeout && + (timeout_ms > host->max_busy_timeout)) use_r1b_resp = false; cmd.opcode = MMC_SWITCH; @@ -552,10 +554,6 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, cmd.flags = MMC_CMD_AC; if (use_r1b_resp) { cmd.flags |= MMC_RSP_SPI_R1B | MMC_RSP_R1B; - /* - * A busy_timeout of zero means the host can decide to use - * whatever value it finds suitable. - */ cmd.busy_timeout = timeout_ms; } else { cmd.flags |= MMC_RSP_SPI_R1 | MMC_RSP_R1;