From 77120d53649678ea1cb72591f522d63c27b6a261 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Mon, 9 Sep 2013 17:14:07 -0600 Subject: [PATCH] lspci: Clarify "PCIe-to-PCI/PCI-X" desc and Bridge Retry Config Enable The PCI_EXP_TYPE_PCI_BRIDGE type is a PCIe to PCI/PCI-X bridge, so be a bit more complete in the comment and printed device type. Also, per PCIe spec r3.0, Table 7-14, the PCIe Device Control "Bridge Configuration Retry Enable" bit only applies to PCIe-to-PCI/PCI-X bridges; it does not apply to PCI-to-PCIe bridges. Signed-off-by: Bjorn Helgaas --- lib/header.h | 4 ++-- ls-caps.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/header.h b/lib/header.h index 6608003..cb63d40 100644 --- a/lib/header.h +++ b/lib/header.h @@ -728,8 +728,8 @@ #define PCI_EXP_TYPE_ROOT_PORT 0x4 /* Root Port */ #define PCI_EXP_TYPE_UPSTREAM 0x5 /* Upstream Port */ #define PCI_EXP_TYPE_DOWNSTREAM 0x6 /* Downstream Port */ -#define PCI_EXP_TYPE_PCI_BRIDGE 0x7 /* PCI/PCI-X Bridge */ -#define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 /* PCI/PCI-X to PCIE Bridge */ +#define PCI_EXP_TYPE_PCI_BRIDGE 0x7 /* PCIe to PCI/PCI-X Bridge */ +#define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 /* PCI/PCI-X to PCIe Bridge */ #define PCI_EXP_TYPE_ROOT_INT_EP 0x9 /* Root Complex Integrated Endpoint */ #define PCI_EXP_TYPE_ROOT_EC 0xa /* Root Complex Event Collector */ #define PCI_EXP_FLAGS_SLOT 0x0100 /* Slot implemented */ diff --git a/ls-caps.c b/ls-caps.c index 7621010..de0d79e 100644 --- a/ls-caps.c +++ b/ls-caps.c @@ -696,7 +696,7 @@ static void cap_express_dev(struct device *d, int where, int type) FLAG(w, PCI_EXP_DEVCTL_PHANTOM), FLAG(w, PCI_EXP_DEVCTL_AUX_PME), FLAG(w, PCI_EXP_DEVCTL_NOSNOOP)); - if (type == PCI_EXP_TYPE_PCI_BRIDGE || type == PCI_EXP_TYPE_PCIE_BRIDGE) + if (type == PCI_EXP_TYPE_PCI_BRIDGE) printf(" BrConfRtry%c", FLAG(w, PCI_EXP_DEVCTL_BCRE)); if (((type == PCI_EXP_TYPE_ENDPOINT) || (type == PCI_EXP_TYPE_LEG_END)) && (t & PCI_EXP_DEVCAP_FLRESET)) @@ -1105,7 +1105,7 @@ cap_express(struct device *d, int where, int cap) printf("Downstream Port (Slot%c)", FLAG(cap, PCI_EXP_FLAGS_SLOT)); break; case PCI_EXP_TYPE_PCI_BRIDGE: - printf("PCI/PCI-X Bridge"); + printf("PCI-Express to PCI/PCI-X Bridge"); break; case PCI_EXP_TYPE_PCIE_BRIDGE: printf("PCI/PCI-X to PCI-Express Bridge"); -- 2.39.2