From patchwork Mon May 23 06:49:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 68324 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp1064334qge; Sun, 22 May 2016 23:49:57 -0700 (PDT) X-Received: by 10.66.145.195 with SMTP id sw3mr24927988pab.36.1463986197389; Sun, 22 May 2016 23:49:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d62si49556609pfc.214.2016.05.22.23.49.57; Sun, 22 May 2016 23:49:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753051AbcEWGtx (ORCPT + 30 others); Mon, 23 May 2016 02:49:53 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:36570 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752938AbcEWGtw (ORCPT ); Mon, 23 May 2016 02:49:52 -0400 Received: by mail-pf0-f172.google.com with SMTP id c189so63562769pfb.3 for ; Sun, 22 May 2016 23:49:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=KyXdWwC6eARd4gIJnmQsznsBmN2TzRNqkVX3Hh5mhvE=; b=jowC7fyFSgt7qfuGGaFbxhPzo1KmtA0nQ2KfhvNn7ICcgLbcc0pWVWLlbXLANqn38e x16Slcqswg4HzYvq+D+tR6bKUhP/f1dQBeo+opU5zhm8/vtYI52ycMfOxyehH0ardjKr 9C/Adggnm7Wejd/Z5kODpFdZVJzp4XaN/a1xc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KyXdWwC6eARd4gIJnmQsznsBmN2TzRNqkVX3Hh5mhvE=; b=EmgRd5k/fDKpEGolHdnd0hcxX/KeKp3GZwSrEh9ELYGg8OgYnp1HeAKPg3nZhf1LE9 eeyuvhS4t/IfNjYkoApCf+52h/6w+ZRvu5CSyN4GZIXpOtLV3HLj6Uo6YkaqnzPGCBPt 67qmyXpYMnlcmPM9lspg9J4AgAo2aY7wnFmzK8dRXLM+nthm4d7jTSE8b4o7Bf37GBc/ HyYIJLNvn1JRdpQuRKcp755LSa3aZPhOl/0tte3NTKbNBY3CQ7L/+HNO0UIv2EAL5O2W XWv8SN5LqZXEbG5j83wLwvEgX5AVQ3x2D9dcPAhoGu1NPKJwchFpi8BWhf9korx0fk/h Utlg== X-Gm-Message-State: ALyK8tK2qfl5zjZqP4mr9YlU8fW54WQusCkJPGhKyoX2YHOCXvj/1PHoCI5iPXictfQDMMSA X-Received: by 10.98.35.93 with SMTP id j90mr6899367pfj.10.1463986190929; Sun, 22 May 2016 23:49:50 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id 141sm6568378pfx.68.2016.05.22.23.49.46 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 May 2016 23:49:50 -0700 (PDT) From: Baolin Wang To: ulf.hansson@linaro.org Cc: adrian.hunter@intel.com, rmk+kernel@arm.linux.org.uk, shawn.lin@rock-chips.com, dianders@chromium.org, heiko@sntech.de, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, broonie@kernel.org, linus.walleij@linaro.org, baolin.wang@linaro.org Subject: [RESEND RFC v2] mmc: Change the max discard sectors and erase response if mmc host supports busy signalling Date: Mon, 23 May 2016 14:49:28 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When mmc host HW supports busy signalling (using R1B as response), We shouldn't use 'host->max_busy_timeout' as the limitation when deciding the max discard sectors that we tell the generic BLOCK layer about. Instead, we should pick one preferred erase size as the max discard sectors. If the host controller supports busy signalling and the timeout for the erase operation does not exceed the max_busy_timeout, we should use R1B response. Or we need to prevent the host from doing hw busy detection, which is done by converting to a R1 response instead. Changes since v1: - Remove the 'MMC_CAP_WAIT_WHILE_BUSY' flag checking when deciding the max discard sectors. Signed-off-by: Baolin Wang --- drivers/mmc/core/core.c | 47 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) -- 1.7.9.5 diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 99275e4..0df40fa 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2060,7 +2060,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from, unsigned int to, unsigned int arg) { struct mmc_command cmd = {0}; - unsigned int qty = 0; + unsigned int qty = 0, busy_timeout = 0; unsigned long timeout; int err; @@ -2128,8 +2128,23 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from, memset(&cmd, 0, sizeof(struct mmc_command)); cmd.opcode = MMC_ERASE; cmd.arg = arg; - cmd.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC; - cmd.busy_timeout = mmc_erase_timeout(card, arg, qty); + busy_timeout = mmc_erase_timeout(card, arg, qty); + /* + * If the host controller supports busy signalling and the timeout for + * the erase operation does not exceed the max_busy_timeout, we should + * use R1B response. Or we need to prevent the host from doing hw busy + * detection, which is done by converting to a R1 response instead. + */ + if ((card->host->max_busy_timeout && + busy_timeout > card->host->max_busy_timeout) || + !(card->host->caps & MMC_CAP_WAIT_WHILE_BUSY)) { + cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC; + cmd.busy_timeout = 0; + } else { + cmd.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC; + cmd.busy_timeout = busy_timeout; + } + err = mmc_wait_for_cmd(card->host, &cmd, 0); if (err) { pr_err("mmc_erase: erase error %d, status %#x\n", @@ -2321,23 +2336,39 @@ static unsigned int mmc_do_calc_max_discard(struct mmc_card *card, unsigned int arg) { struct mmc_host *host = card->host; - unsigned int max_discard, x, y, qty = 0, max_qty, timeout; + unsigned int max_discard, x, y, qty = 0, max_qty, min_qty, timeout; unsigned int last_timeout = 0; - if (card->erase_shift) + if (card->erase_shift) { max_qty = UINT_MAX >> card->erase_shift; - else if (mmc_card_sd(card)) + min_qty = card->pref_erase >> card->erase_shift; + } else if (mmc_card_sd(card)) { max_qty = UINT_MAX; - else + min_qty = card->pref_erase; + } else { max_qty = UINT_MAX / card->erase_size; + min_qty = card->pref_erase / card->erase_size; + } /* Find the largest qty with an OK timeout */ do { y = 0; for (x = 1; x && x <= max_qty && max_qty - x >= qty; x <<= 1) { timeout = mmc_erase_timeout(card, arg, qty + x); - if (timeout > host->max_busy_timeout) + /* + * We should not only use 'host->max_busy_timeout' as + * the limitation when deciding the max discard sectors. + * We should set a balance value to improve the erase + * speed, and it can not get too long timeout at the + * same time. + * + * Here we set 'card->pref_erase' as the minimal discard + * sectors when deciding the max discard sectors. + */ + if (qty + x > min_qty && + timeout > host->max_busy_timeout) break; + if (timeout < last_timeout) break; last_timeout = timeout;