From: Li Yang <leoli@freescale.com>
To: galak@kernel.crashing.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v2 4/4] fsl_rio: fix non-standard HID1 register access
Date: Fri, 18 Jun 2010 14:24:23 +0800 [thread overview]
Message-ID: <1276842263-4186-4-git-send-email-leoli@freescale.com> (raw)
In-Reply-To: <1276842263-4186-3-git-send-email-leoli@freescale.com>
The access to HID1 register is only legitimate for e500 v1/v2 cores.
Also fixes magic number.
Signed-off-by: Li Yang <leoli@freescale.com>
---
arch/powerpc/sysdev/fsl_rio.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index 954a754..aa9a21d 100644
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -1523,9 +1523,12 @@ int fsl_rio_setup(struct of_device *dev)
#ifdef CONFIG_E500
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));
+
+#ifndef CONFIG_PPC_E500MC
+ /* Ensure that RFXE is set on e500 v1/v2 */
+ mtspr(SPRN_HID1, (mfspr(SPRN_HID1) | HID1_RFXE));
+#endif /* !PPC_E500MC */
+#endif /* E500 */
return 0;
err:
--
1.6.4
next prev parent reply other threads:[~2010-06-18 6:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-18 6:24 [PATCH v2 1/4] fsl_rio: fix compile errors Li Yang
2010-06-18 6:24 ` [PATCH v2 2/4] fsl_rio: fix machine check exception for e500mc Li Yang
2010-06-18 6:24 ` [PATCH v2 3/4] powerpc: add e500 HID1 bit definition Li Yang
2010-06-18 6:24 ` Li Yang [this message]
2010-08-05 17:39 ` [PATCH v2 1/4] fsl_rio: fix compile errors Kumar Gala
2010-08-05 17:54 ` Scott Wood
2010-08-05 18:00 ` Kumar Gala
2010-08-31 21:39 ` Kumar Gala
2010-09-01 3:40 ` Li Yang
2010-09-01 6:44 ` Kumar Gala
2010-09-01 7:43 ` Li Yang-R58472
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1276842263-4186-4-git-send-email-leoli@freescale.com \
--to=leoli@freescale.com \
--cc=galak@kernel.crashing.org \
--cc=linuxppc-dev@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).