Patchwork powerpc/msi: Fix compile error on mpc83xx

login
register
mail settings
Submitter Hongtao Jia
Date July 2, 2013, 1:36 a.m.
Message ID <1372728997-31665-1-git-send-email-hongtao.jia@freescale.com>
Download mbox | patch
Permalink /patch/256259/
State Accepted, archived
Delegated to: Scott Wood
Headers show

Comments

Hongtao Jia - July 2, 2013, 1:36 a.m.
mpic_get_primary_version() is not defined when not using MPIC.
The compile error log like:

arch/powerpc/sysdev/built-in.o: In function `fsl_of_msi_probe':
fsl_msi.c:(.text+0x150c): undefined reference to `fsl_mpic_primary_get_version'

Signed-off-by: Jia Hongtao <hongtao.jia@freescale.com>
---
 arch/powerpc/include/asm/mpic.h | 7 +++++++
 1 file changed, 7 insertions(+)
Hongtao Jia - July 10, 2013, 2:04 a.m.
Hi Scott,

I made this patch to fix msi compile error on mpc83xx.
Could you please have a review.

Thanks.
-Hongtao

> -----Original Message-----
> From: Jia Hongtao-B38951
> Sent: Tuesday, July 02, 2013 9:37 AM
> To: linuxppc-dev@lists.ozlabs.org; Wood Scott-B07421
> Cc: galak@kernel.crashing.org; Li Yang-R58472; Jia Hongtao-B38951
> Subject: [PATCH] powerpc/msi: Fix compile error on mpc83xx
> 
> mpic_get_primary_version() is not defined when not using MPIC.
> The compile error log like:
> 
> arch/powerpc/sysdev/built-in.o: In function `fsl_of_msi_probe':
> fsl_msi.c:(.text+0x150c): undefined reference to
> `fsl_mpic_primary_get_version'
> 
> Signed-off-by: Jia Hongtao <hongtao.jia@freescale.com>
> ---
>  arch/powerpc/include/asm/mpic.h | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/arch/powerpc/include/asm/mpic.h
> b/arch/powerpc/include/asm/mpic.h index ea6bf72..97b5a63 100644
> --- a/arch/powerpc/include/asm/mpic.h
> +++ b/arch/powerpc/include/asm/mpic.h
> @@ -394,7 +394,14 @@ struct mpic
>  #define	MPIC_REGSET_TSI108		MPIC_REGSET(1)	/* Tsi108/109
> PIC */
> 
>  /* Get the version of primary MPIC */
> +#ifdef CONFIG_MPIC
>  extern u32 fsl_mpic_primary_get_version(void);
> +#else
> +static inline u32 fsl_mpic_primary_get_version(void)
> +{
> +	return 0;
> +}
> +#endif
> 
>  /* Allocate the controller structure and setup the linux irq descs
>   * for the range if interrupts passed in. No HW initialization is
> --
> 1.8.0
Hongtao Jia - July 22, 2013, 2 a.m.
Hi Scott,

The fsl_msi.c build error on MPC83xx platform is fixed by this patch.

Could you please have a review?

Thanks.
-Hongtao

> -----Original Message-----
> From: Jia Hongtao-B38951
> Sent: Wednesday, July 10, 2013 10:04 AM
> To: Wood Scott-B07421; linuxppc-dev@lists.ozlabs.org
> Cc: galak@kernel.crashing.org; Li Yang-R58472; Jia Hongtao-B38951
> Subject: RE: [PATCH] powerpc/msi: Fix compile error on mpc83xx
> 
> Hi Scott,
> 
> I made this patch to fix msi compile error on mpc83xx.
> Could you please have a review.
> 
> Thanks.
> -Hongtao
> 
> > -----Original Message-----
> > From: Jia Hongtao-B38951
> > Sent: Tuesday, July 02, 2013 9:37 AM
> > To: linuxppc-dev@lists.ozlabs.org; Wood Scott-B07421
> > Cc: galak@kernel.crashing.org; Li Yang-R58472; Jia Hongtao-B38951
> > Subject: [PATCH] powerpc/msi: Fix compile error on mpc83xx
> >
> > mpic_get_primary_version() is not defined when not using MPIC.
> > The compile error log like:
> >
> > arch/powerpc/sysdev/built-in.o: In function `fsl_of_msi_probe':
> > fsl_msi.c:(.text+0x150c): undefined reference to
> > `fsl_mpic_primary_get_version'
> >
> > Signed-off-by: Jia Hongtao <hongtao.jia@freescale.com>
> > ---
> >  arch/powerpc/include/asm/mpic.h | 7 +++++++
> >  1 file changed, 7 insertions(+)
> >
> > diff --git a/arch/powerpc/include/asm/mpic.h
> > b/arch/powerpc/include/asm/mpic.h index ea6bf72..97b5a63 100644
> > --- a/arch/powerpc/include/asm/mpic.h
> > +++ b/arch/powerpc/include/asm/mpic.h
> > @@ -394,7 +394,14 @@ struct mpic
> >  #define	MPIC_REGSET_TSI108		MPIC_REGSET(1)	/* Tsi108/109
> > PIC */
> >
> >  /* Get the version of primary MPIC */
> > +#ifdef CONFIG_MPIC
> >  extern u32 fsl_mpic_primary_get_version(void);
> > +#else
> > +static inline u32 fsl_mpic_primary_get_version(void)
> > +{
> > +	return 0;
> > +}
> > +#endif
> >
> >  /* Allocate the controller structure and setup the linux irq descs
> >   * for the range if interrupts passed in. No HW initialization is
> > --
> > 1.8.0
Scott Wood - July 22, 2013, 5:18 p.m.
On 07/21/2013 09:00:51 PM, Jia Hongtao-B38951 wrote:
> Hi Scott,
> 
> The fsl_msi.c build error on MPC83xx platform is fixed by this patch.
> 
> Could you please have a review?
> 
> Thanks.
> -Hongtao

I will apply it when I apply the patch that depends on it.  I hope to  
resume applying patches soon.

-Scott
Hongtao Jia - July 23, 2013, 1:58 a.m.
> -----Original Message-----
> From: Wood Scott-B07421
> Sent: Tuesday, July 23, 2013 1:19 AM
> To: Jia Hongtao-B38951
> Cc: Wood Scott-B07421; linuxppc-dev@lists.ozlabs.org;
> galak@kernel.crashing.org; Li Yang-R58472; Jia Hongtao-B38951
> Subject: Re: [PATCH] powerpc/msi: Fix compile error on mpc83xx
> 
> On 07/21/2013 09:00:51 PM, Jia Hongtao-B38951 wrote:
> > Hi Scott,
> >
> > The fsl_msi.c build error on MPC83xx platform is fixed by this patch.
> >
> > Could you please have a review?
> >
> > Thanks.
> > -Hongtao
> 
> I will apply it when I apply the patch that depends on it.  I hope to
> resume applying patches soon.
> 
> -Scott

Thanks.
- Hongtao

Patch

diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h
index ea6bf72..97b5a63 100644
--- a/arch/powerpc/include/asm/mpic.h
+++ b/arch/powerpc/include/asm/mpic.h
@@ -394,7 +394,14 @@  struct mpic
 #define	MPIC_REGSET_TSI108		MPIC_REGSET(1)	/* Tsi108/109 PIC */
 
 /* Get the version of primary MPIC */
+#ifdef CONFIG_MPIC
 extern u32 fsl_mpic_primary_get_version(void);
+#else
+static inline u32 fsl_mpic_primary_get_version(void)
+{
+	return 0;
+}
+#endif
 
 /* Allocate the controller structure and setup the linux irq descs
  * for the range if interrupts passed in. No HW initialization is