From patchwork Wed Jun 14 05:52:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varadarajan Narayanan X-Patchwork-Id: 9785453 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E2033602D9 for ; Wed, 14 Jun 2017 05:56:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E87002853F for ; Wed, 14 Jun 2017 05:56:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD61628585; Wed, 14 Jun 2017 05:56:50 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 93C332853F for ; Wed, 14 Jun 2017 05:56:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754224AbdFNFxy (ORCPT ); Wed, 14 Jun 2017 01:53:54 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:44508 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754415AbdFNFxw (ORCPT ); Wed, 14 Jun 2017 01:53:52 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id C173560861; Wed, 14 Jun 2017 05:53:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1497419631; bh=gKRCa95B5rLMBle9f55fs7Lmo5/F+sFmsf469drIa6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AZ5+8CO4vSP+viNjerPHkL/demwXBwnmLgBZys+y3eQ8V+lVUUkcn7/7PfT+h5cbT JX9sBs6KheqvdAX9icwWtGjuwsg7zQUfRNvis8M1VbeS7LO1G9yT8MAYREdksc2MyZ 4szBhdHOGPhTc+0O7K6aYI8pBdgkQR3ovpIYWkZQ= Received: from absahu-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: varada@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 67DB660960; Wed, 14 Jun 2017 05:53:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1497419626; bh=gKRCa95B5rLMBle9f55fs7Lmo5/F+sFmsf469drIa6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wa0h5d07HSAHbJVrR+apYhFcievWSY3z+9ZYAKXDv7ugsDPOgpPCOo+Ty7W+HCTJx lVYupjO6W7HdBj7I3QTQS2/u0syrQE3dsSUiAWZ094ToI0gkO+8Oxu9YONX0TkQ3Kb qadB/LSAwcIwdAOoy5gmDM4rlN8XRbFTcZIqlJUs= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 67DB660960 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=varada@codeaurora.org From: Varadarajan Narayanan To: broonie@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, andy.gross@linaro.org, david.brown@linaro.org, linux-spi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org Cc: Varadarajan Narayanan Subject: [PATCH 10/18] spi: qup: Fix DMA mode interrupt handling Date: Wed, 14 Jun 2017 11:22:23 +0530 Message-Id: <1497419551-21834-11-git-send-email-varada@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1497419551-21834-1-git-send-email-varada@codeaurora.org> References: <1497419551-21834-1-git-send-email-varada@codeaurora.org> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is needed for v1, where the i/o completion is not handled in the dma driver. Signed-off-by: Andy Gross Signed-off-by: Varadarajan Narayanan --- drivers/spi/spi-qup.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 872de28..bd53e82 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -510,9 +510,9 @@ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id) writel_relaxed(qup_err, controller->base + QUP_ERROR_FLAGS); writel_relaxed(spi_err, controller->base + SPI_ERROR_FLAGS); - writel_relaxed(opflags, controller->base + QUP_OPERATIONAL); if (!xfer) { + writel_relaxed(opflags, controller->base + QUP_OPERATIONAL); dev_err_ratelimited(controller->dev, "unexpected irq %08x %08x %08x\n", qup_err, spi_err, opflags); return IRQ_HANDLED; @@ -540,7 +540,15 @@ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id) error = -EIO; } - if (!spi_qup_is_dma_xfer(controller->mode)) { + if (spi_qup_is_dma_xfer(controller->mode)) { + writel_relaxed(opflags, controller->base + QUP_OPERATIONAL); + if (opflags & QUP_OP_IN_SERVICE_FLAG && + opflags & QUP_OP_MAX_INPUT_DONE_FLAG) + complete(&controller->rxc); + if (opflags & QUP_OP_OUT_SERVICE_FLAG && + opflags & QUP_OP_MAX_OUTPUT_DONE_FLAG) + complete(&controller->txc); + } else { if (opflags & QUP_OP_IN_SERVICE_FLAG) spi_qup_read(controller, xfer); @@ -553,6 +561,9 @@ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id) controller->xfer = xfer; spin_unlock_irqrestore(&controller->lock, flags); + /* re-read opflags as flags may have changed due to actions above */ + opflags = readl_relaxed(controller->base + QUP_OPERATIONAL); + if ((controller->rx_bytes == xfer->len && (opflags & QUP_OP_MAX_INPUT_DONE_FLAG)) || error) complete(&controller->done);