From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D656DC33CAF for ; Thu, 16 Jan 2020 19:03:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A109C206E6 for ; Thu, 16 Jan 2020 19:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579201396; bh=pW7Gw8OOC03WmjY5jFqoDEPIzvGcfAEHq8iNMn7Pifc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=M5I2iw22LVFfPL+BLkoOE9KEKuA1TtsZq3Te8HRqjJxEHdzoxYQuoJV4gDfwk5uWE vZbshahd3gp/BVHL6tYUeQ0f2PFeM3Jn39yZjPX+gWzD6INmT6d+tmiG39L2mZQoIa EYhfZpdkWtn47eo9tfKDjq+qzK7+2hYBnel+KZ5I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389137AbgAPTDJ (ORCPT ); Thu, 16 Jan 2020 14:03:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:33760 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388564AbgAPRFS (ORCPT ); Thu, 16 Jan 2020 12:05:18 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0BF8324653; Thu, 16 Jan 2020 17:05:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194317; bh=pW7Gw8OOC03WmjY5jFqoDEPIzvGcfAEHq8iNMn7Pifc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HfMDKWJwlnceqL/lDfeiuMTTgQfzxM6E0BtRBZABM8wQKEO8SrwQLkxpHoHOq0S4Q E2TqIMqf5xv5OWVSyo3UZK/Kx65/kzZll9kQM0sAO5sIomKnDVdRkn9OcOyL7Rv3Go h56l8NWOCnNw2mNqIP94bbwq/MeKlxotBlapXIoc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sowjanya Komatineni , Mark Brown , Sasha Levin , linux-spi@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 268/671] spi: tegra114: terminate dma and reset on transfer timeout Date: Thu, 16 Jan 2020 11:58:26 -0500 Message-Id: <20200116170509.12787-5-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sowjanya Komatineni [ Upstream commit 32bd1a9551cae34e6889afa235c7afdfede9aeac ] Fixes: terminate DMA and perform controller reset on transfer timeout to clear the FIFO's and errors. Signed-off-by: Sowjanya Komatineni Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-tegra114.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c index 17c2c78318f7..b1b726673f85 100644 --- a/drivers/spi/spi-tegra114.c +++ b/drivers/spi/spi-tegra114.c @@ -869,7 +869,16 @@ static int tegra_spi_transfer_one_message(struct spi_master *master, if (WARN_ON(ret == 0)) { dev_err(tspi->dev, "spi transfer timeout, err %d\n", ret); + if (tspi->is_curr_dma_xfer && + (tspi->cur_direction & DATA_DIR_TX)) + dmaengine_terminate_all(tspi->tx_dma_chan); + if (tspi->is_curr_dma_xfer && + (tspi->cur_direction & DATA_DIR_RX)) + dmaengine_terminate_all(tspi->rx_dma_chan); ret = -EIO; + reset_control_assert(tspi->rst); + udelay(2); + reset_control_deassert(tspi->rst); goto complete_xfer; } -- 2.20.1