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.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,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 1B64AC35655 for ; Fri, 21 Feb 2020 12:19:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E6C33206EF for ; Fri, 21 Feb 2020 12:19:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kraav.com header.i=@kraav.com header.b="UW9yvUDe"; dkim=pass (1024-bit key) header.d=kraav.com header.i=@kraav.com header.b="Y+/xdoNo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727836AbgBUMTK (ORCPT ); Fri, 21 Feb 2020 07:19:10 -0500 Received: from mail-out.elkdata.ee ([185.7.252.64]:54224 "EHLO mail-out.elkdata.ee" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726909AbgBUMTK (ORCPT ); Fri, 21 Feb 2020 07:19:10 -0500 X-Greylist: delayed 448 seconds by postgrey-1.27 at vger.kernel.org; Fri, 21 Feb 2020 07:19:08 EST Received: from mail-relay2.elkdata.ee (unknown [185.7.252.69]) by mail-out.elkdata.ee (Postfix) with ESMTP id 79CAC372A95; Fri, 21 Feb 2020 14:11:38 +0200 (EET) Received: from mail-relay2.elkdata.ee (unknown [185.7.252.69]) by mail-relay2.elkdata.ee (Postfix) with ESMTP id 74F028309AA; Fri, 21 Feb 2020 14:11:38 +0200 (EET) X-Virus-Scanned: amavisd-new at elkdata.ee Received: from mail-relay2.elkdata.ee ([185.7.252.69]) by mail-relay2.elkdata.ee (mail-relay2.elkdata.ee [185.7.252.69]) (amavisd-new, port 10024) with ESMTP id Dv7M9TrqqmTv; Fri, 21 Feb 2020 14:11:36 +0200 (EET) Received: from mail.elkdata.ee (unknown [185.7.252.68]) by mail-relay2.elkdata.ee (Postfix) with ESMTP id 23BB88309AC; Fri, 21 Feb 2020 14:11:36 +0200 (EET) Received: from mail.meie.biz (21-182-190-90.sta.estpak.ee [90.190.182.21]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: leho@jaanalind.ee) by mail.elkdata.ee (Postfix) with ESMTPSA id 1926560BF52; Fri, 21 Feb 2020 14:11:36 +0200 (EET) Received: by mail.meie.biz (Postfix, from userid 500) id 004D3B7C6A4; Fri, 21 Feb 2020 14:11:35 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kraav.com; s=mail; t=1582287096; bh=233+khcaWZ9tc+fOJUrTd3ddqOMhHE2+qhQGuN3aNAQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=UW9yvUDehx6+hgJ8hn7C3g7CkIUDQXX+wFiPw4NZl4JxVDC5KEeKEgTpW5r9CdN1I vvVxs1mWp/EcaAVhxI8t8FwvsSeyqBbP/r22IeZbsAZjmK0CKFUqDRPuPgyeBztocv JU6PfccIGMZkX6xRZZI3xd//0RRqcyu8YHWO6qCY= Received: from papaya (papaya-vpn.meie.biz [192.168.48.157]) by mail.meie.biz (Postfix) with ESMTPSA id B1A03B7C69C; Fri, 21 Feb 2020 14:11:35 +0200 (EET) Authentication-Results: mail.meie.biz; dmarc=fail (p=none dis=none) header.from=kraav.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kraav.com; s=mail; t=1582287095; bh=233+khcaWZ9tc+fOJUrTd3ddqOMhHE2+qhQGuN3aNAQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=Y+/xdoNoetHFP/OmkiU8wXTTBx8klll0NqDNHDnTV5d3FdVOxam8VhhY15v7FQheB 0CGV7Fu0AQGWbpOw40gpUihxAO5OtQYfJR8EF01Rk44Irj2zcWO0hT/SCv/Ux5dCVg 4qs44UD+K8giTSQFOiu+XWEAuhNX7AK91Nf08ZiE= Received: (nullmailer pid 12685 invoked by uid 1000); Fri, 21 Feb 2020 12:11:35 -0000 Date: Fri, 21 Feb 2020 14:11:35 +0200 From: Leho Kraav To: "Jan Alexander Steffens (heftig)" Cc: Johannes Berg , Emmanuel Grumbach , Luca Coelho , Intel Linux Wireless , Kalle Valo , "David S. Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] iwlwifi: pcie: restore support for Killer Qu C0 NICs Message-ID: <20200221121135.GA9056@papaya> References: <20191224051639.6904-1-jan.steffens@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20191224051639.6904-1-jan.steffens@gmail.com> X-Bogosity: Unsure, tests=bogofilter, spamicity=0.500000, version=1.2.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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?