From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753559AbdAZXhx (ORCPT ); Thu, 26 Jan 2017 18:37:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41942 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752538AbdAZXhn (ORCPT ); Thu, 26 Jan 2017 18:37:43 -0500 From: Gerd Hoffmann To: linux-rpi-kernel@lists.infradead.org Cc: Stefan Wahren , Eric Anholt , Ulf Hansson , linux-mmc@vger.kernel.org, Gerd Hoffmann , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Stephen Warren , Lee Jones , linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM2835 ARM ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 06/13] mmc: bcm2835: add bcm2835_check_cmd_error Date: Fri, 27 Jan 2017 00:37:19 +0100 Message-Id: <1485473846-24537-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1485473846-24537-1-git-send-email-kraxel@redhat.com> References: <1485473846-24537-1-git-send-email-kraxel@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 26 Jan 2017 23:37:33 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Gerd Hoffmann --- drivers/mmc/host/bcm2835.c | 58 ++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c index 8270c76..33eaebd 100644 --- a/drivers/mmc/host/bcm2835.c +++ b/drivers/mmc/host/bcm2835.c @@ -954,6 +954,38 @@ static void bcm2835_timeout(unsigned long data) spin_unlock_irqrestore(&host->lock, flags); } +static bool bcm2835_check_cmd_error(struct bcm2835_host *host, u32 intmask) +{ + struct device *dev = &host->pdev->dev; + + if (!(intmask & SDHSTS_ERROR_MASK)) + return false; + + if (!host->cmd) + return true; + + dev_err(dev, "sdhost_busy_irq: intmask %x, data %p\n", + intmask, host->mrq->data); + if (intmask & SDHSTS_CRC7_ERROR) { + host->cmd->error = -EILSEQ; + } else if (intmask & (SDHSTS_CRC16_ERROR | + SDHSTS_FIFO_ERROR)) { + if (host->mrq->data) + host->mrq->data->error = -EILSEQ; + else + host->cmd->error = -EILSEQ; + } else if (intmask & SDHSTS_REW_TIME_OUT) { + if (host->mrq->data) + host->mrq->data->error = -ETIMEDOUT; + else + host->cmd->error = -ETIMEDOUT; + } else if (intmask & SDHSTS_CMD_TIME_OUT) { + host->cmd->error = -ETIMEDOUT; + } + bcm2835_dumpregs(host); + return true; +} + static void bcm2835_check_data_error(struct bcm2835_host *host, u32 intmask) { if (!host->data) @@ -983,30 +1015,10 @@ static void bcm2835_busy_irq(struct bcm2835_host *host, u32 intmask) } host->use_busy = false; - if (intmask & SDHSTS_ERROR_MASK) { - dev_err(dev, "sdhost_busy_irq: intmask %x, data %p\n", - intmask, host->mrq->data); - if (intmask & SDHSTS_CRC7_ERROR) { - host->cmd->error = -EILSEQ; - } else if (intmask & (SDHSTS_CRC16_ERROR | - SDHSTS_FIFO_ERROR)) { - if (host->mrq->data) - host->mrq->data->error = -EILSEQ; - else - host->cmd->error = -EILSEQ; - } else if (intmask & SDHSTS_REW_TIME_OUT) { - if (host->mrq->data) - host->mrq->data->error = -ETIMEDOUT; - else - host->cmd->error = -ETIMEDOUT; - } else if (intmask & SDHSTS_CMD_TIME_OUT) { - host->cmd->error = -ETIMEDOUT; - } + if (bcm2835_check_cmd_error(host, intmask)) + return; - bcm2835_dumpregs(host); - } else { - bcm2835_finish_command(host, NULL); - } + bcm2835_finish_command(host, NULL); } static void bcm2835_data_irq(struct bcm2835_host *host, u32 intmask) -- 1.8.3.1