From patchwork Thu Oct 3 15:53:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 175191 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp640215ill; Thu, 3 Oct 2019 10:37:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqz+q/1VpwigYUhorxwBhZmOKPFXiisacTrzcaV0O3h/KlAMnPfsq5iOKxg0Tg1vYjNy3t0Z X-Received: by 2002:a05:6402:17eb:: with SMTP id t11mr10453598edy.97.1570124221787; Thu, 03 Oct 2019 10:37:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570124221; cv=none; d=google.com; s=arc-20160816; b=RY+iNGus4U1wVPyDoND1YZLvyEv/ruHmdg97kdxba9oQBlT6IpY9sXUJtb4wu5LBPA EjEXrgFB3/JSOTZeq3L3UKaQgRBZe/wDwBRCBrLisKTfbm/z8oCSolvywqYyZeBpyR5V SM5KwYElx2FXgkZuzwFAWs2ti12GZ3fG+cMtdYmM15R3uCgd+OpV0z2uHvCRvi8tUj+6 epbLss763x7rVHOt/QjJ+UOHYDzEysRzMlCiXwcVl0kpeqnUwy1kLjWEY5/KWtT4JtVN s/dL7+otsHW9OFk2ptrN6ddtB8iwslBKDVL4JCp/Lnxnh9Ykx1ZZQMnRhUx4gQIbTWxj wluw== 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=NsMiORjG5q7MrczAR7nCRX9QdVZlqbaIt9eQPO4lgyA=; b=vW1xGDiWE25+THESOAR0gKV53L1LUcGKCurjJYTXvLhh51gaxj2qxrH7FRB2wa4iUX CrwnebJWOBox7zci4DYB97kC/rZEXuaZiLoL7uV/AQ6mCTyLK8ZJBnQA4qQSSby0g3QZ auhTac+vzIMl4VTYgvZGhT4/eZ47R+JQz+bZ8wWU2KsEZ84WwhSvNtbg9aSsJIp1KpCP XzzbsorwLCS9R3hn5bg3x+zNoqkOFanqwQNf2z5fNp8/tvp9YZAcvObsM/pwvO5oJn2A wGFNzv8XphkV0rtL98//ChtygYNpysUY6Z1AEoItlOpOvS3p5pMt6S/hkBavW6WGU1C+ GS5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=lhFmFXTR; 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 z7si1681793ejr.99.2019.10.03.10.37.01; Thu, 03 Oct 2019 10:37:01 -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=lhFmFXTR; 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 S1732344AbfJCRg7 (ORCPT + 14 others); Thu, 3 Oct 2019 13:36:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:49682 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729985AbfJCQEB (ORCPT ); Thu, 3 Oct 2019 12:04:01 -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 815B2207FF; Thu, 3 Oct 2019 16:03:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118640; bh=iw2RiHJuQkS8MmiAI+Oheb6nqhnVOozxDjGK6U5Lmy8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lhFmFXTRChAt0n0ugtyXDva3bDhHU/nh5Z90VtFvyL5V9GH5HgG40ujRlmfNvVFzo Pzf4Y9eJKdDHuKOB1SwNKRZts67juPlXuBM1Cavw/TmzTkrBmV96ir/8EmpN156rJU 9tPGIz2f6SU5GYoWOq3+iChTfafRenmAYGx1g89Y= 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.9 085/129] dmaengine: ti: edma: Do not reset reserved paRAM slots Date: Thu, 3 Oct 2019 17:53:28 +0200 Message-Id: <20191003154357.581377596@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154318.081116689@linuxfoundation.org> References: <20191003154318.081116689@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 57962bff75324..72f31e837b1d5 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) {