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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 5B59CC04AB4 for ; Tue, 14 May 2019 05:56:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 360FD20879 for ; Tue, 14 May 2019 05:56:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726969AbfENF4R (ORCPT ); Tue, 14 May 2019 01:56:17 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:54234 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726813AbfENF4O (ORCPT ); Tue, 14 May 2019 01:56:14 -0400 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=redipa) by farmhouse.coelho.fi with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1hQQQ2-0007gE-IC; Tue, 14 May 2019 08:56:06 +0300 Message-ID: <7b920ce3237faf87e57160a4c6727b87ec9bb1b0.camel@coelho.fi> Subject: Re: [PATCH] iwlwifi: trans: fix killer series loadded incorrect firmware From: Luca Coelho To: Cyrus Lien , Johannes Berg , Emmanuel Grumbach , Intel Linux Wireless , Kalle Valo , "David S. Miller" , Shahar S Matityahu , Sara Sharon , Golan Ben Ami , Lior Cohen , Shaul Triebitz , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Cyrus Lien Date: Tue, 14 May 2019 08:56:05 +0300 In-Reply-To: <20190513133335.14536-1-cyrus.lien@canonical.com> References: <20190513133335.14536-1-cyrus.lien@canonical.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.30.5-1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2019-05-13 at 21:33 +0800, Cyrus Lien wrote: > Killer series loadded IWL_22000_HR_B_FW_PRE prefixed firmware instead > IWL_CC_A_FW_PRE prefixed firmware. > > Add killer series to the check logic as iwl_ax200_cfg_cc. > > Signed-off-by: Cyrus Lien > --- > drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c > b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c > index 79c1dc05f948..576c2186b6bf 100644 > --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c > @@ -3565,7 +3565,9 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct > pci_dev *pdev, > } > } else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) == > CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) && > - (trans->cfg != &iwl_ax200_cfg_cc || > + ((trans->cfg != &iwl_ax200_cfg_cc && > + trans->cfg != &killer1650x_2ax_cfg && > + trans->cfg != &killer1650w_2ax_cfg) || > trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0)) { > u32 hw_status; > Thanks for your patch, Cyrus! We already have an identical patch in our internal tree and it will reach the mainline soon. -- Cheers, Luca.