* FAILED: patch "[PATCH] EDAC/synopsys: Fix wrong value type assignment for edac_mode" failed to apply to 4.19-stable tree
@ 2021-09-27 11:00 gregkh
2021-09-27 22:47 ` Borislav Petkov
0 siblings, 1 reply; 4+ messages in thread
From: gregkh @ 2021-09-27 11:00 UTC (permalink / raw)
To: lakshmi.sai.krishna.potthuri, bp, shubhrajyoti.datta, stable; +Cc: stable
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 <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 5297cfa6bdf93e3889f78f9b482e2a595a376083 Mon Sep 17 00:00:00 2001
From: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>
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 <lakshmi.sai.krishna.potthuri@xilinx.com>
Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: <stable@vger.kernel.org>
Link: https://lkml.kernel.org/r/20210818072315.15149-1-shubhrajyoti.datta@xilinx.com
diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c
index 7e7146b22c16..7d08627e738b 100644
--- a/drivers/edac/synopsys_edac.c
+++ b/drivers/edac/synopsys_edac.c
@@ -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;
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: FAILED: patch "[PATCH] EDAC/synopsys: Fix wrong value type assignment for edac_mode" failed to apply to 4.19-stable tree
2021-09-27 11:00 FAILED: patch "[PATCH] EDAC/synopsys: Fix wrong value type assignment for edac_mode" failed to apply to 4.19-stable tree gregkh
@ 2021-09-27 22:47 ` Borislav Petkov
2021-09-27 22:48 ` Borislav Petkov
0 siblings, 1 reply; 4+ messages in thread
From: Borislav Petkov @ 2021-09-27 22:47 UTC (permalink / raw)
To: gregkh; +Cc: lakshmi.sai.krishna.potthuri, shubhrajyoti.datta, stable
On Mon, Sep 27, 2021 at 01:00:53PM +0200, gregkh@linuxfoundation.org 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 <stable@vger.kernel.org>.
---
From: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>
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 <lakshmi.sai.krishna.potthuri@xilinx.com>
Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: <stable@vger.kernel.org>
Link: https://lkml.kernel.org/r/20210818072315.15149-1-shubhrajyoti.datta@xilinx.com
---
drivers/edac/synopsys_edac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c
index 0c9c59e2b5a3..ba9de54a701e 100644
--- a/drivers/edac/synopsys_edac.c
+++ b/drivers/edac/synopsys_edac.c
@@ -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;
--
2.29.2
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: FAILED: patch "[PATCH] EDAC/synopsys: Fix wrong value type assignment for edac_mode" failed to apply to 4.19-stable tree
2021-09-27 22:47 ` Borislav Petkov
@ 2021-09-27 22:48 ` Borislav Petkov
2021-10-04 10:13 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Borislav Petkov @ 2021-09-27 22:48 UTC (permalink / raw)
To: gregkh; +Cc: lakshmi.sai.krishna.potthuri, shubhrajyoti.datta, stable
On Tue, Sep 28, 2021 at 12:47:25AM +0200, Borislav Petkov wrote:
> On Mon, Sep 27, 2021 at 01:00:53PM +0200, gregkh@linuxfoundation.org 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 <stable@vger.kernel.org>.
>
> ---
> From: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>
> 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 <lakshmi.sai.krishna.potthuri@xilinx.com>
> Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
> Signed-off-by: Borislav Petkov <bp@suse.de>
> Cc: <stable@vger.kernel.org>
> Link: https://lkml.kernel.org/r/20210818072315.15149-1-shubhrajyoti.datta@xilinx.com
> ---
> drivers/edac/synopsys_edac.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c
> index 0c9c59e2b5a3..ba9de54a701e 100644
> --- a/drivers/edac/synopsys_edac.c
> +++ b/drivers/edac/synopsys_edac.c
> @@ -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.
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: FAILED: patch "[PATCH] EDAC/synopsys: Fix wrong value type assignment for edac_mode" failed to apply to 4.19-stable tree
2021-09-27 22:48 ` Borislav Petkov
@ 2021-10-04 10:13 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2021-10-04 10:13 UTC (permalink / raw)
To: Borislav Petkov; +Cc: lakshmi.sai.krishna.potthuri, shubhrajyoti.datta, stable
On Tue, Sep 28, 2021 at 12:48:56AM +0200, Borislav Petkov wrote:
> On Tue, Sep 28, 2021 at 12:47:25AM +0200, Borislav Petkov wrote:
> > On Mon, Sep 27, 2021 at 01:00:53PM +0200, gregkh@linuxfoundation.org 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 <stable@vger.kernel.org>.
> >
> > ---
> > From: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>
> > 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 <lakshmi.sai.krishna.potthuri@xilinx.com>
> > Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
> > Signed-off-by: Borislav Petkov <bp@suse.de>
> > Cc: <stable@vger.kernel.org>
> > Link: https://lkml.kernel.org/r/20210818072315.15149-1-shubhrajyoti.datta@xilinx.com
> > ---
> > drivers/edac/synopsys_edac.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c
> > index 0c9c59e2b5a3..ba9de54a701e 100644
> > --- a/drivers/edac/synopsys_edac.c
> > +++ b/drivers/edac/synopsys_edac.c
> > @@ -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.
All now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-04 10:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-27 11:00 FAILED: patch "[PATCH] EDAC/synopsys: Fix wrong value type assignment for edac_mode" failed to apply to 4.19-stable tree gregkh
2021-09-27 22:47 ` Borislav Petkov
2021-09-27 22:48 ` Borislav Petkov
2021-10-04 10:13 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.