From patchwork Tue Mar 24 18:06:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 211070 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=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 137CBC2BAEE for ; Tue, 24 Mar 2020 18:07:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E26E42076E for ; Tue, 24 Mar 2020 18:07:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="oK1mzPqf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727630AbgCXSHH (ORCPT ); Tue, 24 Mar 2020 14:07:07 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:34801 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727567AbgCXSHH (ORCPT ); Tue, 24 Mar 2020 14:07:07 -0400 Received: by mail-lj1-f196.google.com with SMTP id s13so19665434ljm.1 for ; Tue, 24 Mar 2020 11:07:04 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=uvF8ZHqHncSrlilA+ZOuPkJJR+jnp9zcVFv/87o5LaA=; b=oK1mzPqfkxG/iI7JuTymhz8PwdWqxx+e7x0Jqu9BHN8pgSeEh45sB+tqc+dlKIJTmG sk8XCKxhW5qzM5V4oHS5C5JEA0bBjvnSWVYMvK/93WwrGfLPha32t1yQq1SG6HznyZnV mPQJ17ERFSlNPAtu6c1KFdJ0vSzhSp3rdV7rSsQsPNz+sj7xIw3wzV2vnxExyFytnAVN KLVDtc81LqNc9JKMczR3pZs5FpNW60muKtRc+V3mN29HPpSwSxNfbARpcpzZkCNDSKMy WdcQB9aM1If7ayqZXCks+ykKcqbvlvGkDt2BzsOdscnWZOvmZ9kAMBvpdLZ154LOKbYz xZEQ== 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:mime-version:content-transfer-encoding; bh=uvF8ZHqHncSrlilA+ZOuPkJJR+jnp9zcVFv/87o5LaA=; b=WrV0kIR+Un2vZoD74CWKQRjENFOsjVgG6hFNv/F0Y9ECwRycnrCojLK7OzB3s0sAbr dQbFjQ3/Mh5LtjhXIEa9MFZvfYqQis8jxlid+wGyDb9rIP65W5qrHOxLpP9NKi2/QFc2 961QQE7mVXOP2fv22dp6GPnSpItrqAnxzb6cQfKPTNwVuU6Z4+5xlB10VO2/S2IaRuWS 6GHp1vyr57oFzN4BCBbozwCD6Q5h6wsTOIrjpEzmDlmsTeb525qfatO8/bkatphaxR2P vaQd/2pTA8FkK0Nv3Qx78VEMVda9Za7izt+Mf0pqKyIk3YOokkht/O/91dZ5otLLIfWG 2pvw== X-Gm-Message-State: ANhLgQ17afO4EZ5JU92ZULBnIwfLQY288SoUno+EqcvUzFr/RGei+Klx OXEScB3AyHn6y6XveYdwsYPWdw== X-Google-Smtp-Source: ADFU+vuj6+OEplFWywKu8+N/4cJzYyfPXNEg64BZexka+oV9s8DhnK0JoBBEXqnwk0u9zvcy23pWig== X-Received: by 2002:a2e:9c4:: with SMTP id 187mr18342643ljj.89.1585073224123; Tue, 24 Mar 2020 11:07:04 -0700 (PDT) Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id 203sm10519660ljf.65.2020.03.24.11.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2020 11:07:03 -0700 (PDT) From: Ulf Hansson To: Greg Kroah-Hartman , Sasha Levin , stable@vger.kernel.org Cc: linux-mmc@vger.kernel.org, Ulf Hansson , Sowjanya Komatineni , Faiz Abbas , Anders Roxell , Naresh Kamboju Subject: [PATCH 5.5.12 3/5] mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for eMMC sleep command Date: Tue, 24 Mar 2020 19:06:48 +0100 Message-Id: <20200324180650.28819-4-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200324180650.28819-1-ulf.hansson@linaro.org> References: <20200324180650.28819-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org [ Upstream commit 18d200460cd73636d4f20674085c39e32b4e0097 ] The busy timeout for the CMD5 to put the eMMC into sleep state, is specific to the card. Potentially the timeout may exceed the host->max_busy_timeout. If that becomes the case, mmc_sleep() converts from using an R1B response to an R1 response, as to prevent the host from doing HW busy detection. However, it has turned out that some hosts requires an R1B response no matter what, so let's respect that via checking MMC_CAP_NEED_RSP_BUSY. Note that, if the R1B gets enforced, the host becomes fully responsible of managing the needed busy timeout, in one way or the other. Suggested-by: Sowjanya Komatineni Cc: Link: https://lore.kernel.org/r/20200311092036.16084-1-ulf.hansson@linaro.org Signed-off-by: Ulf Hansson --- drivers/mmc/core/mmc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index f6912ded652d..de14b5845f52 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1910,9 +1910,12 @@ static int mmc_sleep(struct mmc_host *host) * If the max_busy_timeout of the host is specified, validate it against * the sleep cmd timeout. 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. + * response instead of a R1B. Note, some hosts requires R1B, which also + * means they are on their own when it comes to deal with the busy + * timeout. */ - if (host->max_busy_timeout && (timeout_ms > host->max_busy_timeout)) { + if (!(host->caps & MMC_CAP_NEED_RSP_BUSY) && host->max_busy_timeout && + (timeout_ms > host->max_busy_timeout)) { cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; } else { cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;