From patchwork Fri Aug 4 17:43:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 109444 Delivered-To: patch@linaro.org Received: by 10.140.101.6 with SMTP id t6csp2474531qge; Fri, 4 Aug 2017 10:44:36 -0700 (PDT) X-Received: by 10.84.233.141 with SMTP id l13mr3701483plk.333.1501868676064; Fri, 04 Aug 2017 10:44:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501868676; cv=none; d=google.com; s=arc-20160816; b=MIQPYuMXQ3ogLAFQbcrgh788ykUkjxzO464W7rHN9hFIt9w6FWg39K2VZ5cIf4+ALp cr2RXhzeVQ8nBS/lsdOu/Fnmzfh5liq0dbc0YUfn1R5QofPARIf3qQ79bPiWZ/RDgocC rMsONehARK1lZNsvDEPPExZ7iZhR940tcJqRCOc25sHUmQo8YCnsNd9c/CMdyaAdDPvm jjE2yxmwulti8R8ViLi20qXyR75dRssEefUyasVu6NrvCtkKoK3ti7o4DcKL/vUM2NnZ W9dlhAFGu51SqalRwFFtceDaKvy7zpmJw7+bPvtktaFUYlQVA7qoEakmSISgwQbSBWuA f00A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=z7nihxWu0S+4O4TVXoHtmzKCVQm9II0xJWIGwBdARGY=; b=weAeBMWz88niQQY/AGZJFn187sVxcHxmZk/obPn7YuVuXefEkPlFRpUr1rHaCvuOJV lmRJR+QPi/LkQ3/1zwMWSY34f3n1h8bwfNB9vxsGY6aIZ984Fw0nzh5SGUHi6CPmTu0j FvqJZWgvol8CBXpgwS1NsbQQB3Z9OsWYnJ7e83mw8xRK4cxqqubDv5NtXCli63pd8sw3 4Se0mwaiLgfut1WnL0LGO8/F/nvCjy5vCzp7pmVfuuFLIwU6IsDPSK7LWgZDyrbiYTGB twxry3l742/5z/VHV2tpsabgbRLgkQFMYZjSw6qtf4gIG7IMY7h7caSJr7Qa4ihbDidg bjMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.b=E8HOVsJn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x1si1433538plm.825.2017.08.04.10.44.35; Fri, 04 Aug 2017 10:44:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.b=E8HOVsJn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753235AbdHDRoV (ORCPT + 25 others); Fri, 4 Aug 2017 13:44:21 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:37628 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753190AbdHDRoO (ORCPT ); Fri, 4 Aug 2017 13:44:14 -0400 Received: by mail-wm0-f51.google.com with SMTP id t201so25438647wmt.0 for ; Fri, 04 Aug 2017 10:44:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z7nihxWu0S+4O4TVXoHtmzKCVQm9II0xJWIGwBdARGY=; b=E8HOVsJnkEjVlZYdCdfxq48z2awtsy2zysBcf4JuhWy0jg/gUTbb5u4zwmXlPAN4IR UN4Pt+gQ0tPO0n0fRcm9uB4JghRxuLUacpXANmOXkfjDD9WQ4IJ6JSzDlcSqs2Hky8Hh p0JfVaU0pscmenHiWQuQ2/HYbzF9kmJXr5qvderfRk/p7q1FWzuyDkzNoFWv+eHQIj45 xB/WPVYctvi+oT+Pqpcw6tJ47dWX3xFeRrTG6uRWJKOO19rUXaqgqqo+J0uk/zWU1RBe hAhB3v9iu23XEWkBP40AIakAb2P9MK/o5Z26412+rRLEAxqGG5Zp1jeoz5C8SpHQUvO+ 6FXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=z7nihxWu0S+4O4TVXoHtmzKCVQm9II0xJWIGwBdARGY=; b=Qsppe8faqH02oPj08at56qFiIE9DvDH8KhHEyvXgrpJjRA+5Qr6Fyqtgkm82VwktYG yWBxYimLP95vOK33t3MHosRFAiLBfE9TuUoNXry7Ro0g60n3LdXeZImkBr/quEEXlbmx ehYLVzw2tLiOSD2JxVm0jfiN5nKbJmUq0LqOkgrtZGxGcHOxhlZQ+Nk3V5liVjqzSB46 gvhwReN5avwIGMV4KZfiOLivQH4bYSot1NAlZLYag0E1I9YLN9sz0Rv4mEi73a0CwkGe gCl8GHvsiLjKMLH9mK0nzKAjFiQygCjA8xx5Zg5B7LKeFxUCASrh/8gPe7AjsOKdekXa vcUQ== X-Gm-Message-State: AHYfb5hd4BlwMj8kQ9TjjGMfHqLi8IXfqFGiqtsrTINOKsChKUJWKusX cwT9lPLF45TJ91cl X-Received: by 10.28.199.207 with SMTP id x198mr1728255wmf.156.1501868652787; Fri, 04 Aug 2017 10:44:12 -0700 (PDT) Received: from localhost.localdomain (cag06-3-82-243-161-21.fbx.proxad.net. [82.243.161.21]) by smtp.googlemail.com with ESMTPSA id p17sm996082wma.45.2017.08.04.10.44.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Aug 2017 10:44:12 -0700 (PDT) From: Jerome Brunet To: Ulf Hansson , Kevin Hilman , Carlo Caione Cc: Jerome Brunet , linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/14] mmc: meson-gx: simplify interrupt handler Date: Fri, 4 Aug 2017 19:43:48 +0200 Message-Id: <20170804174353.16486-10-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170804174353.16486-1-jbrunet@baylibre.com> References: <20170804174353.16486-1-jbrunet@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org No functional change, just improve interrupt handler readability Signed-off-by: Jerome Brunet --- drivers/mmc/host/meson-gx-mmc.c | 93 +++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 54 deletions(-) -- 2.9.4 diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 4cc7d6530536..d876b80db27d 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -78,16 +78,22 @@ #define STATUS_BUSY BIT(31) #define SD_EMMC_IRQ_EN 0x4c -#define IRQ_EN_MASK GENMASK(13, 0) #define IRQ_RXD_ERR_MASK GENMASK(7, 0) #define IRQ_TXD_ERR BIT(8) #define IRQ_DESC_ERR BIT(9) #define IRQ_RESP_ERR BIT(10) +#define IRQ_CRC_ERR \ + (IRQ_RXD_ERR_MASK | IRQ_TXD_ERR | IRQ_DESC_ERR | IRQ_RESP_ERR) #define IRQ_RESP_TIMEOUT BIT(11) #define IRQ_DESC_TIMEOUT BIT(12) +#define IRQ_TIMEOUTS \ + (IRQ_RESP_TIMEOUT | IRQ_DESC_TIMEOUT) #define IRQ_END_OF_CHAIN BIT(13) #define IRQ_RESP_STATUS BIT(14) #define IRQ_SDIO BIT(15) +#define IRQ_EN_MASK \ + (IRQ_CRC_ERR | IRQ_TIMEOUTS | IRQ_END_OF_CHAIN | IRQ_RESP_STATUS |\ + IRQ_SDIO) #define SD_EMMC_CMD_CFG 0x50 #define SD_EMMC_CMD_ARG 0x54 @@ -703,57 +709,40 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) struct mmc_data *data; u32 irq_en, status, raw_status; unsigned long flag; - irqreturn_t ret = IRQ_HANDLED; + irqreturn_t ret = IRQ_NONE; - if (WARN_ON(!host)) + if (WARN_ON(!host) || WARN_ON(!host->cmd)) return IRQ_NONE; - cmd = host->cmd; - - if (WARN_ON(!cmd)) - return IRQ_NONE; + spin_lock_irqsave(&host->lock, flag); + cmd = host->cmd; data = cmd->data; - - spin_lock_irqsave(&host->lock, flag); irq_en = readl(host->regs + SD_EMMC_IRQ_EN); raw_status = readl(host->regs + SD_EMMC_STATUS); status = raw_status & irq_en; - if (!status) { - dev_warn(host->dev, "Spurious IRQ! status=0x%08x, irq_en=0x%08x\n", - raw_status, irq_en); - ret = IRQ_NONE; - goto out; - } - - meson_mmc_read_resp(host->mmc, cmd); - cmd->error = 0; - if (status & IRQ_RXD_ERR_MASK) { - dev_dbg(host->dev, "Unhandled IRQ: RXD error\n"); - cmd->error = -EILSEQ; - } - if (status & IRQ_TXD_ERR) { - dev_dbg(host->dev, "Unhandled IRQ: TXD error\n"); - cmd->error = -EILSEQ; - } - if (status & IRQ_DESC_ERR) - dev_dbg(host->dev, "Unhandled IRQ: Descriptor error\n"); - if (status & IRQ_RESP_ERR) { - dev_dbg(host->dev, "Unhandled IRQ: Response error\n"); + if (status & IRQ_CRC_ERR) { + dev_dbg(host->dev, "CRC Error - status 0x%08x\n", status); cmd->error = -EILSEQ; + ret = IRQ_HANDLED; + goto out; } - if (status & IRQ_RESP_TIMEOUT) { - dev_dbg(host->dev, "Unhandled IRQ: Response timeout\n"); + + if (status & IRQ_TIMEOUTS) { + dev_dbg(host->dev, "Timeout - status 0x%08x\n", status); cmd->error = -ETIMEDOUT; + ret = IRQ_HANDLED; + goto out; } - if (status & IRQ_DESC_TIMEOUT) { - dev_dbg(host->dev, "Unhandled IRQ: Descriptor timeout\n"); - cmd->error = -ETIMEDOUT; + + meson_mmc_read_resp(host->mmc, cmd); + + if (status & IRQ_SDIO) { + dev_dbg(host->dev, "IRQ: SDIO TODO.\n"); + ret = IRQ_HANDLED; } - if (status & IRQ_SDIO) - dev_dbg(host->dev, "Unhandled IRQ: SDIO.\n"); if (status & (IRQ_END_OF_CHAIN | IRQ_RESP_STATUS)) { if (data && !cmd->error) @@ -761,26 +750,20 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) if (meson_mmc_bounce_buf_read(data) || meson_mmc_get_next_command(cmd)) ret = IRQ_WAKE_THREAD; - } else { - dev_warn(host->dev, "Unknown IRQ! status=0x%04x: MMC CMD%u arg=0x%08x flags=0x%08x stop=%d\n", - status, cmd->opcode, cmd->arg, - cmd->flags, cmd->mrq->stop ? 1 : 0); - if (cmd->data) { - struct mmc_data *data = cmd->data; - - dev_warn(host->dev, "\tblksz %u blocks %u flags 0x%08x (%s%s)", - data->blksz, data->blocks, data->flags, - data->flags & MMC_DATA_WRITE ? "write" : "", - data->flags & MMC_DATA_READ ? "read" : ""); - } + else + ret = IRQ_HANDLED; } out: - /* ack all (enabled) interrupts */ - writel(status, host->regs + SD_EMMC_STATUS); + /* ack all enabled interrupts */ + writel(irq_en, host->regs + SD_EMMC_STATUS); if (ret == IRQ_HANDLED) meson_mmc_request_done(host->mmc, cmd->mrq); + else if (ret == IRQ_NONE) + dev_warn(host->dev, + "Unexpected IRQ! status=0x%08x, irq_en=0x%08x\n", + raw_status, irq_en); spin_unlock_irqrestore(&host->lock, flag); return ret; @@ -939,10 +922,12 @@ static int meson_mmc_probe(struct platform_device *pdev) /* Stop execution */ writel(0, host->regs + SD_EMMC_START); - /* clear, ack, enable all interrupts */ + /* clear, ack and enable interrupts */ writel(0, host->regs + SD_EMMC_IRQ_EN); - writel(IRQ_EN_MASK, host->regs + SD_EMMC_STATUS); - writel(IRQ_EN_MASK, host->regs + SD_EMMC_IRQ_EN); + writel(IRQ_CRC_ERR | IRQ_TIMEOUTS | IRQ_END_OF_CHAIN, + host->regs + SD_EMMC_STATUS); + writel(IRQ_CRC_ERR | IRQ_TIMEOUTS | IRQ_END_OF_CHAIN, + host->regs + SD_EMMC_IRQ_EN); ret = devm_request_threaded_irq(&pdev->dev, irq, meson_mmc_irq, meson_mmc_irq_thread, IRQF_SHARED,