Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp881145pxk; Thu, 17 Sep 2020 20:12:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYX88J+9irTTlwC5nBqKUF4PKV/rhbyPLtvhvIK37AyeMGIX/iWSDAFAH+2r9WPaX/xe+4 X-Received: by 2002:a17:906:aacb:: with SMTP id kt11mr33593429ejb.294.1600398770716; Thu, 17 Sep 2020 20:12:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600398770; cv=none; d=google.com; s=arc-20160816; b=DzoHSDkFXzdfTZwW6/cQEP6Cwfn+vW0U0M27qgNdwcR93z5cTObAX3ERvCZs/EhAsG 8D8XAsJEC1zLS4pKZ5LJFW2HVilHDPJVIZ/S5RvVqb4fHIqpw7YdAnSIDjbavXgcPtvY D8gcbG4mKyhw6c1B9MEec7JfDXrKUnLjd82A02wPeJGKVIWYNChpsMZplkIuZnEHy9eS PyWTi1/yBdHTfs1pLlqf7U9Pog4G1pAODT93czBGcxcmC02Y3ZBEZgY8IB3NB37c/B5v vMI86U8IqbJFmsxQQW4aWN153JrjCvhBYopyMEcZWO/zg2s6rj16BzkPvp2Q054FU9mT VaGQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zBrMtfjtnF0wSHOBbxomlKThXorq41fwEnEjerlXleA=; b=qLAuIAw2xXZ2Yh021tjBqcZDvPsWGAoVkvNBgKVxYwSCJKVaZvwIMydM0dCTujy5jQ 22ORUqb2APFL5FB74iXvF51tSeG6w6IvGbOVXmwTCwnsFBUtG2rQE8eEv141bw6lvw45 qmmS2y9fzQwQOm0QOE5S735/daLF5d8qKOYSFefCNsbsDwTPDQQQIQtLD+VGc0WiY+wt 0uF5kG+vALwqkEkmnGtEgWMA1lLL1GAiZ2d57Duk8jyYTW5FFLZnid18TIk4hB3ZAllQ nrtOyILgfyiSwFeRT5tvQylYKDZfIvPaWFKconKtBw9MoYPAO0JdXXzSyhT9YLwcMQ2c 9+8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=h2M8ZSs8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s18si1617662ejd.305.2020.09.17.20.12.27; Thu, 17 Sep 2020 20:12:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=h2M8ZSs8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730705AbgIRDKl (ORCPT + 99 others); Thu, 17 Sep 2020 23:10:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:48432 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726858AbgIRCCu (ORCPT ); Thu, 17 Sep 2020 22:02:50 -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 21EF722211; Fri, 18 Sep 2020 02:02:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600394564; bh=kvljy/+dKd5hVOBCgeK3ADPEBHeF/kDaMYGcYzXQcjA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h2M8ZSs8dPKaXlTLyyqTSsGcztx/u+DBwbR4YMLdG6fuDvwcK6Kyb+/+SfovXKFu+ 1dOKpJ7jLpcTY4oL1HLSz5LQmjVYeaVhhDfmBe7lsK1M+BqV56oOi5fNwemUKyWuvs quve2Hk4vh/sty9gVDcSRF2ljJ5ZPVqmTFNeDGsA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kai Vehmanen , Takashi Iwai , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.4 077/330] ALSA: hda: enable regmap internal locking Date: Thu, 17 Sep 2020 21:56:57 -0400 Message-Id: <20200918020110.2063155-77-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918020110.2063155-1-sashal@kernel.org> References: <20200918020110.2063155-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kai Vehmanen [ Upstream commit 8e85def5723eccea30ebf22645673692ab8cb3e2 ] This reverts commit 42ec336f1f9d ("ALSA: hda: Disable regmap internal locking"). Without regmap locking, there is a race between snd_hda_codec_amp_init() and PM callbacks issuing regcache_sync(). This was caught by following kernel warning trace: <4> [358.080081] WARNING: CPU: 2 PID: 4157 at drivers/base/regmap/regcache.c:498 regcache_cache_only+0xf5/0x130 [...] <4> [358.080148] Call Trace: <4> [358.080158] snd_hda_codec_amp_init+0x4e/0x100 [snd_hda_codec] <4> [358.080169] snd_hda_codec_amp_init_stereo+0x40/0x80 [snd_hda_codec] Suggested-by: Takashi Iwai BugLink: https://gitlab.freedesktop.org/drm/intel/issues/592 Signed-off-by: Kai Vehmanen Link: https://lore.kernel.org/r/20200108180856.5194-1-kai.vehmanen@linux.intel.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/hda/hdac_regmap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/hda/hdac_regmap.c b/sound/hda/hdac_regmap.c index 2596a881186fa..49780399c2849 100644 --- a/sound/hda/hdac_regmap.c +++ b/sound/hda/hdac_regmap.c @@ -363,7 +363,6 @@ static const struct regmap_config hda_regmap_cfg = { .reg_write = hda_reg_write, .use_single_read = true, .use_single_write = true, - .disable_locking = true, }; /** -- 2.25.1