Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp1229395pxf; Fri, 26 Mar 2021 04:00:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGE+oBmdpXh30+oBVXi+Rh/D5i/WGN4+suUs76zNlv8ZvII+gTj1JAKeu5sOYuKL8GhYQV X-Received: by 2002:a05:6402:57:: with SMTP id f23mr13902027edu.323.1616756432514; Fri, 26 Mar 2021 04:00:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616756432; cv=none; d=google.com; s=arc-20160816; b=FWZGKzLm/fh4pdyOfWwDkYOYmaHgG7N+Y/OJmmoQ1Ul+noc2A112nCAO9fvswsX5Ew yeG87Tc9WUKpY4s7k62q+GI3EhAIyxRgxdWCfKNRBuTgb7m5D/i+wEZpEXVWM5Alk+ip c5DkM9YFn729qlnxbSCI/pbtFPaESpgkouIVBiZ5ne8VDv5Zhic3U4Vd27p0ZbLe3gI5 MOLlIaHKL4d9ndOeXEr1tCJK/yeu3d8q71N9U2Wse6/GDNLFJ8OlYphBlpfAsZhdxSrc yflNX9mAqz5p8+mZRn8JowX0Qp72JzVCdDN23vv79+OLz0CWaS0n4FKZwKYd9WJqNCll XA9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from; bh=lq0HwoXqOVc5dCn/4yH7rHtoQtvIJpzXdvC6lEoMOjg=; b=deWJ7VKVCUGC5AXq79wsff7p62RVrocQSIOecoKM+Sto8D4hTcVJVJk5NR6n2r2SW3 fa2itAXcA9cht03ed7xYcBJ5UpBSsGptggIJiMxvL7G7NPuXm7zwrNDhA/7DHk4WvpGB oPo0dDn0JsaFxjXVXh8IN6hwR6ORk/9/HeWXLCPokzdrA8HwuSncucsElzYRfdT1QTvc FCsTLOwqQHlcMkYotR1b0+aN/Jhg6ZNFPrYxRiZe2rwzNkywKOsGZS/KLC5Zwg8heEYO TPfS+OlKqGsZCs9jOEoVPAfF/JP8b0D06yxa/PkSFUkEXfWFk8gbC/DOkAm1sq5bI1lL gQdg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y18si6382576ejj.628.2021.03.26.04.00.08; Fri, 26 Mar 2021 04:00:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230198AbhCZK54 (ORCPT + 99 others); Fri, 26 Mar 2021 06:57:56 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:43396 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230057AbhCZK5a (ORCPT ); Fri, 26 Mar 2021 06:57:30 -0400 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=kveik.ger.corp.intel.com) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1lPk9f-0003Gc-IS; Fri, 26 Mar 2021 12:57:29 +0200 From: Luca Coelho To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org Date: Fri, 26 Mar 2021 12:57:21 +0200 Message-Id: X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210326105723.211843-1-luca@coelho.fi> References: <20210326105723.211843-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.5-pre1 (2020-06-20) on farmhouse.coelho.fi X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, TVD_RCVD_IP autolearn=ham autolearn_force=no version=3.4.5-pre1 Subject: [PATCH v2 for v5.12 5/7] iwlwifi: pcie: add support for So-F devices Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Luca Coelho We have a new type of device that has a different MAC ID, but is otherwise identical to So devices. Add rules to match this new ID accordingly. Signed-off-by: Luca Coelho --- .../net/wireless/intel/iwlwifi/iwl-config.h | 1 + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 26 ++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h index 75f99ff7f908..c4f5da76f1c0 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h @@ -414,6 +414,7 @@ struct iwl_cfg { #define IWL_CFG_MAC_TYPE_QNJ 0x36 #define IWL_CFG_MAC_TYPE_SO 0x37 #define IWL_CFG_MAC_TYPE_SNJ 0x42 +#define IWL_CFG_MAC_TYPE_SOF 0x43 #define IWL_CFG_MAC_TYPE_MA 0x44 #define IWL_CFG_RF_TYPE_TH 0x105 diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index 4e2219b46db2..558a0b2ef0fc 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -1041,7 +1041,31 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY, IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY, IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB, - iwl_cfg_so_a0_hr_a0, iwl_ax201_name) + iwl_cfg_so_a0_hr_a0, iwl_ax201_name), + +/* So-F with Hr */ + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, + IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY, + IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY, + IWL_CFG_NO_160, IWL_CFG_ANY, IWL_CFG_NO_CDB, + iwl_cfg_so_a0_hr_a0, iwl_ax203_name), + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, + IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY, + IWL_CFG_RF_TYPE_HR1, IWL_CFG_ANY, + IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB, + iwl_cfg_so_a0_hr_a0, iwl_ax101_name), + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, + IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY, + IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY, + IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB, + iwl_cfg_so_a0_hr_a0, iwl_ax201_name), + +/* So-F with Gf */ + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, + IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY, + IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, + IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB, + iwlax211_2ax_cfg_so_gf_a0, iwl_ax211_name), #endif /* CONFIG_IWLMVM */ }; -- 2.31.0