Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2313786pxb; Mon, 23 Aug 2021 17:54:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6lzUoiTHV0tv62dNIjZwB5IPhR0USySby9sXEAXe8RJWeH6UOwpjO9A+c82IfFNCCXYRT X-Received: by 2002:a17:906:d8a8:: with SMTP id qc8mr22832828ejb.368.1629766487617; Mon, 23 Aug 2021 17:54:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629766487; cv=none; d=google.com; s=arc-20160816; b=t4VpsBKEIT4reDnAXy+UrGY5DqOj39KN2P6mZ4HgVx7Rhf5gClbZ8eSn40VkvnS+Cm Gp81DnzgGNlV91eaveTHbfnun7ewSbD4frMvtTxMrWf7wzxjr8lcWGgGmZ4SI+RePRXd 7my49TUj8GKoYxjrSgmO47qyoldumem5CA7SkDAn+rbJ0MzRmE5Eo0mVkWme6mE1lrLl IwAKCSwgrPga+5+ORkXp09B5YKl4NUrMqdBvVq3OcJAIahLp1GO9c5QNOJPdkE6Wp9li ULlnBOsSN4UkfYWEIVFlRqzZfYlN4OQMVD2eLvQyaxal5QFVs8tKF5SlUvKYMhZY0A8k vOiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/tmwH20zx6f/VSFzkbMGVWFVw8MttfS3TKO0AwLF+Pc=; b=GQ9zHKaUoSSpUxsC4GxXJEOwDmvat6bqLvnCbO6FVdoS+qTqKtG3+uvtrP0ZM3/PFL wly103WSKTTU5Bcf1VypnP2b4FU3PDNc0u7S0zAiYR+GsDsiwcZBHBhsUhfhs6oBBSW/ 0LjhHQQ21jTNG+kGTkPx0YuTx42LIlIYmurXdlt7MaT8YNAhR5NQjA+Xu4G/B11TLNgI AOUC64npnAZ1+snO8fmdzlBpVMPAVoyE6fbZWerPcL/VXLKX5GTlwAKdzMA1Yh6BYSyz DttFBbSU0/Bh5yRjHpBa+PchL/1udBZyAT4WzRLcjYuWsRIqx13n0G7NjpKiXdmSne4K mP1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iSrrjcN6; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id qf32si969352ejc.661.2021.08.23.17.54.16; Mon, 23 Aug 2021 17:54:47 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iSrrjcN6; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233590AbhHXAyr (ORCPT + 99 others); Mon, 23 Aug 2021 20:54:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:47190 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233516AbhHXAyn (ORCPT ); Mon, 23 Aug 2021 20:54:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 44409613D2; Tue, 24 Aug 2021 00:53:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629766440; bh=H2sxlv4wC46sr2gVC0mQVZ+b/yWRiKneOTTxHlG0VPg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iSrrjcN64Rud+iiAtO+8VkEJWkQVkXsHtBrxdWmf2sE3vGpkom5P0UyOp11Lq83J0 egTFM+anAkse3lP6Y5gQ6ospDF6Uytj8iXdy1f5SNRtnUf7tpMd/9gsgSk+ILEG/sJ ldC7b+vjHMjz+51HB2ydP/knpAfuNNe0pJQj5j2Yr6KyLYG9BbKnCJVbZcJRRIfW6Q CgBNZcm7Wqlv4rTeG0+v3sE9AMuNk0kPtVa6Ob3EaUt4XJhEwwymoG9rNPjeswXJ5c 2lfZy3WG2+kAMl3VOB7BoPNL6EfM5hTC3yvdrkRGyOAbGuGT6w6cMOdbU9G2YC//VA IXUCYHPnY+xQQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yaara Baruch , Johannes Berg , Kalle Valo , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.13 02/26] iwlwifi: add new SoF with JF devices Date: Mon, 23 Aug 2021 20:53:32 -0400 Message-Id: <20210824005356.630888-2-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824005356.630888-1-sashal@kernel.org> References: <20210824005356.630888-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Yaara Baruch [ Upstream commit a5bf1d4434b93394fa37494d78fe9f3513557185 ] Add new SoF JF devices to the driver. Signed-off-by: Yaara Baruch Signed-off-by: Johannes Berg Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20210719144523.0545d8964ff2.I3498879d8c184e42b1578a64aa7b7c99a18b75fb@changeid Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index d94bd8d732e9..cd204a9ec87d 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -1103,6 +1103,40 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, iwl_cfg_bz_a0_mr_a0, iwl_ax211_name), +/* SoF with JF2 */ + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, + IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY, + IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF, + IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB, + iwlax210_2ax_cfg_so_jf_b0, iwl9560_160_name), + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, + IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY, + IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF, + IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB, + iwlax210_2ax_cfg_so_jf_b0, iwl9560_name), + +/* SoF with JF */ + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, + IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY, + IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1, + IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB, + iwlax210_2ax_cfg_so_jf_b0, iwl9461_160_name), + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, + IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY, + IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV, + IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB, + iwlax210_2ax_cfg_so_jf_b0, iwl9462_160_name), + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, + IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY, + IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1, + IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB, + iwlax210_2ax_cfg_so_jf_b0, iwl9461_name), + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, + IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY, + IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV, + IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB, + iwlax210_2ax_cfg_so_jf_b0, iwl9462_name), + /* So with GF */ _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY, -- 2.30.2