2010-11-03 10:23:01

by Xie Shaohui-B21989

Subject: [PATCH 2/4][v2] fsl_rio: fix non-standard HID1 register access

Signed-off-by: Shaohui Xie <[email protected]>
Cc: Li Yang <[email protected]>
Cc: Kumar Gala <[email protected]>
Cc: Roy Zang <[email protected]>
Cc: Alexandre Bounine <[email protected]>
---
arch/powerpc/kernel/cpu_setup_fsl_booke.S | 6 ++++++
arch/powerpc/sysdev/fsl_rio.c | 2 --
2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
index 0adb50a..8fd5bc6 100644
--- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S
+++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
@@ -63,6 +63,12 @@ _GLOBAL(__setup_cpu_e500v2)
bl __e500_icache_setup
bl __e500_dcache_setup
bl __setup_e500_ivors
+#ifdef CONFIG_RAPIDIO
+ /* Ensure that RFXE is set */
+ mfspr r3,SPRN_HID1
+ oris r3,r3,HID1_RFXE@h
+ mtspr SPRN_HID1,r3
+#endif
mtlr r4
blr
_GLOBAL(__setup_cpu_e500mc)
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index 4127636..1143c93 100644
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -1538,8 +1538,6 @@ int fsl_rio_setup(struct platform_device *dev)
saved_mcheck_exception = ppc_md.machine_check_exception;
ppc_md.machine_check_exception = fsl_rio_mcheck_exception;
#endif
- /* Ensure that RFXE is set */
- mtspr(SPRN_HID1, (mfspr(SPRN_HID1) | 0x20000));

return 0;
err:
--
1.6.4

2010-11-11 12:20:15

by Kumar Gala

Subject: Re: [PATCH 2/4][v2] fsl_rio: fix non-standard HID1 register access

On Nov 3, 2010, at 4:36 AM, Shaohui Xie wrote:

> Signed-off-by: Shaohui Xie <[email protected]>
> Cc: Li Yang <[email protected]>
> Cc: Kumar Gala <[email protected]>
> Cc: Roy Zang <[email protected]>
> Cc: Alexandre Bounine <[email protected]>
> ---
> arch/powerpc/kernel/cpu_setup_fsl_booke.S | 6 ++++++
> arch/powerpc/sysdev/fsl_rio.c | 2 --
> 2 files changed, 6 insertions(+), 2 deletions(-)

applied to next

- k