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=-12.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS autolearn=ham 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 E45DDC4360F for ; Thu, 4 Apr 2019 08:17:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF3CC2147C for ; Thu, 4 Apr 2019 08:17:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554365840; bh=8vaCCJftAlvWXo1BrHwMU61KzZ/eaKCzHoIfhkosh+I=; h=From:To:Cc:Subject:In-Reply-To:Date:List-ID:From; b=AHWjtlYAGAaK/3EfSlLbUe+iyc8d42QR8tSHkWQQ3hED73RDtkznwChAYecxVzrC2 4a8kRwPEJfv1PCi1eiwWgULBHM2Eg1BTfWGnV52ikYj7Hc7N5zNTQxtGBI32dfUbu0 geGfXJ07Ss0CTg5KY8imlh0ysopXDlTxWRtAcMCM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728811AbfDDIRT (ORCPT ); Thu, 4 Apr 2019 04:17:19 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:51276 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728744AbfDDIRP (ORCPT ); Thu, 4 Apr 2019 04:17:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=4IjJUDwwQm4taL0qsOOF+oE9ce3AozsivfzJGbmmA7k=; b=BaVal56jnNSx 4VRU1SWLkCkPbXHxQffLzBRGHb/6IzzoE/+9OzO46X5PunhyaYnwi4kKbOQ8Y6uEEIp3qcjTLGb49 6VSe21pYVFirijXuDcQH1ZgxWGegUd1L3vyvgFrHGqu/HccIclOFp96tLu7ow8sQDd5LC9gJw7CwF RA8WM=; Received: from [147.50.13.10] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hBxYY-000536-Ef; Thu, 04 Apr 2019 08:17:06 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 5AB33441D3D; Thu, 4 Apr 2019 15:17:03 +0700 (+07) From: Mark Brown To: Sugar Zhang Cc: Mark Brown , heiko@sntech.de, broonie@kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Takashi Iwai , Liam Girdwood , linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, alsa-devel@alsa-project.org Subject: Applied "ASoC: rockchip: pdm: fix regmap_ops hang issue" to the asoc tree In-Reply-To: <1554298856-59028-2-git-send-email-sugar.zhang@rock-chips.com> X-Patchwork-Hint: ignore Message-Id: <20190404081703.5AB33441D3D@finisterre.ee.mobilebroadband> Date: Thu, 4 Apr 2019 15:17:03 +0700 (+07) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The patch ASoC: rockchip: pdm: fix regmap_ops hang issue has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From c85064435fe7a216ec0f0238ef2b8f7cd850a450 Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Wed, 3 Apr 2019 21:40:45 +0800 Subject: [PATCH] ASoC: rockchip: pdm: fix regmap_ops hang issue 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 --- 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.20.1