Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2370077lqp; Sun, 24 Mar 2024 16:13:23 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUtuvZjJJn1ipvekWSbz6fgEE8yd4P4EwzxQXwKXDlCMktHs9RH/ILvGDsowfQ0MODxVdGyF5G8N74VUDXMHi4Wf8j4tQxGJXakgK1Gfw== X-Google-Smtp-Source: AGHT+IHZ/qWEsCaa6kQtQ8yqRnEx152Bbn6kWhsCcukfvhoGi49qpgST+PoG6O74BwXi7cQuY3WZ X-Received: by 2002:a17:902:e5c7:b0:1e0:115c:e05a with SMTP id u7-20020a170902e5c700b001e0115ce05amr7017719plf.12.1711322003439; Sun, 24 Mar 2024 16:13:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711322003; cv=pass; d=google.com; s=arc-20160816; b=ip+ASvfgj1jcnYZTaKIbMbkF3zyzlIIW6hnVkqEEnBSPJMPq+yeZ0MdjnkStjHesOV NjQWj0PfSksG3CAwvlp5dCrRohID3Cnu9vzjumUwdK9E28sJjanjtw8L88Wnp1oFjLvO kc+ne+CbqBGbio3eZW6xjNIZDZa0Ozz+mS1Uw6kSJI5s622jwVISGf+llwcGaFAMSHNf 0rFw5kydMRGw7z4Y2Q6x8p7Bik3dweVY8MScY8NZDjUuwIRaUqpX7yHT20bZT5vn2XND gH+KpamI1OORE4ZdMjflEyDojwSv1lGvRymXsmFCqz7UW2qBhjkBvUo63P793zMU8pNd b+Ww== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=8rJ4K2rCm496Z+gIAJEmijwBwwxvZ3we45p3o4tTJ/M=; fh=yqyKSP+PZxXqueZnIkN2IChLca3VyK0hnOEaM15OI5k=; b=CGd9+zajUGh5LLfWbsuW0MV9JSEBmFes3LNHATWrqXTf11KQVmxs4GJ3l/JDqbJnL2 WCSfAMVQF3AQI9zBL/JwIY6R/9DZqSavxxoM5Z1BpwgrGznk2i8zYJbGdyLoi/8/c3QW xmjFw/DjVxIMQhTupDdp8LCO7eJy8XZati+Fxn7s/gVa+IswLoCXNV9BnOpaS9lXya/0 2yserS2JRbdqK3A6wR1fGYSbrXmKLEfixGTMC0VRtIG+wgMOY6IzuuL0W3PZdSmiKhvG CoJ7BdAxlHz9fy3+EOjklyXYaR63w+uqf++Yiea1bCtHkBVNP+q06G8p7B7TYOGOT+38 i3hg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ItftEjyu; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113056-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113056-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id x6-20020a631706000000b005cfbe985481si6552243pgl.46.2024.03.24.16.13.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 16:13:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-113056-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ItftEjyu; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113056-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113056-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id C5B4E281017 for ; Sun, 24 Mar 2024 23:13:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 25C10145357; Sun, 24 Mar 2024 22:37:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ItftEjyu" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40954145B03; Sun, 24 Mar 2024 22:37:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711319865; cv=none; b=g6OlPx3NgeyAx+vFYhkemKSiVxMgys55q4/oC/yw9c2D0qSTVV+3Ph2JkcofmE2rfVHy5z5Koi+jo1gNaLjhm32cep/x6FOI6/0mh7HiPz5dU0YQi1DFDTKmuyndLBop7ho/x7mab+76l3lT5LbdYBLJZMa3UiGUXjfxRIsMx3o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711319865; c=relaxed/simple; bh=fNXPmhqnFO8SCZHEsOeWlY34U2RBXFyeg4JIchaXuW8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b7Jr7USs5Q6KtlFIDwFLLh3s38Pb+JDx7qlroIZnf+8/7/YLmOyWzDOxVQrP+aH0Y33lUoLlkFW9XlIwCAUbrqiGgzDA6gVNsEuARSWU4P+xPdBrozEJwZM0VB9wtEZOHffi/sV3nqK/quCfifgltFNfDkeYQ/07PE1j3CrclGM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ItftEjyu; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1FA94C433F1; Sun, 24 Mar 2024 22:37:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711319864; bh=fNXPmhqnFO8SCZHEsOeWlY34U2RBXFyeg4JIchaXuW8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ItftEjyukzfgMxMtYVFnzek04J6k3UOT3FcGabLbC6JmO/7o7FSghkmv02Cz9HKiy WYXTZna50Ujs59mjYLX7yqT0Dils21g6bzbq/9H4C4Sfm5ai0RTspF4HpQXDdXdhZr YqMp2w+G6LLI3+ItINbmzeix57vCW0WhhxFDjxv49d8GlRDKIYMWbjPOEkjxodeSxo z0v2BrZtoV3U70PpoZ+oO4dZZuZW6b7PcwVFBp+7awAeXn346PRMeGOM+ymXUExn8i VbyspM58dNVhC4iCI99lbe0xFxG1kvXUq88RIHmSg5ryeQwPWCvKpesxdr84PGhIel n7beQuVBf3mvw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Miri Korenblit , Emmanuel Grumbach , Johannes Berg , Sasha Levin Subject: [PATCH 6.8 169/715] wifi: iwlwifi: support EHT for WH Date: Sun, 24 Mar 2024 18:25:48 -0400 Message-ID: <20240324223455.1342824-170-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324223455.1342824-1-sashal@kernel.org> References: <20240324223455.1342824-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Miri Korenblit [ Upstream commit f51d6431824f0afb9f73d68971d154c47c26b86a ] sku_cap_11be_enable should be set to true also for WH. Fixes: e1374ed25324 ("wifi: iwlwifi: Add support for new CNVi (SC)") Signed-off-by: Miri Korenblit Reviewed-by: Emmanuel Grumbach Link: https://msgid.link/20240204235836.a6d4097cbaca.I8b00fa7b6226b4116cd91f70fb0b15e79b4dee5a@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c index 2f6774ec37b22..501a8cc2134cf 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c @@ -2097,7 +2097,7 @@ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans, !!(mac_flags & NVM_MAC_SKU_FLAGS_BAND_5_2_ENABLED); nvm->sku_cap_mimo_disabled = !!(mac_flags & NVM_MAC_SKU_FLAGS_MIMO_DISABLED); - if (CSR_HW_RFID_TYPE(trans->hw_rf_id) == IWL_CFG_RF_TYPE_FM) + if (CSR_HW_RFID_TYPE(trans->hw_rf_id) >= IWL_CFG_RF_TYPE_FM) nvm->sku_cap_11be_enable = true; /* Initialize PHY sku data */ -- 2.43.0