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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 78C56C282C8 for ; Mon, 28 Jan 2019 17:16:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 36D222082E for ; Mon, 28 Jan 2019 17:16:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548695777; bh=P0oOs61tq//lvwzcpa3l3hK24HNWIhwRluwau96AKpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gTvNyV/kqxeW0NwDIDlerNNmKatBYrfD61xpRK/MHNHz2TnEhBiL4qhp33a0Dc5pP 7nfpzOszRtZ7x+iz+IA64ZpurFAbodNUFIhxwkmJMcyfZRcE7KFYKyjy62tldhLwhM pA5I+7T7W058kTi1ScPIzyHySkPihwhTnpGm13/g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732034AbfA1QGc (ORCPT ); Mon, 28 Jan 2019 11:06:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:55558 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727985AbfA1QGc (ORCPT ); Mon, 28 Jan 2019 11:06:32 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 45DB72147A; Mon, 28 Jan 2019 16:06:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548691591; bh=P0oOs61tq//lvwzcpa3l3hK24HNWIhwRluwau96AKpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sgJxbhXxw5lrjZppYwbkl82fAlpBlv0+FYVff19AAx14QlrXnxyE1W4tQMd4ogt0/ fntwN0lVeZl08u1vikysoQ2I0mkHxNEVlOTcDFvhNYdADa0hKpAlP7enslF+HABSXA 8SkLiLNO1ZwHBl9uKphuve5SoFNtu+fRCVj23DIA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Michal Suchanek , Stefan Wahren , Ulf Hansson , Sasha Levin , linux-mmc@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 152/258] mmc: bcm2835: reset host on timeout Date: Mon, 28 Jan 2019 10:57:38 -0500 Message-Id: <20190128155924.51521-152-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128155924.51521-1-sashal@kernel.org> References: <20190128155924.51521-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Michal Suchanek [ Upstream commit f6000a4eb34e6462bc0dd39809c1bb99f9633269 ] The bcm2835 mmc host tends to lock up for unknown reason so reset it on timeout. The upper mmc block layer tries retransimitting with single blocks which tends to work out after a long wait. This is better than giving up and leaving the machine broken for no obvious reason. Fixes: 660fc733bd74 ("mmc: bcm2835: Add new driver for the sdhost controller.") Signed-off-by: Michal Suchanek Signed-off-by: Stefan Wahren Acked-by: Eric Anholt Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/bcm2835.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c index aef40e1739ee..a251be266ad7 100644 --- a/drivers/mmc/host/bcm2835.c +++ b/drivers/mmc/host/bcm2835.c @@ -286,6 +286,7 @@ static void bcm2835_reset(struct mmc_host *mmc) if (host->dma_chan) dmaengine_terminate_sync(host->dma_chan); + host->dma_chan = NULL; bcm2835_reset_internal(host); } @@ -846,6 +847,8 @@ static void bcm2835_timeout(struct work_struct *work) dev_err(dev, "timeout waiting for hardware interrupt.\n"); bcm2835_dumpregs(host); + bcm2835_reset(host->mmc); + if (host->data) { host->data->error = -ETIMEDOUT; bcm2835_finish_data(host); -- 2.19.1