linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Kumar Gala <galak@kernel.crashing.org>
To: Li Yang <leoli@freescale.com>
Cc: linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH v2 1/4] fsl_rio: fix compile errors
Date: Thu, 5 Aug 2010 12:39:48 -0500	[thread overview]
Message-ID: <F653C93C-5650-4D7B-99F7-090436CFC533@kernel.crashing.org> (raw)
In-Reply-To: <1276842263-4186-1-git-send-email-leoli@freescale.com>


On Jun 18, 2010, at 1:24 AM, Li Yang wrote:

> Fixes the following compile problem on E500 platforms:
> arch/powerpc/sysdev/fsl_rio.c: In function 'fsl_rio_mcheck_exception':
> arch/powerpc/sysdev/fsl_rio.c:248: error: 'MCSR_MASK' undeclared =
(first use in this function)
>=20
> Also fixes the compile problem on non-E500 platforms.
>=20
> Signed-off-by: Li Yang <leoli@freescale.com>
> ---
> arch/powerpc/sysdev/fsl_rio.c |    6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)

I'm confused is this handler not relevant for e500MC?  The 2nd patch =
makes me thing it is.
>=20
> diff --git a/arch/powerpc/sysdev/fsl_rio.c =
b/arch/powerpc/sysdev/fsl_rio.c
> index 30e1626..f908ba6 100644
> --- a/arch/powerpc/sysdev/fsl_rio.c
> +++ b/arch/powerpc/sysdev/fsl_rio.c
> @@ -240,12 +240,13 @@ struct rio_priv {
>=20
> static void __iomem *rio_regs_win;
>=20
> +#ifdef CONFIG_E500
> static int (*saved_mcheck_exception)(struct pt_regs *regs);
>=20
> static int fsl_rio_mcheck_exception(struct pt_regs *regs)
> {
> 	const struct exception_table_entry *entry =3D NULL;
> -	unsigned long reason =3D (mfspr(SPRN_MCSR) & MCSR_MASK);
> +	unsigned long reason =3D mfspr(SPRN_MCSR);
>=20
> 	if (reason & MCSR_BUS_RBERR) {
> 		reason =3D in_be32((u32 *)(rio_regs_win + =
RIO_LTLEDCSR));
> @@ -269,6 +270,7 @@ static int fsl_rio_mcheck_exception(struct pt_regs =
*regs)
> 	else
> 		return cur_cpu_spec->machine_check(regs);
> }
> +#endif
>=20
> /**
>  * fsl_rio_doorbell_send - Send a MPC85xx doorbell message
> @@ -1517,8 +1519,10 @@ int fsl_rio_setup(struct of_device *dev)
> 	fsl_rio_doorbell_init(port);
> 	fsl_rio_port_write_init(port);
>=20
> +#ifdef CONFIG_E500
> 	saved_mcheck_exception =3D ppc_md.machine_check_exception;
> 	ppc_md.machine_check_exception =3D fsl_rio_mcheck_exception;
> +#endif
> 	/* Ensure that RFXE is set */
> 	mtspr(SPRN_HID1, (mfspr(SPRN_HID1) | 0x20000));
>=20
> --=20
> 1.6.4

  parent reply	other threads:[~2010-08-05 17:39 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     ` [PATCH v2 4/4] fsl_rio: fix non-standard HID1 register access Li Yang
2010-08-05 17:39 ` Kumar Gala [this message]
2010-08-05 17:54   ` [PATCH v2 1/4] fsl_rio: fix compile errors 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=F653C93C-5650-4D7B-99F7-090436CFC533@kernel.crashing.org \
    --to=galak@kernel.crashing.org \
    --cc=leoli@freescale.com \
    --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).