| Message ID | 1279730810-24926-1-git-send-email-alexandre.bounine@idt.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Kumar Gala |
| Headers | show |
>Subject: [PATCH] RapidIO,powerpc/85xx: remove MCSR_MASK in fsl_rio > >Fixes compile problem caused by MCSR_MASK removal from book-E definitions. Hi Alex, Only with your patch, there will still be problem on SRIO platforms other than MPC85xx. I have posted a patch series to fix this together with several compatibility issues a month before. http://patchwork.ozlabs.org/patch/56135/ http://patchwork.ozlabs.org/patch/56136/ http://patchwork.ozlabs.org/patch/56138/ http://patchwork.ozlabs.org/patch/56137/ Can anyone pick the patch series quickly as currently there is a compile error when SRIO is enabled. - Leo > >Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com> >Cc: Kumar Gala <galak@kernel.crashing.org> >Cc: Grant Likely <grant.likely@secretlab.ca> >Cc: Matt Porter <mporter@kernel.crashing.org> >--- > arch/powerpc/sysdev/fsl_rio.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > >diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c >index 30e1626..c58df58 100644 >--- a/arch/powerpc/sysdev/fsl_rio.c >+++ b/arch/powerpc/sysdev/fsl_rio.c >@@ -245,7 +245,7 @@ static int (*saved_mcheck_exception)(struct pt_regs >*regs); static int fsl_rio_mcheck_exception(struct pt_regs *regs) { > const struct exception_table_entry *entry = NULL; >- unsigned long reason = (mfspr(SPRN_MCSR) & MCSR_MASK); >+ unsigned long reason = mfspr(SPRN_MCSR); > > if (reason & MCSR_BUS_RBERR) { > reason = in_be32((u32 *)(rio_regs_win + RIO_LTLEDCSR));
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c index 30e1626..c58df58 100644 --- a/arch/powerpc/sysdev/fsl_rio.c +++ b/arch/powerpc/sysdev/fsl_rio.c @@ -245,7 +245,7 @@ static int (*saved_mcheck_exception)(struct pt_regs *regs); static int fsl_rio_mcheck_exception(struct pt_regs *regs) { const struct exception_table_entry *entry = NULL; - unsigned long reason = (mfspr(SPRN_MCSR) & MCSR_MASK); + unsigned long reason = mfspr(SPRN_MCSR); if (reason & MCSR_BUS_RBERR) { reason = in_be32((u32 *)(rio_regs_win + RIO_LTLEDCSR));
Fixes compile problem caused by MCSR_MASK removal from book-E definitions. Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com> Cc: Kumar Gala <galak@kernel.crashing.org> Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Matt Porter <mporter@kernel.crashing.org> --- arch/powerpc/sysdev/fsl_rio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)