From patchwork Tue Jul 7 15:16:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 235017 Delivered-To: patch@linaro.org Received: by 2002:a54:2c11:0:0:0:0:0 with SMTP id g17csp304181ecp; Tue, 7 Jul 2020 08:23:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKmZLlxF7u6C4CCbzc+wNFaSOiagvV/cqOZtqhsE/G7TtLEj0UGPvNEqvEqHW3nIv92NOC X-Received: by 2002:a05:6402:2cb:: with SMTP id b11mr56821315edx.66.1594135392441; Tue, 07 Jul 2020 08:23:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594135392; cv=none; d=google.com; s=arc-20160816; b=z1M3mpQNrTQBIe6nmDyPJXuGZTasvVXKTpryketzRA9WybgL2W7o1YnuQRKpuzebU4 WBF9M6xKzN554RujMNjVNjjPwGYJK1e/D3QiB55CH47G5Uf4rLqi0nC+mBTpOb7ON0tN yRCyMS6jjfWjkDI8tjVJBbpC6WgcmErbMtX3s44vf42tfAEGzqgP5IRbWodGbpYpBDkS WTRJPbR7reZSvEsrKWSGgJE8R6I3DPYLRLvEgyKk1TI/W15jkR1I6bSV4j+/omFqeWrt qBzbAwL/A7q5MtAonBz0P0wS0yRcy2qvp7tqGS9boyAQYr+h03AmIEVM+XwiL0gTRpSN hjVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qEXaeO/RBCE4gxY1zUzUaGeK5kTxbPVf9w68DVQb/Ww=; b=VBGpS74+HnIilryAfdViYYRkjw4ODi0cydsz/SzeLRgA2Gi5JtkgQbUouLJTt3RsSX /LJAKL+TRiocV3PnySiAKtpLt6Fho/N/mlSbyro8o+mPvmx6NzD2aqMb924dtFvRvDAP sdj98PdrNVNDJr5H6sOQWY5JWV4pmr/fp0zvBSaGAq4zSPhua5dSBXT/TWANE6+i/hH8 rMlXD6gA4+7e0ruRYHtOBk7JszBHM5DWQRsulEd/3iDOa0LK8tCb6b8kC9CaiIqapZlS 5UR/27FDfG8SYt1eYuvAsm9TBXz5PQflq3T5AmDGIEZBppdP8NXg8GPU01dOpEdOrEMn HPnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ww75triT; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y17si14932695edw.91.2020.07.07.08.23.12; Tue, 07 Jul 2020 08:23:12 -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=@kernel.org header.s=default header.b=ww75triT; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729941AbgGGPXK (ORCPT + 15 others); Tue, 7 Jul 2020 11:23:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:36096 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729950AbgGGPXK (ORCPT ); Tue, 7 Jul 2020 11:23:10 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DE16B207CD; Tue, 7 Jul 2020 15:23:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594135389; bh=t48+Xhwq9/p8QGgsPqjcI4Z6WeMmsCy0ku+QepkjvXw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ww75triTQgAHN1JQZlS7oCve4Mw5O51C7dvlpVr34Cy2g1e0gJN2sao9ZSksI8DoD 2VbSIjz/RSjrPBHVwDk2p5bLpScrUl7ps/AYlbXEuRRbPu196ssG35gfWU6wIpRNIo X3LeD7/obuIAIA7Z0UKORme9v4x7h5YUAw9ElNFo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tero Kristo , Santosh Shilimkar , Tony Lindgren , Sasha Levin Subject: [PATCH 5.7 021/112] soc: ti: omap-prm: use atomic iopoll instead of sleeping one Date: Tue, 7 Jul 2020 17:16:26 +0200 Message-Id: <20200707145801.997136149@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200707145800.925304888@linuxfoundation.org> References: <20200707145800.925304888@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tero Kristo [ Upstream commit 98ece19f247159a51003796ede7112fef2df5d7f ] The reset handling APIs for omap-prm can be invoked PM runtime which runs in atomic context. For this to work properly, switch to atomic iopoll version instead of the current which can sleep. Otherwise, this throws a "BUG: scheduling while atomic" warning. Issue is seen rather easily when CONFIG_PREEMPT is enabled. Signed-off-by: Tero Kristo Acked-by: Santosh Shilimkar Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- drivers/soc/ti/omap_prm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.25.1 diff --git a/drivers/soc/ti/omap_prm.c b/drivers/soc/ti/omap_prm.c index 96c6f777519c0..c9b3f9ebf0bbf 100644 --- a/drivers/soc/ti/omap_prm.c +++ b/drivers/soc/ti/omap_prm.c @@ -256,10 +256,10 @@ static int omap_reset_deassert(struct reset_controller_dev *rcdev, goto exit; /* wait for the status to be set */ - ret = readl_relaxed_poll_timeout(reset->prm->base + - reset->prm->data->rstst, - v, v & BIT(st_bit), 1, - OMAP_RESET_MAX_WAIT); + ret = readl_relaxed_poll_timeout_atomic(reset->prm->base + + reset->prm->data->rstst, + v, v & BIT(st_bit), 1, + OMAP_RESET_MAX_WAIT); if (ret) pr_err("%s: timedout waiting for %s:%lu\n", __func__, reset->prm->data->name, id);