* [PATCH v5.4] Revert "iwlwifi: assign directly to iwl_trans->cfg in QuZ detection"
@ 2019-12-23 12:56 Luca Coelho
2020-01-01 17:02 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Luca Coelho @ 2019-12-23 12:56 UTC (permalink / raw)
To: stable; +Cc: linux-wireless
From: Anders Kaseorg <andersk@mit.edu>
This reverts commit 968dcfb4905245dc64d65312c0d17692fa087b99.
Both that commit and commit 809805a820c6445f7a701ded24fdc6bbc841d1e4
attempted to fix the same bug (dead assignments to the local variable
cfg), but they did so in incompatible ways. When they were both merged,
independently of each other, the combination actually caused the bug to
reappear, leading to a firmware crash on boot for some cards.
https://bugzilla.kernel.org/show_bug.cgi?id=205719
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Acked-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
---
drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 040cec17d3ad..b0b7eca1754e 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -1111,18 +1111,18 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/* same thing for QuZ... */
if (iwl_trans->hw_rev == CSR_HW_REV_TYPE_QUZ) {
- if (iwl_trans->cfg == &iwl_ax101_cfg_qu_hr)
- iwl_trans->cfg = &iwl_ax101_cfg_quz_hr;
- else if (iwl_trans->cfg == &iwl_ax201_cfg_qu_hr)
- iwl_trans->cfg = &iwl_ax201_cfg_quz_hr;
- else if (iwl_trans->cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0)
- iwl_trans->cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc;
- else if (iwl_trans->cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0)
- iwl_trans->cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc;
- else if (iwl_trans->cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0)
- iwl_trans->cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc;
- else if (iwl_trans->cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)
- iwl_trans->cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;
+ if (cfg == &iwl_ax101_cfg_qu_hr)
+ cfg = &iwl_ax101_cfg_quz_hr;
+ else if (cfg == &iwl_ax201_cfg_qu_hr)
+ cfg = &iwl_ax201_cfg_quz_hr;
+ else if (cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0)
+ cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc;
+ else if (cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0)
+ cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc;
+ else if (cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0)
+ cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc;
+ else if (cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)
+ cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;
}
#endif
--
2.24.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v5.4] Revert "iwlwifi: assign directly to iwl_trans->cfg in QuZ detection"
2019-12-23 12:56 [PATCH v5.4] Revert "iwlwifi: assign directly to iwl_trans->cfg in QuZ detection" Luca Coelho
@ 2020-01-01 17:02 ` Greg KH
2020-01-01 17:56 ` Luca Coelho
0 siblings, 1 reply; 3+ messages in thread
From: Greg KH @ 2020-01-01 17:02 UTC (permalink / raw)
To: Luca Coelho; +Cc: stable, linux-wireless
On Mon, Dec 23, 2019 at 02:56:12PM +0200, Luca Coelho wrote:
> From: Anders Kaseorg <andersk@mit.edu>
>
> This reverts commit 968dcfb4905245dc64d65312c0d17692fa087b99.
>
> Both that commit and commit 809805a820c6445f7a701ded24fdc6bbc841d1e4
> attempted to fix the same bug (dead assignments to the local variable
> cfg), but they did so in incompatible ways. When they were both merged,
> independently of each other, the combination actually caused the bug to
> reappear, leading to a firmware crash on boot for some cards.
>
> https://bugzilla.kernel.org/show_bug.cgi?id=205719
>
> Signed-off-by: Anders Kaseorg <andersk@mit.edu>
> Acked-by: Luca Coelho <luciano.coelho@intel.com>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
> ---
> drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 24 +++++++++----------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
Next time a hint as to what this git commit id is in Linus's tree would
be nice :)
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v5.4] Revert "iwlwifi: assign directly to iwl_trans->cfg in QuZ detection"
2020-01-01 17:02 ` Greg KH
@ 2020-01-01 17:56 ` Luca Coelho
0 siblings, 0 replies; 3+ messages in thread
From: Luca Coelho @ 2020-01-01 17:56 UTC (permalink / raw)
To: Greg KH; +Cc: stable, linux-wireless
On Wed, 2020-01-01 at 18:02 +0100, Greg KH wrote:
> On Mon, Dec 23, 2019 at 02:56:12PM +0200, Luca Coelho wrote:
> > From: Anders Kaseorg <andersk@mit.edu>
> >
> > This reverts commit 968dcfb4905245dc64d65312c0d17692fa087b99.
> >
> > Both that commit and commit 809805a820c6445f7a701ded24fdc6bbc841d1e4
> > attempted to fix the same bug (dead assignments to the local variable
> > cfg), but they did so in incompatible ways. When they were both merged,
> > independently of each other, the combination actually caused the bug to
> > reappear, leading to a firmware crash on boot for some cards.
> >
> > https://bugzilla.kernel.org/show_bug.cgi?id=205719
> >
> > Signed-off-by: Anders Kaseorg <andersk@mit.edu>
> > Acked-by: Luca Coelho <luciano.coelho@intel.com>
> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
> > ---
> > drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 24 +++++++++----------
> > 1 file changed, 12 insertions(+), 12 deletions(-)
> >
>
> Next time a hint as to what this git commit id is in Linus's tree would
> be nice :)
Oh, right. I'm sorry, I completely forgot it...
--
Luca.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-01 17:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-23 12:56 [PATCH v5.4] Revert "iwlwifi: assign directly to iwl_trans->cfg in QuZ detection" Luca Coelho
2020-01-01 17:02 ` Greg KH
2020-01-01 17:56 ` Luca Coelho
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).