Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3579844pxb; Mon, 24 Jan 2022 12:42:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJzBKzkD/eG10zFVyxVfT/bby4zqzhLTzCvW2a6BTWV9e+azQhaNCpM3Z+pVmK0jbG2ELmPI X-Received: by 2002:a17:902:e882:b0:14b:588d:e0ee with SMTP id w2-20020a170902e88200b0014b588de0eemr4884505plg.122.1643056956321; Mon, 24 Jan 2022 12:42:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643056956; cv=none; d=google.com; s=arc-20160816; b=Jsobq3qGhbWdceZu2o0tpQs9XymZ/urUGtG88sTLXDi2rrHVwtNM6bHuQa8WF/MexT nIzfLsEjuEEhM20NtdWx7SEJMHGAdCP8xAcWSmQ+dr/ENfxRzRjer+s54ehLHMBZLt+j IJ/yDuZ+NQeWTDBBippCBUeCrCDS7TGg98ENHsS2cbVASLP4dRPTlApzn/1D9seG5f9s m+bdc9+lQWqZ4CoPJjN/21lUf22bpDZ4+FALI0Tkb+LfO0/frnNOuVapLuxD3Rv98iNH MoHZA6UR50UTVavI3VDoAlkqTRJZmk8lq3IOQy8gY2jnglOHfq7/E7MYiEAu9+BL3uPU Im0w== 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=H77cS8aRUTYMXXB59tpAqM+ibj/vW9BwoACHslN71KX+NvVTLohJcv8XVpr0xZNjhL Cr1YLVVbfYfVht1d+pFr8pOXabYTPO0QDuoQeRVG7y0cIS3ILFy7GMk4Tta8YyDWGz+l ctIFlpsduWk0F5DAfAnnEyr5QeQPj8C+DPCYgPoovF+k1YAj1AMpprOc57CkaHt/MWUd TxP0+0l96eIQzJYALyjrHM4enlHWN0jNk/OcER9WuCUp0DWdp7zFBBJ3sPfHRRN815BC U4C8ihjEwkLqyXjtRTT+cFyeOo4pJBvY8kIgdGqHvAbmk+C5KyPcDxdsPeKcMxas59S0 NOQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bXxMZnrT; 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 z1si6319735plg.542.2022.01.24.12.42.23; Mon, 24 Jan 2022 12:42:36 -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=bXxMZnrT; 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 S1359500AbiAXT7p (ORCPT + 99 others); Mon, 24 Jan 2022 14:59:45 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:33092 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349371AbiAXTlC (ORCPT ); Mon, 24 Jan 2022 14:41:02 -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 ams.source.kernel.org (Postfix) with ESMTPS id E673DB811FB; Mon, 24 Jan 2022 19:41:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27AD1C36AE9; Mon, 24 Jan 2022 19:40:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643053259; bh=GmbIhl0GKXFYcgNw3rnSAj5/45aGoCjBXjN0MRLk7Lo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bXxMZnrTkPQ+k5ajnsQ5e2GetsyFeqBOe379YUa0QGlYUaT3rfE+Is7qRCz9H6tbH OBLGYZSJD4M/7lNfulV7+7i+GCmnP5aY14j6uT+M5InAs616+a9j1VMIr8EdSs8jPk FDi8TZ85HKKCod21N4KVtLym8o7eDnTvB2GWOZuo= 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.4 308/320] dmaengine: at_xdmac: Fix lld view setting Date: Mon, 24 Jan 2022 19:44:52 +0100 Message-Id: <20220124184004.418436997@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124183953.750177707@linuxfoundation.org> References: <20220124183953.750177707@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;