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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 1561DC43219 for ; Sat, 27 Apr 2019 01:54:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D1B2720679 for ; Sat, 27 Apr 2019 01:54:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556330094; bh=P0SYwHsozH/6iagqvsGNIJFk3gv2btfITSQrcBJvrNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NFpuIUioB2sdrptnr/wHt/Qg02zHAUSA2sZ69qm7Ul/tzuJUu7yT3YroJX1Y1c/ge qxQx/Qcxg07SqT98vSVCF++5w65PDysBvUe4a6dgjyEyhw9Ti1IfID6XtslKSQy+/U r4liLhozKgsUMTW1QLpaECCclf7hN9WCT5JCMGE8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727673AbfD0Bjg (ORCPT ); Fri, 26 Apr 2019 21:39:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:42746 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727666AbfD0Bjf (ORCPT ); Fri, 26 Apr 2019 21:39:35 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6342120873; Sat, 27 Apr 2019 01:39:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556329175; bh=P0SYwHsozH/6iagqvsGNIJFk3gv2btfITSQrcBJvrNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mNDXZPsJzTZaUDFb4ovXxOeYGRzBcDxxaVZqMzDTzYB/neRQ+WzFf864cPEcZ5QCe ImRsNgACWh3nGh39kFrl6DFToVMWdTHBZrqxQRfa1rwOo1FYa+Fjbh3g34NBDXwwqX v4r3jfDxUkFlJDq+BKdDXoIUWCqZl0tF6Srdtsu0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sugar Zhang , Mark Brown , Sasha Levin , linux-rockchip@lists.infradead.org Subject: [PATCH AUTOSEL 5.0 37/79] ASoC: rockchip: pdm: fix regmap_ops hang issue Date: Fri, 26 Apr 2019 21:37:56 -0400 Message-Id: <20190427013838.6596-37-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190427013838.6596-1-sashal@kernel.org> References: <20190427013838.6596-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sugar Zhang [ Upstream commit c85064435fe7a216ec0f0238ef2b8f7cd850a450 ] This is because set_fmt ops maybe called when PD is off, and in such case, regmap_ops will lead system hang. enale PD before doing regmap_ops. Signed-off-by: Sugar Zhang Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/rockchip/rockchip_pdm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c index 400e29edb1c9..8a2e3bbce3a1 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c @@ -208,7 +208,9 @@ static int rockchip_pdm_set_fmt(struct snd_soc_dai *cpu_dai, return -EINVAL; } + pm_runtime_get_sync(cpu_dai->dev); regmap_update_bits(pdm->regmap, PDM_CLK_CTRL, mask, val); + pm_runtime_put(cpu_dai->dev); return 0; } -- 2.19.1