From mboxrd@z Thu Jan 1 00:00:00 1970 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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 A4FE9C43381 for ; Mon, 1 Apr 2019 17:37:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6DED52190A for ; Mon, 1 Apr 2019 17:37:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554140279; bh=ufH+x/+dAcNOsHwkVNB/ZQfUcn5BVB3+ZJDKwsev3xo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SoUN3BBgFfzk7aNyIFkpdCATcw+DIfn0HkdwaZmtA9yUCd4rkPGcUr67MVd8f3edz u93WbViUHjzI79Fr03tQk2FsWfDf6KIVLDxdc3xBpXn7rkULX0rvLPKa1CrZNhIX6Q 9OxvPS3qM6LwMXrZVylWhMAHfFkSCJvrl4VEPp84= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388269AbfDARh6 (ORCPT ); Mon, 1 Apr 2019 13:37:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:50876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388021AbfDARhx (ORCPT ); Mon, 1 Apr 2019 13:37:53 -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 C30582070B; Mon, 1 Apr 2019 17:37:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554140273; bh=ufH+x/+dAcNOsHwkVNB/ZQfUcn5BVB3+ZJDKwsev3xo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vg1Nkdyq/HniTn76xjMNuInrizOXK2JwUUgPu80xzAE4mlCKhIMeLRgtP4lr1Xpqq ZgEkUy7rqv0A9MJIKXGNRHtOEMdLwiB0nknEkZ8UTLX54+9qnnp1Z/LzT+i9PmhSw6 ncqhkGFPH9jF3TKSSDMT64PurPcZy6BfKJIQbEu0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chaotian Jing , Ulf Hansson , Sasha Levin Subject: [PATCH 3.18 26/50] mmc: mmc: fix switch timeout issue caused by jiffies precision Date: Mon, 1 Apr 2019 19:03:09 +0200 Message-Id: <20190401170044.200076740@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170041.257273804@linuxfoundation.org> References: <20190401170041.257273804@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 987aa5f8059613bf85cbb6f64ffbd34f5cb7a9d1 ] with CONFIG_HZ=100, the precision of jiffies is 10ms, and the generic_cmd6_time of some card is also 10ms. then, may be current time is only 5ms, but already timed out caused by jiffies precision. Signed-off-by: Chaotian Jing Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/core/mmc_ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index 7911e0510a1d..16a39a8d2e7e 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -490,7 +490,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, timeout_ms = MMC_OPS_TIMEOUT_MS; /* Must check status to be sure of no errors. */ - timeout = jiffies + msecs_to_jiffies(timeout_ms); + timeout = jiffies + msecs_to_jiffies(timeout_ms) + 1; do { if (send_status) { err = __mmc_send_status(card, &status, ignore_crc); -- 2.19.1