From patchwork Tue Aug 10 17:29:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 494360 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp4178662jap; Tue, 10 Aug 2021 10:40:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8aLImSVYiROeIftBrxX9wAldxoS5GWCUw2NFxV21F/afohoW73i+NLb4u49Ra28d5L99N X-Received: by 2002:a05:6402:39a:: with SMTP id o26mr4035489edv.64.1628617240849; Tue, 10 Aug 2021 10:40:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628617240; cv=none; d=google.com; s=arc-20160816; b=KpoHlrkdEiZqgMmRHI7x32KMhyawlIHpiKbVQDWH3rX77DgSz7DmmtnWjQyWZm33/o yl4qNhCDbxSYwa+1hX8lz6Hs/X4HKELrFEnWdxj67Zuy78CUns80SyBWO/Jvn6gqpILp Lxnnt+MRXT0MRN7ITG1mH1vyUUbtkLD+/ejhUSwXIIRYcPYAgPryS3jxFnGf2v7dXTiv 29Ot4qiAoZ0y0NoXQptsvaDf5uoQUcnjkPc/tfWz29Juc+OySiOpu7XbkHaQJTdC1z+f k7exQdN7MUbvr9HCeC2Y1q/hB5uEILURH2/uhqa5Vdu0xYSY2zNBXWK1XMRfmIL0LZbx j7hg== 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=Fu+FZiJOqvw2zfp5lDAqXHz7EaRH9cx99hHUxwKHk78=; b=HKUnm97z34Fw/9GC1lsfOVPI8HNoeoQkoeo5ec7xRW64O+BMEScj7YRmbxV2VZl7PP pE0PkhUsemyjwxrgrKrcgXBnvKTDbrfzNbQwSKHnZW9fYofC6WzjOAUxtrV+msA2MHPc N2X9YmTWMPij3DaA/IWKs3TvIFc8wgxrtti0CNm1ZBzNgLpaG8fgHUzsFaApBw6CmfQK I0IyBgWu2r71EHUVuEzj0d1haupWVdqb2FaIaUFTNj3BxcjxVAW1V7jLAjgmDTDhWQP2 s/5wVx5KyWVqOPIG5tEWtgpW1YklSda4YinngUr1idbb7a617akkOIani4EK/hgjG2cO ZbcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="g/pbbBX7"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 jo21si22108514ejb.82.2021.08.10.10.40.40; Tue, 10 Aug 2021 10:40:40 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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="g/pbbBX7"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S232640AbhHJRkp (ORCPT + 12 others); Tue, 10 Aug 2021 13:40:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:42218 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235419AbhHJRje (ORCPT ); Tue, 10 Aug 2021 13:39:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7E2AF6115B; Tue, 10 Aug 2021 17:37:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628617041; bh=j1a6Z+n+QRy7CFaUYhg8hxITUPRiaBKuXeJkfzOuPSo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g/pbbBX7g9jqHZIO8CKnvifTR8wYny21rHGEyAjzyhdodWPGx9D2p0REQpS5CxUx6 lflfalh7ja6Q2d2E/OXLJHbchCqSm7IxpoGU42DzckcUZ7gKd1mHDe1ItENGcJPUuX RlTFLv29NOlfGcDK9KksUfknGhlxJutB+b2UN9k4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Kunihiko Hayashi , Vinod Koul , Sasha Levin Subject: [PATCH 5.10 019/135] dmaengine: uniphier-xdmac: Use readl_poll_timeout_atomic() in atomic state Date: Tue, 10 Aug 2021 19:29:13 +0200 Message-Id: <20210810172956.325942856@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810172955.660225700@linuxfoundation.org> References: <20210810172955.660225700@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kunihiko Hayashi [ Upstream commit 55f24c27b6c1a840b62fe297616f1f9ea3576cb7 ] The function uniphier_xdmac_chan_stop() is only called in atomic state. Should use readl_poll_timeout_atomic() there instead of readl_poll_timeout(). Reported-by: Dan Carpenter Fixes: 667b9251440b ("dmaengine: uniphier-xdmac: Add UniPhier external DMA controller driver") Signed-off-by: Kunihiko Hayashi Link: https://lore.kernel.org/r/1627364852-28432-1-git-send-email-hayashi.kunihiko@socionext.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/uniphier-xdmac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.30.2 diff --git a/drivers/dma/uniphier-xdmac.c b/drivers/dma/uniphier-xdmac.c index 16b19654873d..d6b8a202474f 100644 --- a/drivers/dma/uniphier-xdmac.c +++ b/drivers/dma/uniphier-xdmac.c @@ -209,8 +209,8 @@ static int uniphier_xdmac_chan_stop(struct uniphier_xdmac_chan *xc) writel(0, xc->reg_ch_base + XDMAC_TSS); /* wait until transfer is stopped */ - return readl_poll_timeout(xc->reg_ch_base + XDMAC_STAT, val, - !(val & XDMAC_STAT_TENF), 100, 1000); + return readl_poll_timeout_atomic(xc->reg_ch_base + XDMAC_STAT, val, + !(val & XDMAC_STAT_TENF), 100, 1000); } /* xc->vc.lock must be held by caller */