FAILED: patch "[PATCH] mmc: mmci: stm32: correctly check all elements of sg list" failed to apply to 5.4-stable tree

The patch below does not apply to the 5.4-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 <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 0d319dd5a27183b75d984e3dc495248e59f99334 Mon Sep 17 00:00:00 2001
From: Yann Gautier <[email protected]>
Date: Thu, 17 Mar 2022 12:19:43 +0100
Subject: [PATCH] mmc: mmci: stm32: correctly check all elements of sg list

Use sg and not data->sg when checking sg list elements. Else only the first element alignment is checked.
The last element should be checked the same way, for_each_sg already set sg to sg_next(sg).

Fixes 46b723dd867d ("mmc: mmci: add stm32 sdmmc variant")

Cc [email protected]

Signed-off-by Yann Gautier <[email protected]>

Link https://lore.kernel.org/r/[email protected] open here

Signed-off-by Ulf Hansson <[email protected]>

drivers/mmc/host/mmci_stm32_sdmmc.c +3 -3

index 9c13f2c31365..4566d7fc9055 100644
@@ -62,8 +62,8 @@ static int sdmmc_idma_validate_data(struct mmci_host *host,
  	 * excepted the last element which has no constraint on idmasize
  	 */
  	for_each_sg(data->sg, sg, data->sg_len - 1, i) {
-		if (!IS_ALIGNED(data->sg->offset, sizeof(u32)) ||
-		    !IS_ALIGNED(data->sg->length, SDMMC_IDMA_BURST)) {
+		if (!IS_ALIGNED(sg->offset, sizeof(u32)) ||
+		    !IS_ALIGNED(sg->length, SDMMC_IDMA_BURST)) {
  			dev_err(mmc_dev(host->mmc),
  				"unaligned scatterlist: ofst:%x length:%d\n",
  				data->sg->offset, data->sg->length);

@@ -71,7 +71,7 @@ static int sdmmc_idma_validate_data(struct mmci_host *host,
  		}
  	}
 
-	if (!IS_ALIGNED(data->sg->offset, sizeof(u32))) {
+	if (!IS_ALIGNED(sg->offset, sizeof(u32))) {
  		dev_err(mmc_dev(host->mmc),
  			"unaligned last scatterlist: ofst:%x length:%d\n",
  			data->sg->offset, data->sg->length);

Quoted 8 lines · On 4/11/22 09:33, [email protected] wrote:

The patch below does not apply to the 5.4-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 <[email protected]>.

thanks,

Quoted 1 line

greg k-h

Hi Greg,

The patch doesn't apply because the following one is not there:
127e6e98ca9b mmc: mmci_sdmmc: Replace sg_dma_xxx macros

Maybe it should have been a fix patch too.