From a8a0f8103e276564fcff93b0feaa07633d051d81 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Thu, 30 May 2024 17:46:01 +0200 Subject: [PATCH] RCD: Cleanup --- lib/pci.h | 8 ++++---- ls-caps.c | 58 +++++++++++++++++++++++++++---------------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/lib/pci.h b/lib/pci.h index 671972d..5ae1dab 100644 --- a/lib/pci.h +++ b/lib/pci.h @@ -159,9 +159,9 @@ struct pci_dev { u16 subsys_vendor_id, subsys_id; /* Subsystem vendor id and subsystem id */ struct pci_dev *parent; /* Parent device, does not have to be always accessible */ int no_config_access; /* No access to config space for this device */ - u32 rcd_link_cap; /* Link Capabilities register for RCD */ - u16 rcd_link_status; /* Link Status register for RCD */ - u16 rcd_link_ctrl; /* Link Control register for RCD */ + u32 rcd_link_cap; /* Link Capabilities register for Restricted CXL Devices */ + u16 rcd_link_status; /* Link Status register for RCD */ + u16 rcd_link_ctrl; /* Link Control register for RCD */ /* Fields used internally */ struct pci_access *access; @@ -234,7 +234,7 @@ char *pci_get_string_property(struct pci_dev *d, u32 prop) PCI_ABI; #define PCI_FILL_SUBSYS 0x00040000 /* subsys_vendor_id and subsys_id */ #define PCI_FILL_PARENT 0x00080000 #define PCI_FILL_DRIVER 0x00100000 /* OS driver currently in use (string property) */ -#define PCI_FILL_RCD_LNK 0x00200000 /* CXL RCD Link status properties */ +#define PCI_FILL_RCD_LNK 0x00200000 /* CXL RCD Link status properties (rcd_*) */ void pci_setup_cache(struct pci_dev *, u8 *cache, int len) PCI_ABI; diff --git a/ls-caps.c b/ls-caps.c index fca1164..c2aaea5 100644 --- a/ls-caps.c +++ b/ls-caps.c @@ -1399,58 +1399,58 @@ static void cap_express_link_rcd(struct device *d) if (!pdev->rcd_link_cap) return; + t = pdev->rcd_link_cap; aspm = (t & PCI_EXP_LNKCAP_ASPM) >> 10; cap_speed = t & PCI_EXP_LNKCAP_SPEED; cap_width = (t & PCI_EXP_LNKCAP_WIDTH) >> 4; printf("\t\tLnkCap:\tPort #%d, Speed %s, Width x%d, ASPM %s", - t >> 24, - link_speed(cap_speed), cap_width, - aspm_support(aspm)); - if (aspm) { + t >> 24, + link_speed(cap_speed), cap_width, + aspm_support(aspm)); + if (aspm) + { printf(", Exit Latency "); if (aspm & 1) printf("L0s %s", latency_l0s((t & PCI_EXP_LNKCAP_L0S) >> 12)); if (aspm & 2) printf("%sL1 %s", (aspm & 1) ? ", " : "", latency_l1((t & PCI_EXP_LNKCAP_L1) >> 15)); - } + } printf("\n"); printf("\t\t\tClockPM%c Surprise%c LLActRep%c BwNot%c ASPMOptComp%c\n", - FLAG(t, PCI_EXP_LNKCAP_CLOCKPM), - FLAG(t, PCI_EXP_LNKCAP_SURPRISE), - FLAG(t, PCI_EXP_LNKCAP_DLLA), - FLAG(t, PCI_EXP_LNKCAP_LBNC), - FLAG(t, PCI_EXP_LNKCAP_AOC)); + FLAG(t, PCI_EXP_LNKCAP_CLOCKPM), + FLAG(t, PCI_EXP_LNKCAP_SURPRISE), + FLAG(t, PCI_EXP_LNKCAP_DLLA), + FLAG(t, PCI_EXP_LNKCAP_LBNC), + FLAG(t, PCI_EXP_LNKCAP_AOC)); w = pdev->rcd_link_ctrl; printf("\t\tLnkCtl:\tASPM %s;", aspm_enabled(w & PCI_EXP_LNKCTL_ASPM)); printf(" Disabled%c CommClk%c\n\t\t\tExtSynch%c ClockPM%c AutWidDis%c BWInt%c AutBWInt%c\n", - FLAG(w, PCI_EXP_LNKCTL_DISABLE), - FLAG(w, PCI_EXP_LNKCTL_CLOCK), - FLAG(w, PCI_EXP_LNKCTL_XSYNCH), - FLAG(w, PCI_EXP_LNKCTL_CLOCKPM), - FLAG(w, PCI_EXP_LNKCTL_HWAUTWD), - FLAG(w, PCI_EXP_LNKCTL_BWMIE), - FLAG(w, PCI_EXP_LNKCTL_AUTBWIE)); + FLAG(w, PCI_EXP_LNKCTL_DISABLE), + FLAG(w, PCI_EXP_LNKCTL_CLOCK), + FLAG(w, PCI_EXP_LNKCTL_XSYNCH), + FLAG(w, PCI_EXP_LNKCTL_CLOCKPM), + FLAG(w, PCI_EXP_LNKCTL_HWAUTWD), + FLAG(w, PCI_EXP_LNKCTL_BWMIE), + FLAG(w, PCI_EXP_LNKCTL_AUTBWIE)); w = pdev->rcd_link_status; sta_speed = w & PCI_EXP_LNKSTA_SPEED; sta_width = (w & PCI_EXP_LNKSTA_WIDTH) >> 4; printf("\t\tLnkSta:\tSpeed %s%s, Width x%d%s\n", - link_speed(sta_speed), - link_compare(PCI_EXP_TYPE_ROOT_INT_EP, sta_speed, cap_speed), - sta_width, - link_compare(PCI_EXP_TYPE_ROOT_INT_EP, sta_width, cap_width)); + link_speed(sta_speed), + link_compare(PCI_EXP_TYPE_ROOT_INT_EP, sta_speed, cap_speed), + sta_width, + link_compare(PCI_EXP_TYPE_ROOT_INT_EP, sta_width, cap_width)); printf("\t\t\tTrErr%c Train%c SlotClk%c DLActive%c BWMgmt%c ABWMgmt%c\n", - FLAG(w, PCI_EXP_LNKSTA_TR_ERR), - FLAG(w, PCI_EXP_LNKSTA_TRAIN), - FLAG(w, PCI_EXP_LNKSTA_SL_CLK), - FLAG(w, PCI_EXP_LNKSTA_DL_ACT), - FLAG(w, PCI_EXP_LNKSTA_BWMGMT), - FLAG(w, PCI_EXP_LNKSTA_AUTBW)); - - return; + FLAG(w, PCI_EXP_LNKSTA_TR_ERR), + FLAG(w, PCI_EXP_LNKSTA_TRAIN), + FLAG(w, PCI_EXP_LNKSTA_SL_CLK), + FLAG(w, PCI_EXP_LNKSTA_DL_ACT), + FLAG(w, PCI_EXP_LNKSTA_BWMGMT), + FLAG(w, PCI_EXP_LNKSTA_AUTBW)); } static int -- 2.39.2