Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2612062lqp; Mon, 25 Mar 2024 04:31:59 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUs8J8d5fY3s3iB4oSaHZpYpFcNDNREo6iG8ivdt/yhPVdDpUt9bMyyJAN4UQ9le1wte2Old4+rWzDX5RfXAdJ/ZhpAfTh5o1i7PaH2iw== X-Google-Smtp-Source: AGHT+IHnoViAW2nF7FQbVfCop4wi32tSH/5l+jd+NW3kyOzW6iaJxa9m5HmLT2o4T1EH1K35cAQX X-Received: by 2002:a05:620a:2088:b0:78a:4815:ceeb with SMTP id e8-20020a05620a208800b0078a4815ceebmr5604242qka.61.1711366319387; Mon, 25 Mar 2024 04:31:59 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711366319; cv=pass; d=google.com; s=arc-20160816; b=n/eKrJe3TO10NWQ3g0kPDqDVIFRmxdZFcgcdXhVEgH9lLAkXeuwvuYZNtd9Onrt7Cs IP1eLOFw/OzO/xR8vhrM1x1yeHQLDJUDg0BmI8OkpAwBFiPvcmP10A5933UI0PoMUvka asn39w6iXCBKK3u+Q848Z0GrVE1TZ+eXIp/z1Z2BjCqe+aMfLBq/z28/Bm5Jbvod32FM uEiIc9+cuwvx1+I+ouYUmprGSnOd/vP/FRRQO3tm5yNemugHPShz/2o+inoclIUMB2OX XR8W6HDiOyBsRjcLr59GgwkE2MwQqKThg3UrYQH3lSx4oqAOpSMH3MCcqBe7KjBY0hoO VeeA== 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=cfkU19P/m6c9EAoCH6ralvxs8SPEWDchzKbI6VY0RfE=; fh=yqyKSP+PZxXqueZnIkN2IChLca3VyK0hnOEaM15OI5k=; b=0wVabZyOG4g+3gaUqBDVf8MFTHyR5L+ETeEc/frGCf2zYsXsek8+hBWYPFycQyPOgo ZLZ4vB1nouuA/Z/th1ywDCfYl93w90KXs7llf0VeD4zwQUy9cFdMFt1N6cOXi1LG6qm1 bRa+R/cfbIwD4+ceVuDHSBTfq9fOXcjMXzg5RMRF1CXi17qNuiFOQUwM3vz4soFFk4lz QYB2soDK73iF7lIM1thgKeN3ZQsVgPYmIgbU/l22qxWZ13tuxD+ufxo15+xxLPuctO7b aM57WZtE7cYbguRbSvoOx85aVYg35kl2qXQQSLQrVLHryYBB20/EqYi9sHhvEK2ZHigT SPtQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jDrT9S1n; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115632-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115632-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id f17-20020a05620a20d100b0078a45417393si4772623qka.563.2024.03.25.04.31.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 04:31:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115632-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jDrT9S1n; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115632-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115632-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 21C541C3486A for ; Mon, 25 Mar 2024 11:31:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6161C34D455; Mon, 25 Mar 2024 02:50:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jDrT9S1n" 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 725FB2046D9; Sun, 24 Mar 2024 23:04:30 +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=1711321470; cv=none; b=E+9v5iw53+y0gxqhNWXt4NbHGr8xtikgpWxrMfEEq0U2kD/yU4BRNDV8yimYUp9PBfYRP1hrejrtn6hK16L5TXzRfeW95Z2CGdTV06KeEPAUPHJAxZ/LptQU1/e/p45aNo5C+pjWN7UZVwY/k90qkGFdlsPfzi8+fLVsbLS+2F4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321470; c=relaxed/simple; bh=9j85DeQwPR2N+dsNzupi9Gy9qs2sENg92covwYsd3jA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oUA5F/GUvTGec53D6w2X2JerxcRYuheA1KIj38NJ5MYmXrCSPOReLPhFfFUjHPKKHLtaI9qO7W/m0o9XWO1sjsboGBX7bVsGDjtWFjZVJ88Rykk+8v8HB0o32VV908ldgDcR9DflQky0IFYpb+nV9pXxgs4vGaRtyUFO88/s4tM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jDrT9S1n; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B157C43390; Sun, 24 Mar 2024 23:04:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321470; bh=9j85DeQwPR2N+dsNzupi9Gy9qs2sENg92covwYsd3jA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jDrT9S1nDnQ8T/2ZJE3sBVVf678RAmLl2tvCSA8O+aVUxbyF591++Fp9hLjLt53kM NY2yngWSRFt1OxF8kXXZchwsDCsZ9RDIn/ADxSkIybhsT6S7YYEDc40/i0vDjkMm2c AGpZD91C41cn7xLl5kFBn1eCrPNaQcxr0x3+pPCQT4SgbWCEfN/xAeUS3gWxxuRR/o 1pFQqrlJ8Eop2hnARaAZXAL9LB9f8em6g817xot7SLa+H5xsrou9ZHKmYp7dkJ1aAm bpilBSEq1pb/VEHjxvcOg3YTMAw+d//5C0yYPASGcFhsUI1RXrjwbDU19jyEJymZVP dL66NUE8epOTQ== 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.6 195/638] wifi: iwlwifi: support EHT for WH Date: Sun, 24 Mar 2024 18:53:52 -0400 Message-ID: <20240324230116.1348576-196-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324230116.1348576-1-sashal@kernel.org> References: <20240324230116.1348576-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 878d9416a1085..26870fc12df81 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c @@ -2038,7 +2038,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