From patchwork Thu Oct 3 15:53:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 175089 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp512545ill; Thu, 3 Oct 2019 08:58:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqwFw1qvnB7spfyJBfcVLjdGJ8qMMQoFhVn8qSH5qEyhR/mZ7CjwoXC9Js05asC2SO0XREjv X-Received: by 2002:a50:91b1:: with SMTP id g46mr10071005eda.255.1570118320962; Thu, 03 Oct 2019 08:58:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570118320; cv=none; d=google.com; s=arc-20160816; b=msiroK2jXba7UUsppPlmihvBcFi1b/8e/wKyxJinubWLCZEZuJekBwfs4h3QnObH2y XmP1qGQmzhPLqz8ss8j/8OGNq/mlruX817qWfExFbL7p0dzQzgMLK1Vkf/uj8VqiN1Eb IsxCoy4GKd3X9A1GLlkA49TDGuu2uJwPIoL7IWi1WFShNlZ36Wne7qRGNaSxCvqXlUJF HEsP0/ppufK4zn82na7niGRXkE7JGfHLP72IDyKd+8dDSF6vNAKRenxXfBKBG70U4ZLo 9OOyCE6BqqYu18vMfwS/8Vy58Hj0zfpqBXQR8NyrwTa+Fs82XoqQu18FMTEPgolFqlGd J3fg== 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=MQZqimd3huadoosc/ilmddr6Y0irmlxJmL0h3zOwmFA=; b=NNtkxndrCAl7f9sc1XKLwustL8IfJpbZo6IfD+IfyVsggg3+4JyNL9b5gNWgXR3unU dCQpsAlSejSu965k4LS7R2zxbrU5ig26UTGF3r4JNuE/7LBVqS1lQTB8VB87lj+akbiZ HtQsV7bF0fRm6CXghr0Ymmg7T0jhW9Ynscg/hpT09EZ2c8V2aSJLsxO5REyDsY02cdnp ELL3hkzGCcSV0zyvEJSFnAWPRZCZ7L6/BC6jiOYKxzKF7DMLxzEE36RPIfrWjFnPaAV9 UAAtp3592s++eUsJowucN7IT0Pcj5z9YMnqjUtjjXmqP51TfIQNjAM3oebYsRMjX0AXi Vq3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LkhO4FLp; 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 o14si257937ejc.433.2019.10.03.08.58.40; Thu, 03 Oct 2019 08:58:40 -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=LkhO4FLp; 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 S1731228AbfJCP6i (ORCPT + 14 others); Thu, 3 Oct 2019 11:58:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:41424 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731257AbfJCP6h (ORCPT ); Thu, 3 Oct 2019 11:58:37 -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 5957921848; Thu, 3 Oct 2019 15:58:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118316; bh=n5gj2Hdae2Hdoc1sUt7oWb1wv6BAKbPyC4gdc9lKEK0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LkhO4FLpxieoJdjSjHtNKawcQR4Lq6Z3M7hyibrrLsYkU2zN8F2X8azxoPDDcEIyY kCjL6Y7+VmJazF46QV/uNSdUMnHARhSeCLWUXgGfFIWKzNm6LvgqGM4vizfk630QjV lHSN9xh3Iq2iSulDifbQDFj4ZyesL98H0WW2p2ZA= 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.4 67/99] dmaengine: ti: edma: Do not reset reserved paRAM slots Date: Thu, 3 Oct 2019 17:53:30 +0200 Message-Id: <20191003154329.805952678@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154252.297991283@linuxfoundation.org> References: <20191003154252.297991283@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 85674a8d04368..e508c8c5f3fde 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -2218,9 +2218,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; @@ -2233,6 +2230,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) {