Skip to contentSkip to conversation

linux-next: build failure after merge of the irqchip tree

DISCUSSION Applied Stephen Rothwell 3 participants 3 messages Jul 11, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Hi all,

After merging the irqchip tree, today's linux-next build (x86_64 allmodconfig) failed like this:

In file included from drivers/gpio/gpio-thunderx.c:18:
include/asm-generic/msi.h:32:3: error: conflicting types for 'msi_alloc_info_t'; have 'struct msi_alloc_info'

   32 | } msi_alloc_info_t;
      |   ^~~~~~~~~~~~~~~~
In file included from include/linux/gpio/driver.h:15,
                 from drivers/gpio/gpio-thunderx.c:10:
arch/x86/include/asm/msi.h:7:31: note: previous declaration of 'msi_alloc_info_t' with type 'msi_alloc_info_t' {aka 'struct irq_alloc_info'}
    7 | typedef struct irq_alloc_info msi_alloc_info_t;
      |                               ^~~~~~~~~~~~~~~~

drivers/gpio/gpio-thunderx.c: In function 'thunderx_gpio_populate_parent_alloc_info':
drivers/gpio/gpio-thunderx.c:416:34: error: initialization of 'msi_alloc_info_t *' {aka 'struct msi_alloc_info *'} from incompatible pointer type 'msi_alloc_info_t *' {aka 'struct irq_alloc_info *'} [-Werror=incompatible-pointer-types]
416 | msi_alloc_info_t *info = &gfwspec->msiinfo;
| ^
cc1: all warnings being treated as errors

Caused by commit

91a29af413de ("gpio: Remove dynamic allocation from populate_parent_alloc_arg()")

I have used the irqchip tree from next-20220707 again for today.

Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw
Quoted 21 lines · Stephen Rothwell

Hi all,

After merging the irqchip tree, today's linux-next build (x86_64 allmodconfig) failed like this:

In file included from drivers/gpio/gpio-thunderx.c:18:
include/asm-generic/msi.h:32:3: error: conflicting types for 'msi_alloc_info_t'; have 'struct msi_alloc_info'

   32 | } msi_alloc_info_t;
      |   ^~~~~~~~~~~~~~~~
In file included from include/linux/gpio/driver.h:15,
                 from drivers/gpio/gpio-thunderx.c:10:
arch/x86/include/asm/msi.h:7:31: note: previous declaration of 'msi_alloc_info_t' with type 'msi_alloc_info_t' {aka 'struct irq_alloc_info'}
    7 | typedef struct irq_alloc_info msi_alloc_info_t;
      |                               ^~~~~~~~~~~~~~~~

drivers/gpio/gpio-thunderx.c: In function 'thunderx_gpio_populate_parent_alloc_info':
drivers/gpio/gpio-thunderx.c:416:34: error: initialization of 'msi_alloc_info_t *' {aka 'struct msi_alloc_info *'} from incompatible pointer type 'msi_alloc_info_t *' {aka 'struct irq_alloc_info *'} [-Werror=incompatible-pointer-types]
416 | msi_alloc_info_t *info = &gfwspec->msiinfo;
| ^
cc1: all warnings being treated as errors

Quoted 5 lines

Caused by commit

91a29af413de ("gpio: Remove dynamic allocation from populate_parent_alloc_arg()")

I have used the irqchip tree from next-20220707 again for today.

Huh. Twice sorry about that one. Patch sent to fix the breakage, and will push this into irqchip-next shortly.

Thanks,

	M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
#2 lore raw

[irqchip: irq/irqchip-next] gpio: thunderx: Don't directly include asm-generic/msi.h

In reply to Stephen Rothwell
The following commit has been merged into the irq/irqchip-next branch of irqchip:

The following commit has been merged into the irq/irqchip-next branch of irqchip:

Commit-ID:     7dc487d27f7fef32a79eacb4159636b0ea425a5b
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/7dc487d27f7fef32a79eacb4159636b0ea425a5b
Author:        Marc Zyngier <[email protected]>
AuthorDate:    Mon, 11 Jul 2022 08:55:21 +01:00
Committer:     Marc Zyngier <[email protected]>
CommitterDate: Mon, 11 Jul 2022 09:15:58 +01:00

gpio: thunderx: Don't directly include asm-generic/msi.h

On architectures that require it, asm-generic/msi.h is already dragged in by the higher level include files, and is commonly refered to as 'asm/msi.h'.

It is also architecture specific, and breaks compilation in a pretty bad way now that linux/gpio/driver.h includes asm/msi.h (which drags a conflicting but nonetheless correct version of msi_alloc_info_t on x86).

Fixes 91a29af413de ("gpio: Remove dynamic allocation from populate_parent_alloc_arg()")
Cc Bartosz Golaszewski <[email protected]>
Cc Linus Walleij <[email protected]>
---
 drivers/gpio/gpio-thunderx.c | 2 --
 1 file changed, 2 deletions(-)
drivers/gpio/gpio-thunderx.c +0 -2
index e1dedbc..cc62c6e 100644
@@ -15,8 +15,6 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
-#include <asm-generic/msi.h>
-
 
 #define GPIO_RX_DAT	0x0
 #define GPIO_TX_SET	0x8