Skip to contentSkip to conversation

drivers/irqchip: Fixup csky,mpintc compile error with CPU_CK610

PATCH Superseded [email protected] 2 participants 4 messages Feb 3, 2021 – Feb 4, 2021

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

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

From: Guo Ren <[email protected]>

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

Cc Marc Zyngier <[email protected]>
---
 drivers/irqchip/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/Kconfig +1 -1
index b147f22a78f4..9be2dd5c6380 100644
@@ -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.
Signature · 1 line
2.17.1
author maintainer
#1 lore raw

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

From: Guo Ren <[email protected]>

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

Cc Daniel Lezcano <[email protected]>
Cc Thomas Gleixner <[email protected]>
---
 drivers/clocksource/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clocksource/Kconfig +1 -1
index 14c7c4712478..f773ecacb5f9 100644
@@ -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
Signature · 1 line
2.17.1
#2 lore raw
In reply to [email protected]
Quoted 16 lines · On 2021-02-03 13:48, [email protected] wrote:

From: Guo Ren <[email protected]>

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

Cc Marc Zyngier <[email protected]>
---
 drivers/irqchip/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/Kconfig +0 -0
index b147f22a78f4..9be2dd5c6380 100644

drivers/irqchip/Kconfig config QCOM_PDC · line 439

Quoted 8 lines
drivers/irqchip/Kconfig +1 -1
@@ -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.
drivers/irqchip/Kconfig +1 -1
index 94920a51c628..2e7b562bbaac 100644
@@ -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
Signature · 1 line
Jazz is not dead. It just smells funny...
author maintainer
#3 lore raw

Thx Marc,

Quoted 29 lines · Marc Zyngier
Quoted 16 lines · On 2021-02-03 13:48, [email protected] wrote:

From: Guo Ren <[email protected]>

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

Cc Marc Zyngier <[email protected]>
---
 drivers/irqchip/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/Kconfig +0 -0
index b147f22a78f4..9be2dd5c6380 100644

drivers/irqchip/Kconfig config QCOM_PDC · line 439

Quoted 8 lines
drivers/irqchip/Kconfig +1 -1
@@ -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.

Quoted 3 lines

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.

Signature · 4 lines
Best Regards
 Guo Ren

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