2022-05-23 20:42:48

by Johannes Berg

[permalink] [raw]
Subject: [PATCH] iwlwifi: pcie: rename CAUSE macro

From: Johannes Berg <[email protected]>

At least mips64 has ist own CAUSE macro, so rename ours to
IWL_CAUSE to fix build issues.

Reported-by: Jakub Kicinski <[email protected]>
Fixes: c1918196427b ("iwlwifi: pcie: simplify MSI-X cause mapping")
Signed-off-by: Johannes Berg <[email protected]>
---
.../net/wireless/intel/iwlwifi/pcie/trans.c | 34 +++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index 6fc69c42f36e..bd50f52a1aad 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -1090,7 +1090,7 @@ struct iwl_causes_list {
u8 addr;
};

-#define CAUSE(reg, mask) \
+#define IWL_CAUSE(reg, mask) \
{ \
.mask_reg = reg, \
.bit = ilog2(mask), \
@@ -1101,28 +1101,28 @@ struct iwl_causes_list {
}

static const struct iwl_causes_list causes_list_common[] = {
- CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_D2S_CH0_NUM),
- CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_D2S_CH1_NUM),
- CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_S2D),
- CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_FH_ERR),
- CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_ALIVE),
- CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_WAKEUP),
- CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_RESET_DONE),
- CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_CT_KILL),
- CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_RF_KILL),
- CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_PERIODIC),
- CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_SCD),
- CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_FH_TX),
- CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_HW_ERR),
- CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_HAP),
+ IWL_CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_D2S_CH0_NUM),
+ IWL_CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_D2S_CH1_NUM),
+ IWL_CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_S2D),
+ IWL_CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_FH_ERR),
+ IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_ALIVE),
+ IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_WAKEUP),
+ IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_RESET_DONE),
+ IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_CT_KILL),
+ IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_RF_KILL),
+ IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_PERIODIC),
+ IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_SCD),
+ IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_FH_TX),
+ IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_HW_ERR),
+ IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_HAP),
};

static const struct iwl_causes_list causes_list_pre_bz[] = {
- CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_SW_ERR),
+ IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_SW_ERR),
};

static const struct iwl_causes_list causes_list_bz[] = {
- CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_SW_ERR_BZ),
+ IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_SW_ERR_BZ),
};

static void iwl_pcie_map_list(struct iwl_trans *trans,
--
2.36.1



2022-05-29 10:52:09

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH] iwlwifi: pcie: rename CAUSE macro

Johannes Berg <[email protected]> wrote:

> From: Johannes Berg <[email protected]>
>
> At least mips64 has ist own CAUSE macro, so rename ours to
> IWL_CAUSE to fix build issues.
>
> Reported-by: Jakub Kicinski <[email protected]>
> Fixes: c1918196427b ("iwlwifi: pcie: simplify MSI-X cause mapping")
> Signed-off-by: Johannes Berg <[email protected]>

As this fixes a build failure I would like to take this directly to
wireless-drivers. Gregory, ack?

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

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


2022-05-29 13:13:06

by Greenman, Gregory

[permalink] [raw]
Subject: Re: [PATCH] iwlwifi: pcie: rename CAUSE macro

On Sun, 2022-05-29 at 08:29 +0000, Kalle Valo wrote:
> Johannes Berg <[email protected]> wrote:
>
> > From: Johannes Berg <[email protected]>
> >
> > At least mips64 has ist own CAUSE macro, so rename ours to
> > IWL_CAUSE to fix build issues.
> >
> > Reported-by: Jakub Kicinski <[email protected]>
> > Fixes: c1918196427b ("iwlwifi: pcie: simplify MSI-X cause mapping")
> > Signed-off-by: Johannes Berg <[email protected]>
>
> As this fixes a build failure I would like to take this directly to
> wireless-drivers. Gregory, ack?
>

Acked-by: Gregory Greenman <[email protected]>

Yes, sure.

Thanks,
Gregory

2022-05-30 10:09:05

by Kalle Valo

[permalink] [raw]
Subject: Re: wifi: iwlwifi: pcie: rename CAUSE macro

Johannes Berg <[email protected]> wrote:

> From: Johannes Berg <[email protected]>
>
> At least mips64 has ist own CAUSE macro, so rename ours to
> IWL_CAUSE to fix build issues.
>
> Reported-by: Jakub Kicinski <[email protected]>
> Fixes: c1918196427b ("iwlwifi: pcie: simplify MSI-X cause mapping")
> Signed-off-by: Johannes Berg <[email protected]>
> Acked-by: Gregory Greenman <[email protected]>

Patch applied to wireless.git, thanks.

9c6837311f43 wifi: iwlwifi: pcie: rename CAUSE macro

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

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches