On Tue, Oct 15, 2024 at 04:52:34PM +0200, Borislav Petkov wrote: > On Fri, Oct 11, 2024 at 11:31:33AM -0400, Frank Li wrote: > > From: Ye Li <ye.li@xxxxxxx> > > > > Add support for the i.MX9 DDR controller, which has different register > > offsets and some function changes compared to the existing fsl_ddr > > controller. The ECC and error injection functions are almost the same, so > > update and reuse the driver for i.MX9. A special type 'TYPE_IMX9' is added > > specifically for the i.MX9 controller to distinguish the differences. > > > > Signed-off-by: Ye Li <ye.li@xxxxxxx> > > Reviewed-by: Peng Fan <peng.fan@xxxxxxx> > > Signed-off-by: Frank Li <Frank.Li@xxxxxxx> > > --- > > drivers/edac/fsl_ddr_edac.c | 48 ++++++++++++++++++++++++++++++++++++------ > > drivers/edac/fsl_ddr_edac.h | 10 +++++++++ > > drivers/edac/layerscape_edac.c | 1 + > > 3 files changed, 53 insertions(+), 6 deletions(-) > > checking file drivers/edac/fsl_ddr_edac.c > Hunk #1 FAILED at 31. > Hunk #2 succeeded at 442 (offset 4 lines). > Hunk #3 succeeded at 478 (offset 4 lines). > Hunk #4 succeeded at 492 (offset 4 lines). > Hunk #5 succeeded at 520 (offset 4 lines). > Hunk #6 succeeded at 550 (offset 4 lines). > Hunk #7 succeeded at 577 (offset 4 lines). > 1 out of 7 hunks FAILED > checking file drivers/edac/fsl_ddr_edac.h > Hunk #3 FAILED at 71. > 1 out of 3 hunks FAILED > checking file drivers/edac/layerscape_edac.c > > What tree have you created your patches against? I base on linux-next: next-20241010. I can rebase to edac-for-next https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git/ Is it what you expect base? Frank > > > diff --git a/drivers/edac/fsl_ddr_edac.c b/drivers/edac/fsl_ddr_edac.c > > index ccc13c2adfd6f..3e4c2869a07cd 100644 > > --- a/drivers/edac/fsl_ddr_edac.c > > +++ b/drivers/edac/fsl_ddr_edac.c > > @@ -31,16 +31,28 @@ > > > > static int edac_mc_idx; > > I see here: > > |static int edac_mc_idx; > | > |static u32 orig_ddr_err_disable; > |static u32 orig_ddr_err_sbe; > |static bool little_endian; > | > |static inline u32 ddr_in32(struct fsl_mc_pdata *pdata, unsigned int off) > > and you don't have those in your diff. > > What's up? > > -- > Regards/Gruss, > Boris. > > https://people.kernel.org/tglx/notes-about-netiquette
