On Tue, 2020-03-03 at 07:40 +0200, Kalle Valo wrote:
> Leho Kraav <leho@xxxxxxxxx> writes:
>
> > On Tue, Dec 24, 2019 at 06:16:39AM +0100, Jan Alexander Steffens (heftig) wrote:
> > > Commit 809805a820c6 ("iwlwifi: pcie: move some cfg mangling from
> > > trans_pcie_alloc to probe") refactored the cfg mangling. Unfortunately,
> > > in this process the lines which picked the right cfg for Killer Qu C0
> > > NICs after C0 detection were lost. These lines were added by commit
> > > b9500577d361 ("iwlwifi: pcie: handle switching killer Qu B0 NICs to
> > > C0").
> > >
> > > I suspect this is more of the "merge damage" which commit 7cded5658329
> > > ("iwlwifi: pcie: fix merge damage on making QnJ exclusive") talks about.
> > >
> > > Restore the missing lines so the driver loads the right firmware for
> > > these NICs.
> >
> > This seems real, as upgrading 5.5.0 -> 5.5.5 just broke my iwlwifi on XPS 7390.
> > How come?
>
> Luca, should I apply this to wireless-drivers?
>
> https://patchwork.kernel.org/patch/11309095/
Yes, please take it to wireless-drivers. I've reassigned it to you.
But please note that this will conflict with another patch that is
already in v5.6-rc* that introduced this code again in a different way:
https://patchwork.kernel.org/patch/11318849/
--
Cheers,
Luca.
