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. */