From patchwork Fri Jun 19 14:32:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191240 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp661327ilo; Fri, 19 Jun 2020 09:05:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpPYwRvEMpqqUbVLigkSsfZ8AUrQoRLNMgvgFsO+aUZI0g3j1Y7pL7w6wPunNGf1gpQSNi X-Received: by 2002:aa7:dd8e:: with SMTP id g14mr4050139edv.263.1592582738117; Fri, 19 Jun 2020 09:05:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592582738; cv=none; d=google.com; s=arc-20160816; b=b1IPvhiVX9IjXvAmuhp66bZASii3JTsNME6W9HcC/ZQf38VQP52C+x3GUmOi0SF6eu yVA7s41CcEplO602eQxH5ps3PsUdvZ47/tPV9Kfh+pIB8u9mYl4XX6wldLmclqGJzmOj m9R4dwpUsYkcWeJs0U1XEZ/26/fuDETX7x1jtyHMb8Bm85fr4Eb1NPzOOeJoHUW9Km+p 6yZWhg0qjpsZoc05HR575eL8wSXY3Dm84d87whLlG3NlSjsxW8QRHA43opI5rNKl2CO/ QLu12DXJmHH4ZluqjLHIjuEawiaYa73qTE+j8vSMlBMiJzKt6taMcVH+/JDEe87RcjOj 9tMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pY0j5UDQRuY2xGJ0fvk/gqv6oAlbm3ZqMylVICd3nQM=; b=KXliWkRu/2ykIya2Ccg1llHkem0oKynobfYUHuTmiRJoz9WHOJh4+JJAwzQDU7kgoG gsrZdKgaEDSIJPN0NHcBF/OP4eBrDgkQw+h9j8K3w9NIqJIH+LA+f7xXx9tAFMY4PChP 8udsk3OC/oogDuGL1wy80Id4RLLbi6efX/3gsKd7+JlpI1fncBTagSNGIWwWl1Lx5nR1 /Wvpwk424C2bhCrXav7wdH6SS+kB6igQincwiHfRixeLshXHftsy1GVv1m7NXlYdbPfa y9QlMICB4YL4hJORq6FMnks7cbkVE6DdcqNhEMTlwfTQmZv95qZskB54I3OjR/6AGuwl qsYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mR1c0oAr; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h25si3981978ejt.604.2020.06.19.09.05.37; Fri, 19 Jun 2020 09:05:38 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mR1c0oAr; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405484AbgFSQEW (ORCPT + 15 others); Fri, 19 Jun 2020 12:04:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:41176 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403808AbgFSPK6 (ORCPT ); Fri, 19 Jun 2020 11:10:58 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 01BE5206FA; Fri, 19 Jun 2020 15:10:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579457; bh=M+tyrRCR/fbrbhIGQkHftEMicDK86NTkiH6WntT4Quk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mR1c0oArYppZZFbqDYoqaSebCokTfNb4wtogwf2Lg6pTRPyfAl94xW1927eta0OLx s8nNQMu7ptqhliRGjLL+M9CxDsZBFQ3TPyBaQaAEzUHQg2/P/4drQhE+PzFb9njvXT R3aCyW/cNgqRQjixD5kyEoi95ggg05Vu5MO1S8hU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bruce Chang , Harald Welte , Ulf Hansson , Sasha Levin Subject: [PATCH 5.4 142/261] mmc: via-sdmmc: Respect the cmd->busy_timeout from the mmc core Date: Fri, 19 Jun 2020 16:32:33 +0200 Message-Id: <20200619141656.674488729@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141649.878808811@linuxfoundation.org> References: <20200619141649.878808811@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ulf Hansson [ Upstream commit 966244ccd2919e28f25555a77f204cd1c109cad8 ] Using a fixed 1s timeout for all commands (and data transfers) is a bit problematic. For some commands it means waiting longer than needed for the timer to expire, which may not a big issue, but still. For other commands, like for an erase (CMD38) that uses a R1B response, may require longer timeouts than 1s. In these cases, we may end up treating the command as it failed, while it just needed some more time to complete successfully. Fix the problem by respecting the cmd->busy_timeout, which is provided by the mmc core. Cc: Bruce Chang Cc: Harald Welte Signed-off-by: Ulf Hansson Link: https://lore.kernel.org/r/20200414161413.3036-17-ulf.hansson@linaro.org Signed-off-by: Sasha Levin --- drivers/mmc/host/via-sdmmc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c index f4ac064ff471..8d96ecba1b55 100644 --- a/drivers/mmc/host/via-sdmmc.c +++ b/drivers/mmc/host/via-sdmmc.c @@ -319,6 +319,8 @@ struct via_crdr_mmc_host { /* some devices need a very long delay for power to stabilize */ #define VIA_CRDR_QUIRK_300MS_PWRDELAY 0x0001 +#define VIA_CMD_TIMEOUT_MS 1000 + static const struct pci_device_id via_ids[] = { {PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_9530, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,}, @@ -551,14 +553,17 @@ static void via_sdc_send_command(struct via_crdr_mmc_host *host, { void __iomem *addrbase; struct mmc_data *data; + unsigned int timeout_ms; u32 cmdctrl = 0; WARN_ON(host->cmd); data = cmd->data; - mod_timer(&host->timer, jiffies + HZ); host->cmd = cmd; + timeout_ms = cmd->busy_timeout ? cmd->busy_timeout : VIA_CMD_TIMEOUT_MS; + mod_timer(&host->timer, jiffies + msecs_to_jiffies(timeout_ms)); + /*Command index*/ cmdctrl = cmd->opcode << 8;