From patchwork Wed Sep 13 12:27:46 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: 138992 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1260129vqx; Wed, 13 Sep 2023 10:57:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF3y4igw3u4IYOtpk8cJVyQytJZI7G1iUSr+5/9/F2f971/4ChWhrns0hVoRqfNANUfWAMx X-Received: by 2002:a05:6a20:748d:b0:14b:f78e:d061 with SMTP id p13-20020a056a20748d00b0014bf78ed061mr4554838pzd.19.1694627828832; Wed, 13 Sep 2023 10:57:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694627828; cv=none; d=google.com; s=arc-20160816; b=NL0UZmjPRb149AYl/zouy42XucFCRjhGDtTTwbeMWwOIPdYNSd03WpO/RLYP2psP5x SOB8AV2/VWv9ER3sWIXXpGwahRem+0efGGkpTi4VY4nn8G7wZHVTvRuitwwjN4fBjmPz 0PXTXKnXjhR1EQ32wAOjvDVjF4S5lRL2OE4EpMOXhwsf9i+WGwAgS52KdS7IBaEaCFFE GmvflOY5vFdIVHIWThpnFYXCf25OOceCgffBJ5QuaegLmDRkUtB/2kxRUwale/e+fr5n 4pqTGWNyO066/4bOUg9KJHK8lVzadAvdG/hvrT0lK7v/OAHXPEVogcBtvo2lLVw/04xa z/bQ== 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=CmTs2JSAuyn3WpEEb4ryg/Pqsiyo2BElTafmXVi7Ya4=; fh=G53TxynpyDB/TTQTbqbNeWaiPYxw164d+a7J4Jydx54=; b=Om/yC0U8EbFsxs/vCBjj0PfPlPTjrOIE62Th/pob+wUaeL/KRJVMx7hbWmrkutb3MN cFYBvPhVvs1SLXzpWhgDcgw2ZTyah8HliCKyZtMB+WtX75ygDcMWTmswLBO7nvkyRK67 uuXga50KYkkCKFQPEdxDLW0bWBrgjaHuIrbxWagj6VVVBMNeZlIIDkh5Om3TwIpjafYU +HflId/8wDo/85wJx7uYuDNro3uoCpVyb+6r5f7RewY1XeftwhVY9ENH6kabJD9zF7n6 yOWGwbO9NvLIs+hjtLWF7OoNCxZXecKfAJ6oA+lmWVLYb4tJQx3ITf7xj5fXNFeI+WHZ 6ufA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JAvIhe8o; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id fo11-20020a056a00600b00b0069026254582si276867pfb.98.2023.09.13.10.57.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 10:57:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JAvIhe8o; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 101B281E3E0F; Wed, 13 Sep 2023 05:31:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240525AbjIMMbL (ORCPT + 36 others); Wed, 13 Sep 2023 08:31:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240601AbjIMMbC (ORCPT ); Wed, 13 Sep 2023 08:31:02 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 191941BE9; Wed, 13 Sep 2023 05:30:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694608257; x=1726144257; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Mu9Ph5F+vByInHmgU9mzAsly58jmdXUJoUDkh08q/ug=; b=JAvIhe8oBLKfmvI9HXmfC/i4MUtzb0+pztsqyPCJ/ImY8YSzZB0uNgE3 vlCxwYd0FgmMGAcm42qTEvaSqX6/gS/D+VgwS1qmwQRmFqqIL4Xk0P4C8 3Z/zlbDGjjt1UI/5BVOnbPswv+IRlohbnwb8OEfrNW9GWMVbxAO2zjuME dZhqjT79uquVosQqbIE1qyHdRqijbiP6NBnYCpIT9+x/jHLni1XSGJHa3 ah27Az1P09XIqwwFRPbtUP8gOQpJ3Xn9CXXbUByjz1DTk7BTmy5gAzZYu bCa0PdYAXX3agSWxHZSsB7ROYogQrev3+Amx5BEpeXZ5OcpDo/j1MPHei w==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="368912589" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="368912589" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Sep 2023 05:28:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="693836663" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="693836663" Received: from pakurapo-mobl3.ger.corp.intel.com (HELO ijarvine-mobl2.ger.corp.intel.com) ([10.249.45.213]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Sep 2023 05:28:29 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Jonathan Cameron , linux-pci@vger.kernel.org, Bjorn Helgaas , Nilesh Javali , GR-QLogic-Storage-Upstream@marvell.com, "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH v2 08/10] scsi: qla2xxx: Use FIELD_GET() to extract PCIe capability fields Date: Wed, 13 Sep 2023 15:27:46 +0300 Message-Id: <20230913122748.29530-9-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230913122748.29530-1-ilpo.jarvinen@linux.intel.com> References: <20230913122748.29530-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 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 (agentk.vger.email [0.0.0.0]); Wed, 13 Sep 2023 05:31:50 -0700 (PDT) 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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776928830322741204 X-GMAIL-MSGID: 1776946070446681419 Use FIELD_GET() to extract PCIe capability registers field instead of custom masking and shifting. Signed-off-by: Ilpo Järvinen --- drivers/scsi/qla2xxx/qla_os.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 50db08265c51..7e103d711825 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -5,6 +5,7 @@ */ #include "qla_def.h" +#include #include #include #include @@ -633,8 +634,8 @@ qla24xx_pci_info_str(struct scsi_qla_host *vha, char *str, size_t str_len) const char *speed_str; pcie_capability_read_dword(ha->pdev, PCI_EXP_LNKCAP, &lstat); - lspeed = lstat & PCI_EXP_LNKCAP_SLS; - lwidth = (lstat & PCI_EXP_LNKCAP_MLW) >> 4; + lspeed = FIELD_GET(PCI_EXP_LNKCAP_SLS, lstat); + lwidth = FIELD_GET(PCI_EXP_LNKCAP_MLW, lstat); switch (lspeed) { case 1: