From patchwork Mon Jul 27 14:04:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 247185 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp4850031ilg; Mon, 27 Jul 2020 07:29:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6f3jijy6uQ8S/J9x0ewmEWGPYVYvccO/ZEF+tozjDrhmkvm/neeJ2eCsxWHPlplXk1Ezn X-Received: by 2002:a05:6402:7d5:: with SMTP id u21mr4815077edy.235.1595860184176; Mon, 27 Jul 2020 07:29:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595860184; cv=none; d=google.com; s=arc-20160816; b=xDrMiZhEJocK52jkUON3wL6zkRZ3M7XtWPi4vyIBo9YmPYSCJUxhjr8pHdn5tmqkc1 ziP/cqGYoIZoO7yPZKaLH9WKCftJqZFZx57VISPdJyJGtPk1D7+0tFgpCW968vehQPoA u56n7/DyiJljTCCKlm7MmvIYSg6dhg2mjOjqo5V7rNxfodRkllPyCEtoX1rYNEpFggBP WOyS36N+i3RMXoZcqYCpy06u+z17iGraOgPc6+atbhNLrVBufS+H38d5wEkCrv7xOOsg nVu2asZT1ADDxTVep0s45ezKPT70a8QE9y2RefguPAesJ4nOZuMfp1KJyNI/jPKzUH9u j7Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dofxhU6eQpSwO1n//+4Aerlstpov/g9EQfAdmX30hrw=; b=Wx7ITeBSelkF2Mao7DNPuYw+QgGbNrqSdRln2D3WN9PeD52u6maixalYczumTx8pjZ FjbBoIN3Z77zUZjWqN7ojBmavZIDjJCZJfegaEZ2LWa3AfFMoQzoPyRdvpN0+pVuVoDq ZoMfQEfcev9ekMOIRWWODQD22o52nc+m2HTrEJ5oURWH7sgmaj8zTlt0cHlrb2va8Ky2 98QXIb9TNeEroSECXEcbfy61NuuJbB6yiHYTYjU0Yetrb5dnWTxEK3gGJt2bzAQ/FJQx RXGn0pd/xiTT5/+aSFveWnD7yStI0ymTUqBJFQyLh9EXsFZfHwr6PpYl5F+qRfNggFJT 00iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=i9QdEFmX; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y26si3484106edr.390.2020.07.27.07.29.44; Mon, 27 Jul 2020 07:29:44 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=i9QdEFmX; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731130AbgG0OXE (ORCPT + 15 others); Mon, 27 Jul 2020 10:23:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:52140 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732004AbgG0OXD (ORCPT ); Mon, 27 Jul 2020 10:23:03 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6194D2070A; Mon, 27 Jul 2020 14:23:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859782; bh=e9V3lPrkqDvI9PpIFRoLbKwiPOAE5nFcLwbfsSfpGZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i9QdEFmXUUaCw6pViwV10r5Ua79rEAQW1nyOgAxHxOfUxcuNImnNa2s4tC+f5g/kt Lxo3JqQwB8vKfsicL7N5Z4fYAToo6BpZkXB9A64NjIOtzJqdKbCUUgMTWigaQsrN5C dA+rZzofdLT+Bk0heXmYXbr1LSebAIzErqI+XpCs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Ujfalusi , Vinod Koul , Sasha Levin Subject: [PATCH 5.7 103/179] dmaengine: ti: k3-udma: Fix the running channel handling in alloc_chan_resources Date: Mon, 27 Jul 2020 16:04:38 +0200 Message-Id: <20200727134937.668966561@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134932.659499757@linuxfoundation.org> References: <20200727134932.659499757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Peter Ujfalusi [ Upstream commit b5b0180c2f767e90b4a6a885a0a2abaab6e3d48d ] In the unlikely case when the channel is running (RT enabled) during alloc_chan_resources then we should use udma_reset_chan() and not udma_stop() as the later is trying to initiate a teardown on the channel, which is not valid at this point. Signed-off-by: Peter Ujfalusi Link: https://lore.kernel.org/r/20200527070612.636-3-peter.ujfalusi@ti.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/ti/k3-udma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.25.1 diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 35f54a1af29d8..b777f1924968f 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -1868,7 +1868,7 @@ static int udma_alloc_chan_resources(struct dma_chan *chan) if (udma_is_chan_running(uc)) { dev_warn(ud->dev, "chan%d: is running!\n", uc->id); - udma_stop(uc); + udma_reset_chan(uc, false); if (udma_is_chan_running(uc)) { dev_err(ud->dev, "chan%d: won't stop!\n", uc->id); goto err_res_free;