From patchwork Wed Jan 22 14:27:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 11345835 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B95B717EF for ; Wed, 22 Jan 2020 14:27:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 96ED52465B for ; Wed, 22 Jan 2020 14:27:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="rSQaUcuD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726061AbgAVO15 (ORCPT ); Wed, 22 Jan 2020 09:27:57 -0500 Received: from mail-lf1-f65.google.com ([209.85.167.65]:32843 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725884AbgAVO15 (ORCPT ); Wed, 22 Jan 2020 09:27:57 -0500 Received: by mail-lf1-f65.google.com with SMTP id n25so5508039lfl.0 for ; Wed, 22 Jan 2020 06:27:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=u69ihC/ZR+aWt0/0qdjrRugRF6Lbl1PlbpQFAVv2gC4=; b=rSQaUcuD9WYbFQDeILVt5uWXtC+pYCIbQTmp8rklMfgzJezqUvAmNBdusbpnMXhL9n EWdrbS4rvBkTSapeIsyu6TY4ZmacFWWuGPEWrpaQTwPAKX2Sqe269HU4+Jl70y+3X1hD ytum1u2/qb0DM+2gOimtRxoh77QvmIff2kDFsmq40gTjrpTP79wdEsPlgcBm7IJZ/tP/ pTUtKAygC7lkiDa7E26/4dfUeIyy5qfb9hIScBc1pTyO4yBj24yf/P1Ecre1MjRd080Q piTBfKDeS9NIHq5QsbjdBIOYJFOwdn9cZMjUNqznQZBfxOdYBh6jjTsWajrtcjUNlHm1 3SIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=u69ihC/ZR+aWt0/0qdjrRugRF6Lbl1PlbpQFAVv2gC4=; b=c7VDGv9AqCQyWbRxVhxrkoU0GthqLf/C/0Xo0VvFt2dk2VTmiei1WA8a776LnXwyrF 521WS/6byfSmG4ENR4lrCWfzdNlchS8GhSjNZ5agEE7Ms6FA0zNLjd00aNunskaILnpN Xh61gZtD28XNJV2IZcjokshTAb6/JS/ByDqB+EUpaZDA9eRFTQeVw1S/oTIXn4NKs1/4 DcyHIPD110kFfFsQIP7IU1BoPeXwd3kTNA5qXjIrvZmSk6Mh5vWrUTJ7vv4I3/rAnEJo YC0aqP8udrZUVvs311ZT7H8ECME9ybCsUFGsdpyCKtf6q7hfqtd4uMFhxUTX031HJe3B 2+Ig== X-Gm-Message-State: APjAAAWQY1lW4+9+4BXFmqhkUVnavAAW941WLi9ll3/6GiLQkhWuthuv OtOtCrSeUM9r6umOZmLXV3PSXHQPdfE= X-Google-Smtp-Source: APXvYqz3doFCmwXxXT6oY4So5XrFSZ4pwNSnSrhsOXkF8afaGw1nGLZtjWtykC5JK4h3PWjzgjy1Bg== X-Received: by 2002:a19:c697:: with SMTP id w145mr1978294lff.54.1579703274214; Wed, 22 Jan 2020 06:27:54 -0800 (PST) Received: from uffe-XPS-13-9360.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id u17sm20369548ljk.62.2020.01.22.06.27.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 06:27:52 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Adrian Hunter , Chaotian Jing , Shawn Lin , mirq-linux@rere.qmqm.pl Subject: [PATCH 1/3] mmc: core: Specify timeouts for BKOPS and CACHE_FLUSH for eMMC Date: Wed, 22 Jan 2020 15:27:45 +0100 Message-Id: <20200122142747.5690-2-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200122142747.5690-1-ulf.hansson@linaro.org> References: <20200122142747.5690-1-ulf.hansson@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org 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 --- 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 09113b9ad679..1966abcbc7c0 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -19,7 +19,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, @@ -941,7 +943,7 @@ void mmc_run_bkops(struct mmc_card *card) * urgent levels by using an asynchronous background task, when idle. */ err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, - EXT_CSD_BKOPS_START, 1, MMC_OPS_TIMEOUT_MS); + EXT_CSD_BKOPS_START, 1, MMC_BKOPS_TIMEOUT_MS); if (err) pr_warn("%s: Error %d starting bkops\n", mmc_hostname(card->host), err); @@ -961,7 +963,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 Wed Jan 22 14:27:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 11345837 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BF37D139A for ; Wed, 22 Jan 2020 14:27:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D1852465B for ; Wed, 22 Jan 2020 14:27:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ZB5T1AhW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726101AbgAVO17 (ORCPT ); Wed, 22 Jan 2020 09:27:59 -0500 Received: from mail-lj1-f194.google.com ([209.85.208.194]:34848 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725884AbgAVO17 (ORCPT ); Wed, 22 Jan 2020 09:27:59 -0500 Received: by mail-lj1-f194.google.com with SMTP id j1so7048007lja.2 for ; Wed, 22 Jan 2020 06:27:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7VzLcJjeEnS45bKw7Lmz/k90q+rRtqK0BCgzKkLywLM=; b=ZB5T1AhWhlYE9OxX4czvsDOmCie3OIq2PCb7t3+brXVJN03D6GPlKa9qMqFd99HI6X 3XnsPloGO2mJnQIgNFVxF+cucMuck6V1u5DIjxjfnb6UOn/Kj+B+R8vwi9GFxasDYD4q QibUbtru7HHBCqi1kTrxQ2MUZi6mBOVAH1ottkcYuVJKWAySJPRadOT4H+zOQIwR9PGW awqO6mW51Moye8qt5nFFVY2lVBwZwZLCUXreh55elFDSpXptkNhnLZ0Q/v0gXDchaJkZ ictvabxWEGB6IdMCAahlk3PJeGBZ8p6h08LhoW9QKh+wjJeKsRU5kW5glCEV3OmDe3lm x54A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7VzLcJjeEnS45bKw7Lmz/k90q+rRtqK0BCgzKkLywLM=; b=UE66iyHWnEC4r+ykGMK4VlZeJ9CXuYR8pFwR2NBKG+PLUKB6AzJ5GwV0YQPFSiHekN AOzLLP1JGbNdJGfAEU6skFp8jKDi2z1s5ECLKyAEthmI2dCHyxz6PUG7p9RvBV0V+A+G FmCwhsvf7kaCjqxdt0AeYGvPuhYWs/wvncJALi9lvEd74/AkAD9KpOUC1SXscJuZcwiM 4tNdkfIpuLzXjPvY7NzLuZvVTQuS/nXf3S01vABdsSXxLX+1ySXsBrbYChJ08EglZKZz y6gnurI1aEaHPgJB3ryrVR+OH3JLSnUkAZE6IywVWJU5F1e9IFs/cJJ1Y+MNbo8xecMZ Q0ag== X-Gm-Message-State: APjAAAVYZbv4rYiQqOhqappUrqcLCrrU7xzIdrCSYu3rVp+dcEHNs2/G nM3/grUJKHNWi9IaH9e43TMGAsjdIHI= X-Google-Smtp-Source: APXvYqzlO8BGgEneuZccgn8tDP+LUmTOH9B89/9xKXCs35QSQAIAtq4lZyviJFDHB/ha87fK/REzaQ== X-Received: by 2002:a2e:9041:: with SMTP id n1mr19009718ljg.133.1579703276414; Wed, 22 Jan 2020 06:27:56 -0800 (PST) Received: from uffe-XPS-13-9360.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id u17sm20369548ljk.62.2020.01.22.06.27.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 06:27:55 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Adrian Hunter , Chaotian Jing , Shawn Lin , mirq-linux@rere.qmqm.pl Subject: [PATCH 2/3] mmc: block: Use generic_cmd6_time when modifying INAND_CMD38_ARG_EXT_CSD Date: Wed, 22 Jan 2020 15:27:46 +0100 Message-Id: <20200122142747.5690-3-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200122142747.5690-1-ulf.hansson@linaro.org> References: <20200122142747.5690-1-ulf.hansson@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org 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 --- 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 95b41c0891d0..663d87924e5e 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1107,7 +1107,7 @@ static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req) card->erase_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, card->erase_arg); @@ -1149,7 +1149,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; } @@ -1167,7 +1167,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 Wed Jan 22 14:27:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 11345839 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BFB5913A4 for ; Wed, 22 Jan 2020 14:28:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9DC072467A for ; Wed, 22 Jan 2020 14:28:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="vCzxjkQf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726442AbgAVO2B (ORCPT ); Wed, 22 Jan 2020 09:28:01 -0500 Received: from mail-lj1-f193.google.com ([209.85.208.193]:40231 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725884AbgAVO2B (ORCPT ); Wed, 22 Jan 2020 09:28:01 -0500 Received: by mail-lj1-f193.google.com with SMTP id n18so2082111ljo.7 for ; Wed, 22 Jan 2020 06:27:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iKMQyjxDBSc+wBx/1iQ6rTe3TF9m2VraA2r1zuub9Cs=; b=vCzxjkQf0eK5+n0Yvb5KS7tvQbyS0L/N38j8D0PSCIDPwdO86O32qKyP4tUM4P9pnZ +aOVG9nuZ/6L7VtsQZy+tmm2Lox8pRDM/dDSAC2E5Ec8ZFmWv6qRPl4qSmCNwxsSexx9 bHOT8t2IGpONPwgQA7O5HKltTsCQqwWfiXxEbxtnFyIDtMyb5jo9R2l3Or9XRxJ0tT7f PqwQwKDdfHILGdqZCKCPXB3M4OZw8/6N4eSSChyUYb5/WxKgqtiGgkJ5FXzS3b5yVXrq PvCFra1M2SvO0fXcov+J26WVwDJ0XOBd+xS941oR8CbAgixDFB1zRHh0fQw+OkTYsO9e WSyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iKMQyjxDBSc+wBx/1iQ6rTe3TF9m2VraA2r1zuub9Cs=; b=cVTDl7PTIt26+Am1mfIZ/ZiCpGM8ZQPMFg61ul0YLniugVyc8DGJad0ov+HHEfpm3T geQktsg6Sk9kJtWg2u4wKjobjf+RQFI9ZoVEWbHCuGFpmHWSXvhFF3X6wIvrZi+t8Mwu 0HcFhNfS0JPUrWVcwJzR9yMGpuX3w3s78mnyQU04enmbWqZeU/VzfLTH8N4/hsRmucPC /QlGc3dDy4rmqO56OTPBDcnwmO/4rn6VAri6GAafza/g40bHTRWT9k/WxCk/ZOyV9c1A MMBjj6lamp2yMxnknxZn+4RFUjsc9NeYHdPhsk1cnYJqFnPKFFjDJHbwxwpiA5hmQ/b2 akoQ== X-Gm-Message-State: APjAAAXTAQHPSEjoUZ9pnpUixPYvBKDcFwmVrje/O9F06Jqjp8FmAzt7 /PBziMKa1MCRxwroxvC1FG02LYbxSuM= X-Google-Smtp-Source: APXvYqzJCmDh7AiySbGBM04U1xsULqeJFagf/nw765013LXaioofEr0/Si6wGBu+aBJy0uaZxItlUg== X-Received: by 2002:a05:651c:1110:: with SMTP id d16mr19627966ljo.86.1579703278423; Wed, 22 Jan 2020 06:27:58 -0800 (PST) Received: from uffe-XPS-13-9360.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id u17sm20369548ljk.62.2020.01.22.06.27.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 06:27:57 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Adrian Hunter , Chaotian Jing , Shawn Lin , mirq-linux@rere.qmqm.pl Subject: [PATCH 3/3] mmc: core: Default to generic_cmd6_time as timeout in __mmc_switch() Date: Wed, 22 Jan 2020 15:27:47 +0100 Message-Id: <20200122142747.5690-4-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200122142747.5690-1-ulf.hansson@linaro.org> References: <20200122142747.5690-1-ulf.hansson@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org All callers of __mmc_switch() should now be specifying a valid timeout for the CMD6 command. However, to 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 corresponding code and clarify some related comments. Signed-off-by: Ulf Hansson --- drivers/mmc/core/mmc_ops.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index 1966abcbc7c0..da425ee2d9bf 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -460,10 +460,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 @@ -536,14 +532,19 @@ 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 the max_busy_timeout of the host is specified, make sure it's + * enough to fit the used timeout_ms. In case it's not, let's instruct + * the host to avoid HW busy detection, 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; @@ -554,10 +555,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;