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 B830F255E33 for ; Mon, 12 May 2025 10:16:18 +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=1747044978; cv=none; b=c2khJ4fPS741KSU5VcPTMv5SqDmmRGauTwgOhvSIXWMEvdWKwso7WPoC4Ppk3TnNZfPpguG8ZNINBfeZjcOqGPDIybPZB7g62qtparaSAsp8pYUmJXtHNL+qSCcHAuHpD2Hi0/8/OiYlCroZ8uAElYLr0ifAmoDm2A4NAMu7rh0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747044978; c=relaxed/simple; bh=97/TnXHV+XDs2ruf1DCtJSn/Wcwk3HuDm7D5NSkwkoA=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=AJaCnsMp1ZciD9YGh6QTMt4fi3TVy7T5NI9bEQJ3LYEpXOG1Uy2P6rUkHfwD+y/BwNL79DOFp2vWNmpcqj9WUh/aYm7SqduGShHRVxs8pmYpW+AT/AdFkVmVcrHlokwSdsQkSnUtpv+pokozew50ln2CMkmyi22su5t55wuCCOA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dCq1CI7V; 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="dCq1CI7V" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0E26C4CEE7; Mon, 12 May 2025 10:16:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747044978; bh=97/TnXHV+XDs2ruf1DCtJSn/Wcwk3HuDm7D5NSkwkoA=; h=Subject:To:Cc:From:Date:From; b=dCq1CI7ViTzgjGZclqMOWQwuB+QsB3HRkBgehOlTuyN++Li5FTvxZME9aC87O6kaa anO0gLUNX5kQiHE+oER3B2XD4kkLDWdfuBVGtJxVTzWEHiXdPXK8GXJSuGLqUqn2oI cVIJ043zCE+nvxlJxZoLkBR7+YIGHdHzgtLYilIc= Subject: FAILED: patch "[PATCH] iio: adc: ad7266: Fix potential timestamp alignment issue." failed to apply to 6.1-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:16:09 +0200 Message-ID: <2025051209-quantum-unlaced-36e2@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 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 52d349884738c346961e153f195f4c7fe186fcf4 # git commit -s git send-email --to '' --in-reply-to '2025051209-quantum-unlaced-36e2@gregkh' --subject-prefix 'PATCH 6.1.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); };