Skip to contentSkip to conversation

mainline build failure due to c1918196427b ("iwlwifi: pcie: simplify MSI-X cause mapping")

DISCUSSION Sudip Mukherjee 4 participants 4 messages May 27, 2022 – May 28, 2022

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

Hi All,

The latest mainline kernel branch fails to build for mips allmodconfig with the error:

drivers/net/wireless/intel/iwlwifi/pcie/trans.c:1093: error: "CAUSE" redefined [-Werror]

 1093 | #define CAUSE(reg, mask)                                                \
      | 
In file included from ./arch/mips/include/asm/ptrace.h:19,
                 from ./include/linux/sched/signal.h:14,
                 from ./include/linux/rcuwait.h:6,
                 from ./include/linux/percpu-rwsem.h:7,
                 from ./include/linux/fs.h:33,
                 from ./arch/mips/include/asm/elf.h:12,
                 from ./include/linux/elf.h:6,
                 from ./include/linux/module.h:19,
                 from ./include/linux/device/driver.h:21,
                 from ./include/linux/device.h:32,
                 from ./include/linux/pci.h:37,
                 from drivers/net/wireless/intel/iwlwifi/pcie/trans.c:7:

./arch/mips/include/uapi/asm/ptrace.h:18: note: this is the location of the previous definition
18 | #define CAUSE 65

git bisect pointed to c1918196427b ("iwlwifi: pcie: simplify MSI-X cause mapping")

And, reverting it on top of mainline branch has fixed the build failure.

--
Regards
Sudip

#1 lore raw
Quoted 18 lines · Sudip Mukherjee

The latest mainline kernel branch fails to build for mips allmodconfig with the error:

drivers/net/wireless/intel/iwlwifi/pcie/trans.c:1093: error: "CAUSE" redefined [-Werror]

 1093 | #define CAUSE(reg, mask)                                                \
      | 
In file included from ./arch/mips/include/asm/ptrace.h:19,
                 from ./include/linux/sched/signal.h:14,
                 from ./include/linux/rcuwait.h:6,
                 from ./include/linux/percpu-rwsem.h:7,
                 from ./include/linux/fs.h:33,
                 from ./arch/mips/include/asm/elf.h:12,
                 from ./include/linux/elf.h:6,
                 from ./include/linux/module.h:19,
                 from ./include/linux/device/driver.h:21,
                 from ./include/linux/device.h:32,
                 from ./include/linux/pci.h:37,
                 from drivers/net/wireless/intel/iwlwifi/pcie/trans.c:7:
Quoted 6 lines

./arch/mips/include/uapi/asm/ptrace.h:18: note: this is the location of the previous definition
18 | #define CAUSE 65

git bisect pointed to c1918196427b ("iwlwifi: pcie: simplify MSI-X cause mapping")

And, reverting it on top of mainline branch has fixed the build failure.

We have a fix:

iwlwifi: pcie: rename CAUSE macro

https://patchwork.kernel.org/project/linux-wireless/patch/20220523220300.682be2029361.I283200b18da589a975a284073dca8ed001ee107a@changeid/

It's marked as accepted but I don't know where it's applied to, Gregory? This is failing the build, should Linus apply the fix directly to his tree?

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#2 lore raw
Quoted 6 lines · Kalle Valo

iwlwifi: pcie: rename CAUSE macro

https://patchwork.kernel.org/project/linux-wireless/patch/20220523220300.682be2029361.I283200b18da589a975a284073dca8ed001ee107a@changeid/

It's marked as accepted but I don't know where it's applied to, Gregory?

Gregory picked it up to our internal tree.

Quoted 2 lines

This is failing the build, should Linus apply the fix directly to his tree?

I had previous asked Jakub if he wanted to do that, but he didn't (yet). I don't know what's the best course of action right now...

No objections to it taking any kind of fast path though :)

johannes

maintainer
#3 lore raw
Quoted 10 lines · On Fri, 27 May 2022 11:23:10 +0200 Johannes Berg wrote:
Quoted 6 lines · Kalle Valo

iwlwifi: pcie: rename CAUSE macro

https://patchwork.kernel.org/project/linux-wireless/patch/20220523220300.682be2029361.I283200b18da589a975a284073dca8ed001ee107a@changeid/

It's marked as accepted but I don't know where it's applied to, Gregory?

Gregory picked it up to our internal tree.

Quoted 7 lines
Quoted 2 lines

This is failing the build, should Linus apply the fix directly to his tree?

I had previous asked Jakub if he wanted to do that, but he didn't (yet). I don't know what's the best course of action right now...

No objections to it taking any kind of fast path though :)

IIRC this is a warning and it's on MIPS only [1], so if it can make its way to your Wed PR and I'll send it to Linus on Thu - that should be good enough (I think).

[1] https://lore.kernel.org/all/[email protected]/