[PATCH] powerpc/e500: fix breakage with fsl_rio_mcheck_exception

[Kumar Gala]

On Jun 16, 2011, at 2:09 PM, Scott Wood wrote:

> The wrong MCSR bit was being used on e500mc.  MCSR_BUS_RBERR only exists
> on e500v1/v2.  Use MCSR_LD on e500mc, and remove all MCSR checking
> in fsl_rio_mcheck_exception as we now no longer call that function
> if the appropriate bit in MCSR is not set.
> 
> If RIO support was enabled at compile-time, but was never probed, just
> return from fsl_rio_mcheck_exception rather than dereference a NULL
> pointer.
> 
> TODO: There is still a remaining, though comparitively minor, issue in
> that this recovery mechanism will falsely engage if there's an unrelated
> MCSR_LD event at the same time as a RIO error.
> 
> Signed-off-by: Scott Wood <scottwood at freescale.com>
> ---
> arch/powerpc/kernel/traps.c   |    2 +-
> arch/powerpc/sysdev/fsl_rio.c |   33 +++++++++++++++++----------------
> 2 files changed, 18 insertions(+), 17 deletions(-)

applied to merge

- k