From patchwork Thu Oct 3 15:52:34 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: 175140 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp562348ill; Thu, 3 Oct 2019 09:33:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqx5UlyD9VG2gQzC9T6yFDXpumSb5KrrH59jkdkNRvZdf2QW09rklAGAbqvlcADV8H1Vgg2C X-Received: by 2002:a05:6402:1ade:: with SMTP id ba30mr10679236edb.304.1570120345359; Thu, 03 Oct 2019 09:32:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570120345; cv=none; d=google.com; s=arc-20160816; b=B5sgK/6YVbE8NQ+Mb4ePbjBPLB72x8BaoveAMa7nWyjes1mudB4kVBTSceGoFn14H/ 4aIooC1K9fDFy5wOElSKdvwvPJtXjiGXF6L92ZXKnlkf5SeGvUzTNYammngF/PLLW8A6 punNlTeibD20DT5dcB3wSiJ3Smtjd8PZd/rPmwYcmpZnWtdNqW9ZdXTIKdeAwiKE1imh 6M4qLsM8xLm44lIO/Vmggyld42y7xU2d2euwxYddSREjYA5Ar3zQ0M9vJiTFx7KZt03+ Y4HcEUc5ap9c/MyzA4Vd/cgWIef8qv9c5UpR4CbsRETpQ/L3tePR24ITRK3ZEIPQRVnX 3B3w== 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=HwLExmMmyHF0MO0tqpd+RvEydFRmraG1qx+sWxxtIWCwS5thHDaLybjdXMDW+gPIS5 OzkL0LIFNBb9LgAwyTx9AXALQTM3zVJ0uCXrTbiDEEWL2TT4ACNZBjJC9CsqXQIOKXkk 3qKY0Z48sHPCCglt2m6PLNKjan+eapNCWzW8V0AuJYTO2lYpsqgszCb0aQ65RGQg1oWp NTSrROuR9iEBubZaIqmeQZ1vq8huCkjL2DGQSmnxkvRVB85JqBRPPNoSnEFZfzGMSuYI 1ya6V6jmAzBJU/uvtBylnHb3NsZPNbuvLnVIMmFO51Mrgtg3eTDTqMVL6tLmvjPCCIap dYHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=PIYm7Qvo; 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 h15si1937032eda.284.2019.10.03.09.32.25; Thu, 03 Oct 2019 09:32:25 -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=PIYm7Qvo; 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 S2403941AbfJCQcD (ORCPT + 27 others); Thu, 3 Oct 2019 12:32:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:39126 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403916AbfJCQbw (ORCPT ); Thu, 3 Oct 2019 12:31:52 -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 DC51C2070B; Thu, 3 Oct 2019 16:31:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120311; bh=LHr0zQNTuWMvB8KfJDg2lp4+b/SuKXqID+v+rc6sg8g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PIYm7QvoAXK9cderBXH5f0Zm3oPGvSxQmgF+i2ALN6oqEhFrUJV5lmFldxmJU1Dv/ +9iZDBAS+oMrCkXSbHJSCMwa52XhpCwNfFURDwlyK+K8QgNfXLs1D8dRm3E7lGRmMg X7kEi9g6yWruYlBl9P0c9xqxoafaRyV4lOJBxZrU= 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.2 176/313] dmaengine: ti: edma: Do not reset reserved paRAM slots Date: Thu, 3 Oct 2019 17:52:34 +0200 Message-Id: <20191003154550.329779474@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154533.590915454@linuxfoundation.org> References: <20191003154533.590915454@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) {