From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E7F0039EF32 for ; Tue, 17 Mar 2026 13:09:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773752994; cv=none; b=VLtWDkDRp5HxH36GMjaTnbccQN6+XVm1HH6pqEoHRI+NY/HH2IXhTUlnQIMa8PNiX15u8kOtpID1YUefF/4c8sYNotCVhCZtUQ/BSjgj/UB648if+d72uJQHIq/vfQ1+UatgTolr47z9qRQcbX5Ty7QDaEj7JGh5iGZl0ApBfUo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773752994; c=relaxed/simple; bh=6lHFeo3CR7SyoPU3VErvC5WHd0S9SyLPSkqrIsm+6/I=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=ukC/6MMYfyz3NIVa17/R7esjQ8XCdH3F6R1qRRSnxKcmQh0vC7l1GzQxShEXAWYiKjDZ9JMWU8ut2BoG2P4jP6xLl6hQF9+02fqJjCIdG1jL5oeR2tZeUX5TEhF7q9V46CXBgu/lo7tEVEv0WLrPekOFGXcJPBqTfIb7X/97hD8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=QonAIgIA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="QonAIgIA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31747C4CEF7; Tue, 17 Mar 2026 13:09:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1773752993; bh=6lHFeo3CR7SyoPU3VErvC5WHd0S9SyLPSkqrIsm+6/I=; h=Subject:To:Cc:From:Date:From; b=QonAIgIA1CT4hJtghwo1RcnQyxvd8jqhwNhR+c/eqESTrhyUIbw60NEGnMsh/mqdc ijduA3h6oTKxzwD/vAZ2dOImMegjGJglcJcZK7GIyv1WRsFMHBnZ0q6Ex+z07HMW9K mT1SnhR5AmDZCTdcHO5UOALiao6K2qwKLMihS9qI= Subject: FAILED: patch "[PATCH] iio: imu: inv_icm42600: fix odr switch when turning buffer" failed to apply to 6.1-stable tree To: jean-baptiste.maneyrol@tdk.com,Jonathan.Cameron@huawei.com Cc: From: Date: Tue, 17 Mar 2026 14:09:39 +0100 Message-ID: <2026031739-putdown-harmony-6f22@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-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.1.y git checkout FETCH_HEAD git cherry-pick -x ffd32db8263d2d785a2c419486a450dc80693235 # git commit -s git send-email --to '' --in-reply-to '2026031739-putdown-harmony-6f22@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From ffd32db8263d2d785a2c419486a450dc80693235 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Maneyrol Date: Fri, 30 Jan 2026 17:10:23 +0100 Subject: [PATCH] iio: imu: inv_icm42600: fix odr switch when turning buffer off ODR switch is done in 2 steps when FIFO is on : change the ODR register value and acknowledge change when reading the FIFO ODR change flag. When we are switching odr and turning buffer off just afterward, we are losing the FIFO ODR change flag and ODR switch is blocked. Fix the issue by force applying any waiting ODR change when turning buffer off. Fixes: ec74ae9fd37c ("iio: imu: inv_icm42600: add accurate timestamping") Signed-off-by: Jean-Baptiste Maneyrol Cc: stable@vger.kernel.org Signed-off-by: Jonathan Cameron diff --git a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c index ada968be954d..68a395758031 100644 --- a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c +++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c @@ -371,6 +371,8 @@ static int inv_icm42600_buffer_predisable(struct iio_dev *indio_dev) static int inv_icm42600_buffer_postdisable(struct iio_dev *indio_dev) { struct inv_icm42600_state *st = iio_device_get_drvdata(indio_dev); + struct inv_icm42600_sensor_state *sensor_st = iio_priv(indio_dev); + struct inv_sensors_timestamp *ts = &sensor_st->ts; struct device *dev = regmap_get_device(st->map); unsigned int sensor; unsigned int *watermark; @@ -392,6 +394,8 @@ static int inv_icm42600_buffer_postdisable(struct iio_dev *indio_dev) mutex_lock(&st->lock); + inv_sensors_timestamp_apply_odr(ts, 0, 0, 0); + ret = inv_icm42600_buffer_set_fifo_en(st, st->fifo.en & ~sensor); if (ret) goto out_unlock;