From patchwork Fri Jun 19 14:32:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191252 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp676567ilo; Fri, 19 Jun 2020 09:21:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxqeLg2QTZ+K8BOB9feI5Et9tnehf4msJ+MjKjTaO8xZ36BDMQwBrAaSjBOiU29UpxAKAsq X-Received: by 2002:a17:906:6897:: with SMTP id n23mr4504848ejr.437.1592583683947; Fri, 19 Jun 2020 09:21:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592583683; cv=none; d=google.com; s=arc-20160816; b=gYLO5uIrAZnjvhjyWl6OB5ARE47S7dtD1jPC45/vH55faMhtz3MpKitGEiC4SpaX3h aSmGUrwQOY5xiC54dSwy4VTKM/uop/WrqTX9OIijrl7caSf3dQv92ticVKXF97v6tUrM QsQbhQky3Nme2R2ztAQDs+6CCExAd+bSIGzf+/mE0/L4C7eB/WAHI0oFtAyNmiCFY1cR NjV+aQ9RM6mdj84LVJ8m1DYyTESLD9MInfJ4WyyXPZCJR8R65Kk3Sj6JRnnRO5xtZFVQ RMAQI41JC6/nLch/Q41qPjCvZsSGP4d++YQ4mpKI/gyT8mBDfXcmFj/RYFhDi6i191K8 Cfvw== 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=8WGWVSRzUm3GqLW7tP4YyR4H2y3HOylM+JXwl4gtjbU=; b=BE3g74KUVedZPM8oaWXScj0+qbmippcux1XZb+x/GuR350gb6G1lscUXQyqELWYnDx n0XjwrGpPojtIDTbm1MhzkDxP1xnsqLabO0VdXf33/z2IC3NlFHHZ26n03LS9yu3F1gi 0kus30cnqP0XpItTJnKJv91YR735Ry4H1WQNwkYEmcO0S2V2Wg9aAZZBjEJkxBCzv2HZ uuYODansoKdFFj9g8wwHuL6yXV7RNLdKEqIJUFsOBa/Buo9WRRdZieKGDqHxxcxhjLWw PzY+0TGZ7XBD8qUal5OYA4OWBJ7K1qlW+jHHuq5/zQ3gX62KwFtXANk5FTUAY+KOzfK+ mxqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="HOCu/Yyq"; 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 dn4si4693505ejc.39.2020.06.19.09.21.23; Fri, 19 Jun 2020 09:21:23 -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="HOCu/Yyq"; 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 S2394668AbgFSQVM (ORCPT + 15 others); Fri, 19 Jun 2020 12:21:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:57278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388718AbgFSPAw (ORCPT ); Fri, 19 Jun 2020 11:00:52 -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 578022193E; Fri, 19 Jun 2020 15:00:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592578847; bh=4ljtbtWFQHlpXv5YMNSizjWjGiVY5t/bwWmBU85FxWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HOCu/Yyqk12ZXJgSq74y1AxMVW5gCTwd8j2jIWb1gBpqVDak983vSDrq23xFc9Qih hM9YSruRoKEqvMjxiNQ84bENGgM5kAyf086DbMKuQxa056i9rUN2+aoxZwMGTQdY1R nD7M7gYHHnmhma24lFZA+drYEjd11A4aeFzZTmMU= 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 4.19 179/267] mmc: via-sdmmc: Respect the cmd->busy_timeout from the mmc core Date: Fri, 19 Jun 2020 16:32:44 +0200 Message-Id: <20200619141657.367848960@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141648.840376470@linuxfoundation.org> References: <20200619141648.840376470@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 32c4211506fc..246dc6255e69 100644 --- a/drivers/mmc/host/via-sdmmc.c +++ b/drivers/mmc/host/via-sdmmc.c @@ -323,6 +323,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,}, @@ -555,14 +557,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;