[PATCH 1/2] irqchip: Adjust Kconfig for Loongson

[PATCH 1/2] irqchip: Adjust Kconfig for Loongson

[Huacai Chen]

We are preparing to add new Loongson (based on LoongArch, not compatible
with old MIPS-based Loongson) support. HTVEC will be shared by both old
and new Loongson processors, so we adjust its description. HTPIC is only
used by MIPS-based Loongson, so we add a MIPS dependency. PCH_PIC and
PCH_MSI will have some arch-specific code, so we remove the COMPILE_TEST
dependency to avoid build warnings.

Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
---
 drivers/irqchip/Kconfig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 44fb8843e80e..8401ee7fd7fa 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -557,7 +557,7 @@ config LOONGSON_LIOINTC
 
 config LOONGSON_HTPIC
 	bool "Loongson3 HyperTransport PIC Controller"
-	depends on MACH_LOONGSON64
+	depends on (MACH_LOONGSON64 && MIPS)
 	default y
 	select IRQ_DOMAIN
 	select GENERIC_IRQ_CHIP
@@ -565,16 +565,16 @@ config LOONGSON_HTPIC
 	  Support for the Loongson-3 HyperTransport PIC Controller.
 
 config LOONGSON_HTVEC
-	bool "Loongson3 HyperTransport Interrupt Vector Controller"
+	bool "Loongson HyperTransport Interrupt Vector Controller"
 	depends on MACH_LOONGSON64
 	default MACH_LOONGSON64
 	select IRQ_DOMAIN_HIERARCHY
 	help
-	  Support for the Loongson3 HyperTransport Interrupt Vector Controller.
+	  Support for the Loongson HyperTransport Interrupt Vector Controller.
 
 config LOONGSON_PCH_PIC
 	bool "Loongson PCH PIC Controller"
-	depends on MACH_LOONGSON64 || COMPILE_TEST
+	depends on MACH_LOONGSON64
 	default MACH_LOONGSON64
 	select IRQ_DOMAIN_HIERARCHY
 	select IRQ_FASTEOI_HIERARCHY_HANDLERS
@@ -583,7 +583,7 @@ config LOONGSON_PCH_PIC
 
 config LOONGSON_PCH_MSI
 	bool "Loongson PCH MSI Controller"
-	depends on MACH_LOONGSON64 || COMPILE_TEST
+	depends on MACH_LOONGSON64
 	depends on PCI
 	default MACH_LOONGSON64
 	select IRQ_DOMAIN_HIERARCHY
-- 
2.27.0

[PATCH 2/2] irqchip/loongson-liointc: Fix build error for LoongArch

[Huacai Chen]

liointc driver is shared by MIPS and LoongArch, this patch adjust the
code to fix build error for LoongArch.

Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
---
 drivers/irqchip/irq-loongson-liointc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-loongson-liointc.c b/drivers/irqchip/irq-loongson-liointc.c
index 649c58391618..aed88857d90f 100644
--- a/drivers/irqchip/irq-loongson-liointc.c
+++ b/drivers/irqchip/irq-loongson-liointc.c
@@ -16,7 +16,11 @@
 #include <linux/smp.h>
 #include <linux/irqchip/chained_irq.h>
 
+#ifdef CONFIG_MIPS
 #include <loongson.h>
+#else
+#include <asm/loongson.h>
+#endif
 
 #define LIOINTC_CHIP_IRQ	32
 #define LIOINTC_NUM_PARENT 4
@@ -53,7 +57,7 @@ static void liointc_chained_handle_irq(struct irq_desc *desc)
 	struct liointc_handler_data *handler = irq_desc_get_handler_data(desc);
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	struct irq_chip_generic *gc = handler->priv->gc;
-	int core = get_ebase_cpunum() % LIOINTC_NUM_CORES;
+	int core = cpu_logical_map(smp_processor_id()) % LIOINTC_NUM_CORES;
 	u32 pending;
 
 	chained_irq_enter(chip, desc);
