From nobody Mon Oct 6 08:32:40 2025 Received: from out30-101.freemail.mail.aliyun.com (out30-101.freemail.mail.aliyun.com [115.124.30.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5B193246772; Wed, 23 Jul 2025 03:31:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.101 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753241497; cv=none; b=I8openSgiXkwd5UxDfnE5NQJDm4DPA6xS5etgEY4AA9JOKetcvylhFYZIDBCvLAPDU9UPPNLxYwENa619w47LVhN9M5u5wrQWyPlLwNHAYgIGnC9WhsY+Yjp6EiYOVj4lK6TZrFLakTGJSTziKXopj7U0ewNCwYBvfPCh7rVzls= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753241497; c=relaxed/simple; bh=e8i5hvMewpM5WhmWIf81bh1V/+nLOoUrOKoPhXM0Cpw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=t9g2jsABf6lxDicBlL/RjHSZVjoTw/HElYO2JvHeDVbKOJgPfA9FZx8OX/RvfhDSD8iP0KRNraryLuyDbuvKSwNlmtQt9Tb9FYcdoGXeXkfJmZpiwt5j9H0WA7U9GdNB0ZhBJdWNXql/9N1L1ry8ZBdaxAWdMWcZp17BddN1sDY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=m9JoGrYn; arc=none smtp.client-ip=115.124.30.101 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="m9JoGrYn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1753241484; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=BUXbFKuhUPKjwkP0e/ba8Z6kdLZ3HLdqyrAWba7LI8I=; b=m9JoGrYnc8CiFo/y6vHd8Z5HylHBc/uamvvwzpAfQxLg3hrLMLXlBolVCO/8e5ZDMsmuUfc0z8QYxtjKxWv+9ZFcQ/7GSPnMr6Ln7iXElnT/SuQsU/uCoWsDdFRZ5kh3WvuCzCBFHyqtvXzZj5KVvSL8mJTOF7791+tuQL36lWc= Received: from localhost.localdomain(mailfrom:xueshuai@linux.alibaba.com fp:SMTPD_---0WjZukuI_1753241482 cluster:ay36) by smtp.aliyun-inc.com; Wed, 23 Jul 2025 11:31:22 +0800 From: Shuai Xue To: rostedt@goodmis.org, lukas@wunner.de, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, linux-trace-kernel@vger.kernel.org, helgaas@kernel.org, ilpo.jarvinen@linux.intel.com, mattc@purestorage.com, Jonathan.Cameron@huawei.com Cc: bhelgaas@google.com, tony.luck@intel.com, bp@alien8.de, xueshuai@linux.alibaba.com, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, oleg@redhat.com, naveen@kernel.org, davem@davemloft.net, anil.s.keshavamurthy@intel.com, mark.rutland@arm.com, peterz@infradead.org, tianruidong@linux.alibaba.com Subject: [PATCH v9 1/2] PCI: trace: Add a generic RAS tracepoint for hotplug event Date: Wed, 23 Jul 2025 11:31:07 +0800 Message-Id: <20250723033108.61587-2-xueshuai@linux.alibaba.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250723033108.61587-1-xueshuai@linux.alibaba.com> References: <20250723033108.61587-1-xueshuai@linux.alibaba.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Hotplug events are critical indicators for analyzing hardware health, and surprise link downs can significantly impact system performance and reliability. Define a new TRACING_SYSTEM named "pci", add a generic RAS tracepoint for hotplug event to help health checks. Add enum pci_hotplug_event in include/uapi/linux/pci.h so applications like rasdaemon can register tracepoint event handlers for it. The output is like below: $ echo 1 > /sys/kernel/debug/tracing/events/pci/pci_hp_event/enable $ cat /sys/kernel/debug/tracing/trace_pipe <...>-206 [001] ..... 40.373870: pci_hp_event: 0000:00:02.0 slot= :10, event:LINK_DOWN <...>-206 [001] ..... 40.374871: pci_hp_event: 0000:00:02.0 slot= :10, event:CARD_NOT_PRESENT Suggested-by: Lukas Wunner Suggested-by: Steven Rostedt Signed-off-by: Shuai Xue Signed-off-by: Bjorn Helgaas Reviewed-by: Lukas Wunner Reviewed-by: Jonathan Cameron --- drivers/pci/hotplug/pciehp_ctrl.c | 33 +++++++++++++--- include/trace/events/pci.h | 63 +++++++++++++++++++++++++++++++ include/uapi/linux/pci.h | 7 ++++ 3 files changed, 97 insertions(+), 6 deletions(-) create mode 100644 include/trace/events/pci.h diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp= _ctrl.c index bcc938d4420f..d241f270c8de 100644 --- a/drivers/pci/hotplug/pciehp_ctrl.c +++ b/drivers/pci/hotplug/pciehp_ctrl.c @@ -20,6 +20,9 @@ #include #include =20 +#define CREATE_TRACE_POINTS +#include + #include "../pci.h" #include "pciehp.h" =20 @@ -244,12 +247,20 @@ void pciehp_handle_presence_or_link_change(struct con= troller *ctrl, u32 events) case ON_STATE: ctrl->state =3D POWEROFF_STATE; mutex_unlock(&ctrl->state_lock); - if (events & PCI_EXP_SLTSTA_DLLSC) + if (events & PCI_EXP_SLTSTA_DLLSC) { ctrl_info(ctrl, "Slot(%s): Link Down\n", slot_name(ctrl)); - if (events & PCI_EXP_SLTSTA_PDC) + trace_pci_hp_event(pci_name(ctrl->pcie->port), + slot_name(ctrl), + PCI_HOTPLUG_LINK_DOWN); + } + if (events & PCI_EXP_SLTSTA_PDC) { ctrl_info(ctrl, "Slot(%s): Card not present\n", slot_name(ctrl)); + trace_pci_hp_event(pci_name(ctrl->pcie->port), + slot_name(ctrl), + PCI_HOTPLUG_CARD_NOT_PRESENT); + } pciehp_disable_slot(ctrl, SURPRISE_REMOVAL); break; default: @@ -269,6 +280,9 @@ void pciehp_handle_presence_or_link_change(struct contr= oller *ctrl, u32 events) INDICATOR_NOOP); ctrl_info(ctrl, "Slot(%s): Card not present\n", slot_name(ctrl)); + trace_pci_hp_event(pci_name(ctrl->pcie->port), + slot_name(ctrl), + PCI_HOTPLUG_CARD_NOT_PRESENT); } mutex_unlock(&ctrl->state_lock); return; @@ -281,12 +295,19 @@ void pciehp_handle_presence_or_link_change(struct con= troller *ctrl, u32 events) case OFF_STATE: ctrl->state =3D POWERON_STATE; mutex_unlock(&ctrl->state_lock); - if (present) + if (present) { ctrl_info(ctrl, "Slot(%s): Card present\n", slot_name(ctrl)); - if (link_active) - ctrl_info(ctrl, "Slot(%s): Link Up\n", - slot_name(ctrl)); + trace_pci_hp_event(pci_name(ctrl->pcie->port), + slot_name(ctrl), + PCI_HOTPLUG_CARD_PRESENT); + } + if (link_active) { + ctrl_info(ctrl, "Slot(%s): Link Up\n", slot_name(ctrl)); + trace_pci_hp_event(pci_name(ctrl->pcie->port), + slot_name(ctrl), + PCI_HOTPLUG_LINK_UP); + } ctrl->request_result =3D pciehp_enable_slot(ctrl); break; default: diff --git a/include/trace/events/pci.h b/include/trace/events/pci.h new file mode 100644 index 000000000000..208609492c06 --- /dev/null +++ b/include/trace/events/pci.h @@ -0,0 +1,63 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM pci + +#if !defined(_TRACE_HW_EVENT_PCI_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_HW_EVENT_PCI_H + +#include + +#define PCI_HOTPLUG_EVENT \ + EM(PCI_HOTPLUG_LINK_UP, "LINK_UP") \ + EM(PCI_HOTPLUG_LINK_DOWN, "LINK_DOWN") \ + EM(PCI_HOTPLUG_CARD_PRESENT, "CARD_PRESENT") \ + EMe(PCI_HOTPLUG_CARD_NOT_PRESENT, "CARD_NOT_PRESENT") + +/* Enums require being exported to userspace, for user tool parsing */ +#undef EM +#undef EMe +#define EM(a, b) TRACE_DEFINE_ENUM(a); +#define EMe(a, b) TRACE_DEFINE_ENUM(a); + +PCI_HOTPLUG_EVENT + +/* + * Now redefine the EM() and EMe() macros to map the enums to the strings + * that will be printed in the output. + */ +#undef EM +#undef EMe +#define EM(a, b) {a, b}, +#define EMe(a, b) {a, b} + +TRACE_EVENT(pci_hp_event, + + TP_PROTO(const char *port_name, + const char *slot, + const int event), + + TP_ARGS(port_name, slot, event), + + TP_STRUCT__entry( + __string( port_name, port_name ) + __string( slot, slot ) + __field( int, event ) + ), + + TP_fast_assign( + __assign_str(port_name); + __assign_str(slot); + __entry->event =3D event; + ), + + TP_printk("%s slot:%s, event:%s\n", + __get_str(port_name), + __get_str(slot), + __print_symbolic(__entry->event, PCI_HOTPLUG_EVENT) + ) +); + +#endif /* _TRACE_HW_EVENT_PCI_H */ + +/* This part must be outside protection */ +#include diff --git a/include/uapi/linux/pci.h b/include/uapi/linux/pci.h index a769eefc5139..4f150028965d 100644 --- a/include/uapi/linux/pci.h +++ b/include/uapi/linux/pci.h @@ -39,4 +39,11 @@ #define PCIIOC_MMAP_IS_MEM (PCIIOC_BASE | 0x02) /* Set mmap state to MEM s= pace. */ #define PCIIOC_WRITE_COMBINE (PCIIOC_BASE | 0x03) /* Enable/disable write-= combining. */ =20 +enum pci_hotplug_event { + PCI_HOTPLUG_LINK_UP, + PCI_HOTPLUG_LINK_DOWN, + PCI_HOTPLUG_CARD_PRESENT, + PCI_HOTPLUG_CARD_NOT_PRESENT, +}; + #endif /* _UAPILINUX_PCI_H */ --=20 2.39.3 From nobody Mon Oct 6 08:32:40 2025 Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E1382459C5; Wed, 23 Jul 2025 03:31:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.99 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753241491; cv=none; b=G0EUvRH9vWnNeoQ/FqJW2WVikWoqL0tAAhIpyOU3uh5kTAfW93FN/Tv8yOtJ5wGs2vIvV0A2t3+pz2kY6wVgh+Jtse/D1Os7jC9xfBrHiT3eoCs1M7mZK7Nju/4v0zO22R/wMzL4zK1n4JkcpvlDyA55/VZPvF2x049UteQ3BB0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753241491; c=relaxed/simple; bh=DfcemwLQ8iXSjbDmJigRJOhi+eKd+3Zxb+knrEM/HLM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=USx5gwwaGteB9S8T5lmgZHWX0w5vNbziUMKfsg2VcpJbyar2BgPu7VVVYVh9oEwyO0ye4V4oOP3liEgFWipJYLx2tv5OIrinZMA3n4RfttFma3Jq367Ch/i+LHNVg41XRwlkFV3W5CPPLRp5RHTd71BWrT/wMuZcb3eyEzum4JI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=GHeFzm8L; arc=none smtp.client-ip=115.124.30.99 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="GHeFzm8L" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1753241485; h=From:To:Subject:Date:Message-Id:MIME-Version:Content-Type; bh=+nas5joXf1zSaGaYeGJW4tQn/k0XLkesnmQdspI2ttc=; b=GHeFzm8LmUsg8o3LcmynBF76AVndEU3wnXxwOGpmilTF8QZrh34SNTo4Ejbyq3lbUadYwyyFxl3v8aqh9BkAf7CxqT00Xa0Wtzm3LyGbPrasr5dG3hVQe2/zbjwnJx10tfvqsu1mT5DW5/9YIsbNabX3VPVHjz6bCI2gVSFxlp0= Received: from localhost.localdomain(mailfrom:xueshuai@linux.alibaba.com fp:SMTPD_---0WjZukvI_1753241483 cluster:ay36) by smtp.aliyun-inc.com; Wed, 23 Jul 2025 11:31:24 +0800 From: Shuai Xue To: rostedt@goodmis.org, lukas@wunner.de, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, linux-trace-kernel@vger.kernel.org, helgaas@kernel.org, ilpo.jarvinen@linux.intel.com, mattc@purestorage.com, Jonathan.Cameron@huawei.com Cc: bhelgaas@google.com, tony.luck@intel.com, bp@alien8.de, xueshuai@linux.alibaba.com, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, oleg@redhat.com, naveen@kernel.org, davem@davemloft.net, anil.s.keshavamurthy@intel.com, mark.rutland@arm.com, peterz@infradead.org, tianruidong@linux.alibaba.com Subject: [PATCH v9 2/2] PCI: trace: Add a RAS tracepoint to monitor link speed changes Date: Wed, 23 Jul 2025 11:31:08 +0800 Message-Id: <20250723033108.61587-3-xueshuai@linux.alibaba.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250723033108.61587-1-xueshuai@linux.alibaba.com> References: <20250723033108.61587-1-xueshuai@linux.alibaba.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable PCIe link speed degradation directly impacts system performance and often indicates hardware issues such as faulty devices, physical layer problems, or configuration errors. To this end, add a RAS tracepoint to monitor link speed changes, enabling proactive health checks and diagnostic analysis. The output is like below: $ echo 1 > /sys/kernel/debug/tracing/events/pci/pci_link_event/enable $ cat /sys/kernel/debug/tracing/trace_pipe cat /sys/kernel/debug/tracing/trace_pipe <...>-119 [002] ..... 125.776171: pci_hp_event: 0000:00:03= .0 slot:30, event:CARD_PRESENT <...>-119 [002] ..... 125.776197: pci_hp_event: 0000:00:03= .0 slot:30, event:LINK_UP irq/57-pciehp-119 [002] ..... 125.904335: pcie_link_event: 0000:00= :03.0 type:4, reason:4, cur_bus_speed:2.5 GT/s PCIe, max_bus_speed:16.0 GT/= s PCIe, width:1, flit_mode:0, status:DLLLA irq/57-pciehp-119 [002] ..... 125.907051: pcie_link_event: 0000:00= :03.0 type:4, reason:0, cur_bus_speed:2.5 GT/s PCIe, max_bus_speed:16.0 GT/= s PCIe, width:1, flit_mode:0, status:DLLLA Suggested-by: Bjorn Helgaas Suggested-by: Ilpo J=C3=A4rvinen Suggested-by: Matthew W Carlis Suggested-by: Lukas Wunner Signed-off-by: Shuai Xue --- drivers/pci/hotplug/pciehp_hpc.c | 5 ++- drivers/pci/pci.c | 2 +- drivers/pci/pci.h | 12 +++++-- drivers/pci/pcie/bwctrl.c | 4 +-- drivers/pci/probe.c | 10 ++++-- include/linux/pci.h | 1 + include/trace/events/pci.h | 56 ++++++++++++++++++++++++++++++++ 7 files changed, 80 insertions(+), 10 deletions(-) diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_= hpc.c index 91d2d92717d9..232d6704cb81 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -292,7 +292,7 @@ int pciehp_check_link_status(struct controller *ctrl) { struct pci_dev *pdev =3D ctrl_dev(ctrl); bool found; - u16 lnk_status, linksta2; + u16 lnk_status; =20 if (!pcie_wait_for_link(pdev, true)) { ctrl_info(ctrl, "Slot(%s): No link\n", slot_name(ctrl)); @@ -319,8 +319,7 @@ int pciehp_check_link_status(struct controller *ctrl) return -1; } =20 - pcie_capability_read_word(pdev, PCI_EXP_LNKSTA2, &linksta2); - __pcie_update_link_speed(ctrl->pcie->port->subordinate, lnk_status, links= ta2); + pcie_update_link_speed(ctrl->pcie->port->subordinate, PCIE_HOTPLUG); =20 if (!found) { ctrl_info(ctrl, "Slot(%s): No device found\n", diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 9e42090fb108..6c13af287d63 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4739,7 +4739,7 @@ int pcie_retrain_link(struct pci_dev *pdev, bool use_= lt) * Link Speed. */ if (pdev->subordinate) - pcie_update_link_speed(pdev->subordinate); + pcie_update_link_speed(pdev->subordinate, PCIE_LINK_RETRAIN); =20 return rc; } diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 12215ee72afb..438a6d29d84e 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -452,7 +452,6 @@ static inline int pcie_dev_speed_mbps(enum pci_bus_spee= d speed) } =20 u8 pcie_get_supported_speeds(struct pci_dev *dev); -const char *pci_speed_string(enum pci_bus_speed speed); void __pcie_print_link_status(struct pci_dev *dev, bool verbose); void pcie_report_downtraining(struct pci_dev *dev); =20 @@ -461,7 +460,16 @@ static inline void __pcie_update_link_speed(struct pci= _bus *bus, u16 linksta, u1 bus->cur_bus_speed =3D pcie_link_speed[linksta & PCI_EXP_LNKSTA_CLS]; bus->flit_mode =3D (linksta2 & PCI_EXP_LNKSTA2_FLIT) ? 1 : 0; } -void pcie_update_link_speed(struct pci_bus *bus); + +enum pcie_link_change_reason { + PCIE_LINK_RETRAIN, + PCIE_ADD_BUS, + PCIE_BWCTRL_ENABLE, + PCIE_BWCTRL_IRQ, + PCIE_HOTPLUG +}; + +void pcie_update_link_speed(struct pci_bus *bus, enum pcie_link_change_rea= son reason); =20 /* Single Root I/O Virtualization */ struct pci_sriov { diff --git a/drivers/pci/pcie/bwctrl.c b/drivers/pci/pcie/bwctrl.c index 36f939f23d34..32f1b30ecb84 100644 --- a/drivers/pci/pcie/bwctrl.c +++ b/drivers/pci/pcie/bwctrl.c @@ -199,7 +199,7 @@ static void pcie_bwnotif_enable(struct pcie_device *srv) * Update after enabling notifications & clearing status bits ensures * link speed is up to date. */ - pcie_update_link_speed(port->subordinate); + pcie_update_link_speed(port->subordinate, PCIE_BWCTRL_ENABLE); } =20 static void pcie_bwnotif_disable(struct pci_dev *port) @@ -234,7 +234,7 @@ static irqreturn_t pcie_bwnotif_irq(int irq, void *cont= ext) * speed (inside pcie_update_link_speed()) after LBMS has been * cleared to avoid missing link speed changes. */ - pcie_update_link_speed(port->subordinate); + pcie_update_link_speed(port->subordinate, PCIE_BWCTRL_IRQ); =20 return IRQ_HANDLED; } diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 4b8693ec9e4c..1a42a156f501 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "pci.h" =20 #define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */ @@ -788,14 +789,19 @@ const char *pci_speed_string(enum pci_bus_speed speed) } EXPORT_SYMBOL_GPL(pci_speed_string); =20 -void pcie_update_link_speed(struct pci_bus *bus) +void pcie_update_link_speed(struct pci_bus *bus, enum pcie_link_change_rea= son reason) { struct pci_dev *bridge =3D bus->self; u16 linksta, linksta2; =20 pcie_capability_read_word(bridge, PCI_EXP_LNKSTA, &linksta); pcie_capability_read_word(bridge, PCI_EXP_LNKSTA2, &linksta2); + __pcie_update_link_speed(bus, linksta, linksta2); + trace_pcie_link_event(bus, + reason, + FIELD_GET(PCI_EXP_LNKSTA_NLW, linksta), + linksta & PCI_EXP_LNKSTA_LINK_STATUS_MASK); } EXPORT_SYMBOL_GPL(pcie_update_link_speed); =20 @@ -882,7 +888,7 @@ static void pci_set_bus_speed(struct pci_bus *bus) pcie_capability_read_dword(bridge, PCI_EXP_LNKCAP, &linkcap); bus->max_bus_speed =3D pcie_link_speed[linkcap & PCI_EXP_LNKCAP_SLS]; =20 - pcie_update_link_speed(bus); + pcie_update_link_speed(bus, PCIE_ADD_BUS); } } =20 diff --git a/include/linux/pci.h b/include/linux/pci.h index 05e68f35f392..8346121c035d 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -305,6 +305,7 @@ enum pci_bus_speed { PCI_SPEED_UNKNOWN =3D 0xff, }; =20 +const char *pci_speed_string(enum pci_bus_speed speed); enum pci_bus_speed pcie_get_speed_cap(struct pci_dev *dev); enum pcie_link_width pcie_get_width_cap(struct pci_dev *dev); =20 diff --git a/include/trace/events/pci.h b/include/trace/events/pci.h index 208609492c06..78e651b95cb3 100644 --- a/include/trace/events/pci.h +++ b/include/trace/events/pci.h @@ -57,6 +57,62 @@ TRACE_EVENT(pci_hp_event, ) ); =20 +#define PCI_EXP_LNKSTA_LINK_STATUS_MASK (PCI_EXP_LNKSTA_LBMS | \ + PCI_EXP_LNKSTA_LABS | \ + PCI_EXP_LNKSTA_LT | \ + PCI_EXP_LNKSTA_DLLLA) + +#define LNKSTA_FLAGS \ + { PCI_EXP_LNKSTA_LT, "LT"}, \ + { PCI_EXP_LNKSTA_DLLLA, "DLLLA"}, \ + { PCI_EXP_LNKSTA_LBMS, "LBMS"}, \ + { PCI_EXP_LNKSTA_LABS, "LABS"} + +TRACE_EVENT(pcie_link_event, + + TP_PROTO(struct pci_bus *bus, + unsigned int reason, + unsigned int width, + unsigned int status + ), + + TP_ARGS(bus, reason, width, status), + + TP_STRUCT__entry( + __string( port_name, pci_name(bus->self)) + __field( unsigned int, type ) + __field( unsigned int, reason ) + __field( unsigned int, cur_bus_speed ) + __field( unsigned int, max_bus_speed ) + __field( unsigned int, width ) + __field( unsigned int, flit_mode ) + __field( unsigned int, link_status ) + ), + + TP_fast_assign( + __assign_str(port_name); + __entry->type =3D pci_pcie_type(bus->self); + __entry->reason =3D reason; + __entry->cur_bus_speed =3D bus->cur_bus_speed; + __entry->max_bus_speed =3D bus->max_bus_speed; + __entry->width =3D width; + __entry->flit_mode =3D bus->flit_mode; + __entry->link_status =3D status; + ), + + TP_printk("%s type:%d, reason:%d, cur_bus_speed:%s, max_bus_speed:%s, wid= th:%u, flit_mode:%u, status:%s\n", + __get_str(port_name), + __entry->type, + __entry->reason, + pci_speed_string(__entry->cur_bus_speed), + pci_speed_string(__entry->max_bus_speed), + __entry->width, + __entry->flit_mode, + __print_flags((unsigned long)__entry->link_status, "|", + LNKSTA_FLAGS) + ) +); + #endif /* _TRACE_HW_EVENT_PCI_H */ =20 /* This part must be outside protection */ --=20 2.39.3