From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794272614; b=S5TwPiDp3E6MO5gFkqVerYC5NQRDo3Bo2ANPjojpF20GL0g5Vt+Or9WcT1o7ZsE9g1hm Vjze/KszXKsnQoxORufH7ZbM6mD0EchJLdaIFfmZsw+xuksdnor0k0RBCEggxb0rgW0CF 7bb4Qax0r+ePXn4tEmVeWCb2+UefbSXCmWYQcyojwX5wB4J1X7S+eWva0C1B2ejhp34Bg F3y9OkVGkzkVrWWTtZ57hg8YkSVofel9xHgznxTbhd2TUxZFMwXO27+NnSDKf3elg3fsM DGqQyFpflL5KuMtG05YsIaTcn/hAQNZBUAFG0LhnL5xqXhp90WNEmz12VDgY7I6DZJg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794272614; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=OcZxp3tszv7W+n+AuUcYy3ZQcLSF+fqWXQwKc4ixk04=; b=VjF4Y0mgIA2WOxEo1xUhZNCFqhbzwiCVNH1pOuiN2FxBrHQmuKxP+ZcfeWahRYtw/BbI cSSW+KQ+i2m3Cx1ng2trLwM2Y5+x8/3KL39ivaHmVR8X+8KNfhvboU5nB6T5QvcUCPKmw bHUkSEefm59GrC34jMJvj6OanWIDqbWCRRc5/qZot8UiQspBfJ1efSbWq0ON0CYObCaGe r8WYPq8cXKssPAbtC1dMaXyNXW1ff94EGhWQEVpN2x4ommi5+Kj6087LRNdDaXoHqI1Ra 3M8eYNwTlhPfWlR/X7NOMLZVKicfyfHDzj7WgIF313rz5J1lhBL+h1TsXQ3HE2dLsAw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=g4qzAIga; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 20044606A31C for ; Tue, 10 Nov 2026 01:03:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=g4qzAIga Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89E301F0089F; Tue, 10 Nov 2026 01:03:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794272614; bh=OcZxp3tszv7W+n+AuUcYy3ZQcLSF+fqWXQwKc4ixk04=; h=From:To:Cc:Subject:Date; b=g4qzAIgaUnQgACaoUjG5TCmeDFV/S9kFeOHzBwPE6HvfDjDVgffDtDim0HtfBN6Gy g5sMUiAE/L23t65BGppWfSeBPEfVF/cnN9+RBx3HrMB1XJDf96LVT4zh6L650PYCK/ HZSd0MVB3xGYo/gyhoIU6ImAV9g40E+lqEhAsTmZ2OrvQq6r9bvR92wR2BvvguzqD2 XQe0rRel7c+8XNi2ghZGmLuFasIFYdSOqhyggTulPayXfKB/rz504Nq+rw6GXjWgxL 8qt78+nuuSpwxKGxeWZwc9ZN9Fp6piRW5lPB9f+wVngyOmEPv8SCYGiaR+TIzrCrY1 pqvYMn+RXQeBQ== From: Sasha Levin To: javier.carrasco.cruz@gmail.com, linux@roeck-us.net Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] hwmon: chipcap2: serialize access to the alarm indicators" failed to apply to 6.18-stable tree Date: Mon, 9 Nov 2026 20:03:32 -0500 Message-ID: <20261109200332-failed-6.18-bed5f0c075eb@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y git checkout FETCH_HEAD git cherry-pick -x bed5f0c075eb99442fca6a61c009a32752eceda2 # git commit -s git send-email --to '' --in-reply-to '20261109200332-failed-6.18-bed5f0c075eb@kernel.org' --subject-prefix 'PATCH 6.18.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From bed5f0c075eb99442fca6a61c009a32752eceda2 Mon Sep 17 00:00:00 2001 From: Javier Carrasco Date: Wed, 14 Oct 2026 19:34:09 +0200 Subject: [PATCH] hwmon: chipcap2: serialize access to the alarm indicators low_alarm and high_alarm are accessed from the threaded interrupt handlers and from sysfs without any locking, which can lead to lost alarms. Add a mutex to serialize the access to the alarm indicators and to process_irqs, which the handlers use to decide whether an interrupt belongs to an ongoing operation. Fixes: 3af350929e75 ("hwmon: Add support for Amphenol ChipCap 2") Cc: stable@vger.kernel.org Signed-off-by: Javier Carrasco Link: https://patch.msgid.link/20261014-chipcap2_locks-v3-10-27ebfc2c5b9e@gmail.com [groeck: Dropped obsolete 'Assisted-by: tag] Signed-off-by: Guenter Roeck --- drivers/hwmon/chipcap2.c | 58 +++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/drivers/hwmon/chipcap2.c b/drivers/hwmon/chipcap2.c index eba6469940ab5..b3b725cc7224f 100644 --- a/drivers/hwmon/chipcap2.c +++ b/drivers/hwmon/chipcap2.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -91,6 +92,8 @@ struct cc2_data { int irq_low; int irq_high; bool process_irqs; + /* protects process_irqs and the alarm indicators */ + struct mutex irq_lock; bool regulator_enabled; }; @@ -122,7 +125,8 @@ static int cc2_enable(struct cc2_data *data) /* exclusive regulator, check in case a disable failed */ if (data->regulator_enabled) { - data->process_irqs = true; + scoped_guard(mutex, &data->irq_lock) + data->process_irqs = true; return 0; } @@ -137,7 +141,8 @@ static int cc2_enable(struct cc2_data *data) usleep_range(CC2_STARTUP_TIME_US, CC2_STARTUP_TIME_US + 125); - data->process_irqs = true; + scoped_guard(mutex, &data->irq_lock) + data->process_irqs = true; return 0; } @@ -154,7 +159,8 @@ static void cc2_disable(struct cc2_data *data) synchronize_irq(data->irq_high); /* ignore alarms triggered by voltage toggling when powering up */ - data->process_irqs = false; + scoped_guard(mutex, &data->irq_lock) + data->process_irqs = false; /* exclusive regulator, check in case an enable failed */ if (!data->regulator_enabled) @@ -514,10 +520,12 @@ static irqreturn_t cc2_low_interrupt(int irq, void *data) { struct cc2_data *cc2 = data; - if (cc2->process_irqs) { - hwmon_notify_event(cc2->hwmon, hwmon_humidity, - hwmon_humidity_min_alarm, 0); - cc2->rh_alarm.low_alarm = true; + scoped_guard(mutex, &cc2->irq_lock) { + if (cc2->process_irqs) { + hwmon_notify_event(cc2->hwmon, hwmon_humidity, + hwmon_humidity_min_alarm, 0); + cc2->rh_alarm.low_alarm = true; + } } return IRQ_HANDLED; @@ -527,10 +535,12 @@ static irqreturn_t cc2_high_interrupt(int irq, void *data) { struct cc2_data *cc2 = data; - if (cc2->process_irqs) { - hwmon_notify_event(cc2->hwmon, hwmon_humidity, - hwmon_humidity_max_alarm, 0); - cc2->rh_alarm.high_alarm = true; + scoped_guard(mutex, &cc2->irq_lock) { + if (cc2->process_irqs) { + hwmon_notify_event(cc2->hwmon, hwmon_humidity, + hwmon_humidity_max_alarm, 0); + cc2->rh_alarm.high_alarm = true; + } } return IRQ_HANDLED; @@ -546,11 +556,13 @@ static int cc2_humidity_min_alarm_status(struct cc2_data *data, long *val) if (ret < 0) return ret; - if (data->rh_alarm.low_alarm) { - *val = (measurement < min_hyst) ? 1 : 0; - data->rh_alarm.low_alarm = *val; - } else { - *val = 0; + scoped_guard(mutex, &data->irq_lock) { + if (data->rh_alarm.low_alarm) { + *val = (measurement < min_hyst) ? 1 : 0; + data->rh_alarm.low_alarm = *val; + } else { + *val = 0; + } } return 0; @@ -566,11 +578,13 @@ static int cc2_humidity_max_alarm_status(struct cc2_data *data, long *val) if (ret < 0) return ret; - if (data->rh_alarm.high_alarm) { - *val = (measurement > max_hyst) ? 1 : 0; - data->rh_alarm.high_alarm = *val; - } else { - *val = 0; + scoped_guard(mutex, &data->irq_lock) { + if (data->rh_alarm.high_alarm) { + *val = (measurement > max_hyst) ? 1 : 0; + data->rh_alarm.high_alarm = *val; + } else { + *val = 0; + } } return 0; @@ -753,6 +767,8 @@ static int cc2_probe(struct i2c_client *client) i2c_set_clientdata(client, data); + mutex_init(&data->irq_lock); + data->client = client; data->regulator = devm_regulator_get_exclusive(dev, "vdd"); -- 2.53.0