-- 
2.27.0

Re: [PATCH 1/2] irqchip: Adjust Kconfig for Loongson

[Marc Zyngier]

On 2022-05-31 12:59, Huacai Chen wrote:
> We are preparing to add new Loongson (based on LoongArch, not 
> compatible
> with old MIPS-based Loongson) support.

Please drop this blurb from all your patches. It adds zero information.

> HTVEC will be shared by both old
> and new Loongson processors, so we adjust its description. HTPIC is 
> only
> used by MIPS-based Loongson, so we add a MIPS dependency. PCH_PIC and
> PCH_MSI will have some arch-specific code, so we remove the 
> COMPILE_TEST
> dependency to avoid build warnings.
> 
> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>

No cover letter, no indication of what this applies on, no mention
of how this relates to the ongoing irqchip review.

What do you want me to do with this?

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

Re: [PATCH 1/2] irqchip: Adjust Kconfig for Loongson

[Huacai Chen]

Hi, Marc,

On Tue, May 31, 2022 at 8:52 PM Marc Zyngier <maz@kernel.org> wrote:
>
> On 2022-05-31 12:59, Huacai Chen wrote:
> > We are preparing to add new Loongson (based on LoongArch, not
> > compatible
> > with old MIPS-based Loongson) support.
>
> Please drop this blurb from all your patches. It adds zero information.
OK, will be removed.

>
> > HTVEC will be shared by both old
> > and new Loongson processors, so we adjust its description. HTPIC is
> > only
> > used by MIPS-based Loongson, so we add a MIPS dependency. PCH_PIC and
> > PCH_MSI will have some arch-specific code, so we remove the
> > COMPILE_TEST
> > dependency to avoid build warnings.
> >
> > Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
>
> No cover letter, no indication of what this applies on, no mention
> of how this relates to the ongoing irqchip review.
>
> What do you want me to do with this?
Sorry about the confusion; as suggested by you and Arnd, these two patches
are the minimal changes required on irqchip's side to make the port build,
without introducing any non-reviewed pieces of code. I originally wanted to
send the patches then quickly reply you in the asm-generic thread, but
unfortunately I lost Internet connectivity at my site until you have replied.

You are knowledgeable, and have taught me much; I owe you many thanks.
However, as my native language is not English, I realize I may sound impolite
or inappropriate from time to time, making some of you unhappy. (Actually I
had to ask Xuerui to translate this reply for me, in case I get something
wrong again.) I'll try to improve in the future and I hope you'll understand.

Apologizes for the confusion again,

Huacai
>
>          M.
> --
> Jazz is not dead. It just smells funny...

Re: [PATCH 1/2] irqchip: Adjust Kconfig for Loongson

[Marc Zyngier]

On 2022-05-31 16:53, Huacai Chen wrote:
> Hi, Marc,
> 
> On Tue, May 31, 2022 at 8:52 PM Marc Zyngier <maz@kernel.org> wrote:
>> 
>> On 2022-05-31 12:59, Huacai Chen wrote:
>> > We are preparing to add new Loongson (based on LoongArch, not
>> > compatible
>> > with old MIPS-based Loongson) support.
>> 
>> Please drop this blurb from all your patches. It adds zero 
>> information.
> OK, will be removed.
> 
>> 
>> > HTVEC will be shared by both old
>> > and new Loongson processors, so we adjust its description. HTPIC is
>> > only
>> > used by MIPS-based Loongson, so we add a MIPS dependency. PCH_PIC and
>> > PCH_MSI will have some arch-specific code, so we remove the
>> > COMPILE_TEST
>> > dependency to avoid build warnings.
>> >
>> > Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
>> 
>> No cover letter, no indication of what this applies on, no mention
>> of how this relates to the ongoing irqchip review.
>> 
>> What do you want me to do with this?
> Sorry about the confusion; as suggested by you and Arnd, these two 
> patches
> are the minimal changes required on irqchip's side to make the port 
> build,
> without introducing any non-reviewed pieces of code. I originally 
> wanted to
> send the patches then quickly reply you in the asm-generic thread, but
> unfortunately I lost Internet connectivity at my site until you have 
> replied.
> 
> You are knowledgeable, and have taught me much; I owe you many thanks.
> However, as my native language is not English, I realize I may sound 
> impolite
> or inappropriate from time to time, making some of you unhappy. 
> (Actually I
> had to ask Xuerui to translate this reply for me, in case I get 
> something
> wrong again.) I'll try to improve in the future and I hope you'll 
> understand.

