On Tue, Sep 28, 2021 at 12:47:25AM +0200, Borislav Petkov wrote:
> On Mon, Sep 27, 2021 at 01:00:53PM +0200, gregkh@xxxxxxxxxxxxxxxxxxx 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@xxxxxxxxxxxxxxx>.
>
> ---
> From: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xxxxxxxxxx>
> 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@xxxxxxxxxx>
> Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xxxxxxxxxx>
> Signed-off-by: Borislav Petkov <bp@xxxxxxx>
> Cc: <stable@xxxxxxxxxxxxxxx>
> Link: https://lkml.kernel.org/r/20210818072315.15149-1-shubhrajyoti.datta@xxxxxxxxxx
> ---
> 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
