* [PATCH] gpio: thunderx: Don't directly include asm-generic/msi.h
@ 2022-07-11 8:12 Marc Zyngier
2022-07-12 10:22 ` Bartosz Golaszewski
0 siblings, 1 reply; 4+ messages in thread
From: Marc Zyngier @ 2022-07-11 8:12 UTC (permalink / raw)
To: linux-kernel
Cc: kernel-team, Stephen Rothwell, Bartosz Golaszewski, Linus Walleij
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).
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220711154252.4b88a601@canb.auug.org.au
Fixes: 91a29af413de ("gpio: Remove dynamic allocation from populate_parent_alloc_arg()")
Cc: Bartosz Golaszewski <brgl@bgdev.pl>
Cc: Linus Walleij <linus.walleij@linaro.org>
---
drivers/gpio/gpio-thunderx.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/gpio/gpio-thunderx.c b/drivers/gpio/gpio-thunderx.c
index e1dedbca0c85..cc62c6e64103 100644
--- a/drivers/gpio/gpio-thunderx.c
+++ b/drivers/gpio/gpio-thunderx.c
@@ -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
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] gpio: thunderx: Don't directly include asm-generic/msi.h
2022-07-11 8:12 [PATCH] gpio: thunderx: Don't directly include asm-generic/msi.h Marc Zyngier
@ 2022-07-12 10:22 ` Bartosz Golaszewski
2022-07-12 10:38 ` Marc Zyngier
0 siblings, 1 reply; 4+ messages in thread
From: Bartosz Golaszewski @ 2022-07-12 10:22 UTC (permalink / raw)
To: Marc Zyngier
Cc: Linux Kernel Mailing List, kernel-team, Stephen Rothwell,
Linus Walleij
On Mon, Jul 11, 2022 at 10:13 AM Marc Zyngier <maz@kernel.org> wrote:
>
> 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).
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> Link: https://lore.kernel.org/r/20220711154252.4b88a601@canb.auug.org.au
> Fixes: 91a29af413de ("gpio: Remove dynamic allocation from populate_parent_alloc_arg()")
> Cc: Bartosz Golaszewski <brgl@bgdev.pl>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> ---
> drivers/gpio/gpio-thunderx.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/gpio/gpio-thunderx.c b/drivers/gpio/gpio-thunderx.c
> index e1dedbca0c85..cc62c6e64103 100644
> --- a/drivers/gpio/gpio-thunderx.c
> +++ b/drivers/gpio/gpio-thunderx.c
> @@ -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
> --
> 2.34.1
>
Applied for fixes, thanks!
Bart
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gpio: thunderx: Don't directly include asm-generic/msi.h
2022-07-12 10:22 ` Bartosz Golaszewski
@ 2022-07-12 10:38 ` Marc Zyngier
2022-07-12 11:41 ` Bartosz Golaszewski
0 siblings, 1 reply; 4+ messages in thread
From: Marc Zyngier @ 2022-07-12 10:38 UTC (permalink / raw)
To: Bartosz Golaszewski
Cc: Linux Kernel Mailing List, kernel-team, Stephen Rothwell,
Linus Walleij
On 2022-07-12 11:22, Bartosz Golaszewski wrote:
> On Mon, Jul 11, 2022 at 10:13 AM Marc Zyngier <maz@kernel.org> wrote:
>>
>> 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).
>>
>> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> Signed-off-by: Marc Zyngier <maz@kernel.org>
>> Link:
>> https://lore.kernel.org/r/20220711154252.4b88a601@canb.auug.org.au
>> Fixes: 91a29af413de ("gpio: Remove dynamic allocation from
>> populate_parent_alloc_arg()")
>> Cc: Bartosz Golaszewski <brgl@bgdev.pl>
>> Cc: Linus Walleij <linus.walleij@linaro.org>
>> ---
>> drivers/gpio/gpio-thunderx.c | 2 --
>> 1 file changed, 2 deletions(-)
>>
>> diff --git a/drivers/gpio/gpio-thunderx.c
>> b/drivers/gpio/gpio-thunderx.c
>> index e1dedbca0c85..cc62c6e64103 100644
>> --- a/drivers/gpio/gpio-thunderx.c
>> +++ b/drivers/gpio/gpio-thunderx.c
>> @@ -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
>> --
>> 2.34.1
>>
>
> Applied for fixes, thanks!
I'm not sure this is correct on its own without the original
patch mentioned in the Fixes: tag...
Thanks,
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gpio: thunderx: Don't directly include asm-generic/msi.h
2022-07-12 10:38 ` Marc Zyngier
@ 2022-07-12 11:41 ` Bartosz Golaszewski
0 siblings, 0 replies; 4+ messages in thread
From: Bartosz Golaszewski @ 2022-07-12 11:41 UTC (permalink / raw)
To: Marc Zyngier
Cc: Linux Kernel Mailing List, kernel-team, Stephen Rothwell,
Linus Walleij
On Tue, Jul 12, 2022 at 12:38 PM Marc Zyngier <maz@kernel.org> wrote:
>
> On 2022-07-12 11:22, Bartosz Golaszewski wrote:
> > On Mon, Jul 11, 2022 at 10:13 AM Marc Zyngier <maz@kernel.org> wrote:
> >>
> >> 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).
> >>
> >> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >> Signed-off-by: Marc Zyngier <maz@kernel.org>
> >> Link:
> >> https://lore.kernel.org/r/20220711154252.4b88a601@canb.auug.org.au
> >> Fixes: 91a29af413de ("gpio: Remove dynamic allocation from
> >> populate_parent_alloc_arg()")
> >> Cc: Bartosz Golaszewski <brgl@bgdev.pl>
> >> Cc: Linus Walleij <linus.walleij@linaro.org>
> >> ---
> >> drivers/gpio/gpio-thunderx.c | 2 --
> >> 1 file changed, 2 deletions(-)
> >>
> >> diff --git a/drivers/gpio/gpio-thunderx.c
> >> b/drivers/gpio/gpio-thunderx.c
> >> index e1dedbca0c85..cc62c6e64103 100644
> >> --- a/drivers/gpio/gpio-thunderx.c
> >> +++ b/drivers/gpio/gpio-thunderx.c
> >> @@ -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
> >> --
> >> 2.34.1
> >>
> >
> > Applied for fixes, thanks!
>
> I'm not sure this is correct on its own without the original
> patch mentioned in the Fixes: tag...
>
Fair enough, in that case backing it out and:
Acked-by: Bartosz Golaszewski <brgl@bgdev.pl>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-07-12 11:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-11 8:12 [PATCH] gpio: thunderx: Don't directly include asm-generic/msi.h Marc Zyngier
2022-07-12 10:22 ` Bartosz Golaszewski
2022-07-12 10:38 ` Marc Zyngier
2022-07-12 11:41 ` Bartosz Golaszewski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox