From patchwork Fri Sep 15 15:57:50 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: 140869 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1433730vqi; Fri, 15 Sep 2023 19:07:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IExvq7VMJoqVNrxZnlj2HpOlLejtlFFZylZdCCs1sFOT43LRevhNzYFFryQ/63xy2NiAWVl X-Received: by 2002:a05:6e02:12e7:b0:34f:6f8a:7f02 with SMTP id l7-20020a056e0212e700b0034f6f8a7f02mr4467730iln.31.1694830077892; Fri, 15 Sep 2023 19:07:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694830077; cv=none; d=google.com; s=arc-20160816; b=a5tT+8NiT2OmBnQsIJOWlScLEyqcfeZUvOrynr6CTZv99Laz4ZUWf9Y80Ciy/Y/58C 7BQllKVOsHxeblJ2qAhpEl9YukFE6qVszoHs5MKOeZhUICXvmrQCgFRb9NN0mjtZUD1T aTn2w8ZIAZGiOT6u3wE19sgVvjUnjCuaY3vF6tVmFTG/35IrJclX5pg3JHMi/ARiS9ag jmCe8aGEqyBjUlz6a39KgxfF+c4Gj6izJr6RvJJp7EdYevYXkA+hVZOmZilSagNE4xrN XEqAfUQbAOcWjFn8WS5iyfcmqmwPhbkXsfj+8JcxTnpnla9hieCeMwQWWjR4qO7bBtXn 4GcA== 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=x4at+TntQA5RWzLo4gauqoh2mTfrkJvq+X+TpaJmcm8=; fh=hZLmt6afxROhcWMieefqgqDfx+oilLKHrk2svuRRdTk=; b=GIFsCCQra0k1gHNHl8QkKXdj2lgRMC7B8YpgBJokMjnn6oUQMvLdmgRn35efKIUHnh pH68Vvqx3bMKQM/G2pbUYjsMMcYtUYLGNw0xTcysEy7lyLrCQZwSG8PlxWnddDFNebQa Cu9Z7aXs/3eQpjVniIsLWdzfdFf582VmeUVYzd9ZnAeiUxdTNVG90TCRDpuYrJVWRMmZ cJGKzrmO625gWy1xx9UnF0pS4HyaXHCWcFIF/rdObgTj77nhNETVbvCdoJ5euQqjqZFD /gu1DBVE/gJnLBh/+Td79MuHaJ/9Y/9H2h/1e60Ku7+ZoD3SVV5zBjivuOjYJ4kLzn5E 1UsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TrMK4+re; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id a35-20020a631a63000000b00565cc12ee24si3981444pgm.874.2023.09.15.19.07.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 19:07:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TrMK4+re; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 2FF5B836E02D; Fri, 15 Sep 2023 08:59:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236411AbjIOP6q (ORCPT + 30 others); Fri, 15 Sep 2023 11:58:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236312AbjIOP6X (ORCPT ); Fri, 15 Sep 2023 11:58:23 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD9A5E78; Fri, 15 Sep 2023 08:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694793497; x=1726329497; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6GukoGfg7uQUsmDNdAKAVCGBUPXsn/55pQhVaFv5Paw=; b=TrMK4+re/ce3dDkas1x0ieHkesjZ7k8Zs1FSYVsF83s3KAhH/u3pcl2b zZHi2v+ETSMzal3vSI/OfJYMIN4pJVQcM30LUqdM5QFj2vXZPsmHUMDCG bTKjyifrzixociEwK1YtVswuL7aT1Ttnlh1679zJ+7kcEO+R8cJ+JrCAr 5Ea/5J6KlEEX3FvQ6mGRKCX3hyGw3vAhNRWFvaX7F0nbYv/mH3qqFPGDe VlcrQ+N0/xygWIt0tovNtEi+R8Z1LnME+aO6k8vvu+U1kzT+vG/301V6a TQ0XLoioSiefJrjT1TWGZ/WGebSuDlL+iF2Rqz7VLoNQh610vdLyeUr3V Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10834"; a="369594655" X-IronPort-AV: E=Sophos;i="6.02,149,1688454000"; d="scan'208";a="369594655" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2023 08:58:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10834"; a="745036702" X-IronPort-AV: E=Sophos;i="6.02,149,1688454000"; d="scan'208";a="745036702" Received: from srdoo-mobl1.ger.corp.intel.com (HELO ijarvine-mobl2.ger.corp.intel.com) ([10.252.38.99]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2023 08:58:15 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: linux-pci@vger.kernel.org, Bjorn Helgaas , linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH 5/7] PCI/ASPM: Use FIELD_MAX() instead of literals Date: Fri, 15 Sep 2023 18:57:50 +0300 Message-Id: <20230915155752.84640-6-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230915155752.84640-1-ilpo.jarvinen@linux.intel.com> References: <20230915155752.84640-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Fri, 15 Sep 2023 08:59:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777158143289292397 X-GMAIL-MSGID: 1777158143289292397 Convert 0x3ff literals in encode_l12_threshold() to FIELD_MAX(PCI_L1SS_CTL1_LTR_L12_TH_VALUE) that explains the purpose of the literal. Signed-off-by: Ilpo Järvinen --- drivers/pci/pcie/aspm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 60135fc7281a..fac6c5a0be26 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -335,27 +335,27 @@ static void encode_l12_threshold(u32 threshold_us, u32 *scale, u32 *value) * LTR_L1.2_THRESHOLD_Value ("value") is a 10-bit field with max * value of 0x3ff. */ - if (threshold_ns <= 0x3ff * 1) { + if (threshold_ns <= 1 * FIELD_MAX(PCI_L1SS_CTL1_LTR_L12_TH_VALUE)) { *scale = 0; /* Value times 1ns */ *value = threshold_ns; - } else if (threshold_ns <= 0x3ff * 32) { + } else if (threshold_ns <= 32 * FIELD_MAX(PCI_L1SS_CTL1_LTR_L12_TH_VALUE)) { *scale = 1; /* Value times 32ns */ *value = roundup(threshold_ns, 32) / 32; - } else if (threshold_ns <= 0x3ff * 1024) { + } else if (threshold_ns <= 1024 * FIELD_MAX(PCI_L1SS_CTL1_LTR_L12_TH_VALUE)) { *scale = 2; /* Value times 1024ns */ *value = roundup(threshold_ns, 1024) / 1024; - } else if (threshold_ns <= 0x3ff * 32768) { + } else if (threshold_ns <= 32768 * FIELD_MAX(PCI_L1SS_CTL1_LTR_L12_TH_VALUE)) { *scale = 3; /* Value times 32768ns */ *value = roundup(threshold_ns, 32768) / 32768; - } else if (threshold_ns <= 0x3ff * 1048576) { + } else if (threshold_ns <= 1048576 * FIELD_MAX(PCI_L1SS_CTL1_LTR_L12_TH_VALUE)) { *scale = 4; /* Value times 1048576ns */ *value = roundup(threshold_ns, 1048576) / 1048576; - } else if (threshold_ns <= 0x3ff * (u64) 33554432) { + } else if (threshold_ns <= (u64)33554432 * FIELD_MAX(PCI_L1SS_CTL1_LTR_L12_TH_VALUE)) { *scale = 5; /* Value times 33554432ns */ *value = roundup(threshold_ns, 33554432) / 33554432; } else { *scale = 5; - *value = 0x3ff; /* Max representable value */ + *value = FIELD_MAX(PCI_L1SS_CTL1_LTR_L12_TH_VALUE); } }