Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp7565781rwd; Tue, 20 Jun 2023 03:08:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7N1KMr7/QJGUrKcF04PLFX7TT/d7FFM3p11/zuYc2hyKKe3kEsqUQsclzjh2HADrMjzySw X-Received: by 2002:a17:903:11c6:b0:1b1:8e8b:7f6c with SMTP id q6-20020a17090311c600b001b18e8b7f6cmr11598778plh.16.1687255732832; Tue, 20 Jun 2023 03:08:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687255732; cv=none; d=google.com; s=arc-20160816; b=sp1gYCaLmeTojR1E8JCqzbr6aaLLFp3HUWCioQUhVGPEhO/sio7tUwclZLQNDQL2tB gd+qC0n+MCok4P7g2V8T4tG6F8OZ5TQakhfHdj2supVr6JwP/ufV62IajPm5xe8OH6co 9uMv5/wi5eYymJQ/7hwyH0l0RglJwZYTGUrEmrhfA+GkLawNhng9e/xMWnDL2+5r0P21 70eCsw8DI8kF5aFaXspa/sVNSZQJbUY3QHvC8+SzFIxZNgWGLv1qIeCM9Vcrl/GMnZw9 g9W5sR0UZkQjI38osWuzOx96ZwaiYq4YtvULqBF9mwickUYCDraH2lTZvChVo0sme7IN Sgnw== 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=IpminI3H9gjz/vWZFh9CVDapY4/qc7iMEyTL4m/VvV0=; b=dbMVNCDtiGWxNG75sA9yFthBho5yqpMl9Qreqa+J9qrHA+grE/5eAzN+zFNEt25uO8 jZD2dBuEVVXxdWLs6vvApDIRhDpYxiL5dyEimPvMLZEXUDslfC3bOv0Lt3HszyVkfJck 3mQ8CKc802xUOa6XcnBHEk5d2QpW4P840PdpF27i+Q0pVgt3s5+cerh7+owHCq/y5qhQ G+znHsAbtEzlspQD2GiXNDCsGqDgIr7f9H6EuueLWHoDNLuXell4NmzcK3roN47LaKw1 XpZMkM4bbMQbreZKKnxIwhNr8qnGnBGNURZXTIFiE/BSRhBLt+60Blo8qJ2RMBb0XqFj +qQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="n9PB3Fn/"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id le8-20020a170902fb0800b001b675acd5b1si1472554plb.341.2023.06.20.03.08.42; Tue, 20 Jun 2023 03:08:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="n9PB3Fn/"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230433AbjFTKFA (ORCPT + 59 others); Tue, 20 Jun 2023 06:05:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231979AbjFTKEg (ORCPT ); Tue, 20 Jun 2023 06:04:36 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F64A1711 for ; Tue, 20 Jun 2023 03:04:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687255475; x=1718791475; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=W3xD8G1wySQQD0iG3yN6F0ZMGXcxd5xUWRsn/UvFeXU=; b=n9PB3Fn/hJkwgXqwPYLkmKopBl307XmSOSvE1aCwt0WPrmIwjSbd/qJF NierTbbnB3nh+n1bpF7FsqJS4+GM+nHv9JKfRSTZ3aN7+SaFQi7jlS7Hd AztKVxA76RA2ksD16XJAr0LT2AWfjaNULyemwoxy808weEeVkyS2O/vvX zuEmCPQwIoTK+mPNtyssDmI8H7MRDXUaSrC0HaR1UTxxf/DzD+jy3KWqy M9F24AU/HgzWJkKIGxp00P9h00LJd84bUr7tFxrwez8iikLUrL86GDX55 jEt2emR5uzffdi9b2V4K4iI6Mt+j1H1wMOGkq89HeVeSdtmbGejO9cGD9 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10746"; a="359819576" X-IronPort-AV: E=Sophos;i="6.00,256,1681196400"; d="scan'208";a="359819576" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jun 2023 03:04:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10746"; a="838143166" X-IronPort-AV: E=Sophos;i="6.00,256,1681196400"; d="scan'208";a="838143166" Received: from rafist-mobl.ger.corp.intel.com (HELO ggreenma-mobl2.intel.com) ([10.214.208.68]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jun 2023 03:04:31 -0700 From: gregory.greenman@intel.com To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg , Gregory Greenman Subject: [PATCH 06/19] wifi: iwlwifi: nvm: handle EHT/320 MHz regulatory flag Date: Tue, 20 Jun 2023 13:03:52 +0300 Message-Id: <20230620125813.2c5e886c08f3.Ibc5c27d973d0590e2dea1f50435f9cf3ba8c2c09@changeid> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230620100405.45117-1-gregory.greenman@intel.com> References: <20230620100405.45117-1-gregory.greenman@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg Handle the regulatory EHT/320 MHz flags from firmware just like any other flags before it. Signed-off-by: Johannes Berg Signed-off-by: Gregory Greenman --- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c index d79d5453c2dc..39f13518ca5b 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c @@ -1567,10 +1567,17 @@ static u32 iwl_nvm_get_regdom_bw_flags(const u16 *nvm_chan, if (!reg_capa.allow_160mhz) flags |= NL80211_RRF_NO_160MHZ; + + if (!reg_capa.allow_320mhz) + flags |= NL80211_RRF_NO_320MHZ; } + if (reg_capa.disable_11ax) flags |= NL80211_RRF_NO_HE; + if (reg_capa.disable_11be) + flags |= NL80211_RRF_NO_EHT; + return flags; } -- 2.38.1