From patchwork Sun Nov 11 13:45:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 10677627 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D2B271759 for ; Sun, 11 Nov 2018 13:46:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C35BA2A805 for ; Sun, 11 Nov 2018 13:46:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B5A9B2A7FE; Sun, 11 Nov 2018 13:46:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5915A2A7FE for ; Sun, 11 Nov 2018 13:46:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727594AbeKKXfE (ORCPT ); Sun, 11 Nov 2018 18:35:04 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:44147 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728118AbeKKXfE (ORCPT ); Sun, 11 Nov 2018 18:35:04 -0500 Received: from localhost.localdomain ([37.4.249.153]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Md76B-1fnbNF2g3n-00aFcM; Sun, 11 Nov 2018 14:46:06 +0100 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ulf Hansson Cc: Phil Elwell , Michal Suchanek , linux-rpi-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/7] mmc: bcm2835: Recover from MMC_SEND_EXT_CSD Date: Sun, 11 Nov 2018 14:45:25 +0100 Message-Id: <1541943930-23873-3-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1541943930-23873-1-git-send-email-stefan.wahren@i2se.com> References: <1541943930-23873-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K1:76f9kW/8sTA+tgiHPL430eP1IM2y6ZvGSzaTlEJK8D/yQou8Gi0 5aNVIkKlt1ZXnCl0dGdD8kl44J/XpyDx64aXAEN9Y900kKthUGHGRjIUlPs7pqlY5xYZyWY qryWkiETqueVF2t4sKAv+2YxPg/RyJDs0DQQgGp2dmsnDMSIGvLnsxdTEMrUuQTtv8SqvEn eB/WwaNygMjr+akQ9CebQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:C8VYy6LaVhA=:wO5WCfzvWze2KLB7YHlsAh TgrRc8UA2PqOcgo/z1YdpWCwnrthe3dR65qmLucQR5CQx/C2DbOt/BUs0AU6/of0vb/OK8F3G RTTHvA5hulrUQTsRs/1TQciZ8zTzgrL0PuZhKkTyTPK4NGct3qNnmKD2OUsqgVj6VROENKPDd uY0cB3ZDoBgrrPtFIClI6u9UThDunV9FR1F/hSedLJKNSF8du6H5aXDiGOYkKSESbOgykrHQC DCv5/OWhukd8WfFDmraTcAyyxVAyZZOokIGiYJLJtEYnhmy6k97ZsLHoDrxDqpsCESA/TgyJV vj5TyL5FyAguJbNJ0aPUNlFZI5bTPmg7PzNdnbckTXXRO5zrIfe0ZtJOTPsXtF5xEry/fnbyh fIxPdYluoEHxcP5pD3TUljoVCsudFaUfmgNscc0Mz+3eJrS+ECM5BOpzTGGEXEgOvm+MlRQri nnVEOYYp+ztI3NJm/64OUr/C2X6tYJCUjfb+FuIIY4QqV0uYZ54dxehjsAzYZBxJSmiPW5Ve/ AKiyjszs1iWxUxG60pTu8gkUm2FHSKt+oigfZI7ejXgw4jj9cQgKPDbucGRbDM8bv8jMNytr3 Yxt7cLrCmZPiksR4t8X7oyS/PeN9W7ROpcVlz4e4MJK6SxCfh6QjO1c16jCqCjKSnLhVK3Fyx 0Y8vsogeOaoHEgJR/LwCnkrSB1fby6cXzPvsXa1pBDOIPDeMa0Jzcobx5IDvKk+psbmSLLX8d Gr1W/UoQ8dY45pCvBjbcYfh+hWukG1acd9VZA95Y9DWRU+2jdGi+uqfkTnN7JCiIYSMTlv3lS MBYXM0MfcmX/tVgRnahpGsHZTuUQg== Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Phil Elwell If the user issues an "mmc extcsd read", the SD controller receives what it thinks is a SEND_IF_COND command with an unexpected data block. The resulting operations leave the FSM stuck in READWAIT, a state which persists until the MMC framework resets the controller, by which point the root filesystem is likely to have been unmounted. A less heavyweight solution is to detect the condition and nudge the FSM by asserting the (self-clearing) FORCE_DATA_MODE bit. Link: https://github.com/raspberrypi/linux/issues/2728 Signed-off-by: Phil Elwell --- drivers/mmc/host/bcm2835.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c index f1712df..a251be2 100644 --- a/drivers/mmc/host/bcm2835.c +++ b/drivers/mmc/host/bcm2835.c @@ -773,6 +773,8 @@ static void bcm2835_finish_command(struct bcm2835_host *host) if (!(sdhsts & SDHSTS_CRC7_ERROR) || (host->cmd->opcode != MMC_SEND_OP_COND)) { + u32 edm, fsm; + if (sdhsts & SDHSTS_CMD_TIME_OUT) { host->cmd->error = -ETIMEDOUT; } else { @@ -781,6 +783,13 @@ static void bcm2835_finish_command(struct bcm2835_host *host) bcm2835_dumpregs(host); host->cmd->error = -EILSEQ; } + edm = readl(host->ioaddr + SDEDM); + fsm = edm & SDEDM_FSM_MASK; + if (fsm == SDEDM_FSM_READWAIT || + fsm == SDEDM_FSM_WRITESTART1) + /* Kick the FSM out of its wait */ + writel(edm | SDEDM_FORCE_DATA_MODE, + host->ioaddr + SDEDM); bcm2835_finish_request(host); return; }