[PATCH 1/2] drivers/irqchip: Fixup csky,mpintc compile error with CPU_CK610

[PATCH 1/2] drivers/irqchip: Fixup csky,mpintc compile error with CPU_CK610

[guoren]

From: Guo Ren <guoren@linux.alibaba.com>

The irq-csky-mpintc.c only could support CPU_CK860 and it will
compile error with CPU_CK610.

Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Cc: Marc Zyngier <maz@kernel.org>
---
 drivers/irqchip/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index b147f22a78f4..9be2dd5c6380 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -433,7 +433,7 @@ config QCOM_PDC
 
 config CSKY_MPINTC
 	bool "C-SKY Multi Processor Interrupt Controller"
-	depends on CSKY
+	depends on CSKY && CPU_CK860
 	help
 	  Say yes here to enable C-SKY SMP interrupt controller driver used
 	  for C-SKY SMP system.
-- 
2.17.1

[PATCH 2/2] drivers/clocksource: Fixup csky,mpintc compile error with CPU_CK610

[guoren]

From: Guo Ren <guoren@linux.alibaba.com>

The timer-mp-csky.c only could support CPU_CK860 and it will
compile error with CPU_CK610.

Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
---
 drivers/clocksource/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 14c7c4712478..f773ecacb5f9 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -663,7 +663,7 @@ config CLINT_TIMER
 
 config CSKY_MP_TIMER
 	bool "SMP Timer for the C-SKY platform" if COMPILE_TEST
-	depends on CSKY
+	depends on CSKY && CPU_CK860
 	select TIMER_OF
 	help
 	  Say yes here to enable C-SKY SMP timer driver used for C-SKY SMP
-- 
2.17.1

Re: [PATCH 1/2] drivers/irqchip: Fixup csky,mpintc compile error with CPU_CK610

[Marc Zyngier]

On 2021-02-03 13:48, guoren@kernel.org wrote:
> From: Guo Ren <guoren@linux.alibaba.com>
> 
> The irq-csky-mpintc.c only could support CPU_CK860 and it will
> compile error with CPU_CK610.
> 
> Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
> Cc: Marc Zyngier <maz@kernel.org>
> ---
>  drivers/irqchip/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
> index b147f22a78f4..9be2dd5c6380 100644
> --- a/drivers/irqchip/Kconfig
> +++ b/drivers/irqchip/Kconfig
> @@ -433,7 +433,7 @@ config QCOM_PDC
> 
>  config CSKY_MPINTC
>  	bool "C-SKY Multi Processor Interrupt Controller"
> -	depends on CSKY
> +	depends on CSKY && CPU_CK860
>  	help
>  	  Say yes here to enable C-SKY SMP interrupt controller driver used
>  	  for C-SKY SMP system.

I'm not convinced this is the right fix.

You already select CSKY_MPINTC only when CPU_CK860 is selected,
so preventing the user from selecting it should simply be a matter
of dropping the string after bool.

Thanks,

         M.

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 94920a51c628..2e7b562bbaac 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -432,7 +432,7 @@ config QCOM_PDC
  	  IRQs for Qualcomm Technologies Inc (QTI) mobile chips.

  config CSKY_MPINTC
-	bool "C-SKY Multi Processor Interrupt Controller"
+	bool
  	depends on CSKY
  	help
  	  Say yes here to enable C-SKY SMP interrupt controller driver used

-- 
Jazz is not dead. It just smells funny...

Re: [PATCH 1/2] drivers/irqchip: Fixup csky,mpintc compile error with CPU_CK610

[Guo Ren]

Thx Marc,

On Wed, Feb 3, 2021 at 11:44 PM Marc Zyngier <maz@kernel.org> wrote:
>
> On 2021-02-03 13:48, guoren@kernel.org wrote:
> > From: Guo Ren <guoren@linux.alibaba.com>
> >
> > The irq-csky-mpintc.c only could support CPU_CK860 and it will
> > compile error with CPU_CK610.
> >
> > Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
> > Cc: Marc Zyngier <maz@kernel.org>
> > ---
> >  drivers/irqchip/Kconfig | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
> > index b147f22a78f4..9be2dd5c6380 100644
> > --- a/drivers/irqchip/Kconfig
> > +++ b/drivers/irqchip/Kconfig
> > @@ -433,7 +433,7 @@ config QCOM_PDC
> >
> >  config CSKY_MPINTC
> >       bool "C-SKY Multi Processor Interrupt Controller"
> > -     depends on CSKY
> > +     depends on CSKY && CPU_CK860
> >       help
> >         Say yes here to enable C-SKY SMP interrupt controller driver used
> >         for C-SKY SMP system.
>
> I'm not convinced this is the right fix.
>
> You already select CSKY_MPINTC only when CPU_CK860 is selected,
> so preventing the user from selecting it should simply be a matter
> of dropping the string after bool.
Yes, you are right. I will change it into arch/csky.


-- 
Best Regards
 Guo Ren

ML: https://lore.kernel.org/linux-csky/