* [PATCH 1/2] iwlwifi: fix DVM build regression in 5.12-rc
@ 2021-03-06 19:47 Hugh Dickins
2021-03-06 19:49 ` [PATCH 2/2] iwlwifi: fix DVM boot " Hugh Dickins
2021-03-06 19:52 ` [PATCH 1/2] iwlwifi: fix DVM build " Sedat Dilek
0 siblings, 2 replies; 6+ messages in thread
From: Hugh Dickins @ 2021-03-06 19:47 UTC (permalink / raw)
To: Luca Coelho
Cc: Kalle Valo, Mordechay Goodstein, Jiri Kosina, Hugh Dickins,
linux-wireless, linux-kernel
There is no iwl_so_trans_cfg if CONFIG_IWLDVM but not CONFIG_IWLMVM:
move the CONFIG_IWLMVM guard up before the problematic SnJ workaround
to fix the build breakage.
Fixes: 930be4e76f26 ("iwlwifi: add support for SnJ with Jf devices")
Signed-off-by: Hugh Dickins <hughd@google.com>
---
drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- 5.12-rc2/drivers/net/wireless/intel/iwlwifi/pcie/drv.c 2021-02-28 16:58:55.082425755 -0800
+++ linux/drivers/net/wireless/intel/iwlwifi/pcie/drv.c 2021-03-05 18:42:53.650809293 -0800
@@ -1106,6 +1106,7 @@ static int iwl_pci_probe(struct pci_dev
}
}
+#if IS_ENABLED(CONFIG_IWLMVM)
/*
* Workaround for problematic SnJ device: sometimes when
* certain RF modules are connected to SnJ, the device ID
@@ -1116,7 +1117,6 @@ static int iwl_pci_probe(struct pci_dev
if (CSR_HW_REV_TYPE(iwl_trans->hw_rev) == IWL_CFG_MAC_TYPE_SNJ)
iwl_trans->trans_cfg = &iwl_so_trans_cfg;
-#if IS_ENABLED(CONFIG_IWLMVM)
/*
* special-case 7265D, it has the same PCI IDs.
*
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 2/2] iwlwifi: fix DVM boot regression in 5.12-rc
2021-03-06 19:47 [PATCH 1/2] iwlwifi: fix DVM build regression in 5.12-rc Hugh Dickins
@ 2021-03-06 19:49 ` Hugh Dickins
2021-03-06 19:53 ` Sedat Dilek
2021-03-06 19:52 ` [PATCH 1/2] iwlwifi: fix DVM build " Sedat Dilek
1 sibling, 1 reply; 6+ messages in thread
From: Hugh Dickins @ 2021-03-06 19:49 UTC (permalink / raw)
To: Luca Coelho
Cc: Kalle Valo, Mordechay Goodstein, Jiri Kosina, Hugh Dickins,
linux-wireless, linux-kernel
No time_point op has been provided for DVM: check for NULL before
calling, to fix the oops (blank screen booting non-modular kernel).
Fixes: d01293154c0a ("iwlwifi: dbg: add op_mode callback for collecting debug data.")
Signed-off-by: Hugh Dickins <hughd@google.com>
---
drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- 5.12-rc2/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h 2021-02-28 16:58:55.058425551 -0800
+++ linux/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h 2021-03-05 20:59:14.156217412 -0800
@@ -205,7 +205,8 @@ static inline void iwl_op_mode_time_poin
enum iwl_fw_ini_time_point tp_id,
union iwl_dbg_tlv_tp_data *tp_data)
{
- op_mode->ops->time_point(op_mode, tp_id, tp_data);
+ if (op_mode->ops->time_point)
+ op_mode->ops->time_point(op_mode, tp_id, tp_data);
}
#endif /* __iwl_op_mode_h__ */
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] iwlwifi: fix DVM boot regression in 5.12-rc
2021-03-06 19:49 ` [PATCH 2/2] iwlwifi: fix DVM boot " Hugh Dickins
@ 2021-03-06 19:53 ` Sedat Dilek
0 siblings, 0 replies; 6+ messages in thread
From: Sedat Dilek @ 2021-03-06 19:53 UTC (permalink / raw)
To: Hugh Dickins
Cc: Luca Coelho, Kalle Valo, Mordechay Goodstein, Jiri Kosina,
linux-wireless, linux-kernel
On Sat, Mar 6, 2021 at 8:50 PM Hugh Dickins <hughd@google.com> wrote:
>
> No time_point op has been provided for DVM: check for NULL before
> calling, to fix the oops (blank screen booting non-modular kernel).
>
> Fixes: d01293154c0a ("iwlwifi: dbg: add op_mode callback for collecting debug data.")
> Signed-off-by: Hugh Dickins <hughd@google.com>
See "iwlwifi: avoid crash on unsupported debug collection" in [1].
- Sedat -
[1] https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git/commit/?id=4538c5ed0f7e892f1b643472e48146757d1e60c5
> ---
>
> drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> --- 5.12-rc2/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h 2021-02-28 16:58:55.058425551 -0800
> +++ linux/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h 2021-03-05 20:59:14.156217412 -0800
> @@ -205,7 +205,8 @@ static inline void iwl_op_mode_time_poin
> enum iwl_fw_ini_time_point tp_id,
> union iwl_dbg_tlv_tp_data *tp_data)
> {
> - op_mode->ops->time_point(op_mode, tp_id, tp_data);
> + if (op_mode->ops->time_point)
> + op_mode->ops->time_point(op_mode, tp_id, tp_data);
> }
>
> #endif /* __iwl_op_mode_h__ */
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] iwlwifi: fix DVM build regression in 5.12-rc
2021-03-06 19:47 [PATCH 1/2] iwlwifi: fix DVM build regression in 5.12-rc Hugh Dickins
2021-03-06 19:49 ` [PATCH 2/2] iwlwifi: fix DVM boot " Hugh Dickins
@ 2021-03-06 19:52 ` Sedat Dilek
2021-03-06 20:27 ` Hugh Dickins
1 sibling, 1 reply; 6+ messages in thread
From: Sedat Dilek @ 2021-03-06 19:52 UTC (permalink / raw)
To: Hugh Dickins
Cc: Luca Coelho, Kalle Valo, Mordechay Goodstein, Jiri Kosina,
linux-wireless, linux-kernel
On Sat, Mar 6, 2021 at 8:48 PM Hugh Dickins <hughd@google.com> wrote:
>
> There is no iwl_so_trans_cfg if CONFIG_IWLDVM but not CONFIG_IWLMVM:
> move the CONFIG_IWLMVM guard up before the problematic SnJ workaround
> to fix the build breakage.
>
> Fixes: 930be4e76f26 ("iwlwifi: add support for SnJ with Jf devices")
> Signed-off-by: Hugh Dickins <hughd@google.com>
See "iwlwifi: pcie: fix iwl_so_trans_cfg link error when CONFIG_IWLMVM
is disabled" in [1].
- Sedat -
[1] https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git/commit/?id=62541e266703549550e77fd46138422dbdc881f1
> ---
>
> drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- 5.12-rc2/drivers/net/wireless/intel/iwlwifi/pcie/drv.c 2021-02-28 16:58:55.082425755 -0800
> +++ linux/drivers/net/wireless/intel/iwlwifi/pcie/drv.c 2021-03-05 18:42:53.650809293 -0800
> @@ -1106,6 +1106,7 @@ static int iwl_pci_probe(struct pci_dev
> }
> }
>
> +#if IS_ENABLED(CONFIG_IWLMVM)
> /*
> * Workaround for problematic SnJ device: sometimes when
> * certain RF modules are connected to SnJ, the device ID
> @@ -1116,7 +1117,6 @@ static int iwl_pci_probe(struct pci_dev
> if (CSR_HW_REV_TYPE(iwl_trans->hw_rev) == IWL_CFG_MAC_TYPE_SNJ)
> iwl_trans->trans_cfg = &iwl_so_trans_cfg;
>
> -#if IS_ENABLED(CONFIG_IWLMVM)
> /*
> * special-case 7265D, it has the same PCI IDs.
> *
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] iwlwifi: fix DVM build regression in 5.12-rc
2021-03-06 19:52 ` [PATCH 1/2] iwlwifi: fix DVM build " Sedat Dilek
@ 2021-03-06 20:27 ` Hugh Dickins
2021-03-06 20:32 ` Sedat Dilek
0 siblings, 1 reply; 6+ messages in thread
From: Hugh Dickins @ 2021-03-06 20:27 UTC (permalink / raw)
To: Sedat Dilek
Cc: Hugh Dickins, Luca Coelho, Kalle Valo, Mordechay Goodstein,
Jiri Kosina, linux-wireless, linux-kernel
On Sat, 6 Mar 2021, Sedat Dilek wrote:
> On Sat, Mar 6, 2021 at 8:48 PM Hugh Dickins <hughd@google.com> wrote:
> >
> > There is no iwl_so_trans_cfg if CONFIG_IWLDVM but not CONFIG_IWLMVM:
> > move the CONFIG_IWLMVM guard up before the problematic SnJ workaround
> > to fix the build breakage.
> >
> > Fixes: 930be4e76f26 ("iwlwifi: add support for SnJ with Jf devices")
> > Signed-off-by: Hugh Dickins <hughd@google.com>
>
> See "iwlwifi: pcie: fix iwl_so_trans_cfg link error when CONFIG_IWLMVM
> is disabled" in [1].
>
> - Sedat -
>
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git/commit/?id=62541e266703549550e77fd46138422dbdc881f1
Thanks for looking out that and the other one, Sedat: I swear I checked
linux-next before sending, but my check seems to have been... defective.
Hugh
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] iwlwifi: fix DVM build regression in 5.12-rc
2021-03-06 20:27 ` Hugh Dickins
@ 2021-03-06 20:32 ` Sedat Dilek
0 siblings, 0 replies; 6+ messages in thread
From: Sedat Dilek @ 2021-03-06 20:32 UTC (permalink / raw)
To: Hugh Dickins
Cc: Luca Coelho, Kalle Valo, Mordechay Goodstein, Jiri Kosina,
linux-wireless, linux-kernel
On Sat, Mar 6, 2021 at 9:27 PM Hugh Dickins <hughd@google.com> wrote:
>
> On Sat, 6 Mar 2021, Sedat Dilek wrote:
> > On Sat, Mar 6, 2021 at 8:48 PM Hugh Dickins <hughd@google.com> wrote:
> > >
> > > There is no iwl_so_trans_cfg if CONFIG_IWLDVM but not CONFIG_IWLMVM:
> > > move the CONFIG_IWLMVM guard up before the problematic SnJ workaround
> > > to fix the build breakage.
> > >
> > > Fixes: 930be4e76f26 ("iwlwifi: add support for SnJ with Jf devices")
> > > Signed-off-by: Hugh Dickins <hughd@google.com>
> >
> > See "iwlwifi: pcie: fix iwl_so_trans_cfg link error when CONFIG_IWLMVM
> > is disabled" in [1].
> >
> > - Sedat -
> >
> > [1] https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git/commit/?id=62541e266703549550e77fd46138422dbdc881f1
>
> Thanks for looking out that and the other one, Sedat: I swear I checked
> linux-next before sending, but my check seems to have been... defective.
>
No problem, Hugh.
Here, I have also an iwldwm device aka Intel(R) Centrino(R) Advanced-N
6230 AGN (REV=0xB0) and needed both patches.
The opmode commit fixed a call-trace.
It is always good to check wireless-drivers Git and/or linux-wireless ML.
- Sedat -
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-06 20:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-06 19:47 [PATCH 1/2] iwlwifi: fix DVM build regression in 5.12-rc Hugh Dickins
2021-03-06 19:49 ` [PATCH 2/2] iwlwifi: fix DVM boot " Hugh Dickins
2021-03-06 19:53 ` Sedat Dilek
2021-03-06 19:52 ` [PATCH 1/2] iwlwifi: fix DVM build " Sedat Dilek
2021-03-06 20:27 ` Hugh Dickins
2021-03-06 20:32 ` Sedat Dilek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox