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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 EF89DC433E0 for ; Tue, 9 Jun 2020 00:44:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C4DA020737 for ; Tue, 9 Jun 2020 00:44:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591663469; bh=s/0fHWJWsk3CSOvkSF0fCcWuzyXf2QbMKemiARoezHU=; h=From:To:Cc:Subject:Date:List-ID:From; b=EcjSfrJkNRE2OFhV09SgSStyTgAH99GHtgir46arsP/EF3EQkBeng9NpoBCRpCgkq 4++/WfK6A7fcwgGieBeFj3lRqrHoZXuMroTaBmX5D1xg/LOYBmJ51Li0O1Mu0M31JX P5F9YU6SjVCdQzzh13MPiFzRwTDJzWxcvTmjg6z4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731092AbgFIAnp (ORCPT ); Mon, 8 Jun 2020 20:43:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:59544 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729061AbgFHXMN (ORCPT ); Mon, 8 Jun 2020 19:12:13 -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 4EF57208C3; Mon, 8 Jun 2020 23:12:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591657933; bh=s/0fHWJWsk3CSOvkSF0fCcWuzyXf2QbMKemiARoezHU=; h=From:To:Cc:Subject:Date:From; b=RG5LeXWbK0ZO8i+dpF7A7R+y/hq7YNvsfh9KJ37QQXHY3MKpIxMCrKVgN/DadnBAB NkgjHC5ObsQvn+HtcpkbH6EwH0e1huKXE3x/3pHOCxIYKMYU42g4E8EaPhzAqOMObA sgKi3fPMRQgS4xcUUA18tIftm1MV8azzkIJH601g= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Samu Nuutamo , Sebastian Reichel , Guenter Roeck , Sasha Levin , linux-hwmon@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 001/606] hwmon: (da9052) Synchronize access with mfd Date: Mon, 8 Jun 2020 19:02:06 -0400 Message-Id: <20200608231211.3363633-1-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org From: Samu Nuutamo [ Upstream commit 333e22db228f0bd0c839553015a6a8d3db4ba569 ] When tsi-as-adc is configured it is possible for in7[0123]_input read to return an incorrect value if a concurrent read to in[456]_input is performed. This is caused by a concurrent manipulation of the mux channel without proper locking as hwmon and mfd use different locks for synchronization. Switch hwmon to use the same lock as mfd when accessing the TSI channel. Fixes: 4f16cab19a3d5 ("hwmon: da9052: Add support for TSI channel") Signed-off-by: Samu Nuutamo [rebase to current master, reword commit message slightly] Signed-off-by: Sebastian Reichel Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/hwmon/da9052-hwmon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/hwmon/da9052-hwmon.c b/drivers/hwmon/da9052-hwmon.c index 53b517dbe7e6..4af2fc309c28 100644 --- a/drivers/hwmon/da9052-hwmon.c +++ b/drivers/hwmon/da9052-hwmon.c @@ -244,9 +244,9 @@ static ssize_t da9052_tsi_show(struct device *dev, int channel = to_sensor_dev_attr(devattr)->index; int ret; - mutex_lock(&hwmon->hwmon_lock); + mutex_lock(&hwmon->da9052->auxadc_lock); ret = __da9052_read_tsi(dev, channel); - mutex_unlock(&hwmon->hwmon_lock); + mutex_unlock(&hwmon->da9052->auxadc_lock); if (ret < 0) return ret; -- 2.25.1