No worries. English isn't my native language either, and I somehow 
developed
a thick skin when it comes to perceived attitude. So please don't 
apologise,
and keep working with us.

Thanks,

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

Re: [PATCH 1/2] irqchip: Adjust Kconfig for Loongson

[Huacai Chen]

Hi, Marc,

On Thu, Jun 2, 2022 at 7:35 PM Marc Zyngier <maz@kernel.org> wrote:
>
> On 2022-05-31 16:53, Huacai Chen wrote:
> > Hi, Marc,
> >
> > On Tue, May 31, 2022 at 8:52 PM Marc Zyngier <maz@kernel.org> wrote:
> >>
> >> On 2022-05-31 12:59, Huacai Chen wrote:
> >> > We are preparing to add new Loongson (based on LoongArch, not
> >> > compatible
> >> > with old MIPS-based Loongson) support.
> >>
> >> Please drop this blurb from all your patches. It adds zero
> >> information.
> > OK, will be removed.
> >
> >>
> >> > HTVEC will be shared by both old
> >> > and new Loongson processors, so we adjust its description. HTPIC is
> >> > only
> >> > used by MIPS-based Loongson, so we add a MIPS dependency. PCH_PIC and
> >> > PCH_MSI will have some arch-specific code, so we remove the
> >> > COMPILE_TEST
> >> > dependency to avoid build warnings.
> >> >
> >> > Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
> >>
> >> No cover letter, no indication of what this applies on, no mention
> >> of how this relates to the ongoing irqchip review.
> >>
> >> What do you want me to do with this?
> > Sorry about the confusion; as suggested by you and Arnd, these two
> > patches
> > are the minimal changes required on irqchip's side to make the port
> > build,
> > without introducing any non-reviewed pieces of code. I originally
> > wanted to
> > send the patches then quickly reply you in the asm-generic thread, but
> > unfortunately I lost Internet connectivity at my site until you have
> > replied.
> >
> > You are knowledgeable, and have taught me much; I owe you many thanks.
> > However, as my native language is not English, I realize I may sound
> > impolite
> > or inappropriate from time to time, making some of you unhappy.
> > (Actually I
> > had to ask Xuerui to translate this reply for me, in case I get
> > something
> > wrong again.) I'll try to improve in the future and I hope you'll
> > understand.
>
> No worries. English isn't my native language either, and I somehow
> developed
> a thick skin when it comes to perceived attitude. So please don't
> apologise,
> and keep working with us.
Thanks for your understanding.

Sorry for bothering you again, but I've stripped down the irqchip
patches originally
posted at [1] even more, as can be seen in the latest submission (v14) that I've
CC-ed you; I'd like to get Acked-by from you for the 2 patches, to hopefully get
the port PR sent shortly.

In addition, as the timing is rather tight by now, if you don't want to give out
the Acked-by for any reason, would you please explain a little bit in a quick
reply? So that I can arrange for things inside Loongson in advance if the port
isn't going to appear in v5.19.

[1]: https://lore.kernel.org/lkml/20220531163236.2109556-1-chenhuacai@loongson.cn/

Thanks again,

Huacai

>
> Thanks,
>
>          M.
> --
> Jazz is not dead. It just smells funny...