From patchwork Mon Jan 30 15:17:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 50343 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2238513wrn; Mon, 30 Jan 2023 07:22:36 -0800 (PST) X-Google-Smtp-Source: AK7set+ASlAaADyew/9jNiZTCu234MwWpq4hJ8QmGoJVB9NgB2p5m+QiLRAtMgJ2Ydr5MnbbwJMZ X-Received: by 2002:a05:6402:712:b0:4a1:7543:d6ad with SMTP id w18-20020a056402071200b004a17543d6admr14386332edx.28.1675092156679; Mon, 30 Jan 2023 07:22:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675092156; cv=none; d=google.com; s=arc-20160816; b=P9671duiwn1vH8VEGfMzWt9UcRs5Uz5EsgG7OMQ1J1AOkwpctfLt+i38hiT4HGooJt d+2+i966VpRg3/JGNt8qnSNI6hWlVVMWvnGsp7Jd+ZNgtiSpH4ofJDnb3eAQI5g27Evn Gave4I7PCuUWL9/oWysLK36Pd5VgeWb9MrkX3TsyftSh9rkiNsm+d7LpOIWtnQOQD7+P 8DocWJrmLaF8uv0KirJQbylhSwwBs4HuMH2V7WhQg9qV2Bu24Gocp48vzY6AFHb3yvs/ oAA4OPA0ytwgW/MwXUl98DuQqGUZ00+IKyCaBKix59s3V2rU7EcNkyfQG+BnSsYDWKNT lSig== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=PLL0BZ4IlAGzIaNNQDInw2daiPLT1DnPheFP95b2I7g=; b=UAwVmcUCNUgt8T1Vb9GBJwtdv+Ajgb160jnneBp60KctMxnpIUtVsvfkKgzFao2fpO +1EbSl7UBR3gZiCRXrrVr6xNg+N6lF49mImOoeSh7I6D4ASe6HFJ0juhcEatK12haI/y pIjwk4mf3Bj+sgT9AmMCafNPBDIAgQ0emNNjJ0hQOrXphCkgcO8Gd+ZZBxW+vM9DoR/q eVbPRdT/FilA/RGeZXrrJ2wdGASgrGqyRJQ60GPvjLPFJTW8gOkRkef4K4LhFKyZS5it v38rtx9AC3jeet5M1XFAmibMrwhLrju2M49VY58xdGz7DRTfqpl/C/zeANhOHkwhPrSk kZjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=In+dspDE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y17-20020a50ce11000000b004a2181432ecsi10184224edi.558.2023.01.30.07.22.13; Mon, 30 Jan 2023 07:22:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=In+dspDE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235731AbjA3PTA (ORCPT + 99 others); Mon, 30 Jan 2023 10:19:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238127AbjA3PSq (ORCPT ); Mon, 30 Jan 2023 10:18:46 -0500 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 619193D92C; Mon, 30 Jan 2023 07:18:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675091899; x=1706627899; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=92LbvsRwBB+FsQXF+k+MJ2NaG025JyCEXU4mtLMGezM=; b=In+dspDEH5iRsY8r8V8JDntwbrpVenyxNDBSydO2WPOGu8RPgYTVxRLm 6vCYin9z6rynMkf00SiQ6eXnf7pJqIgOpZbnlc+C6p1lV+fmlZyKGGelE G8K1nBj+Y2JPyZThzyo0Xd0LtDX53hsG1NxPBstbWfZeSNHNmkoLgBipj 98ztUZPsIM+wQ67ykMgninBPZS9AmSKI7B4yS1+4xOwfsZmCCFx3nxFUv YhVbgkgAN2Pr6vUwTMR8jQC9Snx9x4Cx/WpzjDVe9wiON17ALoIu4wjIB QtCfzSVBzvv/kz9sdhMisv27FxQEgjS200NGqKv8O+TJsPFtNwK1wJ8Yn g==; X-IronPort-AV: E=McAfee;i="6500,9779,10606"; a="307233097" X-IronPort-AV: E=Sophos;i="5.97,258,1669104000"; d="scan'208";a="307233097" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2023 07:17:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10606"; a="837994822" X-IronPort-AV: E=Sophos;i="5.97,258,1669104000"; d="scan'208";a="837994822" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 30 Jan 2023 07:17:13 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 2DECF152; Mon, 30 Jan 2023 17:17:50 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Viresh Kumar , Vinod Koul Subject: [PATCH v1 1/1] dmaengine: dw: Move check for paused channel to dwc_get_residue() Date: Mon, 30 Jan 2023 17:17:47 +0200 Message-Id: <20230130151747.20704-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756461433351538730?= X-GMAIL-MSGID: =?utf-8?q?1756461433351538730?= Move check for paused channel to dwc_get_residue() and rename the latter to dwc_get_residue_and_status(). This improves data integrity as residue and DMA channel status are set in the same function under the same conditions. Signed-off-by: Andy Shevchenko --- drivers/dma/dw/core.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c index 97ba3bfc10b1..5f7d690e3dba 100644 --- a/drivers/dma/dw/core.c +++ b/drivers/dma/dw/core.c @@ -889,7 +889,8 @@ static struct dw_desc *dwc_find_desc(struct dw_dma_chan *dwc, dma_cookie_t c) return NULL; } -static u32 dwc_get_residue(struct dw_dma_chan *dwc, dma_cookie_t cookie) +static u32 dwc_get_residue_and_status(struct dw_dma_chan *dwc, dma_cookie_t cookie, + enum dma_status *status) { struct dw_desc *desc; unsigned long flags; @@ -903,6 +904,8 @@ static u32 dwc_get_residue(struct dw_dma_chan *dwc, dma_cookie_t cookie) residue = desc->residue; if (test_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags) && residue) residue -= dwc_get_sent(dwc); + if (test_bit(DW_DMA_IS_PAUSED, &dwc->flags)) + *status = DMA_PAUSED; } else { residue = desc->total_len; } @@ -932,11 +935,7 @@ dwc_tx_status(struct dma_chan *chan, if (ret == DMA_COMPLETE) return ret; - dma_set_residue(txstate, dwc_get_residue(dwc, cookie)); - - if (test_bit(DW_DMA_IS_PAUSED, &dwc->flags) && ret == DMA_IN_PROGRESS) - return DMA_PAUSED; - + dma_set_residue(txstate, dwc_get_residue_and_status(dwc, cookie, &ret)); return ret; }