From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BD3951614B; Wed, 30 Sep 2026 17:08:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790788121; cv=none; b=Rdf/lMdLOglQI15avaDuucFnUWuiaL4ByPpF4BvRenUWdWGGQYBk5lR1rl9U0Bqdlr8KDIeZbYVinZpVx2AM07Gx9phctx9hiV7gc9LKSN8/WqRa14j0DyVbIpb3NXMX1dWOPpuDFpnL6YIR4Cc1pO0uW1OwFLzDrt7WkGo1Oj0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790788121; c=relaxed/simple; bh=tRyAgoeZB7Rd51adBqIvgJ2PEZZrvPhQDdOWzKmeAbk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YmjRaCNvcpALefYlhz4JCZ/WSpLygdhoMXHUIB99XBC3TjZxa+feAMGx12VbozuSzZ5LMbtlT86nFZdlGxpn70X8M9FPaOUT4Q/0lzkkE6f5XOePTIE/PiQE0kGjyUz0iiNhoRpXGXpguq4PSDFR9Mi5lFK1ktaZVLtsZlAWXzU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WCDyW4Ah; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="WCDyW4Ah" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D79151F000FF; Wed, 30 Sep 2026 17:08:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790788120; bh=GzWE91Gq7ekmbaBeyZVW6M4UQI04pJ4OB0XeF04Krq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WCDyW4AhXFKc46Nl54DO/SvFegatReQMdea6VCXAIng4pJQjk1P2zmRf/ZwpC9tau RvD0BphQGh1kiC5rBKsDmH9FOWOQdE/G+Cu31+gjjSOlekYEJJHuT5P0app6sU36cy i2Evj5gAj+3BBB+ihr++2zUg9bPDuPBlw6DjaBus= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sasha Levin Subject: [PATCH 6.12 002/877] Revert "hwmon: (emc1403) Rely on subsystem locking" Date: Wed, 30 Sep 2026 17:15:13 +0200 Message-ID: <20260930152414.797893364@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152414.738996857@linuxfoundation.org> References: <20260930152414.738996857@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ This reverts commit 52dfb8be29d9918c40b512f3d65529f88304afe4. Signed-off-by: Sasha Levin --- drivers/hwmon/emc1403.c | 46 ++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/drivers/hwmon/emc1403.c b/drivers/hwmon/emc1403.c index ccce948a4306e..eca33220d34a0 100644 --- a/drivers/hwmon/emc1403.c +++ b/drivers/hwmon/emc1403.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -29,6 +30,7 @@ enum emc1403_chip { emc1402, emc1403, emc1404, emc1428 }; struct thermal_data { enum emc1403_chip chip; struct regmap *regmap; + struct mutex mutex; }; static ssize_t power_state_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -266,8 +268,8 @@ static s8 emc1403_temp_regs_low[][4] = { }, }; -static int emc1403_get_temp(struct thermal_data *data, int channel, - enum emc1403_reg_map map, long *val) +static int __emc1403_get_temp(struct thermal_data *data, int channel, + enum emc1403_reg_map map, long *val) { unsigned int regvalh; unsigned int regvall = 0; @@ -293,23 +295,38 @@ static int emc1403_get_temp(struct thermal_data *data, int channel, return 0; } +static int emc1403_get_temp(struct thermal_data *data, int channel, + enum emc1403_reg_map map, long *val) +{ + int ret; + + mutex_lock(&data->mutex); + ret = __emc1403_get_temp(data, channel, map, val); + mutex_unlock(&data->mutex); + + return ret; +} + static int emc1403_get_hyst(struct thermal_data *data, int channel, enum emc1403_reg_map map, long *val) { int hyst, ret; long limit; - ret = emc1403_get_temp(data, channel, map, &limit); + mutex_lock(&data->mutex); + ret = __emc1403_get_temp(data, channel, map, &limit); if (ret < 0) - return ret; + goto unlock; ret = regmap_read(data->regmap, 0x21, &hyst); if (ret < 0) - return ret; + goto unlock; if (map == temp_min) *val = limit + hyst * 1000; else *val = limit - hyst * 1000; - return 0; +unlock: + mutex_unlock(&data->mutex); + return ret; } static int emc1403_temp_read(struct thermal_data *data, u32 attr, int channel, long *val) @@ -434,16 +451,20 @@ static int emc1403_set_hyst(struct thermal_data *data, long val) else val = clamp_val(val, 0, 255000); - ret = emc1403_get_temp(data, 0, temp_crit, &limit); + mutex_lock(&data->mutex); + ret = __emc1403_get_temp(data, 0, temp_crit, &limit); if (ret < 0) - return ret; + goto unlock; hyst = limit - val; if (data->chip == emc1428) hyst = clamp_val(DIV_ROUND_CLOSEST(hyst, 1000), 0, 127); else hyst = clamp_val(DIV_ROUND_CLOSEST(hyst, 1000), 0, 255); - return regmap_write(data->regmap, 0x21, hyst); + ret = regmap_write(data->regmap, 0x21, hyst); +unlock: + mutex_unlock(&data->mutex); + return ret; } static int emc1403_set_temp(struct thermal_data *data, int channel, @@ -457,6 +478,7 @@ static int emc1403_set_temp(struct thermal_data *data, int channel, regh = emc1403_temp_regs[channel][map]; regl = emc1403_temp_regs_low[channel][map]; + mutex_lock(&data->mutex); if (regl >= 0) { if (data->chip == emc1428) val = clamp_val(val, -128000, 127875); @@ -465,7 +487,7 @@ static int emc1403_set_temp(struct thermal_data *data, int channel, regval = DIV_ROUND_CLOSEST(val, 125); ret = regmap_write(data->regmap, regh, (regval >> 3) & 0xff); if (ret < 0) - return ret; + goto unlock; ret = regmap_write(data->regmap, regl, (regval & 0x07) << 5); } else { if (data->chip == emc1428) @@ -475,6 +497,8 @@ static int emc1403_set_temp(struct thermal_data *data, int channel, regval = DIV_ROUND_CLOSEST(val, 1000); ret = regmap_write(data->regmap, regh, regval); } +unlock: + mutex_unlock(&data->mutex); return ret; } @@ -671,6 +695,8 @@ static int emc1403_probe(struct i2c_client *client) if (IS_ERR(data->regmap)) return PTR_ERR(data->regmap); + mutex_init(&data->mutex); + hwmon_dev = devm_hwmon_device_register_with_info(&client->dev, client->name, data, &emc1403_chip_info, -- 2.53.0