From patchwork Thu Oct 3 15:53:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 175107 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp532378ill; Thu, 3 Oct 2019 09:11:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqyAiKPCQrwnJ4kgYjIfSi7pXvnLt6BmWf/4GLDIvUkt/nr11/RB0CxleYXyi+aW/SHHTnIe X-Received: by 2002:a17:906:d97a:: with SMTP id rp26mr8569458ejb.251.1570119117676; Thu, 03 Oct 2019 09:11:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570119117; cv=none; d=google.com; s=arc-20160816; b=I02GtqcPbOp9+CmNAQTDgyC/QvLbp7spGrdTB8eoFaB38CBNZtZfWvLh9JXUpAnahB XDLY/N5i6E/aMpg/5TXo5AdJy8/jS3BFdcDl8TtNkFkRVj31u+G46sVhOGmh9gidPwzt 3/JOI3htp2yIfdxFCu/wRjpurANBUnlxc5d5zkLx710f2v6OAgLtyw49Alaf4pQgbjYU ABb59HJDI7foia4U+KN3E+A2HWW9lXWMwAr43UNjhs/BvmEc0uLssoAMdR4nYHV3ntyR rgSBAlQtvWk8uyPmWTlp2mL78uAbot0nIsM+ioSjKyLo/U3DzZuHiyBvkn2jaXgtSE9e miHw== 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=p1Kszr7d5Pr7WOposQLln38Sa4epVCcKv/sghi8zGS0=; b=vAbwUE8370GRyk40743RPsitpYs3W72HNKurTWF3gpUs1wVJukK1pd1Hd9SQz41rpm W3XxJQZOLFt3wl1k89pD5XMDJxndJ0j2Q+sXAi8L3D9GOIbwS4F2uzmcx9KYD6ZAuC75 8+psCWdTFRZYBWJ70MMbmmFdj0sDrzT7EDxW/NZnPOGB3Bt7swnkcBDvS3FTq0AJY5xa DgK5cYvZm7DZNHqJifkIGkbQ/RRuRgS/Xf5/rWg3iUF+1JL+Z3dtXGOiX2K6Qc0xoi7D adHdEnUd/Hw1HCB3CMIfvPz8RNGSrKlnvlq7oSWs47zi/cSCCCKkVHMGTmmIEY7MnUG+ p+NQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1UOPMFLZ; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 h2si1806071edb.346.2019.10.03.09.11.57; Thu, 03 Oct 2019 09:11:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=@kernel.org header.s=default header.b=1UOPMFLZ; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733047AbfJCQLy (ORCPT + 14 others); Thu, 3 Oct 2019 12:11:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:33786 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387928AbfJCQLx (ORCPT ); Thu, 3 Oct 2019 12:11:53 -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 EF52A20865; Thu, 3 Oct 2019 16:11:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570119112; bh=rhHRo2v442EhnNaf/8eTEgT06HCu/RNtjBI3CumZBPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1UOPMFLZp7naOFCE2vxg3OGhoD3grQyE47I7TlbUWgpLOudcj+u+yGcKwHVNXl6CG ssbY0QU/kl4NFz1WqJ0Yc3e0Bu46qhTq/41eKv/nDsxrHS/nnRienC9vWkrEgSQwGO GsiK3sWTQpeLEsvCNs8ygCAYStS/WNSYlr3FG7Ts= 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 4.14 123/185] dmaengine: ti: edma: Do not reset reserved paRAM slots Date: Thu, 3 Oct 2019 17:53:21 +0200 Message-Id: <20191003154505.673074578@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154437.541662648@linuxfoundation.org> References: <20191003154437.541662648@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 c5dbe60664b3660f5ac5854e21273ea2e7ff698f ] Skip resetting paRAM slots marked as reserved as they might be used by other cores. Signed-off-by: Peter Ujfalusi Link: https://lore.kernel.org/r/20190823125618.8133-2-peter.ujfalusi@ti.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/edma.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index a7ea20e7b8e94..519c24465dea4 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -2268,9 +2268,6 @@ static int edma_probe(struct platform_device *pdev) ecc->default_queue = info->default_queue; - for (i = 0; i < ecc->num_slots; i++) - edma_write_slot(ecc, i, &dummy_paramset); - if (info->rsv) { /* Set the reserved slots in inuse list */ rsv_slots = info->rsv->rsv_slots; @@ -2283,6 +2280,12 @@ static int edma_probe(struct platform_device *pdev) } } + for (i = 0; i < ecc->num_slots; i++) { + /* Reset only unused - not reserved - paRAM slots */ + if (!test_bit(i, ecc->slot_inuse)) + edma_write_slot(ecc, i, &dummy_paramset); + } + /* Clear the xbar mapped channels in unused list */ xbar_chans = info->xbar_chans; if (xbar_chans) {