From patchwork Fri Nov 24 08:47:21 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: 169301 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp1010141vqx; Fri, 24 Nov 2023 00:49:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IGOqVnZAz9JnFrXWQ0bfbIdxQMsnjXyEdtk8/qM7uS5HTgE/3f33u7qYJGvNcKoSpzp7ezh X-Received: by 2002:a05:6a20:9381:b0:186:de1b:666 with SMTP id x1-20020a056a20938100b00186de1b0666mr2828116pzh.25.1700815751851; Fri, 24 Nov 2023 00:49:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700815751; cv=none; d=google.com; s=arc-20160816; b=HGHXJsWkpqyqwSMp0iujQ4xoJg0ZwJmRM946fvFxj2NbbLmqBOZcVviAzBj6racw0P jAPKdPK7VvgS/M/VgTy7rst4oZjBGSm+riSIWmnPpA3i4vUVSI31gKlw1Jko7oCAMZoJ p2AdPTJN26HfCuzMgZ9U/lRZ5aTQLdrL23IG2A+YE2GBQipu9FGQLFqanlFjAsZpkzrs e02hvVzCJqo35NtlItrHegY9HreI5JK/nreBTWLBI2nxFxj5VXkqNkS4NdKs7rj/PdDx DUNxGH/lwH13RdwD2vs4IQBPJMqxveQXSTdGvAbQfhS2q8I2DeYhahXsLmzOqJQC7dL9 KkaQ== 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=yDPsVU0rsPrasdaxdANQzuY1zzbICwyhEpw1/fQzD+I=; fh=W+eSkce8uvUdQ8A1Dj5F8klEXQy967eJmFo02igvYfU=; b=FHoB2gQH6TAIDVmZqfEPVZP7O2buoeNwZd1SEE/Y1WBgb4ixrMIoWq9eYKj59yq/+U KdnljHxQTZ7LWwuiDyGUgnU4Dwg/TQ8O3BODIZNDyRklatedbtobGxlH1o91zxVnenI4 gcEZ81WTXJurWcCIgUbSpCbQNfqHfIJ1572OHKV/XCnIEYSn9iLCuubIVh+zkid6x7Jy i+kwRIB7riUsBORyHvIwAwA9jggA3Ax8vJ7DzwV+zUOaPeMcTTSwA0eGf+3PnQkk6a2I 4X6g2QheRq9OGT1AoGPoCA+grKABjHO82wMjEhiOfP1ZgjuKybaWfeETMEhdlFrNjkX/ Vvpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TCNnlQvw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id e18-20020a056a001a9200b0068a5877bfaesi3129008pfv.382.2023.11.24.00.49.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 00:49:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TCNnlQvw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 37F92804BC16; Fri, 24 Nov 2023 00:49:06 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234988AbjKXIsi (ORCPT + 99 others); Fri, 24 Nov 2023 03:48:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231531AbjKXIsZ (ORCPT ); Fri, 24 Nov 2023 03:48:25 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 690C41723; Fri, 24 Nov 2023 00:48:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700815709; x=1732351709; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IOd4p7E6WZRecHlZmv4wDM9ERugu04lZ89KnrsRyhwI=; b=TCNnlQvwSHLbi2Ctn6a+GEatEVP3nIuQ0rvY8Xd4MJZ6GMimhtc2wO4d +dY9oEfYlHMf5Gi9u3G+HbD4Vx7AH0AQ1t3rhOimCpzbDzuZ6ecBuBf8i sF+0vabZMtWFiTWH5KFCkkk46GW8bLXkWwSIUdn8gBrSSwrN63xqOG54p 2kSjayvwT3Vui9OdLaBMvyKGq6OeHrWas4N+3zXLwdTAznsg0/553vZ71 tX5zO0LEh4pMLrtPdvoNrsFdK+mVaOHpJJSCE4ef2CcVjHeR/iPbzJd0a oF2GPPZeDluAxu8otxRA7b9QAHb5Uvq9mt4XMrBfB1DWjHLZFomCYfQaF Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="13945564" X-IronPort-AV: E=Sophos;i="6.04,223,1695711600"; d="scan'208";a="13945564" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2023 00:48:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="833640623" X-IronPort-AV: E=Sophos;i="6.04,223,1695711600"; d="scan'208";a="833640623" Received: from mvlasov-mobl1.ger.corp.intel.com (HELO localhost) ([10.251.220.89]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2023 00:48:23 -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 v2 06/10] wifi: rtlwifi: rtl8821ae: Use pci_find_capability() Date: Fri, 24 Nov 2023 10:47:21 +0200 Message-Id: <20231124084725.12738-7-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231124084725.12738-1-ilpo.jarvinen@linux.intel.com> References: <20231124084725.12738-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 howler.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 (howler.vger.email [0.0.0.0]); Fri, 24 Nov 2023 00:49:06 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783434578051572388 X-GMAIL-MSGID: 1783434578051572388 Instead of open coding the capability structure search, find the PM Capability using pci_find_capability(). While at it, rename the generic 'cap_pointer' to 'pm_cap' which makes the intent of the code more obvious. Signed-off-by: Ilpo Järvinen --- .../wireless/realtek/rtlwifi/rtl8821ae/hw.c | 49 +++---------------- 1 file changed, 8 insertions(+), 41 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c index 53cfeed0b030..7877509c34c7 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c @@ -2270,42 +2270,11 @@ static void _rtl8821ae_clear_pci_pme_status(struct ieee80211_hw *hw) { struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); - u16 cap_hdr; - u8 cap_pointer; - u8 cap_id = 0xff; u8 pmcs_reg; - u8 cnt = 0; + u8 pm_cap; - /* Get the Capability pointer first, - * the Capability Pointer is located at - * offset 0x34 from the Function Header */ - - pci_read_config_byte(rtlpci->pdev, 0x34, &cap_pointer); - rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, - "PCI configuration 0x34 = 0x%2x\n", cap_pointer); - - do { - pci_read_config_word(rtlpci->pdev, cap_pointer, &cap_hdr); - cap_id = cap_hdr & 0xFF; - - rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, - "in pci configuration, cap_pointer%x = %x\n", - cap_pointer, cap_id); - - if (cap_id == 0x01) { - break; - } else { - /* point to next Capability */ - cap_pointer = (cap_hdr >> 8) & 0xFF; - /* 0: end of pci capability, 0xff: invalid value */ - if (cap_pointer == 0x00 || cap_pointer == 0xff) { - cap_id = 0xff; - break; - } - } - } while (cnt++ < 200); - - if (cap_id != 0x01) { + pm_cap = pci_find_capability(rtlpci->pdev, PCI_CAP_ID_PM); + if (!pm_cap) { rtl_dbg(rtlpriv, COMP_INIT, DBG_WARNING, "Cannot find PME Capability\n"); return; @@ -2314,22 +2283,20 @@ static void _rtl8821ae_clear_pci_pme_status(struct ieee80211_hw *hw) /* 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); + pci_read_config_byte(rtlpci->pdev, pm_cap + 5, &pmcs_reg); if (pmcs_reg & BIT(7)) { /* Clear PME_Status with write */ - pci_write_config_byte(rtlpci->pdev, cap_pointer + 5, - pmcs_reg); + pci_write_config_byte(rtlpci->pdev, pm_cap + 5, pmcs_reg); /* Read it back to check */ - pci_read_config_byte(rtlpci->pdev, cap_pointer + 5, - &pmcs_reg); + pci_read_config_byte(rtlpci->pdev, pm_cap + 5, &pmcs_reg); rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Clear PME status 0x%2x to 0x%2x\n", - cap_pointer + 5, pmcs_reg); + pm_cap + 5, pmcs_reg); } else { rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "PME status(0x%2x) = 0x%2x\n", - cap_pointer + 5, pmcs_reg); + pm_cap + 5, pmcs_reg); } }