From patchwork Fri Sep 15 15:57: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: 140631 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1265047vqi; Fri, 15 Sep 2023 12:13:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFkTgR9to7K5fVxbkNToG5vZpxvka7+Gb/6NbDGFizRAlWBVOiNG4ogzra3MKxglmFsEGbN X-Received: by 2002:a05:6a20:560c:b0:154:e887:f581 with SMTP id ir12-20020a056a20560c00b00154e887f581mr2773040pzc.58.1694805221376; Fri, 15 Sep 2023 12:13:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694805221; cv=none; d=google.com; s=arc-20160816; b=dCjrdlEI673dMtPHGSVJIzBTIFaYOUq5cW3xsQ55KogAi1XFDYvXNxvCrLLQ70+lLh FioUF2c7VMmLlf+tX5EeyRb+jcgpPLr6KhRr+upE2e2SUhfTgocn7h3o58GIG+sMHjdm joLH4aJ9/NCd3s3iaf8HmFKTixwByNMJUe8JtU5zg2qiyoMlcji10GY9J3Lh9Nw4hKgm pSOm0iCXwvLcN2YOFUQLSmeqqQYnJM7sVSFgxt0OWlN5YtP1AQja8B0vT/ciF1MUB0EX YepWmiZ7pKK32yfg4B2xHVnKS0f5W+PH1yhpO8foFRUcuUBCzqDtvzhT+46/eeh5YwwS 1qTQ== 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=QYzdGtdUnQykBYwuBSObu+mUlX+sWJFdLmKGH3PbocY=; fh=hZLmt6afxROhcWMieefqgqDfx+oilLKHrk2svuRRdTk=; b=CK4tip8BoLQqmYuIuW29LBrXwXD1kmTzQ1p6+3hm+jU4HBOLM0FuPk9aFpM9w1M1LD CwOlH1+ayPoREWJ3bllEBoJbDyimhJzfIQ8XfdFZ69U4y+V46+u9crdj2AdWuBvYHHjs B+EhbJC/WUTBSFSsKUi2Di3btGAsjVAFuosIA6XRV8nD/EGVFdRfJXuf2ZaQVdAYONhU wUqH3UuEFXMPtkFrH5UzZ+Kki/vluUjPf5YUOY2oHjMJmKWD0DmhCY6w+dmtzIreI79/ rZBcxmBGzeNuv1OgkeV7EToyuWWto2zC2sJQrGUGsgFcd4+jgB7qyUBgqF8BCEHNUs4i RG/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cjhaxKYY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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. [23.128.96.37]) by mx.google.com with ESMTPS id o25-20020a635a19000000b00563de35d397si3540462pgb.487.2023.09.15.12.13.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 12:13:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cjhaxKYY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 2360A8135296; 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 S236334AbjIOP6i (ORCPT + 30 others); Fri, 15 Sep 2023 11:58:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236237AbjIOP6L (ORCPT ); Fri, 15 Sep 2023 11:58:11 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E46CE78; Fri, 15 Sep 2023 08:58:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694793487; x=1726329487; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=j6SDgstlq1BV6IaLeRs7Qh9MPTgsTGm9fYKFIXYrqvw=; b=cjhaxKYYeV367qEMFqa7L+W8L+73NN5NluUZLrsxa6hbc0/F+i7rYrOk iPTfs9ftGw48oyuKl5VXsQnL0jmbZNkrtB4HLf2EVYRpUEjo/6/U15aBC HrtuFzYmgvWgf32iYWDxT6j88xaLJ4RSkW8HOqhZVMxS4qp/vhNA0FFhn bhz6RmsSKLm0i+p7cKlwqJf2wr6qsvJK1u44/MXlvOUyTrQH/8Q9+j02D 5JUg5dHX04LEKw5/hCeiy/sxtSvVkBm2G9RRGfzXyl0DUBuB2lt1fwm1W Uvfsv8n9gcy81simQUuysrJWInlQI3g5VvuwhSbdf16T72ONs/F0JAzka g==; X-IronPort-AV: E=McAfee;i="6600,9927,10834"; a="369594611" X-IronPort-AV: E=Sophos;i="6.02,149,1688454000"; d="scan'208";a="369594611" 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:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10834"; a="745036686" X-IronPort-AV: E=Sophos;i="6.02,149,1688454000"; d="scan'208";a="745036686" 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:04 -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 1/7] PCI: Add PCI_L1SS_CTL2 fields Date: Fri, 15 Sep 2023 18:57:46 +0300 Message-Id: <20230915155752.84640-2-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: 1777132079399093526 X-GMAIL-MSGID: 1777132079399093526 Add L1 PM Substates Control 2 Register fields (PCI_L1SS_CTL2_*). Signed-off-by: Ilpo Järvinen --- include/uapi/linux/pci_regs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h index e5f558d96493..3a7ea9581568 100644 --- a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h @@ -1088,6 +1088,8 @@ #define PCI_L1SS_CTL1_LTR_L12_TH_VALUE 0x03ff0000 /* LTR_L1.2_THRESHOLD_Value */ #define PCI_L1SS_CTL1_LTR_L12_TH_SCALE 0xe0000000 /* LTR_L1.2_THRESHOLD_Scale */ #define PCI_L1SS_CTL2 0x0c /* Control 2 Register */ +#define PCI_L1SS_CTL2_T_PWR_ON_SCALE 0x00000003 /* T_POWER_ON Scale */ +#define PCI_L1SS_CTL2_T_PWR_ON_VALUE 0x000000f8 /* T_POWER_ON Value */ /* Designated Vendor-Specific (DVSEC, PCI_EXT_CAP_ID_DVSEC) */ #define PCI_DVSEC_HEADER1 0x4 /* Designated Vendor-Specific Header1 */ From patchwork Fri Sep 15 15:57: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: 140545 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1189379vqi; Fri, 15 Sep 2023 09:59:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHkFqYzF4zAsUih6lWFU20LpEV/YE6wjK35QN2ihoQL6wgJ+SzYN64A5Vh1jWyKPAixOplK X-Received: by 2002:a05:6a20:8f29:b0:14c:a2e1:65ec with SMTP id b41-20020a056a208f2900b0014ca2e165ecmr2966568pzk.38.1694797198530; Fri, 15 Sep 2023 09:59:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694797198; cv=none; d=google.com; s=arc-20160816; b=drf9BBbScbldgtsiznxWoDxjmd9Rqc3tpsG/5J3wPVRNGSnHS9+FiuYnj2oZYNpVZI d7UU9hRGzOB+U9elwoEwJcHgWoAdkT+o5NHAS+IjalzNc1Phz+rmthqoCFNe+L6HQj+m vNpiKZacLwk2zsPjxENsxoVGypjws5yHNOBEy47TQ9C65KoZ1qlx8jfzMLD92jq9XxJY /EV2NsN+/e21KrDw5+imb0sCfkoq6snv16mQnskDtwLf4vJqVXSM35NfqHoFeseieeb7 BD1tsem+OgOjRfr0KXxEGU9vnxP8bqiRo/hpaULISE9u20kXt9uDUK4dO1O6iuldj4DQ jmqQ== 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=YtB/67mGG4mVB4KhgUR1LHfFpGOtAR5jt0sMo3otLpE=; fh=hZLmt6afxROhcWMieefqgqDfx+oilLKHrk2svuRRdTk=; b=K+wa47Hg7KchQGM8yFN/QS6SvLTqb09vX1FEOtChIKFTEGPvVFGHNCebS+QNEaLREh /FzjpJt2Oc9AgXUlYl94Ox83GeCUHXTT6VvRfJ3sxBMflvOiO1LFbKYnUSbKXmlWnwOM 8yBOCYkTsbmTkNd85n5q5Sq/ZCYMZim06rfV5f14F/M3Xj5d9ytv1AEasmYp/NA9tnvk 4pcNDbDePQY8EfIYZkobKwbJg+C5K5nNzRFLAibgt+E/v/tbOsBV1h0InKDpereDB5GH 3JNZnJQoCo6rH43NXa2UTO3a+RFuX6mR4HILATVnWaHgcccCVIKUTNKmq7zHF0Y3iM2d gqlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dbu8SjSx; 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 c6-20020a6566c6000000b0056a9544e894si3395268pgw.397.2023.09.15.09.59.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 09:59:58 -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=dbu8SjSx; 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 3144C83BD9F6; Fri, 15 Sep 2023 08:59:13 -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 S236353AbjIOP6j (ORCPT + 30 others); Fri, 15 Sep 2023 11:58:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236256AbjIOP6O (ORCPT ); Fri, 15 Sep 2023 11:58:14 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CF2310D9; Fri, 15 Sep 2023 08:58:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694793489; x=1726329489; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uR4i/gIbbK6SHWtcyQkP8PIO6l0TtlX19XHq+hlBpKI=; b=dbu8SjSx/PMiiHlw8dHRyfmd45ZXia+xuMqq4He70Q71k17UG3jqy7TT RFjYw2nFG6GW6GNbTFyGOP5a5pCp9IiosBjPfIf3H6AUZ/s+qOasd4CLA 2LI8h7E4AjNqy5z3Teh8WIKp+GB+FcMMs3MGD1ehldUwdpmA7vUk7whhf 3ZBNf5mkuU31R5h/GdQyUDoG/QzgOKcFC7qb6lTPilTSqJVGh0uj6Vw+y V8OEhZapaT65Q2p204cqtiXrsxBlbr6nONfHloFFmdju6Ekh5HVl7NmqQ 8vVt324ACEIs3Q8HIln5/bWks3Ybfc2hHbWVjqUaie+2t6o4mUsNx/aWL Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10834"; a="369594615" X-IronPort-AV: E=Sophos;i="6.02,149,1688454000"; d="scan'208";a="369594615" 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:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10834"; a="745036692" X-IronPort-AV: E=Sophos;i="6.02,149,1688454000"; d="scan'208";a="745036692" 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:07 -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 2/7] PCI/ASPM: Use FIELD_GET/PREP() to access PCIe capability fields Date: Fri, 15 Sep 2023 18:57:47 +0300 Message-Id: <20230915155752.84640-3-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=-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 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]); Fri, 15 Sep 2023 08:59:13 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777123667204580123 X-GMAIL-MSGID: 1777123667204580123 Replace open-coded variants to access PCIe capability registers fields with FIELD_GET/PREP(). Signed-off-by: Ilpo Järvinen --- drivers/pci/pcie/aspm.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 1bf630059264..06f175d8dee5 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -7,6 +7,7 @@ * Copyright (C) Shaohua Li (shaohua.li@intel.com) */ +#include #include #include #include @@ -267,7 +268,7 @@ static void pcie_aspm_configure_common_clock(struct pcie_link_state *link) /* Convert L0s latency encoding to ns */ static u32 calc_l0s_latency(u32 lnkcap) { - u32 encoding = (lnkcap & PCI_EXP_LNKCAP_L0SEL) >> 12; + u32 encoding = FIELD_GET(PCI_EXP_LNKCAP_L0SEL, lnkcap); if (encoding == 0x7) return (5 * 1000); /* > 4us */ @@ -285,7 +286,7 @@ static u32 calc_l0s_acceptable(u32 encoding) /* Convert L1 latency encoding to ns */ static u32 calc_l1_latency(u32 lnkcap) { - u32 encoding = (lnkcap & PCI_EXP_LNKCAP_L1EL) >> 15; + u32 encoding = FIELD_GET(PCI_EXP_LNKCAP_L1EL, lnkcap); if (encoding == 0x7) return (65 * 1000); /* > 64us */ @@ -371,11 +372,11 @@ static void pcie_aspm_check_latency(struct pci_dev *endpoint) link = endpoint->bus->self->link_state; /* Calculate endpoint L0s acceptable latency */ - encoding = (endpoint->devcap & PCI_EXP_DEVCAP_L0S) >> 6; + encoding = FIELD_GET(PCI_EXP_DEVCAP_L0S, endpoint->devcap); acceptable_l0s = calc_l0s_acceptable(encoding); /* Calculate endpoint L1 acceptable latency */ - encoding = (endpoint->devcap & PCI_EXP_DEVCAP_L1) >> 9; + encoding = FIELD_GET(PCI_EXP_DEVCAP_L1, endpoint->devcap); acceptable_l1 = calc_l1_acceptable(encoding); while (link) { @@ -446,22 +447,24 @@ static void aspm_calc_l12_info(struct pcie_link_state *link, u32 pl1_2_enables, cl1_2_enables; /* Choose the greater of the two Port Common_Mode_Restore_Times */ - val1 = (parent_l1ss_cap & PCI_L1SS_CAP_CM_RESTORE_TIME) >> 8; - val2 = (child_l1ss_cap & PCI_L1SS_CAP_CM_RESTORE_TIME) >> 8; + val1 = FIELD_GET(PCI_L1SS_CAP_CM_RESTORE_TIME, parent_l1ss_cap); + val2 = FIELD_GET(PCI_L1SS_CAP_CM_RESTORE_TIME, child_l1ss_cap); t_common_mode = max(val1, val2); /* Choose the greater of the two Port T_POWER_ON times */ - val1 = (parent_l1ss_cap & PCI_L1SS_CAP_P_PWR_ON_VALUE) >> 19; - scale1 = (parent_l1ss_cap & PCI_L1SS_CAP_P_PWR_ON_SCALE) >> 16; - val2 = (child_l1ss_cap & PCI_L1SS_CAP_P_PWR_ON_VALUE) >> 19; - scale2 = (child_l1ss_cap & PCI_L1SS_CAP_P_PWR_ON_SCALE) >> 16; + val1 = FIELD_GET(PCI_L1SS_CAP_P_PWR_ON_VALUE, parent_l1ss_cap); + scale1 = FIELD_GET(PCI_L1SS_CAP_P_PWR_ON_SCALE, parent_l1ss_cap); + val2 = FIELD_GET(PCI_L1SS_CAP_P_PWR_ON_VALUE, child_l1ss_cap); + scale2 = FIELD_GET(PCI_L1SS_CAP_P_PWR_ON_SCALE, child_l1ss_cap); if (calc_l12_pwron(parent, scale1, val1) > calc_l12_pwron(child, scale2, val2)) { - ctl2 |= scale1 | (val1 << 3); + ctl2 |= FIELD_PREP(PCI_L1SS_CTL2_T_PWR_ON_SCALE, scale1) | + FIELD_PREP(PCI_L1SS_CTL2_T_PWR_ON_VALUE, val1); t_power_on = calc_l12_pwron(parent, scale1, val1); } else { - ctl2 |= scale2 | (val2 << 3); + ctl2 |= FIELD_PREP(PCI_L1SS_CTL2_T_PWR_ON_SCALE, scale2) | + FIELD_PREP(PCI_L1SS_CTL2_T_PWR_ON_VALUE, val2); t_power_on = calc_l12_pwron(child, scale2, val2); } @@ -477,7 +480,9 @@ static void aspm_calc_l12_info(struct pcie_link_state *link, */ l1_2_threshold = 2 + 4 + t_common_mode + t_power_on; encode_l12_threshold(l1_2_threshold, &scale, &value); - ctl1 |= t_common_mode << 8 | scale << 29 | value << 16; + ctl1 |= FIELD_PREP(PCI_L1SS_CTL1_CM_RESTORE_TIME, t_common_mode) | + FIELD_PREP(PCI_L1SS_CTL1_LTR_L12_TH_VALUE, value) | + FIELD_PREP(PCI_L1SS_CTL1_LTR_L12_TH_SCALE, scale); /* Some broken devices only support dword access to L1 SS */ pci_read_config_dword(parent, parent->l1ss + PCI_L1SS_CTL1, &pctl1); From patchwork Fri Sep 15 15:57: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: 140774 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1385164vqi; Fri, 15 Sep 2023 16:45:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHEMFk53lF6s08WcMEY+sWbz8tE8A26j4vkKsEUc2t4gmwooY3Ydo7BzC3gey9Vh7Z9eOHl X-Received: by 2002:a05:6a21:a588:b0:140:6d68:ce07 with SMTP id gd8-20020a056a21a58800b001406d68ce07mr4512314pzc.52.1694821522021; Fri, 15 Sep 2023 16:45:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694821522; cv=none; d=google.com; s=arc-20160816; b=eeqAIK7FyocgWbJqtnETYnOq/0vi4sk8Ze9uU5uKJhs3Bl4C0q26UBG9f7YG1zDgWl /w8Za4ABK/15pO48qHG4YQreMhVJQoV8itEY4vFplCsjQndkW25BHbco7mtkqgO4mkf2 whfkAvL0PTEgMx9Xb2kPS2GwiqxiQOw4+kds4uVvS2lMzn1ryCO3fDa1w2+AnYefo761 WH3BRj/LnJ6QPoZGl27AkVvcE/uDrlt8QX+Gjx4AFFzPSv9eERsWvge/dRs9IATneZAz 9q2qsxyiAnVfKdALgE3SCDwM+BbYGk5ur6x3bTpjo9CutBx1VRcSlbZ45636nX7FYCQ+ butA== 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=0ACBD4bHtmkueZkDaIN4peb61KBakapF2Phd9SW4OHk=; fh=hZLmt6afxROhcWMieefqgqDfx+oilLKHrk2svuRRdTk=; b=JBxBAhk+xrVET0GnYL7AT0OhxbNlb+s0V6PDHyOvHmJEHRfJStCYdx3L7UW6GTTn6G mnjLKcV2U37a7hunTwEvmRXXOJgYVxKOI4f12nwzXFIQFCPR/trt2Ra0T6TcZTG1amCY MHzEY88MjstAvTQyHzk64laj4aQWDgHNmUcQkdZkPSXRsF8I/2mkQToD4ldU2DIJr3Ce UQlW+186OYvPN4k5eHPel7Or5vKD1Cfo6suhwCy+PzKKkR1FyBisaY2Y5M4ndsie7Muz d3YbYBY+f/5p4S9sajoO+OS0sZmYktzv7yt3eXMn/e+IETSa34m8IREFpSBFvx1HytQN WX1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=B3kJOAr3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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. [23.128.96.33]) by mx.google.com with ESMTPS id go4-20020a17090b03c400b0027189fa5057si3907750pjb.120.2023.09.15.16.45.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 16:45:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=B3kJOAr3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 B911D832519C; Fri, 15 Sep 2023 08:59:10 -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 S236386AbjIOP6o (ORCPT + 30 others); Fri, 15 Sep 2023 11:58:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236304AbjIOP6S (ORCPT ); Fri, 15 Sep 2023 11:58:18 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E2C610D9; Fri, 15 Sep 2023 08:58:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694793492; x=1726329492; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oC+J51tGvN01jsQNJsaVvoKnBvB9vBS5Yv0KL0IOWys=; b=B3kJOAr3XSyI4Wieru29LTbHaM12uI63wHR1NMFu3gOb6jJiP8jvgi5M 8ZvYSbjaH/LDOgcXXXz3z16/MAO6z+mOzwjQotduM+mum9HVh5LH2Zzzn nmVXj8BSSqqT3N9piWadqxMEVfyjY+G24apnubCgO75XINLZ+0DIXyZRz B2UyURsHYYG9EZCaKbQBDx0xqXnA1YCH2gW19kMM9lam1g85PUcfkqVZM 860emiZZ1YjHJ0U+Pooktw55x0EHPdiCTGuf6u/x1KYzGJEzx1jAU0cri UylFAH54TitS37FaM61ljGr7VsDdEAUczlXPCr9yDMfRs8J0tmWB1Lxyy Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10834"; a="369594629" X-IronPort-AV: E=Sophos;i="6.02,149,1688454000"; d="scan'208";a="369594629" 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:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10834"; a="745036695" X-IronPort-AV: E=Sophos;i="6.02,149,1688454000"; d="scan'208";a="745036695" 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:10 -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 3/7] PCI/ASPM: Return U32_MAX instead of bit magic construct Date: Fri, 15 Sep 2023 18:57:48 +0300 Message-Id: <20230915155752.84640-4-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=-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 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]); Fri, 15 Sep 2023 08:59:10 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777149172458020007 X-GMAIL-MSGID: 1777149172458020007 Instead of returning a bit obscure -1U, make code's intent of returning the maximum representable value more obvious by returning U32_MAX. Signed-off-by: Ilpo Järvinen --- drivers/pci/pcie/aspm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 06f175d8dee5..4cd11ab27233 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -279,7 +280,7 @@ static u32 calc_l0s_latency(u32 lnkcap) static u32 calc_l0s_acceptable(u32 encoding) { if (encoding == 0x7) - return -1U; + return U32_MAX; return (64 << encoding); } @@ -297,7 +298,7 @@ static u32 calc_l1_latency(u32 lnkcap) static u32 calc_l1_acceptable(u32 encoding) { if (encoding == 0x7) - return -1U; + return U32_MAX; return (1000 << encoding); } From patchwork Fri Sep 15 15:57:49 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: 140632 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1267816vqi; Fri, 15 Sep 2023 12:18:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGhOcBNn1ywYVuD0SdRfh5EBLYAC7pnTstNmhsQRzkJIBqD8FAAOUfJXeRfVeawjs4ALbqd X-Received: by 2002:a05:6a00:1390:b0:68e:2478:d6c9 with SMTP id t16-20020a056a00139000b0068e2478d6c9mr3137527pfg.2.1694805529334; Fri, 15 Sep 2023 12:18:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694805529; cv=none; d=google.com; s=arc-20160816; b=mPGWl4n8JLBwdjZ98tvs977ofubLJUkOaWt4EtWmWN5E43ugXimLfBkp2btXbRJmN/ GN+yay/CYQrx5uthnB/xIZ8ZF/SGAI9P/uFfLxXx3pIGd9D9GUZihVPV/CAsPdlMWXZ8 TFfGauLk7pFh6VsAtAgEs/1YDd13TA/IxdbhI51ZMoj3BTpsAeplkkgIVlyOgCNzPCCA 0JpK3QONup4HxIy5ayBI4rFjQ8c/8DdHf6N9tWC1rNjtI8rW9oPRtlPRhjg+dep0QvZM XXWtsQtQKEKeIysMbong7rlbfn3Vi7LarF402lDg1pqSdywgCE230qqfkGjdw4QxeobE 0sAw== 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=M3vhC+8dwtIg+409RNw9dKpLjsuXFYQpcVY4WO7KC38=; fh=hZLmt6afxROhcWMieefqgqDfx+oilLKHrk2svuRRdTk=; b=BA7MuDlDmmjvKNmw7x3BhRbv2KG5y8upaUEX8D1qai54I6gsLoBGZdR/8paWCHQ6kv /VLsMiWRLgmdMewXwo3+7eo/u+S8PSN0zbSOOSeoobF/DiVNs7RBRfq0FdZt0fiRhaUt DmH+ePTQrpVU0HgBdu63HR3c/1n1k7ONb7QXEgEcbIwZZxIHhpKFULJvxkv2p2P/bS+t nYGyolvwwqW8xwE4xb1UqXDMI2bpHb2+/Q0wdm79SyG3AmKAjnyjM9I+/B5q/VlF2GZr DURZZfjLF2D8ojpAylxhuEODKi1KKPsjMfhh89hQFeuXi+rlOmLmNYA6SQapxzfTSdSZ fjdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gRXL6fm5; 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 g14-20020a056a000b8e00b0068722b7ab8esi3879932pfj.222.2023.09.15.12.18.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 12:18:49 -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=gRXL6fm5; 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 5849083BD9FF; Fri, 15 Sep 2023 08:59:15 -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 S236392AbjIOP6p (ORCPT + 30 others); Fri, 15 Sep 2023 11:58:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236307AbjIOP6T (ORCPT ); Fri, 15 Sep 2023 11:58:19 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB45210CC; Fri, 15 Sep 2023 08:58: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=1694793494; x=1726329494; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NhlkmvqwXXZH4QHEWc0JDmQFQmEU6+At1abVX2qhUbE=; b=gRXL6fm54nh32aZdL1QubRiPWDkaOQ+hqi23yuTTsdf8xzExkPdsDApz zuRINN5802a764vd+xnsv50kfXX61a0BMCRgUZlNXBuzizNYIQUp7ijux A/pHzpawDaYXxOr7dqvRKlrPY8WaoyR/dUuKMnTw5YENEuQMTF9WG+GTr mMN+qK5EIyBWw2fVyEzUx5F2BhUCbPws9S4P4SFx5YYNu1dCcOV86ahtV QJsI0564OpwlBxEF0JusAY2u8M95mtut48mJgWtc1IX2xmZOXq2lmG96r Sl7RlvqVwzG8ol7DrCcn7u5hIzz6kDnMBRpnTG7wMyt+jqC095umbH5Jo A==; X-IronPort-AV: E=McAfee;i="6600,9927,10834"; a="369594644" X-IronPort-AV: E=Sophos;i="6.02,149,1688454000"; d="scan'208";a="369594644" 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:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10834"; a="745036699" X-IronPort-AV: E=Sophos;i="6.02,149,1688454000"; d="scan'208";a="745036699" 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:13 -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 4/7] PCI/ASPM: Use time constants Date: Fri, 15 Sep 2023 18:57:49 +0300 Message-Id: <20230915155752.84640-5-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=-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 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]); Fri, 15 Sep 2023 08:59:15 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777132402523863599 X-GMAIL-MSGID: 1777132402523863599 Use defined constants to convert between time units. Signed-off-by: Ilpo Järvinen --- drivers/pci/pcie/aspm.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 4cd11ab27233..60135fc7281a 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -21,6 +21,8 @@ #include #include #include +#include + #include "../pci.h" #ifdef MODULE_PARAM_PREFIX @@ -272,7 +274,7 @@ static u32 calc_l0s_latency(u32 lnkcap) u32 encoding = FIELD_GET(PCI_EXP_LNKCAP_L0SEL, lnkcap); if (encoding == 0x7) - return (5 * 1000); /* > 4us */ + return 5 * NSEC_PER_USEC; /* > 4us */ return (64 << encoding); } @@ -290,8 +292,8 @@ static u32 calc_l1_latency(u32 lnkcap) u32 encoding = FIELD_GET(PCI_EXP_LNKCAP_L1EL, lnkcap); if (encoding == 0x7) - return (65 * 1000); /* > 64us */ - return (1000 << encoding); + return 65 * NSEC_PER_USEC; /* > 64us */ + return NSEC_PER_USEC << encoding; } /* Convert L1 acceptable latency encoding to ns */ @@ -299,7 +301,7 @@ static u32 calc_l1_acceptable(u32 encoding) { if (encoding == 0x7) return U32_MAX; - return (1000 << encoding); + return NSEC_PER_USEC << encoding; } /* Convert L1SS T_pwr encoding to usec */ @@ -327,7 +329,7 @@ static u32 calc_l12_pwron(struct pci_dev *pdev, u32 scale, u32 val) */ static void encode_l12_threshold(u32 threshold_us, u32 *scale, u32 *value) { - u64 threshold_ns = (u64) threshold_us * 1000; + u64 threshold_ns = (u64)threshold_us * NSEC_PER_USEC; /* * LTR_L1.2_THRESHOLD_Value ("value") is a 10-bit field with max @@ -419,7 +421,7 @@ static void pcie_aspm_check_latency(struct pci_dev *endpoint) if ((link->aspm_capable & ASPM_STATE_L1) && (latency + l1_switch_latency > acceptable_l1)) link->aspm_capable &= ~ASPM_STATE_L1; - l1_switch_latency += 1000; + l1_switch_latency += NSEC_PER_USEC; link = link->parent; } 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); } } From patchwork Fri Sep 15 15:57:51 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: 140701 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1332358vqi; Fri, 15 Sep 2023 14:34:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpWpckTEHMPCy+MolLYIqEcyLYFqp+lllJekX4HtpwwI6966rKHRU1ajDV81z520APjw3k X-Received: by 2002:a05:6a21:47cb:b0:14c:e089:94a8 with SMTP id as11-20020a056a2147cb00b0014ce08994a8mr2475827pzc.27.1694813675937; Fri, 15 Sep 2023 14:34:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694813675; cv=none; d=google.com; s=arc-20160816; b=gE9a5+ZbfMo5YN8tcgbH8wxkSI8C7WM+zCi6UVZY4+H4e2ayzGi7d5RUILvjogvE+u rJmMjXdFixAtg6+xXFylo3QHIpgPINAHokkqiN1BSbDCAI5xBDTASK7nCz6SDMdC+RU1 6IUVrgQEl3e7cd63LokkXqYSUZrqq4pr9FewOTzi90gx2hNRHYF2ApihVPgfTXUqMNGu GLFrAy8XBgFZKidD+fqUqiIc17kNWX58kFJBynTB+rbVjLSJFk3pQOjd5cQMxGTwQr/L ODNppxewYGeYieFLEdXHExjbdRFgXhIkaqZwgtZRM55N0N7zTZkmqbjN6DlpJa113ubl YRnQ== 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=s2PM67r6s8L/ELUm9mEsQ19RjX+AkkSlkQ3RNyMtN2w=; fh=hZLmt6afxROhcWMieefqgqDfx+oilLKHrk2svuRRdTk=; b=cSGM65F1zkCciGj369Y9bL8eon6IJdCMfOkg05jBYnSDcyLWSW/PcCRDzzXEmAjQKm zApC3QvFg+dq90dsMwFxWjX3HnHktoBws2syC+dK+LhV6Io7U+M1EOzw0fz6Pol9OZPJ uAcZPTehVoHHbdSDi0c4nkZUp0utiVA5wq4r1i3wuqEjREbML/6RcEEydlQcQjMcxjZD LrlPPEoLGeYUg3OVeQ1datNK9uQ6iv5g0l5954OQ3al9mI2rLw3W6YOAYYMHSpphJ1Sd KDCC3D7rlKhd8mLXHcrvJNGKtQgtdf3byo94gQUD68RdSUGSktd7eGGdHYMoT2JRipVc swzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=h3fe+s4o; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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. [23.128.96.33]) by mx.google.com with ESMTPS id t9-20020a056a0021c900b0068fbd15c036si4059086pfj.286.2023.09.15.14.34.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 14:34:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=h3fe+s4o; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 50A1383251A8; Fri, 15 Sep 2023 08:59:11 -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 S236425AbjIOP6s (ORCPT + 30 others); Fri, 15 Sep 2023 11:58:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236313AbjIOP6Y (ORCPT ); Fri, 15 Sep 2023 11:58:24 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6CDFE78; Fri, 15 Sep 2023 08:58:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694793499; x=1726329499; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=M5bmNpQLqCow2r0+y/zZHPSJ1bKb8JVfyBcYO0ZR2N4=; b=h3fe+s4oA6plpXHVlCabtGwmTrzxRO+ACL7g2yCotlZbiT226d6d1NT1 uHeLBLFRWzwm4vWJAurGYWkX+Nw+YmmQCZu3IbxS+JYW/0djpmYjLpUFx GB64FhQz5ZBD3jgUOWhQGlArsgWzH8/m7DVhtPu4VpY7RbG9T/AkxlQQm qNKs021OR5he6w49qgvTDh+zZ4ltF22fNHO0UG9airJA0GmDBxOQHh2g3 1PSO01HpJ2NZzs/8HA2l5gpTGtf3i32y/KBlANVIQJxx+TA02O/483nr+ 2BGdXcB19S133SDwyuJv7N9Y0ODK0nVMzt4gBcvn+pyQk3vkHRllGDlwn A==; X-IronPort-AV: E=McAfee;i="6600,9927,10834"; a="369594662" X-IronPort-AV: E=Sophos;i="6.02,149,1688454000"; d="scan'208";a="369594662" 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:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10834"; a="745036705" X-IronPort-AV: E=Sophos;i="6.02,149,1688454000"; d="scan'208";a="745036705" 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:18 -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 6/7] PCI/ASPM: Remove unnecessary includes Date: Fri, 15 Sep 2023 18:57:51 +0300 Message-Id: <20230915155752.84640-7-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=-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 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]); Fri, 15 Sep 2023 08:59:12 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777140944704874035 X-GMAIL-MSGID: 1777140944704874035 aspm.c does not use anything from delay.h nor jiffies.h so remove the includes. Signed-off-by: Ilpo Järvinen --- drivers/pci/pcie/aspm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index fac6c5a0be26..fb25892d15b7 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -19,8 +19,6 @@ #include #include #include -#include -#include #include #include "../pci.h" From patchwork Fri Sep 15 15:57:52 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: 140833 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1404151vqi; Fri, 15 Sep 2023 17:36:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQVXk80NT3AJBfU1jOpWK96GtOteyzyxetK9q4WEjMAHFYR/k98KUMhEbFZsQbLiHq2wzX X-Received: by 2002:a17:903:120c:b0:1c4:2641:7744 with SMTP id l12-20020a170903120c00b001c426417744mr3788414plh.25.1694824587960; Fri, 15 Sep 2023 17:36:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694824587; cv=none; d=google.com; s=arc-20160816; b=KkW5ZRPzPzxDeYEPXxnjLkSz6WmVBKqvUxc7lfTEsMo3bzH1G3YlBfGOJpERK2TYaX cw3cR4Qt8Ebng5TMIdTRoBZK5gOcFqoNzMFUIOwL9pZmadDSGR0aOsj2wjwSYRtDS3MF ydkqxwSeaSmn9BiFbFjW+Iw4nxRnEYSjwpqMyMA9HFeTvWtUWdybE+/4aAl132MiRfj6 LXZ9BVJl+pISLcKHbiAwGm3UJ6vgcCKPWK4gU9iyoxsnnnbEdOJF6g8LEMHc70YbN2FL 7BbteHxBgtqVjqA7q/Tw/hFM8lLiS35+LvSOYfjx5F0gkjWD11xQA4D+PhUAqitZ1Ju6 9gDg== 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=CjIdZR0F3dx/snSV1cYWZGGePBrvB6q+wdg4Np1TuAE=; fh=hZLmt6afxROhcWMieefqgqDfx+oilLKHrk2svuRRdTk=; b=DUX2QuPXxmDx0o1TjQ0j8ju9QfOaWIGbIPS2QOjuTaCMo1iyR5oJG8mDxBhTpqLX2b q7O/DE8ajmQeNcwfOyKBsFkw/4m5u/uhUKi+OpsDj9CCp0OIfIIwzNhjLRAYnlsiBsG3 qgjKB5C1G6Fl+TzWPNoLy+ejVRg/BCtXAuoa7oKjHbu/n5foW08xKFUaT+xeAEhd6rOB YX/wIHT7I5sB6GAcJCjl564QdezG9N7MH5UYZrVjPHkSO8JblUWYZHbsJKa11NSWcMl1 Ff/QMawTSogA1LZPe0FLzK9I4+2LzWFYROX1e528CAr6gExaujLy6OUEJdp/5RU+Hcpd 6YPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NIDYjfdh; 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 p6-20020a170902780600b001bc434b9d95si63311pll.156.2023.09.15.17.36.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 17:36:27 -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=NIDYjfdh; 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 82A388065CAF; Fri, 15 Sep 2023 08:59:07 -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 S236444AbjIOP6t (ORCPT + 30 others); Fri, 15 Sep 2023 11:58:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236316AbjIOP61 (ORCPT ); Fri, 15 Sep 2023 11:58:27 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4646610D9; Fri, 15 Sep 2023 08:58:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694793502; x=1726329502; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NbHznSzo9cAXWJrSxFdkec/xGu/0KxsGpf1kX0P/iv0=; b=NIDYjfdhtQjbYH7xdIniMywUKRIFlesNT+VfT2BCDMDTxUpTz0pc1uqJ vzntkmrRFTa+r/NCZn7tFbPE2qAMk+JLeMYg5GHzrT3sJzMHzSWNBAUxU qBiBXuGBXKvoC62Qm0Vz0OmAlUVkDHyOBFN1HeQCy1Ouy3xUNP4pwU9pn qLlvMW/gukJ47dzaplb3eqigfSsafCQ2hSd47PsRQ743AluGsP/eFwkc+ keP/80xC33LXUH9zDhPc1Kh9r4Cu5zOujrsfod3UsWR2oGaqdKeW3zNGT 8ipk2akUh+r8/fIAm6Y3Zb4U957vqVBKzIyV9wCCMDxyPSTjq3xnVQq5f Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10834"; a="369594668" X-IronPort-AV: E=Sophos;i="6.02,149,1688454000"; d="scan'208";a="369594668" 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:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10834"; a="745036707" X-IronPort-AV: E=Sophos;i="6.02,149,1688454000"; d="scan'208";a="745036707" 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:20 -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 7/7] PCI/ASPM: Convert printk() to pr_*() and add include Date: Fri, 15 Sep 2023 18:57:52 +0300 Message-Id: <20230915155752.84640-8-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 (howler.vger.email [0.0.0.0]); Fri, 15 Sep 2023 08:59:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777152387177257645 X-GMAIL-MSGID: 1777152387177257645 Convert printk(KERN_INFO ...) to pr_info() and add the correct include for it. Signed-off-by: Ilpo Järvinen --- drivers/pci/pcie/aspm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index fb25892d15b7..855feaefd7f4 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -1367,10 +1368,10 @@ static int __init pcie_aspm_disable(char *str) aspm_policy = POLICY_DEFAULT; aspm_disabled = 1; aspm_support_enabled = false; - printk(KERN_INFO "PCIe ASPM is disabled\n"); + pr_info("PCIe ASPM is disabled\n"); } else if (!strcmp(str, "force")) { aspm_force = 1; - printk(KERN_INFO "PCIe ASPM is forcibly enabled\n"); + pr_info("PCIe ASPM is forcibly enabled\n"); } return 1; }