From patchwork Fri Jun 19 14:32:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191239 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp661140ilo; Fri, 19 Jun 2020 09:05:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzTQ8Y5GBIyc2sx4gP6w+MNSJm8AavDAtOkmJ5VhBpx+OpQ5K/C3KkcuKPr0P+QRooD0s0e X-Received: by 2002:aa7:c90a:: with SMTP id b10mr4108257edt.198.1592582726385; Fri, 19 Jun 2020 09:05:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592582726; cv=none; d=google.com; s=arc-20160816; b=hwc+LO4QNvsWUzraJGp1IT0M4NGdGlbbJmRFmERdWKLGeSlVIJ/7yD1sgzybRy9C8x /9KHJBq918fTDrXvEobpv8kOXNMt5sTEcYJL5TSBVw5ayLnD0x3iDGUVesIqeHCGGruJ UkIukNI0kR3oC0EC6FAXc61za9+Jxmvw+2oiA9d5DrJR81sVXd0Pa8NS3j9q6WjHoZJ0 exhP/wir+ILJg7TdxPAS20UE9oIg1RIAm+t+TpvW+rTtFL2AeGOrFdMuZ+Z0YG3SqOOJ RWqTE0Q1b0+ihu2mvnBlgt+l7I1VOe1fJERcbTnxaPYwYHWXmpFs5xl2TWo83DBfFFkA JMAw== 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=IwIV9qP5nnFoZFwpEOrRylCfeNX9OT6QLNYMIlkyV0I=; b=Te9kyiIkFuo4e1+NmZ4bRFHda5XrBpjDWP3M/9hTf/jEN4WR8IGmPep1vtIFeFMAYa rxG6Hw6Et9Ptlnmdvr2Z7AxiEftZsZ7JyX4VvNAeKZwntL2RTqS8i++w3WE7q30xO7UX Ly78i8cawhM/EXcBnGbEO6GuV/Uy7Kii+VDFBfpPvXLbTLI9nCfJ+SXSvtZdynDIXUj2 lB1SB6llaES9fCn82vh1g+Eo+lN18ztKFWLs6ZUqNZE4XFVC0gAB6R0cF2rq7X/rqkg4 RMDK78v0uu3NjX7JN/R15rF6m1DpfuXHU7qekb0waO2FtlLF6E5HpZZ8M0SS3O0LrwRX qdZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xMds3ooV; 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.26; Fri, 19 Jun 2020 09:05:26 -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=xMds3ooV; 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 S2403800AbgFSQEX (ORCPT + 15 others); Fri, 19 Jun 2020 12:04:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:41088 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403803AbgFSPKz (ORCPT ); Fri, 19 Jun 2020 11:10:55 -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 17208206FA; Fri, 19 Jun 2020 15:10:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579454; bh=iN4uu/SZtCI23lgelTAMXjz+AGc7s2h6+bTtogWffiQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xMds3ooVj8w32Jg50YF0z57W+1hOs2UmDjNBnxgZ1PfFB8RNVzlmW0YxjNIKfAq3q bx2h7tgeUGmXwutF9vDEGERdB6uiYxF42L917fqCu72b3RYYpwfXAzna8WC/7rwW/G fU5X2F3EFZF43lvOU5Sq4WTe+NdqB70vgwRIlrLg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rui Miguel Silva , Johan Hovold , Alex Elder , greybus-dev@lists.linaro.org, Ulf Hansson , Sasha Levin Subject: [PATCH 5.4 141/261] staging: greybus: sdio: Respect the cmd->busy_timeout from the mmc core Date: Fri, 19 Jun 2020 16:32:32 +0200 Message-Id: <20200619141656.623784714@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 a389087ee9f195fcf2f31cd771e9ec5f02c16650 ] Using a fixed 1s timeout for all commands is a bit problematic. For some commands it means waiting longer than needed for the timeout 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: Rui Miguel Silva Cc: Johan Hovold Cc: Alex Elder Cc: Greg Kroah-Hartman Cc: greybus-dev@lists.linaro.org Signed-off-by: Ulf Hansson Acked-by: Rui Miguel Silva Acked-by: Greg Kroah-Hartman Link: https://lore.kernel.org/r/20200414161413.3036-20-ulf.hansson@linaro.org Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/staging/greybus/sdio.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/drivers/staging/greybus/sdio.c b/drivers/staging/greybus/sdio.c index 68c5718be827..c4b16bb5c1a4 100644 --- a/drivers/staging/greybus/sdio.c +++ b/drivers/staging/greybus/sdio.c @@ -411,6 +411,7 @@ static int gb_sdio_command(struct gb_sdio_host *host, struct mmc_command *cmd) struct gb_sdio_command_request request = {0}; struct gb_sdio_command_response response; struct mmc_data *data = host->mrq->data; + unsigned int timeout_ms; u8 cmd_flags; u8 cmd_type; int i; @@ -469,9 +470,12 @@ static int gb_sdio_command(struct gb_sdio_host *host, struct mmc_command *cmd) request.data_blksz = cpu_to_le16(data->blksz); } - ret = gb_operation_sync(host->connection, GB_SDIO_TYPE_COMMAND, - &request, sizeof(request), &response, - sizeof(response)); + timeout_ms = cmd->busy_timeout ? cmd->busy_timeout : + GB_OPERATION_TIMEOUT_DEFAULT; + + ret = gb_operation_sync_timeout(host->connection, GB_SDIO_TYPE_COMMAND, + &request, sizeof(request), &response, + sizeof(response), timeout_ms); if (ret < 0) goto out;