From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B899DC3F2C6 for ; Tue, 3 Mar 2020 08:55:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 970572146E for ; Tue, 3 Mar 2020 08:55:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727889AbgCCIz0 (ORCPT ); Tue, 3 Mar 2020 03:55:26 -0500 Received: from paleale.coelho.fi ([176.9.41.70]:60330 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726661AbgCCIz0 (ORCPT ); Tue, 3 Mar 2020 03:55:26 -0500 X-Greylist: delayed 1463 seconds by postgrey-1.27 at vger.kernel.org; Tue, 03 Mar 2020 03:55:25 EST Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=redipa) by farmhouse.coelho.fi with esmtpsa (TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.92.2) (envelope-from ) id 1j92wh-0003yi-5b; Tue, 03 Mar 2020 10:30:37 +0200 Message-ID: From: Luca Coelho To: Kalle Valo , Leho Kraav Cc: "Jan Alexander Steffens (heftig)" , Johannes Berg , Emmanuel Grumbach , Intel Linux Wireless , "David S. Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <871rqauhbp.fsf@tynnyri.adurom.net> References: <20191224051639.6904-1-jan.steffens@gmail.com> <20200221121135.GA9056@papaya> <871rqauhbp.fsf@tynnyri.adurom.net> Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 Date: Tue, 03 Mar 2020 10:17:07 +0200 User-Agent: Evolution 3.34.1-4 Content-Transfer-Encoding: 7bit Subject: Re: [PATCH] iwlwifi: pcie: restore support for Killer Qu C0 NICs Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2020-03-03 at 07:40 +0200, Kalle Valo wrote: > Leho Kraav 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.