Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3628680pxb; Mon, 24 Jan 2022 13:54:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJx2VdYcnvYFI/GreGsS4JUxbGF8cXyoEgtYsF51rhWorTz5iOxjE4DeuNBGRhVHOz976k+t X-Received: by 2002:a17:90b:1e45:: with SMTP id pi5mr249014pjb.91.1643061275536; Mon, 24 Jan 2022 13:54:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643061275; cv=none; d=google.com; s=arc-20160816; b=FASLVQqAzvQzxIyGVma2Xy5JQ1wI82lCdar3PAiE2KEpOSAHTlu+Xb760TEnLpOmGX iumMdKICRgvBHPUDaw14vdVPqq95+ltogjf9AvPp4sKnyDOmxBo+1L0tzS9jPNgoQYel Xz1h5bv7WO8ZuwRa8NkufuzzlPAIbD00GyLpULTDfPaNBU3PM+qNA8JwWaqBitd2+C8v ZO+dLtjag7g4Chbwl/amd/09qnbvcON7T+DrRVlqxdXXUgkYJgV2sY/2jjpavLEdgMCd +9YyQnKPFuNWf4dilZeDECLOmFGhFUDsBmBeBiS6TalyRUfEa7wI3GzS8Si4AqpuRDHX /piw== 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=YOfJLLkWE1OhE8tbTPDgRPW1kUsLSBmeeXwqvnLwYLE=; b=FiRl28ujJ5xLf3lnOTwCmGeTW7lYZJ0DRLXZFl4mR7iQE0lcxXeIx++0jzbbiHB0xa I6CQfJkBxR9vK8P0UxKi1L4tBgAQmNQu7fp4votbtyz/kK4Bnu4Y0JqhecHRPfXDbube PrCjkAOPWbY54N7PLoGwxYpP8RLw5M7128QqX0AjE5K5TBsseieKsHCPG5sl/Hr3OngE tPmOSkRhmOUf59TRYAg8Yxh4PJtElYuAKfqWmjjfQpcnmC+Bnlw08Tfa/dCPvrZkXSZ4 ap+SyLGRGZd+ls2dsjF07eCeooSNbQY5C3DatqIDHX3eAncYj2Ov6h34rts76RGxTf04 E4BQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=02K6P+jM; 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 bi10si13102011plb.110.2022.01.24.13.54.20; Mon, 24 Jan 2022 13:54:35 -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=02K6P+jM; 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 S1458065AbiAXVmo (ORCPT + 99 others); Mon, 24 Jan 2022 16:42:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1446720AbiAXVJQ (ORCPT ); Mon, 24 Jan 2022 16:09:16 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A640C08E859; Mon, 24 Jan 2022 12:08:32 -0800 (PST) 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 D880060916; Mon, 24 Jan 2022 20:08:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DE35C340E5; Mon, 24 Jan 2022 20:08:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643054911; bh=GmbIhl0GKXFYcgNw3rnSAj5/45aGoCjBXjN0MRLk7Lo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=02K6P+jMTc54Ox5Gn03N/2Ef9d/zIsI6+jKuYXEt5AgqlDsWpjRYbeaUTG0PKA5nw zsCJ8qpfbz07Cu/8PTFHrNKmv6nUAF1oX4tqJ04hFabdxFi015YiW3+wqzsfeO1ryX 99uLxzp9l+MpD4uE/SZy4ebiPvWTRNsSZ9f1LG6I= 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.10 544/563] dmaengine: at_xdmac: Fix lld view setting Date: Mon, 24 Jan 2022 19:45:09 +0100 Message-Id: <20220124184043.247442822@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184024.407936072@linuxfoundation.org> References: <20220124184024.407936072@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 @@ -89,6 +89,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 */ @@ -353,7 +354,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;