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 E1A9241C8B for ; Mon, 19 Feb 2024 16:54:03 +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=1708361644; cv=none; b=Dk1vSa0WX/dy4lDitFOb7CFCA8zRYAE7K4C/afoI8IEzGe0PFtxH3q3+NSSY5/3lJg64WfquANYaLDq2GBWgBsOUkYQT1ILxQxfq7um6fB0K7sEG02IxU+c8YhqAD59cqAlEf4w+zjXO83U0JGOQfmJetPZTxmn3sh5YkDbsSgU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708361644; c=relaxed/simple; bh=KWUKPP760aERDixdFOa9FAjuIDVfFLYAqJdb6wMp+9Y=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=qlFo0reBJp6YatsmczcOWuX2j1vrlkb6uavfLBuySIc/Yl8eU7Un3pssNeeqyBwgWs+ygewbXnABtTnQVcCOQ15OSBl3F+tNilZjXCD5+xPSwR6/NmWnWRnG3tSmbWtwCYRJb0/6z5sQEOeQDqpfHlV67MD79EZaY3zI6ykYPw8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rOCu9PGW; 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="rOCu9PGW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 571FEC433F1; Mon, 19 Feb 2024 16:54:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708361643; bh=KWUKPP760aERDixdFOa9FAjuIDVfFLYAqJdb6wMp+9Y=; h=Subject:To:Cc:From:Date:From; b=rOCu9PGWkt+/3RgD7US0MdKsXUmb2OifSsvFjF1jM00YhTIvMmg6i2Wf5oo+GIrVc hbz09kq5iIlwrQq4tPPlrqHBQjuU11FWI5J6zxggx+vBMVF9tgqwZMM9XF7o6UNBAM 91wn6T6heXjC3CEEEAq6lWtUOLjSxEJsyUzQql1g= Subject: FAILED: patch "[PATCH] iio: commom: st_sensors: ensure proper DMA alignment" failed to apply to 5.15-stable tree To: nuno.sa@analog.com,Jonathan.Cameron@huawei.com,Stable@vger.kernel.org Cc: From: Date: Mon, 19 Feb 2024 17:51:06 +0100 Message-ID: <2024021906-stoplight-preorder-1867@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 5.15-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-5.15.y git checkout FETCH_HEAD git cherry-pick -x 862cf85fef85becc55a173387527adb4f076fab0 # git commit -s git send-email --to '' --in-reply-to '2024021906-stoplight-preorder-1867@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 862cf85fef85 ("iio: commom: st_sensors: ensure proper DMA alignment") 474010127e25 ("iio: st_sensors: Add a local lock for protecting odr") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 862cf85fef85becc55a173387527adb4f076fab0 Mon Sep 17 00:00:00 2001 From: Nuno Sa Date: Wed, 31 Jan 2024 10:16:47 +0100 Subject: [PATCH] iio: commom: st_sensors: ensure proper DMA alignment Aligning the buffer to the L1 cache is not sufficient in some platforms as they might have larger cacheline sizes for caches after L1 and thus, we can't guarantee DMA safety. That was the whole reason to introduce IIO_DMA_MINALIGN in [1]. Do the same for st_sensors common buffer. While at it, moved the odr_lock before buffer_data as we definitely don't want any other data to share a cacheline with the buffer. [1]: https://lore.kernel.org/linux-iio/20220508175712.647246-2-jic23@kernel.org/ Fixes: e031d5f558f1 ("iio:st_sensors: remove buffer allocation at each buffer enable") Signed-off-by: Nuno Sa Cc: Link: https://lore.kernel.org/r/20240131-dev_dma_safety_stm-v2-1-580c07fae51b@analog.com Signed-off-by: Jonathan Cameron diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h index 607c3a89a647..f9ae5cdd884f 100644 --- a/include/linux/iio/common/st_sensors.h +++ b/include/linux/iio/common/st_sensors.h @@ -258,9 +258,9 @@ struct st_sensor_data { bool hw_irq_trigger; s64 hw_timestamp; - char buffer_data[ST_SENSORS_MAX_BUFFER_SIZE] ____cacheline_aligned; - struct mutex odr_lock; + + char buffer_data[ST_SENSORS_MAX_BUFFER_SIZE] __aligned(IIO_DMA_MINALIGN); }; #ifdef CONFIG_IIO_BUFFER