From patchwork Thu Oct 3 15:52:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 175160 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp577857ill; Thu, 3 Oct 2019 09:46:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqz/RgbOnipqmYNpHfK/LdVMeF08HAhZhaKS+6fmeyMKO0EKvShLqbXRs99djPQHv7pxtW5T X-Received: by 2002:a17:906:6c8:: with SMTP id v8mr8711025ejb.40.1570121211745; Thu, 03 Oct 2019 09:46:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570121211; cv=none; d=google.com; s=arc-20160816; b=XZhh2gIsE+QXx1nSSROBuPA53Ll33WNbqRf9ZeuFm+mPwZnz0GKGJZZNSZbVOhkJ/r HuBE34nA1OEw3G9BAqM9mltg5jN015x7GBp0c2vdcxxEA+mR8dsq0/eF1sRnAsCdqu5L 4sR1qBA1bX0TLymoSBgMOTcV26vapSzMRg3TBna31FakIDt2o2lP9dKS0Wl+EYFemwNw JEepMNAFxN5ccUB/3fCRyIocynXHpzfmlYEirgUZ4kn7yGGvVzqiWLGmpyvTUUtHei0y 1mlvLFI8/8gkmPZbAoqyt3p2DL1QIsvxbk/AyUViylp7TcPmrukrzL8rDyandowCNNi2 tb9A== 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=vUfCo6EATh9HVPhaL/yVBH4zOUCGDZe+WmIbcjte0A5raWsKALMUWAVGFaUTm9lBr9 dRXlsVKo5+g0UdeL9fnDfq91bx3wGQiZGRdmNNvArZBDA0PxRHc5q1hDJ8T2++RAiLOu vj8WAWGtSDCu6pB3jkdzsnobaJul/48pRuJFKmlXcjoJ4/p+KccDYsuscCvPuA9YS3Bt 7EIvGB2SWR6weWYDRMhtMI//WJ2J6SL2s1J38OPMdRbIDKgDC8N1xpSW9cNIl+1AaL1q 7ndY/25mIGYlN3b2oTr5oQYTxQJuubFG/yMPp6JsEJeZzpOQhKP6SXkqS4ToolMtEgA2 VeSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zVYqSXR2; 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 hh9si1478296ejb.313.2019.10.03.09.46.51; Thu, 03 Oct 2019 09:46:51 -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=zVYqSXR2; 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 S2389249AbfJCQqt (ORCPT + 14 others); Thu, 3 Oct 2019 12:46:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:60186 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392946AbfJCQqs (ORCPT ); Thu, 3 Oct 2019 12:46:48 -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 A28D5215EA; Thu, 3 Oct 2019 16:46:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570121208; bh=LHr0zQNTuWMvB8KfJDg2lp4+b/SuKXqID+v+rc6sg8g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zVYqSXR2uVCjbtsjahGoM52Q5/5TbG854kFRhWyvqC9UVQ7m6XSzpHjOO8+px8FJ/ RUNu5PkkVHyvcj1gm/uLIehdsWyR4AFYAMArSHDdkfLzEfa2NxtRxPqm2KckoJ54hf FKG/QBk5rcSWbG6BdPio4QdQ3JYyuiQ36MhjTf64= 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.3 195/344] dmaengine: ti: edma: Do not reset reserved paRAM slots Date: Thu, 3 Oct 2019 17:52:40 +0200 Message-Id: <20191003154559.443819896@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154540.062170222@linuxfoundation.org> References: <20191003154540.062170222@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/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) {