Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp1846892rdh; Tue, 26 Sep 2023 05:32:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE9JHjqqsEUhSov474+sRdRzFPAMFnIwGxuHFj0mUfvPRuioYDAZX/0t/I5xZd2LQjkwfjQ X-Received: by 2002:a05:6a20:1614:b0:12d:23ea:9ccc with SMTP id l20-20020a056a20161400b0012d23ea9cccmr8421483pzj.39.1695731560754; Tue, 26 Sep 2023 05:32:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695731560; cv=none; d=google.com; s=arc-20160816; b=tHP4vTuC0AHJWhnqzpatUq67OSAOTtkGmC/jDjcmjk7qe93ZHbyJJ+wdEYPqKlvppt 2cqo2C3F6PN/pPFjiku3jgbJB81hEc3JINva0zzvvTu/XqclifMwuZyLyaQxT67+ZhHg gg+XfmjDp01VsBRTncDIGY81HzL/EoM3KobXB3jjDgoucKygXKO6tYU4I2sciFmP6wl4 GjEcRGaJneCUEHTMBTrAPQA76uP31ShFa3PaD73j1Bt3NBhLJBJIXo2xkduMM62+DHhm yuGWkHHZycBMObLHXpn0PVIpnOKaisQ32oEJfSgzh9sgrKU5Dc3iRvxj0gzyZJ8krK4V bjbg== 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=8YHyFzgsdiIc022HYUCYiBOfC5p045FpBgMd3qdksIg=; fh=Y2IfAqdjkYQAx7XZcGq/8JceY1atOOwfX771vvMvH7o=; b=xUc+2C+rbOU1qRhODXfJjpPTwbKJAF6VAAVIk3i4l7aYEA/yrVapgqoG0S2hlrrHBN p+DiQ5cSCzPZ0M04E9H1utP0N0kdIIo3Eg/8535H6E3KFqMHwofbcNe8Mz5/NgAiFd7U jMmrseBAFhDYAcvbEQA/NN8cTzMjZLQe+uysMqBVxUaZFztS3acdCGkngVJyzBbJ63n3 sZAUBno/socDHgwlrGmZ0vgw0Yi0xNVdnwZ9E8CGgc4KlDexqRKXEQQIcIZLSKcInkVv 19L7YWxxbbPkPLB5tiE7w/RVEFnf3iKEb+8I5xVp9hDBlPANzewdECXlCKtwTrzNNsNP hy0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ajhFZx4W; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id i69-20020a638748000000b005740eeadb59si12342392pge.518.2023.09.26.05.32.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 05:32:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ajhFZx4W; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 3517D80926BA; Tue, 26 Sep 2023 01:07:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233818AbjIZIHz (ORCPT + 56 others); Tue, 26 Sep 2023 04:07:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233807AbjIZIHx (ORCPT ); Tue, 26 Sep 2023 04:07:53 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE23410A for ; Tue, 26 Sep 2023 01:07:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695715666; x=1727251666; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fGZXoAFs5byDF6XtERdJN3nPSiISI8zIjpTvU84ILmY=; b=ajhFZx4WpbxnV0FaDp2O+0moXaoezuAaQpH2pU/rOau1KGrgcmQM+v4n 5TrBmhVH7iZVj2FPB1CR3BKGrgOC4YpcYT6hzavYpDr/PbIJWvtdViSSf LfFlm19ioWgaq3xuOdsGmAFoDGEtKGBeOlQWkeXBhYytf3CrZvxoshdDh +C3JI3g9VMSgE1JWsNJBwDdClN0zuRUjH1gZspAS8CT32r5SVYloBXx2K uxqeHhAJEiJhO6IR8IXCPFhCJtBSPV/Odm9QoEIXmccJzcok2RYx9fMip aRGyYlOZS3oeZ4rnRGj1aMLclopQ/TAwjVdzPJisuKfd4a2iketlnGV+Q Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10843"; a="467797266" X-IronPort-AV: E=Sophos;i="6.03,177,1694761200"; d="scan'208";a="467797266" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2023 01:07:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10843"; a="698369284" X-IronPort-AV: E=Sophos;i="6.03,177,1694761200"; d="scan'208";a="698369284" Received: from nbenitzh-mobl2.ger.corp.intel.com (HELO ggreenma-mobl2.intel.com) ([10.251.178.250]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2023 01:07:44 -0700 From: gregory.greenman@intel.com To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg , Gregory Greenman Subject: [PATCH 5/9] wifi: iwlwifi: pcie: clean up WFPM control bits Date: Tue, 26 Sep 2023 11:07:17 +0300 Message-Id: <20230926110319.82d2744690b3.I90c08a27dca26a181dacb069184f39ece77849b5@changeid> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230926080721.876640-1-gregory.greenman@intel.com> References: <20230926080721.876640-1-gregory.greenman@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 26 Sep 2023 01:07:52 -0700 (PDT) From: Johannes Berg We define the same bit twice, remove the less precise definition and use the better one instead. Signed-off-by: Johannes Berg Signed-off-by: Gregory Greenman --- drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 1 - drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h index 6fad5b65a836..06d467068ff4 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h @@ -365,7 +365,6 @@ #define DBGI_SRAM_FIFO_POINTERS_WR_PTR_MSK 0x00000FFF enum { - ENABLE_WFPM = BIT(31), WFPM_AUX_CTL_AUX_IF_MAC_OWNER_MSK = 0x80000000, }; diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index e8687683ff29..26a0953603ab 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2005-2014, 2018-2021 Intel Corporation + * Copyright (C) 2005-2014, 2018-2023 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */ @@ -1134,7 +1134,7 @@ static int get_crf_id(struct iwl_trans *iwl_trans) /* Enable access to peripheral registers */ val = iwl_read_umac_prph_no_grab(iwl_trans, WFPM_CTRL_REG); - val |= ENABLE_WFPM; + val |= WFPM_AUX_CTL_AUX_IF_MAC_OWNER_MSK; iwl_write_umac_prph_no_grab(iwl_trans, WFPM_CTRL_REG, val); /* Read crf info */ -- 2.38.1