From patchwork Sat Apr 15 10:35:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 83704 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp973603vqo; Sat, 15 Apr 2023 04:18:32 -0700 (PDT) X-Google-Smtp-Source: AKy350Yv5qQP1fbFm/JLtG9q8CI2TTJ2AotHbWhyxHAPhbbRAmurXZtXM6e3vxx7d1Iu5/0GhsOy X-Received: by 2002:a17:902:c943:b0:1a6:6e78:9f7d with SMTP id i3-20020a170902c94300b001a66e789f7dmr6819868pla.49.1681557512356; Sat, 15 Apr 2023 04:18:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681557512; cv=none; d=google.com; s=arc-20160816; b=B9vbBx80putuHmiiTnRHJwFsGXwXkqdyymrulBzeC/WVFJEcDSOasTxoXtkizdSv11 kYbw8kXhRQ4C33H7V0gZJsovINQpROEwLTwD3hw5KBUvs+zkB1nE2lzd+7yTW5L96F7f KBxOp4vTos6GKr0g4hNRqArGkt5DviOSi3zrXHJxRHcCegPs+p7lHPqsgsepIWPJetVC qNJs6L2kJJU5TVvfxO1c0vEtebR2zDCR/cqWSjZMlNAvwb+91fM9jxHd1dRduKl96Rq6 yKcnuA3LA/KsdyPttTK+T9s5da+890Xc7IMpZu/aq/ZJoV7fFfgDK7CpiKTBxf81JsaT 3NNw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XarR7BmKiAuXLOXxBf6SEjIw8nfhOz+pxSQRaZ+beV0=; b=pD/HhsTv0ElbamL8ySY3197Zs9mFueGpiqDNBeEKVHDSbZTy1VmgceWpqIGDL5O1dn Ul6nRgds2bGwGGtAdhkz3dBu8I25CLm0VLKEVP98p3W9vSPOYHOa+YNM8GDy8wFfQezg QMMo8gQqapLK36yOIMuHqqAHhgdjpb825fLs32+1z8jg8afOyTL0TBUsZEKrgrPUURzk 3BdVdhQxG6rBvdJTqYkmTShPw72sDbhYCWVNtW7kSiohRmJmC1Tjv2B0roDjV6FJ31FD jA0vTjZU7G0xPYqfE8+5jJxTxP10SzChiJfaYSthovA+kRR+4CNRHY428PZaWjy4h4z4 NDwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Vm4+HXJ5; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ix9-20020a170902f80900b001a220a984f9si6693973plb.546.2023.04.15.04.18.18; Sat, 15 Apr 2023 04:18:32 -0700 (PDT) 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=@kernel.org header.s=k20201202 header.b=Vm4+HXJ5; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230092AbjDOKsE (ORCPT + 99 others); Sat, 15 Apr 2023 06:48:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230091AbjDOKsD (ORCPT ); Sat, 15 Apr 2023 06:48:03 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3148AF14; Sat, 15 Apr 2023 03:47:33 -0700 (PDT) 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 97FC061376; Sat, 15 Apr 2023 10:46:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14E07C433D2; Sat, 15 Apr 2023 10:46:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681555618; bh=R7SwTXxq4n6vsL5nvON8lNyUl7g6u9nqIP9ZCvDXMeQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vm4+HXJ58/UX9/57jm4JxlWyQwuSKMa6I9jcjkcvoJQ9StIJw1dF21zYloiplq+Gb q+b9IDyjPBO8JigcByB7O8kLMQK9LUs9nOKtRi8yWpgiz9wJpsFpGUNhVKmtzkIEyi 40KVCO+BcwfgBT2fRRppdMIWLkBn6g2daqrvf/KGFTD3GSEclUhn4yUlMgcu4XWHdW M0mgpiM9IE9ILsV3oFylUOIR047zMb0a/jPCnd1WVeMe+GiO0Ty138VsE9p9hfgE7K h76r1vc8OjMGa6ExoOuoa/h6Yn61PETb0hlCYynTOUOyHjD1Jj0nOAA/IGxtVg9ThM 3kul41SlS7/sQ== From: Jisheng Zhang To: Eugeniy Paltsev , Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 01/11] dmaengine: dw-axi-dmac: fix reading register when runtime suspended Date: Sat, 15 Apr 2023 18:35:51 +0800 Message-Id: <20230415103601.2979-2-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415103601.2979-1-jszhang@kernel.org> References: <20230415103601.2979-1-jszhang@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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?1763240850228228262?= X-GMAIL-MSGID: =?utf-8?q?1763240850228228262?= We should runtime resume the device before calling axi_chan_is_hw_enable(), otherwise we may see cpu aborts when accessing registers in axi_chan_is_hw_enable(). Signed-off-by: Jisheng Zhang --- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c index 7f3a60e28e38..23a10dbdecb7 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c @@ -462,13 +462,17 @@ static void dw_axi_dma_synchronize(struct dma_chan *dchan) static int dma_chan_alloc_chan_resources(struct dma_chan *dchan) { + int ret; struct axi_dma_chan *chan = dchan_to_axi_dma_chan(dchan); + pm_runtime_get(chan->chip->dev); + /* ASSERT: channel is idle */ if (axi_chan_is_hw_enable(chan)) { dev_err(chan2dev(chan), "%s is non-idle!\n", axi_chan_name(chan)); - return -EBUSY; + ret = -EBUSY; + goto err_busy; } /* LLI address must be aligned to a 64-byte boundary */ @@ -478,13 +482,16 @@ static int dma_chan_alloc_chan_resources(struct dma_chan *dchan) 64, 0); if (!chan->desc_pool) { dev_err(chan2dev(chan), "No memory for descriptors\n"); - return -ENOMEM; + ret = -ENOMEM; + goto err_busy; } dev_vdbg(dchan2dev(dchan), "%s: allocating\n", axi_chan_name(chan)); - pm_runtime_get(chan->chip->dev); - return 0; + +err_busy: + pm_runtime_put(chan->chip->dev); + return ret; } static void dma_chan_free_chan_resources(struct dma_chan *dchan)