From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FD94C41621 for ; Tue, 24 Mar 2020 13:17:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28AF12098B for ; Tue, 24 Mar 2020 13:17:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585055848; bh=6sMiOYJlvl4BCbzeY5JOBzZ28TFMQhLKacMo9wqSaKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=il5hzIXT2LWR4oy78sVCUa9sYJH3eY9E7H/JFW7E0Lmh274RSHyWgo0pbZzSWhQJt kLTkWkgMwe0N5HdhzSF6j6f49fFMnZxyTFEzJOIHg/4oyQzKw9uxO9B5c+leEb6bh4 1G/VeXOvpBOTS1pn32o1+VqM2e7v1QtswlMDYYtY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728212AbgCXNRY (ORCPT ); Tue, 24 Mar 2020 09:17:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:37102 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728205AbgCXNRX (ORCPT ); Tue, 24 Mar 2020 09:17:23 -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 BB1FD206F6; Tue, 24 Mar 2020 13:17:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585055842; bh=6sMiOYJlvl4BCbzeY5JOBzZ28TFMQhLKacMo9wqSaKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SNnQyoDYDmYg+tb/LHq7xGVJvigEOG3QqohFaVvNNkTrTQENwTo5woAnkM78ZjuCI VCxTmB9iwpb5qyZEHh0atKONa9M1guk61vfZWEMIjuxuMPWuHu1/w2asvMoAM96gGD YCELZH0aJEZd5dk+9WU/tzGePCYiOEcVFHbaqZ2Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yuji sasaki , Vinod Koul , Mark Brown , Sasha Levin Subject: [PATCH 5.4 008/102] spi: qup: call spi_qup_pm_resume_runtime before suspending Date: Tue, 24 Mar 2020 14:10:00 +0100 Message-Id: <20200324130807.382615962@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200324130806.544601211@linuxfoundation.org> References: <20200324130806.544601211@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yuji Sasaki [ Upstream commit 136b5cd2e2f97581ae560cff0db2a3b5369112da ] spi_qup_suspend() will cause synchronous external abort when runtime suspend is enabled and applied, as it tries to access SPI controller register while clock is already disabled in spi_qup_pm_suspend_runtime(). Signed-off-by: Yuji sasaki Signed-off-by: Vinod Koul Link: https://lore.kernel.org/r/20200214074340.2286170-1-vkoul@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-qup.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 2f559e5311002..fa8079fbea77a 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -1217,6 +1217,11 @@ static int spi_qup_suspend(struct device *device) struct spi_qup *controller = spi_master_get_devdata(master); int ret; + if (pm_runtime_suspended(device)) { + ret = spi_qup_pm_resume_runtime(device); + if (ret) + return ret; + } ret = spi_master_suspend(master); if (ret) return ret; @@ -1225,10 +1230,8 @@ static int spi_qup_suspend(struct device *device) if (ret) return ret; - if (!pm_runtime_suspended(device)) { - clk_disable_unprepare(controller->cclk); - clk_disable_unprepare(controller->iclk); - } + clk_disable_unprepare(controller->cclk); + clk_disable_unprepare(controller->iclk); return 0; } -- 2.20.1