Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3667485pxb; Mon, 24 Jan 2022 14:53:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJxKV763vlIbHqB0fAqKFS1dxJ/uHp89jFxwZcLNe3crZak6ZdnOynVwotUZWX7Lbkro5Tq1 X-Received: by 2002:a17:902:b181:b0:149:90e2:896a with SMTP id s1-20020a170902b18100b0014990e2896amr16107210plr.149.1643064838684; Mon, 24 Jan 2022 14:53:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643064838; cv=none; d=google.com; s=arc-20160816; b=QDZprd2EQZEgXU+O0bk07sCal65pRGvjKdkUhmMXssMQX9Ei2ugTrwocskwvZs4I/i INBFMlH8ccktOn1oHd9QSdACHx6piloTBgYxzNof1HMpGK7v0Wyj/D/0FNUUWLTIxyDX KX6Vwrb0JiiTJ0trpTU313AB1s1QEUzl2MNg6cHUMJdC7Es/L3MLhCTpN7Aqn0L0p7pE aq6aHXxGGs+HAsizIV3dY7qClt44VJVZMufPKGrsABbnPUm1MorvDhDtsCowaea/NcIo /mrInaOgZLy68S7N8jX0zU9pbXw61yY/Lj5+vrpWP6okB0cb/E2PQUQN3W5kaRluYlbP 7X9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RJn9Kcmk3EqmV/rRBI7gBTLOCLtSYB7dsi9T20lCqyQ=; b=lG2KBVBkuNMcOdrfwLOlpvJQyahpb4a2o+q5jYIRXr1eCN7pcSvBeVn7cHoF14j/Kj DPpLFyxjs8bfYvoQU3NK1cQR54P7E9Nf9ppKhI/4+9lv/cTyyvK3BMsnn1zf+JNTbhiB Q5A/m4csE3/buApWa7mNmlRafG1qDhZnKg5qjIonP4Yh4OdBUMnQmV8jCLkn6J9fvSqA 566qndm4o+G9tnkqFiP8P8IQswZuCvtmQb+Il5gDNoKMMJFJu8xbLK6uaBO8YzlRLFGW M7vcJsR9zHpaGGtEkn6KJaeoti/Tre8dxZruMc4BsMPMl2WuNnwbjcpq3UGB75phiix1 n1+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Is6zTwPF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (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 b37si15373650pgb.385.2022.01.24.14.53.46; Mon, 24 Jan 2022 14:53:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-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=@linuxfoundation.org header.s=korg header.b=Is6zTwPF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1838916AbiAXWtV (ORCPT + 99 others); Mon, 24 Jan 2022 17:49:21 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:60776 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354114AbiAXVnN (ORCPT ); Mon, 24 Jan 2022 16:43:13 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EDAB361320; Mon, 24 Jan 2022 21:43:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA4D0C340E4; Mon, 24 Jan 2022 21:43:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643060589; bh=+O6Zta3ruIVFCjjsQEmorm5Dt7LAqB65TAvz9UppKls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Is6zTwPFTsCqxpJCZdVgeCSxX/SwEOGfKWNL6jR4s7MvigJblbgtyG/BsSmIRWH1E hQESr9NGV7hgBGvPBL/VbiyIzTUYV5I2rh4AhU4Bbiw00OU2vjkov/X0zix2ldhDnO jdB2rd4lagFU23yzNB06vUY/vk50OVinBtq5mfAA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tudor Ambarus , Vinod Koul Subject: [PATCH 5.16 0998/1039] dmaengine: at_xdmac: Fix lld view setting Date: Mon, 24 Jan 2022 19:46:27 +0100 Message-Id: <20220124184158.832161985@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184125.121143506@linuxfoundation.org> References: <20220124184125.121143506@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tudor Ambarus commit 1385eb4d14d447cc5d744bc2ac34f43be66c9963 upstream. AT_XDMAC_CNDC_NDVIEW_NDV3 was set even for AT_XDMAC_MBR_UBC_NDV2, because of the wrong bit handling. Fix it. Fixes: ee0fe35c8dcd ("dmaengine: xdmac: Handle descriptor's view 3 registers") Signed-off-by: Tudor Ambarus Link: https://lore.kernel.org/r/20211215110115.191749-10-tudor.ambarus@microchip.com Signed-off-by: Vinod Koul Signed-off-by: Greg Kroah-Hartman --- drivers/dma/at_xdmac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/dma/at_xdmac.c +++ b/drivers/dma/at_xdmac.c @@ -99,6 +99,7 @@ #define AT_XDMAC_CNDC_NDE (0x1 << 0) /* Channel x Next Descriptor Enable */ #define AT_XDMAC_CNDC_NDSUP (0x1 << 1) /* Channel x Next Descriptor Source Update */ #define AT_XDMAC_CNDC_NDDUP (0x1 << 2) /* Channel x Next Descriptor Destination Update */ +#define AT_XDMAC_CNDC_NDVIEW_MASK GENMASK(28, 27) #define AT_XDMAC_CNDC_NDVIEW_NDV0 (0x0 << 3) /* Channel x Next Descriptor View 0 */ #define AT_XDMAC_CNDC_NDVIEW_NDV1 (0x1 << 3) /* Channel x Next Descriptor View 1 */ #define AT_XDMAC_CNDC_NDVIEW_NDV2 (0x2 << 3) /* Channel x Next Descriptor View 2 */ @@ -402,7 +403,8 @@ static void at_xdmac_start_xfer(struct a */ if (at_xdmac_chan_is_cyclic(atchan)) reg = AT_XDMAC_CNDC_NDVIEW_NDV1; - else if (first->lld.mbr_ubc & AT_XDMAC_MBR_UBC_NDV3) + else if ((first->lld.mbr_ubc & + AT_XDMAC_CNDC_NDVIEW_MASK) == AT_XDMAC_MBR_UBC_NDV3) reg = AT_XDMAC_CNDC_NDVIEW_NDV3; else reg = AT_XDMAC_CNDC_NDVIEW_NDV2;