[v3,3/9] PCI: Remove PCIe suffix in pci_bus_speed_strings[]

Message ID	1581593793-23589-4-git-send-email-yangyicong@hisilicon.com
State	New
Headers	show Return-Path: <linux-pci-owner@vger.kernel.org> From: Yicong Yang <yangyicong@hisilicon.com> To: <helgaas@kernel.org>, <linux-pci@vger.kernel.org> CC: <f.fangjian@huawei.com>, <huangdaode@huawei.com> Subject: [PATCH v3 3/9] PCI: Remove PCIe suffix in pci_bus_speed_strings[] Date: Thu, 13 Feb 2020 19:36:27 +0800 Message-ID: <1581593793-23589-4-git-send-email-yangyicong@hisilicon.com> In-Reply-To: <1581593793-23589-1-git-send-email-yangyicong@hisilicon.com> References: <1581593793-23589-1-git-send-email-yangyicong@hisilicon.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-pci-owner@vger.kernel.org Precedence: bulk
Series	Improve link speed presentation process \| expand [v3,0/9] Improve link speed presentation process [v3,1/9] PCI: add 32 GT/s decoding in some macros [v3,2/9] PCI: Make pci_bus_speed_strings[] public [v3,3/9] PCI: Remove PCIe suffix in pci_bus_speed_strings[] [v3,4/9] PCI: Add comments for link speed info arrays [v3,5/9] PCI: Refactor and rename PCIE_SPEED2STR macro [v3,6/9] PCI: Refactor bus_speed_read() with PCI_SPEED2STR macro [v3,7/9] PCI: Add PCIe suffix when display PCIe slot bus speed [v3,8/9] PCI: Add PCIE_LNKCAP2_SLS2SPEED macro [v3,9/9] PCI: Reduce redundancy in current_link_speed_show()

Message ID

1581593793-23589-4-git-send-email-yangyicong@hisilicon.com

State

New

Headers

From: Yicong Yang <yangyicong@hisilicon.com>
To: <helgaas@kernel.org>, <linux-pci@vger.kernel.org>
CC: <f.fangjian@huawei.com>, <huangdaode@huawei.com>
Subject: [PATCH v3 3/9] PCI: Remove PCIe suffix in pci_bus_speed_strings[]
Date: Thu, 13 Feb 2020 19:36:27 +0800
Message-ID: <1581593793-23589-4-git-send-email-yangyicong@hisilicon.com>
In-Reply-To: <1581593793-23589-1-git-send-email-yangyicong@hisilicon.com>
References: <1581593793-23589-1-git-send-email-yangyicong@hisilicon.com>
MIME-Version: 1.0
Content-Type: text/plain
Sender: linux-pci-owner@vger.kernel.org
Precedence: bulk

Series

Improve link speed presentation process | expand

Commit Message

Yicong Yang Feb. 13, 2020, 11:36 a.m. UTC

Remove "PCIe" suffix of PCIe speed strings in
pci_bus_speed_strings[] array. For example, if we use the
array to decode link speed in __pcie_print_link_status,
it'll lead to redundancy like:
- nvme 0000:01:00.0: 16.000 Gb/s available PCIe bandwidth,
  limited by 5 GT/s x4 link at 0000:00:01.1 (capable of
  31.504 Gb/s with 8 GT/s x4 link)
+ nvme 0000:01:00.0: 16.000 Gb/s available PCIe bandwidth,
  limited by 5 GT/s PCIe x4 link at 0000:00:01.1 (capable
  of 31.504 Gb/s with 8 GT/s PCIe x4 link)

The patch introduces changes in sysfs when display
bus speed of certain slot from cur_bus_speed/max_bus_speed
in /sys/bus/pci/slots/*. It may looks like:
-/sys/bus/pci/slots/0/cur_bus_speed: 8 GT/s PCIe
+/sys/bus/pci/slots/0/cur_bus_speed: 8 GT/s
The following patch will compensate and display slot
bus speed with "PCIe" suffix as before.

[1] https://lore.kernel.org/linux-pci/20200114224909.GA19633@google.com
[2] https://lore.kernel.org/linux-pci/20200205183531.GA229621@google.com
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
---
 drivers/pci/probe.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 4e997e7..6ce47d8 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -700,11 +700,11 @@  const char *pci_bus_speed_strings[] = {
 	"66 MHz PCI-X 533",	/* 0x11 */
 	"100 MHz PCI-X 533",	/* 0x12 */
 	"133 MHz PCI-X 533",	/* 0x13 */
-	"2.5 GT/s PCIe",	/* 0x14 */
-	"5.0 GT/s PCIe",	/* 0x15 */
-	"8.0 GT/s PCIe",	/* 0x16 */
-	"16.0 GT/s PCIe",	/* 0x17 */
-	"32.0 GT/s PCIe",	/* 0x18 */
+	"2.5 GT/s",	/* 0x14 */
+	"5.0 GT/s",	/* 0x15 */
+	"8.0 GT/s",	/* 0x16 */
+	"16.0 GT/s",	/* 0x17 */
+	"32.0 GT/s",	/* 0x18 */
 };
 const int pci_bus_speed_strings_size = ARRAY_SIZE(pci_bus_speed_strings);

[v3,3/9] PCI: Remove PCIe suffix in pci_bus_speed_strings[]

Commit Message

Patch