From patchwork Tue Sep 8 15:23:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 249371 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp4841763ilg; Tue, 8 Sep 2020 12:36:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSxp8RuI4EzG7XGvLecyNLAYoMW+bCeBm++q0869s/YiB8+lG7GTARgkVLXWBUqP5Q7UXZ X-Received: by 2002:a17:906:e918:: with SMTP id ju24mr19913ejb.442.1599593801734; Tue, 08 Sep 2020 12:36:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599593801; cv=none; d=google.com; s=arc-20160816; b=06Hcm33gTYkTbOxwMmr5wnkSdIXYp0FmPMBIctTpCuJbAi+me/pbN1NRkI1pGpaukP TstONTGN05EgHDTrya8kieXKcW6B2geCwCwC/k50vzDm0T+qfThK5m+Bp6M7mUzmnY4M btTxiGXzUPFXCRLdHMf6Mo9m2r23O5pFAMyQSNCWD4arHNcTFfxR+q6qvjrf/t6mI+D+ k7l6Hzg1K7Ws2ez49NuMhQpHoKIoNZ4p0OtZBHXtnfmgXneuNcN6JZadCK8RLT+bZ7pL LYMen5IOZiYt0lXdDK+BGyopAK9hHytk5afXuTSdSkNmO2v5rzXt8HX/joslh3MdPJO9 FWTg== 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=9odXaD6vCKoafFONXSFqD5A1Zem1FVWfL8mR4BHzk9w=; b=QlxA7QqvSHDJo/LohFnzQ7y7kTEgKgIV/rP4aPtAk3ZT+V+zeZnWcQHFsIuLjsm+bu A7pDp+g5/PqoxWlYuIb8UJ1jkkX/R6N5RhtAuvduTInEzjpsXdFnVfcXqF7uKLpOhxaX sq4jDQqqy8XBGLD0JS98tdSLQQeC//F1PPxuTf4nxZysiaDbcUmucCWUa6Wzrslx/Ri4 pJ5YTzh/LP/Lm/K8A8T3aQjEJhxvrZ25aPHoJ+K61HB0XqhB0Gn0Ap+mMI6Ju8yvh6mO 11UmG3M+y1ZWBa2E92Lunq5Vk320y/4qjlWGFAPzu8Ha9KRfwbIBLxIzB2OyISFSS1GG m8ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nu4QlNVL; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x2si15091eju.153.2020.09.08.12.36.41; Tue, 08 Sep 2020 12:36:41 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nu4QlNVL; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731859AbgIHTfi (ORCPT + 15 others); Tue, 8 Sep 2020 15:35:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:47728 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730967AbgIHP5Q (ORCPT ); Tue, 8 Sep 2020 11:57:16 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 2E97E23C91; Tue, 8 Sep 2020 15:36:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599579403; bh=R8jaWjAyQ+yI0TtsogPIEPznYFmbRymeMiijpJN2YFE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nu4QlNVLFEIeHVCfYXVjUTA4RMAAVokKIiTm6Av7cHRjhIv/Tt/m30BsFRbHCmegK Nh2BXmbNeojfTNf9V1Mqj/jqm/NJdO59R5k2ownke7LyXQwuySseO8PwhV+KqKnPbX aetyFA5SC69vn1nYBDfmbiEloraMxJMTLhnBNgdI= 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.8 063/186] dmaengine: ti: k3-udma: Fix the TR initialization for prep_slave_sg Date: Tue, 8 Sep 2020 17:23:25 +0200 Message-Id: <20200908152244.714205354@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152241.646390211@linuxfoundation.org> References: <20200908152241.646390211@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 33ebffa105990c43bf336cabe26c77384f59fe70 ] The TR which needs to be initialized for the next sg entry is indexed by tr_idx and not by the running i counter. In case any sub element in the SG needs more than one TR, the code would corrupt an already configured TR. Signed-off-by: Peter Ujfalusi Link: https://lore.kernel.org/r/20200824120108.9178-1-peter.ujfalusi@ti.com Fixes: 6cf668a4ef829 ("dmaengine: ti: k3-udma: Use the TR counter helper for slave_sg and cyclic") Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/ti/k3-udma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 6c879a7343604..3e488d963f246 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -2109,9 +2109,9 @@ udma_prep_slave_sg_tr(struct udma_chan *uc, struct scatterlist *sgl, return NULL; } - cppi5_tr_init(&tr_req[i].flags, CPPI5_TR_TYPE1, false, false, - CPPI5_TR_EVENT_SIZE_COMPLETION, 0); - cppi5_tr_csf_set(&tr_req[i].flags, CPPI5_TR_CSF_SUPR_EVT); + cppi5_tr_init(&tr_req[tr_idx].flags, CPPI5_TR_TYPE1, false, + false, CPPI5_TR_EVENT_SIZE_COMPLETION, 0); + cppi5_tr_csf_set(&tr_req[tr_idx].flags, CPPI5_TR_CSF_SUPR_EVT); tr_req[tr_idx].addr = sg_addr; tr_req[tr_idx].icnt0 = tr0_cnt0;