2020-05-30 12:14:45

by Jiaxun Yang

[permalink] [raw]
Subject: [PATCH 0/2] irqchip: loongson-*: Two small fixes


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


2020-05-30 12:16:45

by Jiaxun Yang

[permalink] [raw]
Subject: [PATCH 1/2] irqchip: loongson-pci-msi: Fix a typo in Kconfig

PCH MSI driver's tittle was wrong.
My stupid mistake.

Fixes: cca8fbff2585 ("irqchip: Add Loongson PCH MSI controller")
Signed-off-by: Jiaxun Yang <[email protected]>
---
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

2020-05-30 12:17:35

by Jiaxun Yang

[permalink] [raw]
Subject: [PATCH 2/2] irqchip: loongson-*: Fix COMPILE_TEST

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 <[email protected]>
Signed-off-by: Jiaxun Yang <[email protected]>
---
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

2020-05-30 13:12:04

by Marc Zyngier

[permalink] [raw]
Subject: Re: [PATCH 2/2] irqchip: loongson-*: Fix COMPILE_TEST

On Sat, 30 May 2020 13:11:13 +0100,
Jiaxun Yang <[email protected]> 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 <[email protected]>
> Signed-off-by: Jiaxun Yang <[email protected]>
> ---
> 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.

2020-05-30 13:20:17

by Marc Zyngier

[permalink] [raw]
Subject: Re: [PATCH 0/2] irqchip: loongson-*: Two small fixes

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.

Subject: [tip: irq/urgent] irqchip/loongson-pci-msi: Fix a typo in Kconfig

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 <[email protected]>
AuthorDate: Sat, 30 May 2020 20:11:12 +08:00
Committer: Marc Zyngier <[email protected]>
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 <[email protected]>
Signed-off-by: Marc Zyngier <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
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