From patchwork Wed Sep 13 12:27:39 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: 138885 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1157293vqx; Wed, 13 Sep 2023 08:15:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHd4rDB8sNyJ/yn6fB0ZoTE/HYrzAjSsRYOVJl6vWQ82KCutBW35cd1l7D8dwTT1v2ZLAra X-Received: by 2002:a05:6a21:7781:b0:14c:d105:2a59 with SMTP id bd1-20020a056a21778100b0014cd1052a59mr2860315pzc.55.1694618118059; Wed, 13 Sep 2023 08:15:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694618118; cv=none; d=google.com; s=arc-20160816; b=H1zMREOqCSYUF7G3N2QDGTANysrrZ9i/sOkOLXXA549iIhMMOd4zMr71ZUcHuZ4+2m R18zjvi6tPeaxR+uPkXaPszJT7BVyCwm2LcWOxompOLwB0Zrw4S3GIA2iZmcBxAPh8dx d/D+TSQ3MDWrhswoX0ty2cCm4H2Hpqge7EqPH0pcydQ1fAk7Ciy0KJvx6cMJY9Q092rX EjPQpApTSh3+A1hiiCx2EfNNknEe6fotaw77BZatq0dgApWPlXOD2jSHe7MZt7iP1ZCi bLVCSjdjvSSsVEqV4SoYZQVtJvTNC4LuYMcTY9YEZUJPdfwGsHPhepMzQCW1uLHFC52n YtIg== 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=dsRbR6ppyM9ef8a3yCFB43u1RzjiYdUIFFuQJDCvTWQ=; fh=mB+9doZJPFRDQaUXSjkxJ5tpqn93mu1sTw1Sb3OFrCE=; b=TqULgaynYmbJ3GbuaF+HJbGQA3rqSizOTVbNKmqwz/S6Rz2JoB/c39WDs+LbieeCZ5 da4EQM7Aa3jMLhqvtDkdFs841AXs3EdW8VJsQE9vKlDjvLc/0+zAw3ZE4ELZ3uJtu7rL j71PZvnsoMhnPCozNd1677Oafi8lbKJKv5EwYe7+w7LaJxkrVpRyy4qRSwT8qzA1jp5k jXRqJdWIP383IIzeZ75m7yom5+J1ajWEVKvTGBeEpQ3bHEFM6txxBs7LXThS/D8FnxjG bhxPGhCtEku7vQgaZA0SB/UPto/LZidKs7h/nr44XmJdsEEq7z6Nt1bNrbsJzUzZvN9z OpXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="M/Y3ZMhL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id ay6-20020a1709028b8600b001badbe8e441si10123741plb.106.2023.09.13.08.14.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 08:15:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="M/Y3ZMhL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (Postfix) with ESMTP id 15B8F8098E82; Wed, 13 Sep 2023 05:30:40 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240513AbjIMMaU (ORCPT + 36 others); Wed, 13 Sep 2023 08:30:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240480AbjIMMaS (ORCPT ); Wed, 13 Sep 2023 08:30:18 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ADF419AC; Wed, 13 Sep 2023 05:30:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694608214; x=1726144214; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=23uguZCvTV5t58r/xj3uv2xYgJi+V730Lx4ND5oIgSM=; b=M/Y3ZMhLF1paZE0jXaNAillNLiN+rry3+dNT750CWmdXm0SZ1CT5KCNv ar6+Z48T4uQ6p2il1XJOwAFRHWqIY/G2ApwzfWjT24R0UHDYiAckFpD0d lPa7HYWXvowzc6RxYERzcOviT6PAKNOtbre7R5ZvhWUo29p4tJwaZ4Aus w+GtN7PSeb9hMbBxdrgtN66j4i08pfuk55otklVu0mhiTO5gEkftCtggp r+EbViIsxMMPY3FxwrrK4ecc7VrTe77C4Nj4tKPqAyicrKZtQNgMTAa6k lCr8CFxXnwyJl++XF8WUi1hGq5tXoOwBzj1lKTtxkL0w4Rva9RgcWGfTE w==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="368912312" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="368912312" 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:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="693836605" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="693836605" 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:01 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Jonathan Cameron , linux-pci@vger.kernel.org, Bjorn Helgaas , Dennis Dalessandro , Jason Gunthorpe , Leon Romanovsky , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH v2 01/10] IB/hfi1: Use FIELD_GET() to extract Link Width Date: Wed, 13 Sep 2023 15:27:39 +0300 Message-Id: <20230913122748.29530-2-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 (pete.vger.email [0.0.0.0]); Wed, 13 Sep 2023 05:30:40 -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 pete.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776929188685364876 X-GMAIL-MSGID: 1776935887777816466 Use FIELD_GET() to extract PCIe Negotiated Link Width field instead of custom masking and shifting, and remove extract_width() which only wraps that FIELD_GET(). Signed-off-by: Ilpo Järvinen --- drivers/infiniband/hw/hfi1/pcie.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c index 08732e1ac966..c132a9c073bf 100644 --- a/drivers/infiniband/hw/hfi1/pcie.c +++ b/drivers/infiniband/hw/hfi1/pcie.c @@ -3,6 +3,7 @@ * Copyright(c) 2015 - 2019 Intel Corporation. */ +#include #include #include #include @@ -210,12 +211,6 @@ static u32 extract_speed(u16 linkstat) return speed; } -/* return the PCIe link speed from the given link status */ -static u32 extract_width(u16 linkstat) -{ - return (linkstat & PCI_EXP_LNKSTA_NLW) >> PCI_EXP_LNKSTA_NLW_SHIFT; -} - /* read the link status and set dd->{lbus_width,lbus_speed,lbus_info} */ static void update_lbus_info(struct hfi1_devdata *dd) { @@ -228,7 +223,7 @@ static void update_lbus_info(struct hfi1_devdata *dd) return; } - dd->lbus_width = extract_width(linkstat); + dd->lbus_width = FIELD_GET(PCI_EXP_LNKSTA_NLW, linkstat); dd->lbus_speed = extract_speed(linkstat); snprintf(dd->lbus_info, sizeof(dd->lbus_info), "PCIe,%uMHz,x%u", dd->lbus_speed, dd->lbus_width); From patchwork Wed Sep 13 12:27:40 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: 138915 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1185335vqx; Wed, 13 Sep 2023 09:00:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHLHq4hd9ozXiI5FUxhWL2zUK6+f5Tq3NDQO6zA+UnVSblZd43ImWQtNJFkfQmsT71K6oHd X-Received: by 2002:a05:6a00:188b:b0:68e:3fe9:5d35 with SMTP id x11-20020a056a00188b00b0068e3fe95d35mr3928888pfh.0.1694620836035; Wed, 13 Sep 2023 09:00:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694620836; cv=none; d=google.com; s=arc-20160816; b=j5zlFyj9du6fP0bpucJxpNm12E+fcQbMJUhs4zh9Qz0NHoq1Eupp3MVQpoSCR1dvX9 cWCv3q7a2l26TibVhmtAI3/7MiojdcMkF6MJgYHVpXuSWoKpUbn7r8qGLOyNLV1cSZxI lBkF3quSUR6PkZ7hvCZnz24d0ehAyVT9ac+BqL7svCvDUOUwPEW0lmjUHa0LfW3EnhBe yAs+kX1oXPnbnkODws9eEXY6JowiT9+ad7oQdKkD7LkXwxQUJ9Ej67ri1DMmfJNWQmi0 i15MPROUERqOn2CMmIIutvstVyyLsAJY1VgItJnWfx1d70ja1EwN6yV0soIeXxWU7x5i z8tA== 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=F6GOOYl0JZnHXT/PxNMwZT+/frBsJ3K/WEymv53lk1g=; fh=xOZ2YSgk985so6kZuB0sqykv7lh6i7555H8tbdFH9ug=; b=VZf0fe+/65g4vsQl7mZrwuKJR9aOqH24xPaVjc/mm1Za9ywuL3/w2ShPoDxDdZDsuN 8gCe+6qCiyuGu+VzTN8+Cua0RaPjOhF/FvlwKyOZF47l2Bj0pn5r7d/7QUouwIyGZXYu mGUCJMXdkmVsNMju+szUCckf5eIq5WZ9EFx8hbyUPmm2CSCtPrJbrSezCmN/lVmmuige k6CjiLm3c4ViDfLJXGIeQCQk6jxLViwgmzkzjM+tTN0FBQ6C+wTLtnKX277+bztbwwIu 0OnWJLM8jS/6dpIjve6WxAgDYFksNL9pTLAJAJKCRegdkmcowo2fLw9HMfmzsgSTH4cz dpZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=GNLTOGTz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id br14-20020a056a00440e00b0069015b1491bsi1347537pfb.120.2023.09.13.09.00.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 09:00:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=GNLTOGTz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (Postfix) with ESMTP id 597028118773; Wed, 13 Sep 2023 05:30:43 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240515AbjIMMae (ORCPT + 36 others); Wed, 13 Sep 2023 08:30:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240479AbjIMMaa (ORCPT ); Wed, 13 Sep 2023 08:30:30 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B455419B9; Wed, 13 Sep 2023 05:30:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694608226; x=1726144226; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=owLTR4BdRMVCw3koAJFrF4ot3jKom6tn6pjCI8DaxDE=; b=GNLTOGTzKxZneot54/jdGd02jaM6smvUSpd9i3Ph8Vlsll9JBXP8T2oV 6LOluBwgBX8O4V+OgQUsJYrV3xpjEaR/ucPpSbjVJRiXQ1It+D370EYYg QYqO8oyHrQQPYv06VRPletWIP5peQq6vGpIExhFgUC7YSu0JRP7GvqdK3 MAC99rqPPMdgAsxbbs1nIfp+ijy5qb1H8jhm9jLVAmNxfWedcrIXcf48v r57a13i8X3lvrdHMKyF+kEwrdrMvMtNDkSUQEvNdD+zXk4kBcvjylQDrT lvllbyTPHiX+WmD9vZ8WB5wgl/qtkjJr9Nm+2FUfQdJ/ZPixySuKjZyy7 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="368912358" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="368912358" 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:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="693836612" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="693836612" 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:05 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Jonathan Cameron , linux-pci@vger.kernel.org, Bjorn Helgaas , Hans Verkuil , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Jonathan Cameron Subject: [PATCH v2 02/10] media: cobalt: Use FIELD_GET() to extract Link Width Date: Wed, 13 Sep 2023 15:27:40 +0300 Message-Id: <20230913122748.29530-3-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 (pete.vger.email [0.0.0.0]); Wed, 13 Sep 2023 05:30:43 -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 pete.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776938737780399832 X-GMAIL-MSGID: 1776938737780399832 Use FIELD_GET() to extract PCIe Negotiated and Maximum Link Width fields instead of custom masking and shifting. Signed-off-by: Ilpo Järvinen Reviewed-by: Jonathan Cameron --- drivers/media/pci/cobalt/cobalt-driver.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/media/pci/cobalt/cobalt-driver.c b/drivers/media/pci/cobalt/cobalt-driver.c index 74edcc76d12f..6e1a0614e6d0 100644 --- a/drivers/media/pci/cobalt/cobalt-driver.c +++ b/drivers/media/pci/cobalt/cobalt-driver.c @@ -8,6 +8,7 @@ * All rights reserved. */ +#include #include #include #include @@ -210,17 +211,17 @@ void cobalt_pcie_status_show(struct cobalt *cobalt) pcie_capability_read_word(pci_dev, PCI_EXP_LNKSTA, &stat); cobalt_info("PCIe link capability 0x%08x: %s per lane and %u lanes\n", capa, get_link_speed(capa), - (capa & PCI_EXP_LNKCAP_MLW) >> 4); + FIELD_GET(PCI_EXP_LNKCAP_MLW, capa)); cobalt_info("PCIe link control 0x%04x\n", ctrl); cobalt_info("PCIe link status 0x%04x: %s per lane and %u lanes\n", stat, get_link_speed(stat), - (stat & PCI_EXP_LNKSTA_NLW) >> 4); + FIELD_GET(PCI_EXP_LNKSTA_NLW, stat)); /* Bus */ pcie_capability_read_dword(pci_bus_dev, PCI_EXP_LNKCAP, &capa); cobalt_info("PCIe bus link capability 0x%08x: %s per lane and %u lanes\n", capa, get_link_speed(capa), - (capa & PCI_EXP_LNKCAP_MLW) >> 4); + FIELD_GET(PCI_EXP_LNKCAP_MLW, capa)); /* Slot */ pcie_capability_read_dword(pci_dev, PCI_EXP_SLTCAP, &capa); @@ -239,7 +240,7 @@ static unsigned pcie_link_get_lanes(struct cobalt *cobalt) if (!pci_is_pcie(pci_dev)) return 0; pcie_capability_read_word(pci_dev, PCI_EXP_LNKSTA, &link); - return (link & PCI_EXP_LNKSTA_NLW) >> 4; + return FIELD_GET(PCI_EXP_LNKSTA_NLW, link); } static unsigned pcie_bus_link_get_lanes(struct cobalt *cobalt) @@ -250,7 +251,7 @@ static unsigned pcie_bus_link_get_lanes(struct cobalt *cobalt) if (!pci_is_pcie(pci_dev)) return 0; pcie_capability_read_dword(pci_dev, PCI_EXP_LNKCAP, &link); - return (link & PCI_EXP_LNKCAP_MLW) >> 4; + return FIELD_GET(PCI_EXP_LNKCAP_MLW, link); } static void msi_config_show(struct cobalt *cobalt, struct pci_dev *pci_dev) From patchwork Wed Sep 13 12:27:41 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: 139230 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp54425vqi; Wed, 13 Sep 2023 18:59:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHOj5HfhRHMBXhmCs7/iT2PQXTbF00lFc/DSNKCxe2Fda0d3kXrSYbUgQ8McV2bQ8uGkfwp X-Received: by 2002:a17:90b:33cd:b0:26b:280b:d24c with SMTP id lk13-20020a17090b33cd00b0026b280bd24cmr3777317pjb.42.1694656783283; Wed, 13 Sep 2023 18:59:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694656783; cv=none; d=google.com; s=arc-20160816; b=blk/GiPUuhUqByBkW/9k3O3xhtY8ulF3Pw3kEHrsjmY7xtjyZxiaCXfwpzGnR7MH5/ Ky1qKm0efKOleHJ9MGUL11DTeUSJGZtB0TjnmZgjiChQY1I2RApTfqgckKYH9CfCnhVg pS3M7K1J13zXTspukfEC6KMQBsphWDFaI5MXbaaykuKx9SkOMkCcYt25qwaBaPyMGVj+ BQU2ASgZLliMWKye94DbIHiYjb+JkCnJza1uYTmpbivJ/+5GXBWJhMLESuiQS6t92izz QQj1b8WeqJgyceHYaMKUpVkFRt8wPRpG2OdViQYWWmH8SbjL2I91jl2GLyWdxGlpjZPn CeVQ== 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=yEuadT3J77AROzwqn5ZlD/G3jIuuHLd1Hj7O5oEpAHU=; fh=X4Uye5sNwVBuCVMZMaHyDTEYQvcWCD9KmOMf5RPIL/A=; b=L9e4j6kuqBYd4a339eUDkiT2ewJrOtlsVQLVkjvtruZ7URsfrCVwoLcCuYDhn+t2dH gOF3uTWFOXBT3OX9yYlpuJo4ON/BabsC3WFc+iKlJVibmGvwUe74MKMrKq5mwarJXDKC s17fzqGQeWPfstCKNp8o1926RS2LDHa36fL7OLOLJQK+k0xokbdOVoH31iyAf0v0fCvh w9A9poXEA7iweZd5VbU9/6aHXgeLK3TLpbtAHPCdiw9/20y+wtFWFUiNo7+x0bA1cF0D ecRgKklnwu+KjIQbEG0HPUXBRpMAiWG6pY2E2XnCBdgY8/4eT7OEU2pxwmoJsURf6X6V xOOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=eDfgN0Mf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id g20-20020a17090a579400b00263220254e2si570294pji.41.2023.09.13.18.59.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 18:59:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=eDfgN0Mf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 610AD823CC6B; Wed, 13 Sep 2023 05:30:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240538AbjIMMap (ORCPT + 36 others); Wed, 13 Sep 2023 08:30:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236266AbjIMMak (ORCPT ); Wed, 13 Sep 2023 08:30:40 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 776B11BDD; Wed, 13 Sep 2023 05:30: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=1694608235; x=1726144235; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zQpj7OaTDonluY2E3OGQf5kVh3FqltWnatkxOc0duHk=; b=eDfgN0MfyQUdB5ZYrBp0kmgE5KJ/Hn6imRmwhkLYeSWBAMDQO4Qwdbx9 RAFTBcjqI6eZwr0LlRJoTP/iom81QI1Wfhr/NPMjkKv8tnvm8/PmXVtOy 48iCNCzjUXeHnf1iQDrStnH3EbPKmltJHNSmbgiX818BqcrzeeC6YuRF8 WurnHQwNdY25crh9NlxWu/g00Ef/uFSA0m87I/T/EUIMKUo8C3rSFYQeW VLwGKBgYadRL1NFtp7veXPXV6fdFVyuzEYe6pja4I4MA+FACELjyQApeu 30uy+1Td5n5XuVKpt0qXkjuLmp9o0ZJ1hXKgxPNdqj4W1kJq+FR6KIj2F Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="368912417" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="368912417" 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:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="693836628" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="693836628" 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:08 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Jonathan Cameron , linux-pci@vger.kernel.org, Bjorn Helgaas , Jesse Brandeburg , Tony Nguyen , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Jonathan Cameron Subject: [PATCH v2 03/10] igb: Use FIELD_GET() to extract Link Width Date: Wed, 13 Sep 2023 15:27:41 +0300 Message-Id: <20230913122748.29530-4-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 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 05:30:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776976431199369333 X-GMAIL-MSGID: 1776976431199369333 Use FIELD_GET() to extract PCIe Negotiated Link Width field instead of custom masking and shifting. Signed-off-by: Ilpo Järvinen Reviewed-by: Jonathan Cameron --- drivers/net/ethernet/intel/igb/e1000_mac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/e1000_mac.c b/drivers/net/ethernet/intel/igb/e1000_mac.c index caf91c6f52b4..5a23b9cfec6c 100644 --- a/drivers/net/ethernet/intel/igb/e1000_mac.c +++ b/drivers/net/ethernet/intel/igb/e1000_mac.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2007 - 2018 Intel Corporation. */ +#include #include #include #include @@ -50,9 +51,8 @@ s32 igb_get_bus_info_pcie(struct e1000_hw *hw) break; } - bus->width = (enum e1000_bus_width)((pcie_link_status & - PCI_EXP_LNKSTA_NLW) >> - PCI_EXP_LNKSTA_NLW_SHIFT); + bus->width = (enum e1000_bus_width)FIELD_GET(PCI_EXP_LNKSTA_NLW, + pcie_link_status); } reg = rd32(E1000_STATUS); From patchwork Wed Sep 13 12:27:42 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: 139203 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp40742vqi; Wed, 13 Sep 2023 18:17:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHBSKg89cfKvkSymQyOFBbF2zckov3+mYfq5ejzBm8tgapvMiV7BxElfLGuORWsaokI6GAo X-Received: by 2002:a17:90b:1056:b0:26d:17da:5e9f with SMTP id gq22-20020a17090b105600b0026d17da5e9fmr4040913pjb.1.1694654256844; Wed, 13 Sep 2023 18:17:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694654256; cv=none; d=google.com; s=arc-20160816; b=ClseVRPoofhho6WcJIN6xbFTR1kN1MJQdSXgflhdBtqcN/TiY4vIR3MkJTw6FH2mGZ w+dBF7/Fye7HzDGUl291oA8vF6QW8u0TqNBGssillRmA8eezy87xL58ytnifX+s+YMpG uvPU05WPd3Swiv4uilA50zWaJrQ0MVQXVljQXFAf2aGMQizgMvdDeOulyKMckQHyR2O1 3Ji6hQnC5onylK7ft7qOonaa1bzPeau7x/OM3THMf0yAEgjStG9Ogt8Cf1EM3U2YtZUP pqnu+wKSuitagGQMW9NJ/dp6Evej2cjMMU+uEQv1vpfWr1LBd1n7Rn3s8o/ix3ia9CFs 5zgg== 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=aG+seAEWJivQo2wRDqg+8qxnhwYw6sHS0Q6hn3asOks=; fh=TTiIDa12Uva7EtT9KWdViM6meb+1NkLz8d4vL4OGn0M=; b=exnc+B24ueKtwMku7rukRW4MX4nxPjS1sqTq+4NWWT86Ryh35+mmJ3HJALAq45tNA9 64WhoiIbBnd0iNxTjPdCeeIU6AWo6AJ+rSkfaBlRudq3Rkv4U8Bl90qcja5FP8Yl86j8 dRhWdaLK9ny6+IAQxpDMOg7Js6nojgmWZMzwXNpv7YK3ngO9QRg4jtx4YHAGVUq0yTG2 WhthayNvUfa5A/R4qed5Xvfog1hA+NxCenss4wul4/8Z0yhVandq0R6I7MN9Q78yqDBu A5j3udrCeO5tdfhCaEI2wz4jFUM9l3Z4lAdVpECK+oupmPmNzDlrfoQgLsBwWYfQYRrZ 47WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Hdi8p3qA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id s8-20020a17090ad48800b0027455c727f5si520161pju.84.2023.09.13.18.17.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 18:17:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Hdi8p3qA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 D13EE840B7FF; Wed, 13 Sep 2023 05:30:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240458AbjIMMas (ORCPT + 36 others); Wed, 13 Sep 2023 08:30:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240570AbjIMMan (ORCPT ); Wed, 13 Sep 2023 08:30:43 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF8BC1BCE; Wed, 13 Sep 2023 05:30:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694608239; x=1726144239; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+p2qHcmN288VJTNmarM516bgZohk8ZtzFjtp/gNHNio=; b=Hdi8p3qADp2DedEUei1iJZvjf3hCAgdsrd2EdoSFdpPGWpoiKzHkzIKx ucotlmanpLA3thVUoPCGHYGVHueYRbr7yRRdxiBxA/GUYbn8XIQzRhxmc N1/9obp7db0kMrGUIV5jAq17CzYP4BXUqbDhGNEGGImqZ2K+fPD3jUVib x0UtFbJKNDGmlnUM8Hdg4CjgET0mBq+CrTIsroqunETsa1pb/szVnQ41p 1og7louorEMT34L1GJpSoA3bSYkltpyJxBQJ240Fxb3xKdokbQYawraVW 8ePH/P7w0sCav2rvOmlCFMA5qNwyg7bl1zIOa5Gmlu/9UVhAKsr5l6IR0 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="368912450" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="368912450" 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:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="693836640" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="693836640" 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:13 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Jonathan Cameron , linux-pci@vger.kernel.org, Bjorn Helgaas , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Bjorn Helgaas , Thierry Reding , Jonathan Hunter , linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Jonathan Cameron Subject: [PATCH v2 04/10] PCI: tegra194: Use FIELD_GET()/FIELD_PREP() with Link Width fields Date: Wed, 13 Sep 2023 15:27:42 +0300 Message-Id: <20230913122748.29530-5-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 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 05:30:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776973782146561460 X-GMAIL-MSGID: 1776973782146561460 Use FIELD_GET() to extract PCIe Negotiated Link Width field instead of custom masking and shifting. Similarly, change custom code that misleadingly used PCI_EXP_LNKSTA_NLW_SHIFT to prepare value for PCI_EXP_LNKCAP write to use FIELD_PREP() with correct field define (PCI_EXP_LNKCAP_MLW). Signed-off-by: Ilpo Järvinen Reviewed-by: Jonathan Cameron --- drivers/pci/controller/dwc/pcie-tegra194.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c index 4bba31502ce1..248cd9347e8f 100644 --- a/drivers/pci/controller/dwc/pcie-tegra194.c +++ b/drivers/pci/controller/dwc/pcie-tegra194.c @@ -9,6 +9,7 @@ * Author: Vidya Sagar */ +#include #include #include #include @@ -346,8 +347,7 @@ static void apply_bad_link_workaround(struct dw_pcie_rp *pp) */ val = dw_pcie_readw_dbi(pci, pcie->pcie_cap_base + PCI_EXP_LNKSTA); if (val & PCI_EXP_LNKSTA_LBMS) { - current_link_width = (val & PCI_EXP_LNKSTA_NLW) >> - PCI_EXP_LNKSTA_NLW_SHIFT; + current_link_width = FIELD_GET(PCI_EXP_LNKSTA_NLW, val); if (pcie->init_link_width > current_link_width) { dev_warn(pci->dev, "PCIe link is bad, width reduced\n"); val = dw_pcie_readw_dbi(pci, pcie->pcie_cap_base + @@ -760,8 +760,7 @@ static void tegra_pcie_enable_system_interrupts(struct dw_pcie_rp *pp) val_w = dw_pcie_readw_dbi(&pcie->pci, pcie->pcie_cap_base + PCI_EXP_LNKSTA); - pcie->init_link_width = (val_w & PCI_EXP_LNKSTA_NLW) >> - PCI_EXP_LNKSTA_NLW_SHIFT; + pcie->init_link_width = FIELD_GET(PCI_EXP_LNKSTA_NLW, val_w); val_w = dw_pcie_readw_dbi(&pcie->pci, pcie->pcie_cap_base + PCI_EXP_LNKCTL); @@ -920,7 +919,7 @@ static int tegra_pcie_dw_host_init(struct dw_pcie_rp *pp) /* Configure Max lane width from DT */ val = dw_pcie_readl_dbi(pci, pcie->pcie_cap_base + PCI_EXP_LNKCAP); val &= ~PCI_EXP_LNKCAP_MLW; - val |= (pcie->num_lanes << PCI_EXP_LNKSTA_NLW_SHIFT); + val |= FIELD_PREP(PCI_EXP_LNKCAP_MLW, pcie->num_lanes); dw_pcie_writel_dbi(pci, pcie->pcie_cap_base + PCI_EXP_LNKCAP, val); /* Clear Slot Clock Configuration bit if SRNS configuration */ From patchwork Wed Sep 13 12:27:43 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: 139212 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp44270vqi; Wed, 13 Sep 2023 18:27:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJ4FJRcSRZIChpwm8SIyYqC2fjEQVyEZvSra53WpQCUlzk4FJeshsuFzM/Cn4+gp0J1wVG X-Received: by 2002:a05:6358:9494:b0:134:f326:e819 with SMTP id i20-20020a056358949400b00134f326e819mr4776615rwb.29.1694654856926; Wed, 13 Sep 2023 18:27:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694654856; cv=none; d=google.com; s=arc-20160816; b=VWxaKJwjwoOhu/WBcToHchHTNKNIDVjVxLhYjWP1Eg/m/H9eCDjukFtl8CDT46KiRL lhprGstuquEwP0gmhs/aSYZ0Rf5qQMMnkWXfIauUlQgFdZqrRyaLgtSSE0cSBqJt089V mXX/kqEIObRUorDHooUajhfRStm4ZvDDYsrh3aqivDhKWtEsEkt/RPMM/5C/UTF39XYP Dv4AdSNSpt09x+etatOaeJqzz9DATD+QxJCdkB3B/46lzyXHw0AWkfn4AUEDsUQiqLDL Q8kTFUy966hUsa6LC34yBxXPNHo/YWeiW7reJZBigj0TlrMQRPXd5uqYS6I70Jst8K8d 35nQ== 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=fPeEXc1iTsvs3J/oGVoIDePo6qTSsajC5krOXua7Hgo=; fh=+ds33QSv06hx9P6h7KOfywmVP3SoPGb+0Dm+NdVpUrk=; b=tCoKNKT17plMgW9n1wV+49ZcZbFEM2MuM61nH+XW9wzccDVgwmE+cLsoZDq+oFtqMK PaWkhabIJ6+IOJcCJRuBMz4U2gqZ88M6NbPxnu17hGG7jiGSHj9mFLq3612r4gX7Xwwb t6km6AFBy6i4E20OoLA/C+QU1gSMbnLEDK/nicJ79LXD1R5Vt3DrBjmbyrICYYkRCK/L TQFFz/45xTjV3IEZihN13Rs0Ov06eDBV/nMEEPEzSWKWFk9pO1xn15QROqkFvf/feOMF B6SLJbJqsE/klmHOTeV/lTJ6SEYzeO3pjlaBR5lJRQi4XK8XA3WX1+b/QTLTPL1C9KbV 2XBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HtRLAiqw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id k64-20020a638443000000b005688117c6f9si380910pgd.44.2023.09.13.18.27.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 18:27:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HtRLAiqw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id 72AC4806E3E6; Wed, 13 Sep 2023 05:31:01 -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 S240515AbjIMMax (ORCPT + 36 others); Wed, 13 Sep 2023 08:30:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240624AbjIMMas (ORCPT ); Wed, 13 Sep 2023 08:30:48 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91B6D19AD; Wed, 13 Sep 2023 05:30:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694608243; x=1726144243; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=15ibo3GWRPJ9vDYwDbbj+Wf0aSNq2J9+768sCuoyD6A=; b=HtRLAiqweMIDabTVwuwPpX1r5IPX2h26SOtbO8ynDhZxFTg8VVvE1f4G dSbEXL5/tsZvAto3kvHs9Dj/IlxE2zw/Q0RWLtcefkjpeDXJ7gRaORbY4 YIGnybPyPrRvv8eZjmHOo/ehJp8OHJ8Ui2VW/G5J4CpJvKAUEDgO+fzbF fOiLJHomzZ2W5LEjy5+QdC0UUrfMUug3RL3jy7V7oFD5pmkqPeFiBr0fX yYL4mjqMbKIQ3LmLnFXnCNVrU0q/OCy3kDmF7PL+ZwsvOjZ2k8SQ6nrbX 9FXyfvhlINBsM+aedJDuXyxS/ZNRKdvbdDuBA46I6xfVmZKNfFSGgmgXm Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="368912498" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="368912498" 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:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="693836647" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="693836647" 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:18 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Jonathan Cameron , linux-pci@vger.kernel.org, Bjorn Helgaas , Thomas Petazzoni , =?utf-8?q?Pali_Roh=C3=A1r?= , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Jonathan Cameron Subject: [PATCH v2 05/10] PCI: mvebu: Use FIELD_PREP() with Link Width Date: Wed, 13 Sep 2023 15:27:43 +0300 Message-Id: <20230913122748.29530-6-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 (lipwig.vger.email [0.0.0.0]); Wed, 13 Sep 2023 05:31:01 -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 lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776974411113522924 X-GMAIL-MSGID: 1776974411113522924 mvebu_pcie_setup_hw() setups the Maximum Link Width field in the Link Capabilities registers using an open-coded variant of FIELD_PREP() with a literal in shift. Improve readability by using FIELD_PREP(PCI_EXP_LNKCAP_MLW, ...). Signed-off-by: Ilpo Järvinen Reviewed-by: Jonathan Cameron --- drivers/pci/controller/pci-mvebu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c index 60810a1fbfb7..29fe09c99e7d 100644 --- a/drivers/pci/controller/pci-mvebu.c +++ b/drivers/pci/controller/pci-mvebu.c @@ -264,7 +264,7 @@ static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port) */ lnkcap = mvebu_readl(port, PCIE_CAP_PCIEXP + PCI_EXP_LNKCAP); lnkcap &= ~PCI_EXP_LNKCAP_MLW; - lnkcap |= (port->is_x4 ? 4 : 1) << 4; + lnkcap |= FIELD_PREP(PCI_EXP_LNKCAP_MLW, port->is_x4 ? 4 : 1); mvebu_writel(port, lnkcap, PCIE_CAP_PCIEXP + PCI_EXP_LNKCAP); /* Disable Root Bridge I/O space, memory space and bus mastering. */ From patchwork Wed Sep 13 12:27:44 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: 138792 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1073292vqx; Wed, 13 Sep 2023 06:09:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEd6HIsbujdOqfyCpmtW4N4TOnPvKY9pwWwnUQ1ZZM30r88ObuHZPUG3LIt/YvY7kNbvakK X-Received: by 2002:a17:902:c40a:b0:1b0:3ab6:5140 with SMTP id k10-20020a170902c40a00b001b03ab65140mr4044312plk.4.1694610545747; Wed, 13 Sep 2023 06:09:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694610545; cv=none; d=google.com; s=arc-20160816; b=1GCZEUKogyiZLmPh9Nth6ar7zpv/4zYIH4O6WPXtqac5Cf1/rhSuBj3eFkaASoy746 osJS1env7x7zloWb+1EKR72+hB1ahugXmc2e8EcR9qYXY/wXWsa7fzMpv69huE0JIcLg 62MvAkmfO31febooj+hAAurWMWS6KoErX6vHM0BUWHD0xWbSvdN1iFU4g/B4MYxgGThx jz2lk3AHFGSPtKfFYZ0jkhgWGmrYhJ2hCoKLRLNk9eH9Vds7QdoD6rbZHJFb0Sa1wMdM lOM/TjG6xDbCqOB2ernlcfAGQcS0ZJNlgyDfQE/Wh8bdfPzWZbCEY8ZrwkdpzQT8LIXF jPzg== 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=GTIW5xpIO85Vzrx69xXa/UYBrnHyEwPGjg9NjSdThNI=; fh=SwZCXEJZzs6ucvTPox1ePCNuqWWtjNFzfjl4nYefhx8=; b=n0ro+usX7Dqkt8DGvhRvxmyxiJcNUJqz4CKCh65Em462lj2R4cUH/Vir+7DqrWeWhq RZSfxRhBHxsqx5Z0ord3LKFFGmEuFoNm+2PQ9qxWk8+ma1BNl0iq8Z/d+0lMJS07LrDO ASSAWJNhPVtpiQGrNw9qHJFFLROHXuWEFc/acVlJtI/3WSo0a1IaJPF8xfIs6iSKni5Z /c755mg3krKzcbFbMAOgxbEQaUm+0iNwVcDqgDtVwxlOAYLtBM6stT8UwJj5HuaJXDrE ipBHiGZxhnLZpWQ15zGvhfx+hl2bGRoahx/t+QY+jnk1o3kXdiTT5kSiMqYPB5NbBLfe 0PCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=hlU6qkgP; 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 d9-20020a170903230900b001bbb8324bd5si10423622plh.479.2023.09.13.06.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 06:09:05 -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=hlU6qkgP; 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 6FF4B81E3E00; Wed, 13 Sep 2023 05:31:15 -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 S240642AbjIMMbB (ORCPT + 36 others); Wed, 13 Sep 2023 08:31:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240507AbjIMMav (ORCPT ); Wed, 13 Sep 2023 08:30:51 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D93619AD; Wed, 13 Sep 2023 05:30:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694608247; x=1726144247; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lGsBT0uuTDOMajlNgJ3siJtE8uolW3uxhY8d88dRxik=; b=hlU6qkgP3pB5mUXJDy67iBLnatEEj6x8+/Koo7MXG3go6EQ0rgEWu3J7 vp4kuGiA2n5Sy+wdl73KdfWLg/Se+l/WWcFGJ4StsBa45WogMnqdRf9zN H4oq0yj2mw4qUUp6nGY9jWhiFGUFwKlekFAmkJ8pDpFPE7RtT/I1I5ycU b9YBwj+hlHUZRtWW5vS8uKD8gf9gAq9rWwuQSIMYRLMu2v/FOp2a7RBET NaljDv+TDVOuqx0oX8Y6d4e5qSYWD9sRkd/mPkBAdDGjKaWZqnKccQ0Oe ANybNPWBb5Gz9VO3rMZVTSfMSVE7BeWDOvpbwV/KiiEH+c6fWuJhsGLw4 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="368912521" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="368912521" 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:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="693836655" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="693836655" 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:22 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Jonathan Cameron , linux-pci@vger.kernel.org, Bjorn Helgaas , Bjorn Helgaas , linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Jonathan Cameron Subject: [PATCH v2 06/10] PCI: Use FIELD_GET() to extract Link Width Date: Wed, 13 Sep 2023 15:27:44 +0300 Message-Id: <20230913122748.29530-7-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:15 -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: 1776927947584969436 X-GMAIL-MSGID: 1776927947584969436 Use FIELD_GET() to extract PCIe Negotiated and Maximum Link Width fields instead of custom masking and shifting. Signed-off-by: Ilpo Järvinen Reviewed-by: Jonathan Cameron --- drivers/pci/pci-sysfs.c | 5 ++--- drivers/pci/pci.c | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index d9eede2dbc0e..5a6241044c3c 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -12,7 +12,7 @@ * Modeled after usb's driverfs.c */ - +#include #include #include #include @@ -230,8 +230,7 @@ static ssize_t current_link_width_show(struct device *dev, if (err) return -EINVAL; - return sysfs_emit(buf, "%u\n", - (linkstat & PCI_EXP_LNKSTA_NLW) >> PCI_EXP_LNKSTA_NLW_SHIFT); + return sysfs_emit(buf, "%u\n", FIELD_GET(PCI_EXP_LNKSTA_NLW, linkstat)); } static DEVICE_ATTR_RO(current_link_width); diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 59c01d68c6d5..a8adc34dc86f 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include @@ -6257,8 +6258,7 @@ u32 pcie_bandwidth_available(struct pci_dev *dev, struct pci_dev **limiting_dev, pcie_capability_read_word(dev, PCI_EXP_LNKSTA, &lnksta); next_speed = pcie_link_speed[lnksta & PCI_EXP_LNKSTA_CLS]; - next_width = (lnksta & PCI_EXP_LNKSTA_NLW) >> - PCI_EXP_LNKSTA_NLW_SHIFT; + next_width = FIELD_GET(PCI_EXP_LNKSTA_NLW, lnksta); next_bw = next_width * PCIE_SPEED2MBS_ENC(next_speed); @@ -6330,7 +6330,7 @@ enum pcie_link_width pcie_get_width_cap(struct pci_dev *dev) pcie_capability_read_dword(dev, PCI_EXP_LNKCAP, &lnkcap); if (lnkcap) - return (lnkcap & PCI_EXP_LNKCAP_MLW) >> 4; + return FIELD_GET(PCI_EXP_LNKCAP_MLW, lnkcap); return PCIE_LNK_WIDTH_UNKNOWN; } From patchwork Wed Sep 13 12:27:45 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: 139074 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp69263vqb; Wed, 13 Sep 2023 13:29:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFQDaqvH2Fsy2TK5EY7MaXW/sWVr92BdGHlegbcBHlTz39TbGVUF8+cmE8UrTGJyMn/dxA1 X-Received: by 2002:a17:90b:3a82:b0:268:dad:2fdc with SMTP id om2-20020a17090b3a8200b002680dad2fdcmr3528794pjb.21.1694636962795; Wed, 13 Sep 2023 13:29:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694636962; cv=none; d=google.com; s=arc-20160816; b=oXvuZEDdWwQnS/k3D/NUp5qqrqNMbcpnlyCzxQnQDok0UR8DcPNO7cL8VcF5k+8jgH fOw6NfbkBVi8oZLkCe/WDtS3bKbGAoYL62XQh61CwUzn95qNVVkt8T0Y657W0QRchgnl jz2jxiwatUFgHBL/2lD632fn64k7dD0G/7AzQ0/wJlQjvL/vDVz/d70yvO62AS7L+CrS rrCgrQCIrvL6aZFcA9GnS0k4rtJqAw7S8LxGR0KF+wCo5u5NxR/ZoPyntqU6r32pMwky XvYB9EWYmUBVWqWaTaZaGS+BLf8K1Y1Cr8Q8XOxrj0cu51i6UprzP45KV/VsLS1RSpxQ rDgg== 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=S0ZxoL0dKXej0KBmSyoXImLY9I2APB/UUGWMtQ4hS+o=; fh=nA2vVj1DM1EyO+m2HoYoQfT/8NHvxXMyPbwvoRmXN6c=; b=UZ7St1OtwByVmPNOuVvHmGvLBimPj1HYCzq+5Km8rDfuGpXJuO2zq1lfwpKx8fKI/D QTb4UGccqgli1VYJZ9MjpHcb8jhgVeykyO4chj4N1jpLYld1/iY/P9TevqkHTPQlSIDp 8bWNbU7sutQ+NgQMums9e+9+wmK6yS0/a8FhjmiG6TZkkejPk6UjUjG7WFNqFCxDn1pL c/v8+PmGKp27CCAbBvK+/jBNd4S1+UCfts55V+jUbyS+fZ4Hf5Yv0KwjznbCQctWAjto 5E541qqowti3yUgtx8x8T4xZlfCdNEnPctJu0xGMOkqOWhFrj2r7nRS28Jp/rGFDCoei CowQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IuwJfy2b; 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 w20-20020a17090aea1400b0026b2fdb4f82si76280pjy.29.2023.09.13.13.29.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 13:29:22 -0700 (PDT) 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=IuwJfy2b; 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 5AE85842AD01; Wed, 13 Sep 2023 05:31:10 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240479AbjIMMbE (ORCPT + 36 others); Wed, 13 Sep 2023 08:31:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240609AbjIMMbA (ORCPT ); Wed, 13 Sep 2023 08:31:00 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CAE61BC8; Wed, 13 Sep 2023 05:30:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694608249; x=1726144249; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1/Ks4shsYec7fIvyglfV0nBYf14xH5c+nwe3xSib8S0=; b=IuwJfy2bN+EuGCvy3e79A+V2ExaFySKwqOsDAhHkzsFsrZF+azWEA7Xl D5GIRJdv5aCCU+lz3VogF4NrSajM1cZbghT3dlNBhKfuDoY2KQvK+DtJf 0Im4iBl7MFbmi2AhU/6TgkTSitqzYB6uMxPz+7H3vdcdiM1IhVY6nXSKB 6z5AAB82B+EUuoi4xp2PJsEeunf6vMKYuzk6+ZGmatqTSXJQXuqDiStCR OS31pFICW2F7keSpgMyF7tSeBzTD0+n+AUJIUoOt67dh1jRku1IAaXjlH o3VRX9tarh2V3zdawY4xgMN7Y+dU9xKmSnCFoHhozKhXY+nfyhA34tsKI Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="368912530" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="368912530" 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:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="693836656" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="693836656" 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:25 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Jonathan Cameron , linux-pci@vger.kernel.org, Bjorn Helgaas , Bradley Grove , "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 07/10] scsi: esas2r: Use FIELD_GET() to extract PCIe capability fields Date: Wed, 13 Sep 2023 15:27:45 +0300 Message-Id: <20230913122748.29530-8-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 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 05:31:10 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776955647911548627 X-GMAIL-MSGID: 1776955647911548627 Use FIELD_GET() to extract PCIe capability register fields instead of custom masking and shifting. Also remove the unnecessary cast to u8, the value in those fields always fits to u8. Signed-off-by: Ilpo Järvinen Reviewed-by: Jonathan Cameron --- drivers/scsi/esas2r/esas2r_ioctl.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/esas2r/esas2r_ioctl.c b/drivers/scsi/esas2r/esas2r_ioctl.c index 055d2e87a2c8..3f7c1d131ec3 100644 --- a/drivers/scsi/esas2r/esas2r_ioctl.c +++ b/drivers/scsi/esas2r/esas2r_ioctl.c @@ -41,6 +41,8 @@ * USA. */ +#include + #include "esas2r.h" /* @@ -792,16 +794,10 @@ static int hba_ioctl_callback(struct esas2r_adapter *a, pcie_capability_read_dword(a->pcid, PCI_EXP_LNKCAP, &caps); - gai->pci.link_speed_curr = - (u8)(stat & PCI_EXP_LNKSTA_CLS); - gai->pci.link_speed_max = - (u8)(caps & PCI_EXP_LNKCAP_SLS); - gai->pci.link_width_curr = - (u8)((stat & PCI_EXP_LNKSTA_NLW) - >> PCI_EXP_LNKSTA_NLW_SHIFT); - gai->pci.link_width_max = - (u8)((caps & PCI_EXP_LNKCAP_MLW) - >> 4); + gai->pci.link_speed_curr = FIELD_GET(PCI_EXP_LNKSTA_CLS, stat); + gai->pci.link_speed_max = FIELD_GET(PCI_EXP_LNKCAP_SLS, caps); + gai->pci.link_width_curr = FIELD_GET(PCI_EXP_LNKSTA_NLW, stat); + gai->pci.link_width_max = FIELD_GET(PCI_EXP_LNKCAP_MLW, caps); } gai->pci.msi_vector_cnt = 1; 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: From patchwork Wed Sep 13 12:27:47 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: 139068 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp60584vqb; Wed, 13 Sep 2023 13:12:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpR2pYu4jrMhuMU0fjagerEsiADfFLwVq6kE3BKHztBQHW+5g1iqHF2up/KDAFjLzP3s/7 X-Received: by 2002:a17:90b:f07:b0:273:ec82:5554 with SMTP id br7-20020a17090b0f0700b00273ec825554mr5622205pjb.9.1694635923212; Wed, 13 Sep 2023 13:12:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694635923; cv=none; d=google.com; s=arc-20160816; b=1LZcogAJ6ee6fLWigLUUj1k+RkX2WmPFfpxO+qMXHhvpbzCNvqgCVys3J9f/pjKghV KKIuorIgaEeyMID/B/HYnj3fSBX1e6tEyeY9JBC1T+wi4oRx2+ljjXoZBslH0Wf+5D+B z4+aMhPyzbzA46fSSN85ODL8Y2bh8DvIP5qJHcQL3yxoOh8viDLE3TECXXpz3zVvzyVb I18C7xxmNilleajQXUjd03FSQF211RpuM5KZ6wp6mk5wZY1uOcYw9k12WwRQMbtR7FX7 4GOIjNtp2NeC+ciFIJx2a3NF9+rdFfZH1pkyT9LKUaii1Z/WgCtPUXqBHiBZ9Iqa6f9u xQFg== 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=DWxflgHjGoktQp3+UioEKo6aBefxEenDBWAG7ApqGJI=; fh=X4Uye5sNwVBuCVMZMaHyDTEYQvcWCD9KmOMf5RPIL/A=; b=Tx/XsRwSUzUGOXQv9xlREuRJvqikFK9Jg0rZcAbKxse0lgVUh+7wutRX09ZKa8wOPI l80rB1xKExfuH0Xq50E+6dzjWNabGULglG3F3QX0gnJ6o/BC8BjFs/X7tU9Yxl4PzgWM DwyrC12tN4AO3mUo4/CZ4zCheZr6Qk5quDIynPOZBLR+pL+9jXs4haNvtIlyIBlQ129E GaYTt2K3fubsDY5zB1gNKC+9yOVh+j1yNwAv4QLgC3lPOS0+bZnCyqn0lWjD8XsZmmhp JLnAXsQO04MIMqv25agtMDyMFexm4PQp5Ctfl9Ue6aK0okgrLlGaib2GDZI3e7s3C83M r7VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bWkO0aC0; 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 k14-20020a17090a3cce00b002682c370e32si26748pjd.188.2023.09.13.13.11.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 13:12:03 -0700 (PDT) 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=bWkO0aC0; 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 5285C844BC40; Wed, 13 Sep 2023 05:31:38 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240624AbjIMMbh (ORCPT + 36 others); Wed, 13 Sep 2023 08:31:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240629AbjIMMbf (ORCPT ); Wed, 13 Sep 2023 08:31:35 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75DE11BC7; Wed, 13 Sep 2023 05:31:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694608291; x=1726144291; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=h23ccGE5WuEhEsJ1piAqm7UfKXwPFLCCzGvyJoEQsXM=; b=bWkO0aC09I1gdaes/RX+cM0ugVa/3UYNJWcHpRnDBJKOQIggO0mMpZSL 9aH6LMHEBeBF/X+qbgwtb5ie3XarYzwXvcOV8sUe1l/mCcKxIFGWWDgUG YtcgF4bJMVBI9xz6Iy5ImddTm4Vxn2dROICi4XOfa5JFDRfXOOum/+t0K 4YVjX+mVXhTto/PF/EmqzNhOzko70nB0r9PM9Eq3kTNCvk5iStdwKUQXe g2aRXGFMd7uicibFe61R6BgSF6oSRwZDjNfJTDdGRz/T1RyCWHVLpd8TA UZdLdAmLh/zebxSN21vmYj6S3EWxKKF/CqQcDiKABsI64lKDzTTobVUIn Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="368912633" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="368912633" 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:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="693836688" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="693836688" 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:33 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Jonathan Cameron , linux-pci@vger.kernel.org, Bjorn Helgaas , Jesse Brandeburg , Tony Nguyen , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Jonathan Cameron Subject: [PATCH v2 09/10] e1000e: Use PCI_EXP_LNKSTA_NLW & FIELD_GET() instead of custom defines/code Date: Wed, 13 Sep 2023 15:27:47 +0300 Message-Id: <20230913122748.29530-10-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 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 05:31:38 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776942454436744091 X-GMAIL-MSGID: 1776954557994657703 e1000e has own copy of PCI Negotiated Link Width field defines. Use the one from include/uapi/linux/pci_regs.h instead of the custom ones and remove the custom ones. Also convert to use FIELD_GET(). Suggested-by: Jonathan Cameron Signed-off-by: Ilpo Järvinen --- drivers/net/ethernet/intel/e1000e/defines.h | 2 -- drivers/net/ethernet/intel/e1000e/mac.c | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h index 63c3c79380a1..a4d29c9e03a6 100644 --- a/drivers/net/ethernet/intel/e1000e/defines.h +++ b/drivers/net/ethernet/intel/e1000e/defines.h @@ -681,8 +681,6 @@ #define PCIE_LINK_STATUS 0x12 #define PCI_HEADER_TYPE_MULTIFUNC 0x80 -#define PCIE_LINK_WIDTH_MASK 0x3F0 -#define PCIE_LINK_WIDTH_SHIFT 4 #define PHY_REVISION_MASK 0xFFFFFFF0 #define MAX_PHY_REG_ADDRESS 0x1F /* 5 bit address bus (0-0x1F) */ diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c index 5df7ad93f3d7..5340cf73778d 100644 --- a/drivers/net/ethernet/intel/e1000e/mac.c +++ b/drivers/net/ethernet/intel/e1000e/mac.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 1999 - 2018 Intel Corporation. */ +#include + #include "e1000.h" /** @@ -25,9 +27,8 @@ s32 e1000e_get_bus_info_pcie(struct e1000_hw *hw) pci_read_config_word(adapter->pdev, cap_offset + PCIE_LINK_STATUS, &pcie_link_status); - bus->width = (enum e1000_bus_width)((pcie_link_status & - PCIE_LINK_WIDTH_MASK) >> - PCIE_LINK_WIDTH_SHIFT); + bus->width = (enum e1000_bus_width)FIELD_GET(PCI_EXP_LNKSTA_NLW, + pcie_link_status); } mac->ops.set_lan_id(hw); From patchwork Wed Sep 13 12:27:48 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: 138918 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1188591vqx; Wed, 13 Sep 2023 09:04:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJyEl7eKaU+lSrbbCdwfH3GDY6M/EsA2z6ElcRSNFZiDAddn2/82NhHGoQPoqjk8YYm+Y5 X-Received: by 2002:a17:902:f691:b0:1b8:90bd:d157 with SMTP id l17-20020a170902f69100b001b890bdd157mr3290186plg.26.1694621053588; Wed, 13 Sep 2023 09:04:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694621053; cv=none; d=google.com; s=arc-20160816; b=QvqRGx2upT5IsWNj3eH0yOlQg4KMKvY51fEzI/TFIZ0/WK4f9lgNtFLWzYkoZ4Evvc svp4MpJDcZG0bEMtWdFdXkHtVZRc76h8vu8PC5+AQy0Nqd5KIquTOhlwLjAoyQYqnTXu gXQCxuWa59pnYj5HfGFGz1SRg1sjIlOpuCzw20l+fO9Jo4lyiKbrReAuFsRTMqVGMnM8 Oy2oZLHMVR5Yd1BXLrKZkQzKkEGxTlVcw/jXrsViUsqztB7tPjWb/Yqyy3LbD7BIXzJr xYgqh6MT8GY3VmZBsfmG1KQ8f4qe9Sxao1/Cm85KaJj8C3JlfMy17+R5FX8RxrrIjHw0 gJDg== 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=addfjETMEN6WNz1NH/tFWhfevojV7vmFfPX9ZNWnntA=; fh=kjyURwvL350Blhv38ymYPVLxsj1y4AkrMp9vgKIShW8=; b=F0m6wv54Tvp+AJ5jwXjtHz00ygvckCo4unCOQi2i1w9yQSZuTB9fQBtsRXmwqqdAoU QIgWGsnxJ4sIZGVTHvVCVImVtoVy6e0i8pMuN4vNhMzePo/ltyAg+6mnWEkxifdUb5+1 oyYnFeREaAwopi23qCW8tUBbpJzL3k1ZAbwHcGcgqDjQ8eJyjmNt1i05S5MWbPUIKny6 2dvwvxBcnQ5r7HIzYCHb8xT0SloorbVam23LiUlPQM0VTeZ8paFRb2cGSkY2XohBLGsj 0HU/fwc0kX9C8l72z7Bk9hGPJCMecqq25J5mklypFKvNMlTy+2zaZd0V/sy1DZ6j+Dgd 0e5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=BZA1AfNZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id d4-20020a170903230400b001c3e9b0bae1si1858835plh.443.2023.09.13.09.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 09:04:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=BZA1AfNZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (Postfix) with ESMTP id BA6E480FE961; Wed, 13 Sep 2023 05:31:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240697AbjIMMbw (ORCPT + 36 others); Wed, 13 Sep 2023 08:31:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240661AbjIMMbq (ORCPT ); Wed, 13 Sep 2023 08:31:46 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30FBB1FC0; Wed, 13 Sep 2023 05:31:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694608300; x=1726144300; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wo7umevM4e5cancbBmuxKjkF/sAUzuBzzYDYja1futw=; b=BZA1AfNZyKA8S0EMrOjr4K59DEX2wqVsBFYjQTUmK4NioBFHXH2NNVu6 f05aQivLAmnNLjgUeWuMh/wiwSDy5F5tpjl5+JmMndk3NtGloAxkcyuOn mZ5JebhiPzIiGr4zxOweBRNZ0t6L3WS3NsCb0jrGkSGk/AZ7aLMotMrQt MW8tG+sV9ay0OtK6sfwjbA2+61HvQUMHxEf1o01c76SSJ0ee3/KZCRR5j 5HZJc1qw53UVLys6e6KFm0PTP0XXwKKZBHAJhXQIUAnpKon4rypcdgRWR Ey96mSupFVXJQcB2xQQ3PdYt0VSxgft3QLmNZOVPVOhVbH3Uqw317iCA5 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="368912686" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="368912686" 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:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="693836724" X-IronPort-AV: E=Sophos;i="6.02,143,1688454000"; d="scan'208";a="693836724" 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:38 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Jonathan Cameron , linux-pci@vger.kernel.org, Bjorn Helgaas , Jesse Brandeburg , Tony Nguyen , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH v2 10/10] e1000e: Use pcie_capability_read_word() for reading LNKSTA Date: Wed, 13 Sep 2023 15:27:48 +0300 Message-Id: <20230913122748.29530-11-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 (morse.vger.email [0.0.0.0]); Wed, 13 Sep 2023 05:31:55 -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 morse.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776929595713392959 X-GMAIL-MSGID: 1776938966185133605 Use pcie_capability_read_word() for reading LNKSTA and remove the custom define that matches to PCI_EXP_LNKSTA. As only single user for cap_offset remains, remove it too and use adapter->pdev->pcie_cap directly in the if condition. Signed-off-by: Ilpo Järvinen --- drivers/net/ethernet/intel/e1000e/defines.h | 1 - drivers/net/ethernet/intel/e1000e/mac.c | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h index a4d29c9e03a6..23a58cada43a 100644 --- a/drivers/net/ethernet/intel/e1000e/defines.h +++ b/drivers/net/ethernet/intel/e1000e/defines.h @@ -678,7 +678,6 @@ /* PCI/PCI-X/PCI-EX Config space */ #define PCI_HEADER_TYPE_REGISTER 0x0E -#define PCIE_LINK_STATUS 0x12 #define PCI_HEADER_TYPE_MULTIFUNC 0x80 diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c index 5340cf73778d..e86652a30069 100644 --- a/drivers/net/ethernet/intel/e1000e/mac.c +++ b/drivers/net/ethernet/intel/e1000e/mac.c @@ -18,15 +18,13 @@ s32 e1000e_get_bus_info_pcie(struct e1000_hw *hw) struct e1000_mac_info *mac = &hw->mac; struct e1000_bus_info *bus = &hw->bus; struct e1000_adapter *adapter = hw->adapter; - u16 pcie_link_status, cap_offset; + u16 pcie_link_status; - cap_offset = adapter->pdev->pcie_cap; - if (!cap_offset) { + if (!adapter->pdev->pcie_cap) { bus->width = e1000_bus_width_unknown; } else { - pci_read_config_word(adapter->pdev, - cap_offset + PCIE_LINK_STATUS, - &pcie_link_status); + pcie_capability_read_word(adapter->pdev, PCI_EXP_LNKSTA, + &pcie_link_status); bus->width = (enum e1000_bus_width)FIELD_GET(PCI_EXP_LNKSTA_NLW, pcie_link_status); }