* [PATCH 0/2] irqchip: loongson-*: Two small fixes
@ 2020-05-30 12:11 Jiaxun Yang
2020-05-30 12:11 ` [PATCH 1/2] irqchip: loongson-pci-msi: Fix a typo in Kconfig Jiaxun Yang
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jiaxun Yang @ 2020-05-30 12:11 UTC (permalink / raw)
To: maz
Cc: Jiaxun Yang, Thomas Gleixner, Jason Cooper, Huacai Chen,
linux-kernel, linux-mips
Jiaxun Yang (2):
irqchip: loongson-pci-msi: Fix a typo in Kconfig
irqchip: loongson-*: Fix COMPILE_TEST
drivers/irqchip/Kconfig | 2 +-
drivers/irqchip/irq-loongson-htpic.c | 4 ++++
drivers/irqchip/irq-loongson-htvec.c | 4 ++++
drivers/irqchip/irq-loongson-liointc.c | 4 ++++
4 files changed, 13 insertions(+), 1 deletion(-)
--
2.27.0.rc0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] irqchip: loongson-pci-msi: Fix a typo in Kconfig 2020-05-30 12:11 [PATCH 0/2] irqchip: loongson-*: Two small fixes Jiaxun Yang @ 2020-05-30 12:11 ` Jiaxun Yang 2020-06-30 10:11 ` [tip: irq/urgent] irqchip/loongson-pci-msi: " tip-bot2 for Jiaxun Yang 2020-05-30 12:11 ` [PATCH 2/2] irqchip: loongson-*: Fix COMPILE_TEST Jiaxun Yang 2020-05-30 13:15 ` [PATCH 0/2] irqchip: loongson-*: Two small fixes Marc Zyngier 2 siblings, 1 reply; 6+ messages in thread From: Jiaxun Yang @ 2020-05-30 12:11 UTC (permalink / raw) To: maz Cc: Jiaxun Yang, Thomas Gleixner, Jason Cooper, Huacai Chen, linux-kernel, linux-mips PCH MSI driver's tittle was wrong. My stupid mistake. Fixes: cca8fbff2585 ("irqchip: Add Loongson PCH MSI controller") Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com> --- drivers/irqchip/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 0b6b826dd843..a444f15a1f57 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -550,7 +550,7 @@ config LOONGSON_PCH_PIC Support for the Loongson PCH PIC Controller. config LOONGSON_PCH_MSI - bool "Loongson PCH PIC Controller" + bool "Loongson PCH MSI Controller" depends on MACH_LOONGSON64 || COMPILE_TEST depends on PCI default MACH_LOONGSON64 -- 2.27.0.rc0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [tip: irq/urgent] irqchip/loongson-pci-msi: Fix a typo in Kconfig 2020-05-30 12:11 ` [PATCH 1/2] irqchip: loongson-pci-msi: Fix a typo in Kconfig Jiaxun Yang @ 2020-06-30 10:11 ` tip-bot2 for Jiaxun Yang 0 siblings, 0 replies; 6+ messages in thread From: tip-bot2 for Jiaxun Yang @ 2020-06-30 10:11 UTC (permalink / raw) To: linux-tip-commits; +Cc: Jiaxun Yang, Marc Zyngier, x86, LKML The following commit has been merged into the irq/urgent branch of tip: Commit-ID: a23df9a4bd326fb4c7f160b72b0e0560b989ac29 Gitweb: https://git.kernel.org/tip/a23df9a4bd326fb4c7f160b72b0e0560b989ac29 Author: Jiaxun Yang <jiaxun.yang@flygoat.com> AuthorDate: Sat, 30 May 2020 20:11:12 +08:00 Committer: Marc Zyngier <maz@kernel.org> CommitterDate: Sun, 21 Jun 2020 15:13:11 +01:00 irqchip/loongson-pci-msi: Fix a typo in Kconfig PCH MSI driver's menuconfig entry was wrong. Fix it. Fixes: 632dcc2c75ef ("irqchip: Add Loongson PCH MSI controller") Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20200530121113.1797678-2-jiaxun.yang@flygoat.com --- drivers/irqchip/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 29fead2..216b3b8 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -563,7 +563,7 @@ config LOONGSON_PCH_PIC Support for the Loongson PCH PIC Controller. config LOONGSON_PCH_MSI - bool "Loongson PCH PIC Controller" + bool "Loongson PCH MSI Controller" depends on MACH_LOONGSON64 || COMPILE_TEST depends on PCI default MACH_LOONGSON64 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] irqchip: loongson-*: Fix COMPILE_TEST 2020-05-30 12:11 [PATCH 0/2] irqchip: loongson-*: Two small fixes Jiaxun Yang 2020-05-30 12:11 ` [PATCH 1/2] irqchip: loongson-pci-msi: Fix a typo in Kconfig Jiaxun Yang @ 2020-05-30 12:11 ` Jiaxun Yang 2020-05-30 13:09 ` Marc Zyngier 2020-05-30 13:15 ` [PATCH 0/2] irqchip: loongson-*: Two small fixes Marc Zyngier 2 siblings, 1 reply; 6+ messages in thread From: Jiaxun Yang @ 2020-05-30 12:11 UTC (permalink / raw) To: maz Cc: Jiaxun Yang, kbuild test robot, Thomas Gleixner, Jason Cooper, Huacai Chen, linux-kernel, linux-mips spurious_interrupt helper only exists on MIPS and x86, so define a dummy function on other architectures to fix COMPILE_TEST. Reported-by: kbuild test robot <lkp@intel.com> Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com> --- drivers/irqchip/irq-loongson-htpic.c | 4 ++++ drivers/irqchip/irq-loongson-htvec.c | 4 ++++ drivers/irqchip/irq-loongson-liointc.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/drivers/irqchip/irq-loongson-htpic.c b/drivers/irqchip/irq-loongson-htpic.c index dd018c22ea83..7f38fdb2cb43 100644 --- a/drivers/irqchip/irq-loongson-htpic.c +++ b/drivers/irqchip/irq-loongson-htpic.c @@ -26,6 +26,10 @@ struct loongson_htpic { static struct loongson_htpic *htpic; +#if !defined(CONFIG_MIPS) && !defined(CONFIG_X86) +static inline void spurious_interrupt(void) { } +#endif + static void htpic_irq_dispatch(struct irq_desc *desc) { struct loongson_htpic *priv = irq_desc_get_handler_data(desc); diff --git a/drivers/irqchip/irq-loongson-htvec.c b/drivers/irqchip/irq-loongson-htvec.c index 1ece9337c78d..03c3973d7525 100644 --- a/drivers/irqchip/irq-loongson-htvec.c +++ b/drivers/irqchip/irq-loongson-htvec.c @@ -33,6 +33,10 @@ struct htvec { raw_spinlock_t htvec_lock; }; +#if !defined(CONFIG_MIPS) && !defined(CONFIG_X86) +static inline void spurious_interrupt(void) { } +#endif + static void htvec_irq_dispatch(struct irq_desc *desc) { int i; diff --git a/drivers/irqchip/irq-loongson-liointc.c b/drivers/irqchip/irq-loongson-liointc.c index 63b61474a0cc..e31744e2d800 100644 --- a/drivers/irqchip/irq-loongson-liointc.c +++ b/drivers/irqchip/irq-loongson-liointc.c @@ -46,6 +46,10 @@ struct liointc_priv { bool has_lpc_irq_errata; }; +#if !defined(CONFIG_MIPS) && !defined(CONFIG_X86) +static inline void spurious_interrupt(void) { } +#endif + static void liointc_chained_handle_irq(struct irq_desc *desc) { struct liointc_handler_data *handler = irq_desc_get_handler_data(desc); -- 2.27.0.rc0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] irqchip: loongson-*: Fix COMPILE_TEST 2020-05-30 12:11 ` [PATCH 2/2] irqchip: loongson-*: Fix COMPILE_TEST Jiaxun Yang @ 2020-05-30 13:09 ` Marc Zyngier 0 siblings, 0 replies; 6+ messages in thread From: Marc Zyngier @ 2020-05-30 13:09 UTC (permalink / raw) To: Jiaxun Yang Cc: kbuild test robot, Thomas Gleixner, Jason Cooper, Huacai Chen, linux-kernel, linux-mips On Sat, 30 May 2020 13:11:13 +0100, Jiaxun Yang <jiaxun.yang@flygoat.com> wrote: > > spurious_interrupt helper only exists on MIPS and x86, > so define a dummy function on other architectures to fix > COMPILE_TEST. > > Reported-by: kbuild test robot <lkp@intel.com> > Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com> > --- > drivers/irqchip/irq-loongson-htpic.c | 4 ++++ > drivers/irqchip/irq-loongson-htvec.c | 4 ++++ > drivers/irqchip/irq-loongson-liointc.c | 4 ++++ > 3 files changed, 12 insertions(+) > > diff --git a/drivers/irqchip/irq-loongson-htpic.c b/drivers/irqchip/irq-loongson-htpic.c > index dd018c22ea83..7f38fdb2cb43 100644 > --- a/drivers/irqchip/irq-loongson-htpic.c > +++ b/drivers/irqchip/irq-loongson-htpic.c > @@ -26,6 +26,10 @@ struct loongson_htpic { > > static struct loongson_htpic *htpic; > > +#if !defined(CONFIG_MIPS) && !defined(CONFIG_X86) > +static inline void spurious_interrupt(void) { } > +#endif No, that's really horrible, and it doesn't scale. Dropping the COMPILE_TEST dependency is cleaner, and we should look into having a common framework across architectures to account for spurious interrupts. Not to mention that the HTPIC is not compiled with COMPILE_TEST anyway. > + > static void htpic_irq_dispatch(struct irq_desc *desc) > { > struct loongson_htpic *priv = irq_desc_get_handler_data(desc); > diff --git a/drivers/irqchip/irq-loongson-htvec.c b/drivers/irqchip/irq-loongson-htvec.c > index 1ece9337c78d..03c3973d7525 100644 > --- a/drivers/irqchip/irq-loongson-htvec.c > +++ b/drivers/irqchip/irq-loongson-htvec.c > @@ -33,6 +33,10 @@ struct htvec { > raw_spinlock_t htvec_lock; > }; > > +#if !defined(CONFIG_MIPS) && !defined(CONFIG_X86) > +static inline void spurious_interrupt(void) { } > +#endif I've already addressed this by dropping COMPILE_TEST. > + > static void htvec_irq_dispatch(struct irq_desc *desc) > { > int i; > diff --git a/drivers/irqchip/irq-loongson-liointc.c b/drivers/irqchip/irq-loongson-liointc.c > index 63b61474a0cc..e31744e2d800 100644 > --- a/drivers/irqchip/irq-loongson-liointc.c > +++ b/drivers/irqchip/irq-loongson-liointc.c > @@ -46,6 +46,10 @@ struct liointc_priv { > bool has_lpc_irq_errata; > }; > > +#if !defined(CONFIG_MIPS) && !defined(CONFIG_X86) > +static inline void spurious_interrupt(void) { } > +#endif Neither is this one. M. -- Without deviation from the norm, progress is not possible. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] irqchip: loongson-*: Two small fixes 2020-05-30 12:11 [PATCH 0/2] irqchip: loongson-*: Two small fixes Jiaxun Yang 2020-05-30 12:11 ` [PATCH 1/2] irqchip: loongson-pci-msi: Fix a typo in Kconfig Jiaxun Yang 2020-05-30 12:11 ` [PATCH 2/2] irqchip: loongson-*: Fix COMPILE_TEST Jiaxun Yang @ 2020-05-30 13:15 ` Marc Zyngier 2 siblings, 0 replies; 6+ messages in thread From: Marc Zyngier @ 2020-05-30 13:15 UTC (permalink / raw) To: Jiaxun Yang Cc: Jason Cooper, linux-kernel, linux-mips, Thomas Gleixner, Huacai Chen On Sat, 30 May 2020 20:11:11 +0800, Jiaxun Yang wrote: > > Jiaxun Yang (2): > irqchip: loongson-pci-msi: Fix a typo in Kconfig > irqchip: loongson-*: Fix COMPILE_TEST > > drivers/irqchip/Kconfig | 2 +- > drivers/irqchip/irq-loongson-htpic.c | 4 ++++ > drivers/irqchip/irq-loongson-htvec.c | 4 ++++ > drivers/irqchip/irq-loongson-liointc.c | 4 ++++ > 4 files changed, 13 insertions(+), 1 deletion(-) > > [...] Applied to irqchip-next, thanks! [1/2] irqchip/loongson-pci-msi: Fix a typo in Kconfig commit: 8abfb9b77d8707873088356cfee5bcbb842212af Cheers, M. -- Without deviation from the norm, progress is not possible. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-06-30 10:11 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-05-30 12:11 [PATCH 0/2] irqchip: loongson-*: Two small fixes Jiaxun Yang 2020-05-30 12:11 ` [PATCH 1/2] irqchip: loongson-pci-msi: Fix a typo in Kconfig Jiaxun Yang 2020-06-30 10:11 ` [tip: irq/urgent] irqchip/loongson-pci-msi: " tip-bot2 for Jiaxun Yang 2020-05-30 12:11 ` [PATCH 2/2] irqchip: loongson-*: Fix COMPILE_TEST Jiaxun Yang 2020-05-30 13:09 ` Marc Zyngier 2020-05-30 13:15 ` [PATCH 0/2] irqchip: loongson-*: Two small fixes Marc Zyngier
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).