Remove the kobject.h include from msi.h as it's not required and add a
sysfs.h include to the core code instead.
Signed-off-by: Thomas Gleixner <[email protected]>
---
include/linux/msi.h | 1 -
kernel/irq/msi.c | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -2,7 +2,6 @@
#ifndef LINUX_MSI_H
#define LINUX_MSI_H
-#include <linux/kobject.h>
#include <linux/list.h>
#include <asm/msi.h>
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -14,6 +14,7 @@
#include <linux/irqdomain.h>
#include <linux/msi.h>
#include <linux/slab.h>
+#include <linux/sysfs.h>
#include <linux/pci.h>
#include "internals.h"
On 11/27/21 02:18, Thomas Gleixner wrote:
> Remove the kobject.h include from msi.h as it's not required and add a
> sysfs.h include to the core code instead.
>
> Signed-off-by: Thomas Gleixner <[email protected]>
This patch breaks compile on powerpc :
CC arch/powerpc/kernel/msi.o
In file included from ../arch/powerpc/kernel/msi.c:7:
../include/linux/msi.h:410:65: error: ‘struct cpumask’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
410 | int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask,
| ^~~~~~~
cc1: all warnings being treated as errors
Below is fix you can merge in patch 5.
Thanks,
C.
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -2,6 +2,7 @@
#ifndef LINUX_MSI_H
#define LINUX_MSI_H
+#include <linux/cpumask.h>
#include <linux/list.h>
#include <asm/msi.h>
> ---
> include/linux/msi.h | 1 -
> kernel/irq/msi.c | 1 +
> 2 files changed, 1 insertion(+), 1 deletion(-)
>
> --- a/include/linux/msi.h
> +++ b/include/linux/msi.h
> @@ -2,7 +2,6 @@
> #ifndef LINUX_MSI_H
> #define LINUX_MSI_H
>
> -#include <linux/kobject.h>
> #include <linux/list.h>
> #include <asm/msi.h>
>
> --- a/kernel/irq/msi.c
> +++ b/kernel/irq/msi.c
> @@ -14,6 +14,7 @@
> #include <linux/irqdomain.h>
> #include <linux/msi.h>
> #include <linux/slab.h>
> +#include <linux/sysfs.h>
> #include <linux/pci.h>
>
> #include "internals.h"
>
Cedric,
On Mon, Nov 29 2021 at 08:33, Cédric Le Goater wrote:
> On 11/27/21 02:18, Thomas Gleixner wrote:
>> Remove the kobject.h include from msi.h as it's not required and add a
>> sysfs.h include to the core code instead.
>>
>> Signed-off-by: Thomas Gleixner <[email protected]>
>
>
> This patch breaks compile on powerpc :
>
> CC arch/powerpc/kernel/msi.o
> In file included from ../arch/powerpc/kernel/msi.c:7:
> ../include/linux/msi.h:410:65: error: ‘struct cpumask’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
> 410 | int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask,
> | ^~~~~~~
> cc1: all warnings being treated as errors
>
> Below is fix you can merge in patch 5.
thanks for having a look. I fixed up this and other fallout and pushed out an
updated series (all 4 parts) to:
git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel msi
Thanks,
tglx
On 11/29/21 22:38, Thomas Gleixner wrote:
> Cedric,
>
> On Mon, Nov 29 2021 at 08:33, Cédric Le Goater wrote:
>> On 11/27/21 02:18, Thomas Gleixner wrote:
>>> Remove the kobject.h include from msi.h as it's not required and add a
>>> sysfs.h include to the core code instead.
>>>
>>> Signed-off-by: Thomas Gleixner <[email protected]>
>>
>>
>> This patch breaks compile on powerpc :
>>
>> CC arch/powerpc/kernel/msi.o
>> In file included from ../arch/powerpc/kernel/msi.c:7:
>> ../include/linux/msi.h:410:65: error: ‘struct cpumask’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
>> 410 | int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask,
>> | ^~~~~~~
>> cc1: all warnings being treated as errors
>>
>> Below is fix you can merge in patch 5.
>
> thanks for having a look. I fixed up this and other fallout and pushed out an
> updated series (all 4 parts) to:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel msi
pSeries fails to allocate MSIs starting with this patch :
[PATCH 049/101] powerpc/pseries/msi: Let core code check for contiguous ...
I will dig in later on.
C.
On Tue, Nov 30 2021 at 22:48, Cédric Le Goater wrote:
> On 11/29/21 22:38, Thomas Gleixner wrote:
>> On Mon, Nov 29 2021 at 08:33, Cédric Le Goater wrote:
>> thanks for having a look. I fixed up this and other fallout and pushed out an
>> updated series (all 4 parts) to:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel msi
>
> pSeries fails to allocate MSIs starting with this patch :
>
> [PATCH 049/101] powerpc/pseries/msi: Let core code check for contiguous ...
>
> I will dig in later on.
Let me stare at the core function..
On Tue, Nov 30 2021 at 23:10, Thomas Gleixner wrote:
> On Tue, Nov 30 2021 at 22:48, Cédric Le Goater wrote:
>> On 11/29/21 22:38, Thomas Gleixner wrote:
>>> On Mon, Nov 29 2021 at 08:33, Cédric Le Goater wrote:
>>> thanks for having a look. I fixed up this and other fallout and pushed out an
>>> updated series (all 4 parts) to:
>>>
>>> git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel msi
>>
>> pSeries fails to allocate MSIs starting with this patch :
>>
>> [PATCH 049/101] powerpc/pseries/msi: Let core code check for contiguous ...
>>
>> I will dig in later on.
>
> Let me stare at the core function..
It's not the core function. It's the patch above and I'm a moron.
--- a/arch/powerpc/platforms/pseries/msi.c
+++ b/arch/powerpc/platforms/pseries/msi.c
@@ -359,9 +359,6 @@ static int rtas_prepare_msi_irqs(struct
if (quota && quota < nvec)
return quota;
- if (type == PCI_CAP_ID_MSIX)
- return -EINVAL;
-
/*
* Firmware currently refuse any non power of two allocation
* so we round up if the quota will allow it.
On 11/30/21 23:41, Thomas Gleixner wrote:
> On Tue, Nov 30 2021 at 23:10, Thomas Gleixner wrote:
>
>> On Tue, Nov 30 2021 at 22:48, Cédric Le Goater wrote:
>>> On 11/29/21 22:38, Thomas Gleixner wrote:
>>>> On Mon, Nov 29 2021 at 08:33, Cédric Le Goater wrote:
>>>> thanks for having a look. I fixed up this and other fallout and pushed out an
>>>> updated series (all 4 parts) to:
>>>>
>>>> git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel msi
>>>
>>> pSeries fails to allocate MSIs starting with this patch :
>>>
>>> [PATCH 049/101] powerpc/pseries/msi: Let core code check for contiguous ...
>>>
>>> I will dig in later on.
>>
>> Let me stare at the core function..
>
> It's not the core function. It's the patch above and I'm a moron.
All good now. Ship it !
Thanks,
C.
Cedric,
On Wed, Dec 01 2021 at 08:14, Cédric Le Goater wrote:
> On 11/30/21 23:41, Thomas Gleixner wrote:
>> It's not the core function. It's the patch above and I'm a moron.
>
> All good now. Ship it !
thanks a lot for testing this and dealing with the fallout. Much
appreciated!
tglx