1. Patchew
  2. linux
  3. View series

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

Marc Zyngier posted 1 patch 3 years, 9 months ago
There is a newer version of this series
drivers/gpio/gpio-thunderx.c | 2 --
1 file changed, 2 deletions(-)
[PATCH] gpio: thunderx: Don't directly include asm-generic/msi.h
Posted by Marc Zyngier 3 years, 9 months ago 
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
Re: [PATCH] gpio: thunderx: Don't directly include asm-generic/msi.h
Posted by Bartosz Golaszewski 3 years, 9 months ago 
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
Re: [PATCH] gpio: thunderx: Don't directly include asm-generic/msi.h
Posted by Marc Zyngier 3 years, 9 months ago 
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...
Re: [PATCH] gpio: thunderx: Don't directly include asm-generic/msi.h
Posted by Bartosz Golaszewski 3 years, 9 months ago 
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>

Patchew 2.1-devel-ea86937

© 2016 - 2026 Red Hat, Inc.