FAILED: patch "[PATCH] EDAC/synopsys: Fix wrong value type assignment for edac_mode" failed to apply to 4.19-stable tree

PATCH [email protected] 2 participants 4 messages Sep 27, 2021 – Oct 4, 2021

Subsystems (3)

Stable branch Arm/Zynq architecture EDAC-core

lore

Share & tools

lore

[email protected]

author maintainer

2021-09-27 11:01 UTC #0 lore raw

The patch below does not apply to the 4.19-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 5297cfa6bdf93e3889f78f9b482e2a595a376083 Mon Sep 17 00:00:00 2001
From: Sai Krishna Potthuri <[email protected]>
Date: Wed, 18 Aug 2021 12:53:14 +0530
Subject: [PATCH] EDAC/synopsys: Fix wrong value type assignment for edac_mode

dimm->edac_mode contains values of type enum edac_type - not the corresponding capability flags. Fix that.

Issue caught by Coverity check "enumerated type mixed with another type."

[ bp: Rewrite commit message, add tags. ]

Fixes ae9b56e3996d ("EDAC, synps: Add EDAC support for zynq ddr ecc controller")

Signed-off-by Sai Krishna Potthuri <[email protected]>

Signed-off-by Shubhrajyoti Datta <[email protected]>

Signed-off-by Borislav Petkov <[email protected]>

Cc <[email protected]>

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

drivers/edac/synopsys_edac.c +1 -1

index 7e7146b22c16..7d08627e738b 100644
@@ -782,7 +782,7 @@ static void init_csrows(struct mem_ctl_info *mci)
 
 		for (j = 0; j < csi->nr_channels; j++) {
 			dimm		= csi->channels[j]->dimm;
-			dimm->edac_mode	= EDAC_FLAG_SECDED;
+			dimm->edac_mode	= EDAC_SECDED;
 			dimm->mtype	= p_data->get_mtype(priv->baseaddr);
 			dimm->nr_pages	= (size >> PAGE_SHIFT) / csi->nr_channels;
 			dimm->grain	= SYNPS_EDAC_ERR_GRAIN;

Borislav Petkov

2021-09-27 22:47 UTC #1 lore raw

Quoted 5 lines · On Mon, Sep 27, 2021 at 01:00:53PM +0200, [email protected] wrote:

The patch below does not apply to the 4.19-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]>.

---
From: Sai Krishna Potthuri <[email protected]>
Date: Wed, 18 Aug 2021 12:53:14 +0530
Subject: [PATCH] EDAC/synopsys: Fix wrong value type assignment for edac_mode

Upstream commit 5297cfa6bdf93e3889f78f9b482e2a595a376083.

dimm->edac_mode contains values of type enum edac_type - not the corresponding capability flags. Fix that.

Issue caught by Coverity check "enumerated type mixed with another type."

[ bp: Rewrite commit message, add tags. ]

Fixes ae9b56e3996d ("EDAC, synps: Add EDAC support for zynq ddr ecc controller")

Signed-off-by Sai Krishna Potthuri <[email protected]>

Signed-off-by Shubhrajyoti Datta <[email protected]>

Signed-off-by Borislav Petkov <[email protected]>

Cc <[email protected]>

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

---
 drivers/edac/synopsys_edac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/edac/synopsys_edac.c +1 -1

index 0c9c59e2b5a3..ba9de54a701e 100644
@@ -371,7 +371,7 @@ static int synps_edac_init_csrows(struct mem_ctl_info *mci)
 
 		for (j = 0; j < csi->nr_channels; j++) {
 			dimm            = csi->channels[j]->dimm;
-			dimm->edac_mode = EDAC_FLAG_SECDED;
+			dimm->edac_mode = EDAC_SECDED;
 			dimm->mtype     = synps_edac_get_mtype(priv->baseaddr);
 			dimm->nr_pages  = (size >> PAGE_SHIFT) / csi->nr_channels;
 			dimm->grain     = SYNPS_EDAC_ERR_GRAIN;

Signature · 7 lines

2.29.2

-- 
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg

Borislav Petkov

2021-09-27 22:48 UTC #2 lore raw

Quoted 38 lines · Borislav Petkov

Quoted 5 lines · On Mon, Sep 27, 2021 at 01:00:53PM +0200, [email protected] wrote:
The patch below does not apply to the 4.19-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]>.
---
From: Sai Krishna Potthuri <[email protected]>
Date: Wed, 18 Aug 2021 12:53:14 +0530
Subject: [PATCH] EDAC/synopsys: Fix wrong value type assignment for edac_mode
Upstream commit 5297cfa6bdf93e3889f78f9b482e2a595a376083.
dimm->edac_mode contains values of type enum edac_type - not the corresponding capability flags. Fix that.
Issue caught by Coverity check "enumerated type mixed with another type."
[ bp: Rewrite commit message, add tags. ]
Fixes ae9b56e3996d ("EDAC, synps: Add EDAC support for zynq ddr ecc controller")
Signed-off-by Sai Krishna Potthuri <[email protected]>
Signed-off-by Shubhrajyoti Datta <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>
Cc <[email protected]>
Link https://lkml.kernel.org/r/[email protected] open here
---
 drivers/edac/synopsys_edac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/edac/synopsys_edac.c +0 -0
index 0c9c59e2b5a3..ba9de54a701e 100644

drivers/edac/synopsys_edac.c static int synps_edac_init_csrows(struct mem_ctl_info *mci) · line 377

Quoted 8 lines

drivers/edac/synopsys_edac.c +1 -1

@@ -371,7 +371,7 @@ static int synps_edac_init_csrows(struct mem_ctl_info *mci)
 
 		for (j = 0; j < csi->nr_channels; j++) {
 			dimm            = csi->channels[j]->dimm;
-			dimm->edac_mode = EDAC_FLAG_SECDED;
+			dimm->edac_mode = EDAC_SECDED;
 			dimm->mtype     = synps_edac_get_mtype(priv->baseaddr);
 			dimm->nr_pages  = (size >> PAGE_SHIFT) / csi->nr_channels;
 			dimm->grain     = SYNPS_EDAC_ERR_GRAIN;

... and you get the idea - just use this one for 4.9.y and 4.14.y - it should apply cleanly there.

Thx.

Signature · 4 lines

Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg

Greg KH

author maintainer

2021-10-04 10:13 UTC #3 lore raw

Quoted 39 lines · Borislav Petkov

Quoted 38 lines · Borislav Petkov
Quoted 5 lines · On Mon, Sep 27, 2021 at 01:00:53PM +0200, [email protected] wrote:
The patch below does not apply to the 4.19-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]>.
---
From: Sai Krishna Potthuri <[email protected]>
Date: Wed, 18 Aug 2021 12:53:14 +0530
Subject: [PATCH] EDAC/synopsys: Fix wrong value type assignment for edac_mode
Upstream commit 5297cfa6bdf93e3889f78f9b482e2a595a376083.
dimm->edac_mode contains values of type enum edac_type - not the corresponding capability flags. Fix that.
Issue caught by Coverity check "enumerated type mixed with another type."
[ bp: Rewrite commit message, add tags. ]
Fixes ae9b56e3996d ("EDAC, synps: Add EDAC support for zynq ddr ecc controller")
Signed-off-by Sai Krishna Potthuri <[email protected]>
Signed-off-by Shubhrajyoti Datta <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>
Cc <[email protected]>
Link https://lkml.kernel.org/r/[email protected] open here
---
 drivers/edac/synopsys_edac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/edac/synopsys_edac.c +0 -0
index 0c9c59e2b5a3..ba9de54a701e 100644
@@ -371,7 +371,7 @@ static int synps_edac_init_csrows(struct mem_ctl_info *mci)
 

Quoted 11 lines

drivers/edac/synopsys_edac.c static int synps_edac_init_csrows(struct mem_ctl_info *mci) · line 377
Quoted 8 lines
drivers/edac/synopsys_edac.c +1 -1
 		for (j = 0; j < csi->nr_channels; j++) {
 			dimm            = csi->channels[j]->dimm;
-			dimm->edac_mode = EDAC_FLAG_SECDED;
+			dimm->edac_mode = EDAC_SECDED;
 			dimm->mtype     = synps_edac_get_mtype(priv->baseaddr);
 			dimm->nr_pages  = (size >> PAGE_SHIFT) / csi->nr_channels;
 			dimm->grain     = SYNPS_EDAC_ERR_GRAIN;
... and you get the idea - just use this one for 4.9.y and 4.14.y - it should apply cleanly there.

All now queued up, thanks.

greg k-h