From patchwork Mon Aug 28 14:29:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 111160 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp4918287qge; Mon, 28 Aug 2017 07:29:32 -0700 (PDT) X-Received: by 10.84.215.222 with SMTP id g30mr974205plj.25.1503930572388; Mon, 28 Aug 2017 07:29:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503930572; cv=none; d=google.com; s=arc-20160816; b=tPd1oceTQ50DNbHhAFmMhNyPnY33oDJJkf6IALsj2TJQZ0CAxy1to2v9jsu2XOOk2H wUGHlRtBKZWByYbNnehp8D7tSk930NwQWz5YsovBr2s2OZu8sPIJlxlYdA9IcV2Xz29S FCgeoeWsvm81RjAgBoT1ptHKrwwODZCOye+EMnJzFmhetcSpQCZhSVii8rlN0HEQcw3K F3XEqXZy1DFNwmLtKB80xfXC7HUz38y9WRS6mInexVlBGvC3RqkumisDjQbZ/MUyAS0r C1EwQ6JQDjXReW5XPqfZD/eIujpiHlERCJAewjjeJIWKNRqlIhuWpQXcjAqicqIUterX Exmw== 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=26+sYuHxRbaRtFgoVlhJDHeOWxdKvDgWQ3ZquQUUrFY=; b=kX4Y4BZmPA7ycRJzN5C0ov4M2GmhHGgNkT5T2u9Elq8lyMUMKrtapNuFuPxsI07xaL Xo7vOOss89ok0Yxdge2Qwy0I9/cRFz5x1CN7Hf+lXIRpy2Xt6/oIO+73LJ67eX4FNoHp 9mWTb84Gm/wytcl7IdfQzcz4Ifl+M/k9A8rCzVFsbYmd78jvKKjU+KttUi7FxhBTaJNr NChrgLmXjbVXcVsog62lh//kq3nh7dpyFhNMrpiyxQGTO8xaT252/Py3bqjyxZD/RxQV QN0dbXtmd0b0tr7iEswgtHrVMBQd3Ut5jRYeRFewCnABvD9DXgyARJVk1dG4bh4QDaJd ccfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=0HD/+XyJ; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-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 s36si400338pld.335.2017.08.28.07.29.32; Mon, 28 Aug 2017 07:29:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=0HD/+XyJ; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751410AbdH1O3a (ORCPT + 6 others); Mon, 28 Aug 2017 10:29:30 -0400 Received: from mail-wr0-f175.google.com ([209.85.128.175]:33423 "EHLO mail-wr0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751304AbdH1O32 (ORCPT ); Mon, 28 Aug 2017 10:29:28 -0400 Received: by mail-wr0-f175.google.com with SMTP id k94so2261172wrc.0 for ; Mon, 28 Aug 2017 07:29:27 -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=+BfMh8vXJJwxIiA1X9jTa/xsLAhlx3s4WqvL8wJJeeQ=; b=0HD/+XyJKPdJ2sXOsigsTN2ZTiCZlM1SPEm+jLZnFA51cLJ5uHikkY/3tBrCqzakuy 1azJvvcb3AblEw57rLKMip9riV4vgYvatLaZhQob14w9t8KHCKQwoOcbQZq4iCswsw8k 4gWqCDF9r/CRfOjSXOAWcGNWEWpsDcvNqvRggSzua9XggRYeoE98649LExVVHIUWlhQr ebsb3JCRkPX8juPiIbeUcJiew1tD1OAwSIqV4C0Z7xdoHQTZPCxcqlNzmuoFjkiO2N8x JuG4Q0fNOF8FeDbmt7ajjmDb8OqbydIvcqscOFF/c49DKCs6kiJinW22euhV+xfJT39E 0ilQ== 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=+BfMh8vXJJwxIiA1X9jTa/xsLAhlx3s4WqvL8wJJeeQ=; b=bpKclogYQBLtSReRFaUowRiMB7uckZXLsM4FeL44ouDEF1OuTrGyRayuvNZLMEtedo uR8afaXfCxQ/K4gRF16SaANLK+gq6P6KSm//oq+5WT8YwPbBSF+ziX8/dwi9zDEnydEx fGKnaAWn2/IG0iJ4yloa2DEe+tuW3mIxhjeXVhlpRY+LM+NWfv7jOxf/l87KRrDuL4n2 oS4MA22VxT+QtPqciZvpuuBnMDf5IouzZ/rdY3YT6sHqYXqFjcAboZpo5TXDUh1J/z9l Q97KFWoFB2ocLwXFU8fLL0o0y1hiNkJfj9lPKsb/SD3kbolTcOBiFHxDZQ7TszhOiswl aUbA== X-Gm-Message-State: AHYfb5gEB1/P8zK3epFcxA211ucqiAF9O/xObn8cF6fs/V+vqQvRNHRM LEY7ja3eWE0Gn5Bq X-Received: by 10.223.166.20 with SMTP id k20mr509987wrc.35.1503930567240; Mon, 28 Aug 2017 07:29:27 -0700 (PDT) Received: from localhost.localdomain (uluru.liltaz.com. [163.172.81.188]) by smtp.googlemail.com with ESMTPSA id z39sm604792wrz.61.2017.08.28.07.29.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Aug 2017 07:29:26 -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 v3 08/13] mmc: meson-gx: simplify interrupt handler Date: Mon, 28 Aug 2017 16:29:10 +0200 Message-Id: <20170828142915.27020-9-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170828142915.27020-1-jbrunet@baylibre.com> References: <20170828142915.27020-1-jbrunet@baylibre.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org No functional change, just improve interrupt handler readability Reviewed-by: Kevin Hilman Signed-off-by: Jerome Brunet --- drivers/mmc/host/meson-gx-mmc.c | 93 +++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 54 deletions(-) -- 2.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 43aabb793121..3914c3a82cc4 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 @@ -760,57 +766,40 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) struct mmc_command *cmd; struct mmc_data *data; u32 irq_en, status, raw_status; - 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(&host->lock); + cmd = host->cmd; data = cmd->data; - - spin_lock(&host->lock); 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) @@ -818,26 +807,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(&host->lock); return ret; @@ -1017,10 +1000,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,