From patchwork Thu Oct 3 15:53:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 175115 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp544116ill; Thu, 3 Oct 2019 09:20:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqwJVCpZiUU5dsgim/i1FJCncqhpiw3y1x2On/h2EZQ7+es6Xw1ypl9NM1eNV8eM1IioTxIV X-Received: by 2002:a17:906:7294:: with SMTP id b20mr8385674ejl.216.1570119610207; Thu, 03 Oct 2019 09:20:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570119610; cv=none; d=google.com; s=arc-20160816; b=QgD7Z8IzYYwolWngvNQwMqBNSNUM/UUnICQX32E02NySn860vY1wblJNdb5ZQ2o7xg h1nHvQidjB8+ypYZDhCASj0TtAR9T7yMcGxgcOVnhyR79p/IkN/7FrmhbrFjLnhYbhGu z2tkj+ItRZ126twQiNNh5M5jI/vN2QuHYKB6DSoG5vb4Dm623zrAI8KsfRL6AWYsndB6 Ovz8xpCm5IZ2yPv0jPzmzrvzHALBVTQEWxM+Upj0el/etyzFSeJ26jYjvd/WPjxxp9LY Jhb+FFYLhIooileg/E2pIqkSWUtGWa+9njmPTxtSO+wa7ErycvTHRxBVeTVl/Fv8SZND Ea5A== 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=O0sarBjX+FEYJUyNwY/bcxo5JxSF4Q5rmolAVKyREAY=; b=TngP3fnIK1Z6W1U1UVxfZzFDFQziVUeMik3CePENUBnJral8Ws8osykSEO4/wXmxwF 54VICy/50wkuL8nkUhZRxKvbSU6QJ2oAX+GaxJP7MYKbcFrkCG2gYK69O+VVdUPsC4X7 3H4f4z01dmBpw+ts9YZGSUVcnTVU7yFNTa2ZE3fNdUZOp8Bp1KO7Bv921PQ/b4uY5ZEz dWnaHAZ1isKGfquaJd4Oe7jPkl7YC8eiYKWQaK+bLoWMvkzHuRH2CLsKQVFhdGi45wMS XBp7w4mCg/8C7vEWfZ+1O83a3/GKTgmAJiNlLMTfLzGUB0wbyrvrKrbvI1ILWCwHwd4O 2hmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SbhfTtUV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 ni5si1589144ejb.184.2019.10.03.09.20.09; Thu, 03 Oct 2019 09:20:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=SbhfTtUV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389825AbfJCQUF (ORCPT + 27 others); Thu, 3 Oct 2019 12:20:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:47342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389813AbfJCQUC (ORCPT ); Thu, 3 Oct 2019 12:20:02 -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 F0F1B21848; Thu, 3 Oct 2019 16:20:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570119601; bh=LHr0zQNTuWMvB8KfJDg2lp4+b/SuKXqID+v+rc6sg8g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SbhfTtUVr45RA8YEBSx9mJosWvAtDbmAxlobTW/xdXFILQ5c26dchFp8zRIYvbqru z6gBPp5T5rVH61Gssx4Wg78CN8XKIrqD63PUw+Vi/sM9XD7imWTO+gJQ1hw2OCQJwC VFVr+wTM+POdRqmlzJl5hGOaumwV0N3PfyBr793M= 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.19 126/211] dmaengine: ti: edma: Do not reset reserved paRAM slots Date: Thu, 3 Oct 2019 17:53:12 +0200 Message-Id: <20191003154515.588298715@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154447.010950442@linuxfoundation.org> References: <20191003154447.010950442@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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/ti/edma.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/drivers/dma/ti/edma.c b/drivers/dma/ti/edma.c index ceabdea40ae0f..982631d4e1f8a 100644 --- a/drivers/dma/ti/edma.c +++ b/drivers/dma/ti/edma.c @@ -2273,9 +2273,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; @@ -2288,6 +2285,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) {