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 EF334259C86 for ; Mon, 12 May 2025 10:02:27 +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=1747044148; cv=none; b=f8X6FHqY1X2YMeTSxRYPpfo3he6GH5pR92j8m+kUSQMSrqcdSdleN37AuRJO3u+R/Ten+nsLyNFUBEXSVylIZSZ7tawlfAsymE5TwYiND+MOsDH0t4Q5Gp4ydrZEUVijjas4wSxzeZwY7QRt6nbM3DF55+JQJlx3/rqJPoRst20= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747044148; c=relaxed/simple; bh=oubB0PQulUlVbDktC/Z7qkl3DEIA+R5ALlR+v3DXIR4=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=gLQG+s4/ByOLsIovj/1FbVsfzTxXyvzxpgFtyUCVu3y02M3VkXV0YFTsuJCBQDTXIaNu+H3ebAWi61jAvipVorcFsHr+XECOymb/JYHV1R9NNCklc4K82V5JStMYEG+GJnuPYNTVDHftMv3wG70L0hD0tn/WBsqHxiUtHpLEXXs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DyJ+v+9B; 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="DyJ+v+9B" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEA1DC4CEE7; Mon, 12 May 2025 10:02:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747044147; bh=oubB0PQulUlVbDktC/Z7qkl3DEIA+R5ALlR+v3DXIR4=; h=Subject:To:Cc:From:Date:From; b=DyJ+v+9By4X1yqKb1iMLzF6VbFMH7k6/N6Az2PJBX6KiatuOWrjyPjEeTARBO+Ykr FS5TD2A2WY6w2N1Fms4Hbq8/gkn5Z8TPEUUpbVnJsXXISN9J2iL+xRB5PS0UM5B1/p aWTud9eXszgXeEDTfTuqiPRuvojivvZxwAtz6F78= Subject: FAILED: patch "[PATCH] iio: adc: ad7266: Fix potential timestamp alignment issue." failed to apply to 5.15-stable tree To: Jonathan.Cameron@huawei.com,Stable@vger.kernel.org,dlechner@baylibre.com,nuno.sa@analog.com Cc: From: Date: Mon, 12 May 2025 12:02:19 +0200 Message-ID: <2025051219-maybe-spilt-5bf6@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=UTF-8 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 52d349884738c346961e153f195f4c7fe186fcf4 # git commit -s git send-email --to '' --in-reply-to '2025051219-maybe-spilt-5bf6@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 52d349884738c346961e153f195f4c7fe186fcf4 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Sun, 13 Apr 2025 11:34:24 +0100 Subject: [PATCH] iio: adc: ad7266: Fix potential timestamp alignment issue. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On architectures where an s64 is only 32-bit aligned insufficient padding would be left between the earlier elements and the timestamp. Use aligned_s64 to enforce the correct placement and ensure the storage is large enough. Fixes: 54e018da3141 ("iio:ad7266: Mark transfer buffer as __be16") # aligned_s64 is much newer. Reported-by: David Lechner Reviewed-by: Nuno Sá Reviewed-by: David Lechner Link: https://patch.msgid.link/20250413103443.2420727-2-jic23@kernel.org Cc: Signed-off-by: Jonathan Cameron diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c index 18559757f908..7fef2727f89e 100644 --- a/drivers/iio/adc/ad7266.c +++ b/drivers/iio/adc/ad7266.c @@ -45,7 +45,7 @@ struct ad7266_state { */ struct { __be16 sample[2]; - s64 timestamp; + aligned_s64 timestamp; } data __aligned(IIO_DMA_MINALIGN); };