From patchwork Mon Oct 24 11:30:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9422 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp478850wru; Mon, 24 Oct 2022 07:18:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6u65iPWxe2RYFmwJN7qkwKG+hiSk1eCXaYxK6yikTQyhq0YrwscEgT1ZN5w+7xO5pRcZ7d X-Received: by 2002:a17:907:d22:b0:78e:2788:51ae with SMTP id gn34-20020a1709070d2200b0078e278851aemr27278648ejc.689.1666621086275; Mon, 24 Oct 2022 07:18:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666621086; cv=none; d=google.com; s=arc-20160816; b=QAT9T/61Z1RJ2lNisaJ02BeoYRBgu3FZliygvlGZ9jum19/PRvc8oCTifwhZ+SplbP YjS2ddW9tg2OlIZ920WRIEWUMpTukDFfGpJiKwLTmMWy6pWUHqO7rv4k1tM3evrLAsSL /JybSAShUZa3S5LkbNpdX4G0AldowrxhuGIzuo0+tOfGdFygAsydMO61MspsoOTSFoXY 9a89sM0rHvSBu97PEQiRbC/keccWE6S8IUdYtUCMEBb5U4gGREUTgp7zryc3Dl6wUqTz 34Ie+lnGjzTy9hY+gl7BydPJVv5RppcRHfvoYtu8EzlI23OGgj0LYO7tGLpHq612a4El WQSw== 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=OB0xPnEEL+eHOwvDOcLgO4naMXYzl622J5Df3zK6pao=; b=NcZJGRIbaULEL8Kk/qjNNNXGKUu0GdswWuO6a9tzwqOlzyugxMrVbh9Ew9D6ycrre/ 34Y50lnk/3Y5u3v6ToMZZTqzYE3BVMq1ud6mBDiIbI2Ox/K66yh2PWM1fikbNWw+5cmP FkahaxzB0UN2FPkUo0MMioBlCrsb5VRK+hqdGYpwC6Z2D84CEANjHVcC9FdmMRxiRkHY MqyKj84lL3v0LGZQEgw9gzxuzSz0+rQ/UidsmBg2lUnLk9JwrVqHMlcdJn57BJXjwcSQ XXecVzmqrdBB3bzxuN3QHF93cyG+ogHTK2EvpUowXg39js9r3/ht1T4cCkmWR3sk1c3e gnTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ebSBJLye; 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=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dt19-20020a170907729300b00732fcbcfedesi29568816ejc.623.2022.10.24.07.17.39; Mon, 24 Oct 2022 07:18:06 -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=@linuxfoundation.org header.s=korg header.b=ebSBJLye; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236913AbiJXOAa (ORCPT + 99 others); Mon, 24 Oct 2022 10:00:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237067AbiJXN7Q (ORCPT ); Mon, 24 Oct 2022 09:59:16 -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 7C6908C002; Mon, 24 Oct 2022 05:46:42 -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 ACCB8612B3; Mon, 24 Oct 2022 12:46:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2B7EC433C1; Mon, 24 Oct 2022 12:46:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615597; bh=jggFdXoYPgsmJa9ZXLL1sfM4l5+1zveb2heyzFPoVHE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ebSBJLyexLfwmKBfPDJWqiYGxeWWQMfovxmCqV8pzneJQMgtwf9YTF2zlMVjogAEx 8dUCNgVHBj4Fu9YikLOIU65MXjufmrdepVQInDVZPg3v6gjmiDDs6yFFgeNyx6EIUM WizmtImyojSVsh2vTkDDllb6nOrFeYhiX21/TEcQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jie Hai , Zhou Wang , Vinod Koul , Sasha Levin Subject: [PATCH 5.15 294/530] dmaengine: hisilicon: Disable channels when unregister hisi_dma Date: Mon, 24 Oct 2022 13:30:38 +0200 Message-Id: <20221024113058.376538032@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1747578872590592869?= X-GMAIL-MSGID: =?utf-8?q?1747578872590592869?= From: Jie Hai [ Upstream commit e3bdaa04ada31f46d0586df83a2789b8913053c5 ] When hisi_dma is unloaded or unbinded, all of channels should be disabled. This patch disables DMA channels when driver is unloaded or unbinded. Fixes: e9f08b65250d ("dmaengine: hisilicon: Add Kunpeng DMA engine support") Signed-off-by: Jie Hai Acked-by: Zhou Wang Link: https://lore.kernel.org/r/20220830062251.52993-2-haijie1@huawei.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/hisi_dma.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/dma/hisi_dma.c b/drivers/dma/hisi_dma.c index f680e9b40bf7..70a0d784a6a3 100644 --- a/drivers/dma/hisi_dma.c +++ b/drivers/dma/hisi_dma.c @@ -180,7 +180,8 @@ static void hisi_dma_reset_qp_point(struct hisi_dma_dev *hdma_dev, u32 index) hisi_dma_chan_write(hdma_dev->base, HISI_DMA_CQ_HEAD_PTR, index, 0); } -static void hisi_dma_reset_hw_chan(struct hisi_dma_chan *chan) +static void hisi_dma_reset_or_disable_hw_chan(struct hisi_dma_chan *chan, + bool disable) { struct hisi_dma_dev *hdma_dev = chan->hdma_dev; u32 index = chan->qp_num, tmp; @@ -201,8 +202,11 @@ static void hisi_dma_reset_hw_chan(struct hisi_dma_chan *chan) hisi_dma_do_reset(hdma_dev, index); hisi_dma_reset_qp_point(hdma_dev, index); hisi_dma_pause_dma(hdma_dev, index, false); - hisi_dma_enable_dma(hdma_dev, index, true); - hisi_dma_unmask_irq(hdma_dev, index); + + if (!disable) { + hisi_dma_enable_dma(hdma_dev, index, true); + hisi_dma_unmask_irq(hdma_dev, index); + } ret = readl_relaxed_poll_timeout(hdma_dev->base + HISI_DMA_Q_FSM_STS + index * HISI_DMA_OFFSET, tmp, @@ -218,7 +222,7 @@ static void hisi_dma_free_chan_resources(struct dma_chan *c) struct hisi_dma_chan *chan = to_hisi_dma_chan(c); struct hisi_dma_dev *hdma_dev = chan->hdma_dev; - hisi_dma_reset_hw_chan(chan); + hisi_dma_reset_or_disable_hw_chan(chan, false); vchan_free_chan_resources(&chan->vc); memset(chan->sq, 0, sizeof(struct hisi_dma_sqe) * hdma_dev->chan_depth); @@ -394,7 +398,7 @@ static void hisi_dma_enable_qp(struct hisi_dma_dev *hdma_dev, u32 qp_index) static void hisi_dma_disable_qp(struct hisi_dma_dev *hdma_dev, u32 qp_index) { - hisi_dma_reset_hw_chan(&hdma_dev->chan[qp_index]); + hisi_dma_reset_or_disable_hw_chan(&hdma_dev->chan[qp_index], true); } static void hisi_dma_enable_qps(struct hisi_dma_dev *hdma_dev)