From patchwork Fri Nov 17 09:44:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 166067 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp413195vqn; Fri, 17 Nov 2023 01:49:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IFCVT3ooXRwvSARG7A/t+1aX+XYY5xfwqmB9QBT4lKc76RloBBHMDBoW0yorhDstMUIJWys X-Received: by 2002:a05:6a20:9152:b0:163:a041:336c with SMTP id x18-20020a056a20915200b00163a041336cmr15646651pzc.48.1700214581006; Fri, 17 Nov 2023 01:49:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700214580; cv=none; d=google.com; s=arc-20160816; b=XOA788exNhvL2yxmz4VPsIuDreCKMTtPW6SI73VXGwhDTlJs5Xc6dSSSQTAE2zGdmG UGzRPc24OZBZjqt7FutJXrNiGEkxHxvmhg9G7sXT/rSeuKwMqEoutW9xlWgSSelscHca Ke/am1fwlszTbc6vOADp+rNrqwzydLlq1PbTDSKoAJX9YlowoLMO9rkpIGCX4WmU7NZV LObkNAfYcT6vRY+WgAzMKF5vJrB5o1fjf0wjPncaNkc8k2qEDbTAVWIpROwWdaNR1D51 0fFxAsTXIR0fDfQRjhmJnX+hZqnbl/wEusOjZ/HCQu78q68TqQPRyIMf6izXr5lrdgXQ 8PZQ== 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=q2oBJeqlvbIXCZB+MeofN29pvey9EBCsq62yuI4ql3s=; fh=W+eSkce8uvUdQ8A1Dj5F8klEXQy967eJmFo02igvYfU=; b=FA/4MV208fL/knFHHb30624tQkYasXkMAnrLqPt5cy8/hhn/yRU3/mij6Y3nF2PKHc F18ek1Qi2JzmNkgNHP7pEb6Y2RMycRY5QrUMTCETUaI0G7FZaAm4dVa9LsddPphtVLdi uD/ZpKr88SrMuNUePB0EHCeepKH56GACVtwgQ0XxaSkpjttMI3HDeU6XvrkS2fuv6zeP M5aX5g1G2tCVIpyG9dTC33x5rS0lhXo7puMY4Ux9gpbgxflDyXxapb7Oax/LlAXVsSJR sncm0PG237jpBkH32QrOuMuvkBsLUNWam8tXNIgK9jbCy/A4+xOXrfzIIJatvTznRuQK pNgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HqoVB079; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id b15-20020a170902d50f00b001c3b4cb8c88si1553721plg.338.2023.11.17.01.49.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 01:49:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HqoVB079; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-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 groat.vger.email (Postfix) with ESMTP id C97D3806B063; Fri, 17 Nov 2023 01:49:33 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345815AbjKQJss (ORCPT + 30 others); Fri, 17 Nov 2023 04:48:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235722AbjKQJsX (ORCPT ); Fri, 17 Nov 2023 04:48:23 -0500 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E933F3ABB; Fri, 17 Nov 2023 01:45:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700214348; x=1731750348; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=72smyAApKQNC+XZ0RCO6MV2sV0AG9LsieeP9S29kMNA=; b=HqoVB079egJsOYtRiydACWF4IHfVneaGVXwxv0HAm8FbYgieiuRFu+SZ v+ruecU7uhG3z9q+/7K7shJyB93g7M1aJGMXNS931fn2mcxI3O430GRoJ mHeAoWkviOeI8eNUYCrFHPMFIMO9TsVSt9gu+URhYl/Q3OANC7VijSjpR twrwLgTvM53kvsZjPgPEcVCeaEtj43VMI3gxVpZnbmOPW999LeTA6kYot ahv2VwKU0wrJcb4/K1G33wYBe8XxEG/IG4MDzGA087CwrzpM9tsxB/Ih/ 51Io8r45RXeczIqWvqLUff7JXW7pUOKTV4ptBxEsGYAYVdBA0st1E7Ya4 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10896"; a="9929563" X-IronPort-AV: E=Sophos;i="6.04,206,1695711600"; d="scan'208";a="9929563" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2023 01:45:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10896"; a="909390798" X-IronPort-AV: E=Sophos;i="6.04,206,1695711600"; d="scan'208";a="909390798" Received: from rvadera-mobl.ger.corp.intel.com (HELO localhost) ([10.251.219.158]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2023 01:45:43 -0800 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: "John W. Linville" , Kalle Valo , Larry Finger , linux-wireless@vger.kernel.org, Ping-Ke Shih , Bjorn Helgaas , linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH 4/7] rtlwifi: rtl8821ae: Reverse PM capability exists check Date: Fri, 17 Nov 2023 11:44:22 +0200 Message-Id: <20231117094425.80477-5-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231117094425.80477-1-ilpo.jarvinen@linux.intel.com> References: <20231117094425.80477-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Fri, 17 Nov 2023 01:49:33 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782804204611714121 X-GMAIL-MSGID: 1782804204611714121 Check if PM capability does not exists and return early which follows the usual error handling pattern. Signed-off-by: Ilpo Järvinen --- .../wireless/realtek/rtlwifi/rtl8821ae/hw.c | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c index 6ae37d61a2a2..53cfeed0b030 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c @@ -2305,30 +2305,31 @@ static void _rtl8821ae_clear_pci_pme_status(struct ieee80211_hw *hw) } } while (cnt++ < 200); - if (cap_id == 0x01) { - /* Get the PM CSR (Control/Status Register), - * The PME_Status is located at PM Capatibility offset 5, bit 7 - */ - pci_read_config_byte(rtlpci->pdev, cap_pointer + 5, &pmcs_reg); - - if (pmcs_reg & BIT(7)) { - /* Clear PME_Status with write */ - pci_write_config_byte(rtlpci->pdev, cap_pointer + 5, - pmcs_reg); - /* Read it back to check */ - pci_read_config_byte(rtlpci->pdev, cap_pointer + 5, - &pmcs_reg); - rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, - "Clear PME status 0x%2x to 0x%2x\n", - cap_pointer + 5, pmcs_reg); - } else { - rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, - "PME status(0x%2x) = 0x%2x\n", - cap_pointer + 5, pmcs_reg); - } - } else { + if (cap_id != 0x01) { rtl_dbg(rtlpriv, COMP_INIT, DBG_WARNING, "Cannot find PME Capability\n"); + return; + } + + /* Get the PM CSR (Control/Status Register), + * The PME_Status is located at PM Capatibility offset 5, bit 7 + */ + pci_read_config_byte(rtlpci->pdev, cap_pointer + 5, &pmcs_reg); + + if (pmcs_reg & BIT(7)) { + /* Clear PME_Status with write */ + pci_write_config_byte(rtlpci->pdev, cap_pointer + 5, + pmcs_reg); + /* Read it back to check */ + pci_read_config_byte(rtlpci->pdev, cap_pointer + 5, + &pmcs_reg); + rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, + "Clear PME status 0x%2x to 0x%2x\n", + cap_pointer + 5, pmcs_reg); + } else { + rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, + "PME status(0x%2x) = 0x%2x\n", + cap_pointer + 5, pmcs_reg); } }