hwtracing: hisi_ptt: Only add the supported devices to the filters list
Subsystems (3)
PATCH 1/2 hwtracing: hisi_ptt: Only add the supported devices to the filters list
From: Yicong Yang <[email protected]>
The PTT device can only support the devices on the same PCIe core, within BDF range [lower_bdf, upper_bdf]. It's not correct to assume the devices on the root bus are from the same PCIe core, there are cases that root ports from different PCIe core are sharing the same bus. So add the checking when initialize the filters list.
--- drivers/hwtracing/ptt/hisi_ptt.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/hwtracing/ptt/hisi_ptt.c +10 -0
@@ -356,8 +356,18 @@ static int hisi_ptt_register_irq(struct hisi_ptt *hisi_ptt)static int hisi_ptt_init_filters (struct pci_dev *pdev,void *data) { +struct pci_dev *root_port =pcie_find_root_port (pdev);struct hisi_ptt_filter_desc *filter;struct hisi_ptt *hisi_ptt = data; +u32 port_devid; + +if (!root_port) +return 0 ; + + port_devid =PCI_DEVID (root_port->bus->number, root_port->devfn); +if (port_devid < hisi_ptt->lower_bdf || + port_devid > hisi_ptt->upper_bdf) +return 0 ;/* * We won't fail the probe if filter allocation failed here. The filters
Signature · 1 line
2.24.0
PATCH 2/2 MAINTAINERS: Update the entries for HiSilicon PTT device driver
From: Yicong Yang <[email protected]>
Add missing entries for the perf userspace part of this driver. Also add Jonathan as the maintainer for his expertise on this driver and PCIe stuffs.
--- MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+)
MAINTAINERS +4 -0
@@ -9263,11 +9263,15 @@ F: drivers/perf/hisilicon/hns3_pmu.c HISILICON PTT DRIVER M: Yicong Yang <[email protected]> +M: Jonathan Cameron <[email protected]> L: [email protected] S: Maintained F: Documentation/ABI/testing/sysfs-devices-hisi_ptt F: Documentation/trace/hisi-ptt.rst F: drivers/hwtracing/ptt/ +F: tools/perf/arch/arm64/util/hisi-ptt.c +F: tools/perf/util/hisi-ptt* +F: tools/perf/util/hisi-ptt-decoder/* HISILICON QM DRIVER M: Weili Qian <[email protected]>
Signature · 1 line
2.24.0
Re: [PATCH 2/2] MAINTAINERS: Update the entries for HiSilicon PTT device driver
Quoted 7 lines · On Tue, 22 Nov 2022 20:02:09 +0800 Yicong Yang <[email protected]> wrote:
From: Yicong Yang <[email protected]>
Add missing entries for the perf userspace part of this driver. Also add Jonathan as the maintainer for his expertise on this driver and PCIe stuffs.
Signed-off-by Yicong Yang <[email protected]>
Quoted 24 lines
--- MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+)MAINTAINERS +4
-0@@ -9263,11 +9263,15 @@ F: drivers/perf/hisilicon/hns3_pmu.c HISILICON PTT DRIVER M: Yicong Yang <[email protected]> +M: Jonathan Cameron <[email protected]> L: [email protected] S: Maintained F: Documentation/ABI/testing/sysfs-devices-hisi_ptt F: Documentation/trace/hisi-ptt.rst F: drivers/hwtracing/ptt/ +F: tools/perf/arch/arm64/util/hisi-ptt.c +F: tools/perf/util/hisi-ptt* +F: tools/perf/util/hisi-ptt-decoder/* HISILICON QM DRIVER M: Weili Qian <[email protected]>
Quoted 10 lines · On Tue, 22 Nov 2022 20:02:08 +0800 Yicong Yang <[email protected]> wrote:
From: Yicong Yang <[email protected]>
The PTT device can only support the devices on the same PCIe core, within BDF range [
lower_bdf,upper_bdf]. It's not correct to assume the devices on the root bus are from the same PCIe core, there are cases that root ports from different PCIe core are sharing the same bus. So add the checking when initialize the filters list.Fixes ff0de066b463 ("hwtracing: hisi_ptt: Add trace function support for HiSilicon PCIe Tune and Trace device")Signed-off-by Yicong Yang <[email protected]>
Make sense to me.
Quoted 27 lines
--- drivers/hwtracing/ptt/hisi_ptt.c | 10 ++++++++++ 1 file changed, 10 insertions(+)drivers/hwtracing/ptt/hisi_ptt.c +10
-0@@ -356,8 +356,18 @@ static int hisi_ptt_register_irq(struct hisi_ptt *hisi_ptt)static int hisi_ptt_init_filters (struct pci_dev *pdev,void *data) { +struct pci_dev *root_port =pcie_find_root_port (pdev);struct hisi_ptt_filter_desc *filter;struct hisi_ptt *hisi_ptt = data; +u32 port_devid; + +if (!root_port) +return 0 ; + + port_devid =PCI_DEVID (root_port->bus->number, root_port->devfn); +if (port_devid < hisi_ptt->lower_bdf || + port_devid > hisi_ptt->upper_bdf) +return 0 ;/* * We won't fail the probe if filter allocation failed here. The filters
Hi Mathieu,
Do we still have a chance to catch this cycle for these 2 patches?
Thanks!
Quoted 38 lines · Yicong Yang
From: Yicong Yang <[email protected]>
The PTT device can only support the devices on the same PCIe core, within BDF range [
lower_bdf,upper_bdf]. It's not correct to assume the devices on the root bus are from the same PCIe core, there are cases that root ports from different PCIe core are sharing the same bus. So add the checking when initialize the filters list.Fixes ff0de066b463 ("hwtracing: hisi_ptt: Add trace function support for HiSilicon PCIe Tune and Trace device")Signed-off-by Yicong Yang <[email protected]>--- drivers/hwtracing/ptt/hisi_ptt.c | 10 ++++++++++ 1 file changed, 10 insertions(+)drivers/hwtracing/ptt/hisi_ptt.c +10
-0@@ -356,8 +356,18 @@ static int hisi_ptt_register_irq(struct hisi_ptt *hisi_ptt)static int hisi_ptt_init_filters (struct pci_dev *pdev,void *data) { +struct pci_dev *root_port =pcie_find_root_port (pdev);struct hisi_ptt_filter_desc *filter;struct hisi_ptt *hisi_ptt = data; +u32 port_devid; + +if (!root_port) +return 0 ; + + port_devid =PCI_DEVID (root_port->bus->number, root_port->devfn); +if (port_devid < hisi_ptt->lower_bdf || + port_devid > hisi_ptt->upper_bdf) +return 0 ;/* * We won't fail the probe if filter allocation failed here. The filters
Hi Yicong Yang
Quoted 3 lines · Yicong Yang
Hi Mathieu,
Do we still have a chance to catch this cycle for these 2 patches?
Sorry, I have been handling the coresight tree this cycle (and will be going forward). I have already sent the pull request to Greg. I am afraid it is late for this cycle.
I can queue it for the next cycle.
Suzuki
Quoted 42 lines
Thanks!
Quoted 38 lines · Yicong Yang
From: Yicong Yang <[email protected]>
The PTT device can only support the devices on the same PCIe core, within BDF range [
lower_bdf,upper_bdf]. It's not correct to assume the devices on the root bus are from the same PCIe core, there are cases that root ports from different PCIe core are sharing the same bus. So add the checking when initialize the filters list.Fixes ff0de066b463 ("hwtracing: hisi_ptt: Add trace function support for HiSilicon PCIe Tune and Trace device")Signed-off-by Yicong Yang <[email protected]>--- drivers/hwtracing/ptt/hisi_ptt.c | 10 ++++++++++ 1 file changed, 10 insertions(+)drivers/hwtracing/ptt/hisi_ptt.c +10
-0@@ -356,8 +356,18 @@ static int hisi_ptt_register_irq(struct hisi_ptt *hisi_ptt)static int hisi_ptt_init_filters (struct pci_dev *pdev,void *data) { +struct pci_dev *root_port =pcie_find_root_port (pdev);struct hisi_ptt_filter_desc *filter;struct hisi_ptt *hisi_ptt = data; +u32 port_devid; + +if (!root_port) +return 0 ; + + port_devid =PCI_DEVID (root_port->bus->number, root_port->devfn); +if (port_devid < hisi_ptt->lower_bdf || + port_devid > hisi_ptt->upper_bdf) +return 0 ;/* * We won't fail the probe if filter allocation failed here. The filters
Quoted 5 lines · Suzuki K Poulose
Hi Yicong Yang
Quoted 2 lines · Yicong Yang
Hi Mathieu,
Quoted 8 lines
Quoted 1 line
Do we still have a chance to catch this cycle for these 2 patches?
Sorry, I have been handling the coresight tree this cycle (and will be going forward). I have already sent the pull request to Greg. I am afraid it is late for this cycle.
I can queue it for the next cycle.
Thanks for the information.
It's ok, I'll resend in the next cycle.
Thanks,
Yicong
Quoted 43 lines
Quoted 32 lines
Thanks!
Quoted 28 lines · Yicong Yang
From: Yicong Yang <[email protected]>
The PTT device can only support the devices on the same PCIe core, within BDF range [
lower_bdf,upper_bdf]. It's not correct to assume the devices on the root bus are from the same PCIe core, there are cases that root ports from different PCIe core are sharing the same bus. So add the checking when initialize the filters list.Fixes ff0de066b463 ("hwtracing: hisi_ptt: Add trace function support for HiSilicon PCIe Tune and Trace device")Signed-off-by Yicong Yang <[email protected]>---
drivers/hwtracing/ptt/hisi_ptt.c| 10 ++++++++++1 file changed, 10 insertions(+)drivers/hwtracing/ptt/hisi_ptt.c +5
-0@@ -356,8 +356,18 @@ static int hisi_ptt_register_irq(struct hisi_ptt *hisi_ptt) static int hisi_ptt_init_filters(struct pci_dev *pdev, void *data) { + struct pci_dev *root_port = pcie_find_root_port(pdev); struct hisi_ptt_filter_desc *filter; struct hisi_ptt *hisi_ptt = data; + u32 port_devid; + + if (!root_port) + return 0;Quoted 8 lines
drivers/hwtracing/ptt/hisi_ptt.c static int hisi_ptt_register_irq(struct hisi_ptt *hisi_ptt)
Quoted 8 lines
drivers/hwtracing/ptt/hisi_ptt.c +5
-0+ + port_devid = PCI_DEVID(root_port->bus->number, root_port->devfn); + if (port_devid < hisi_ptt->lower_bdf || + port_devid > hisi_ptt->upper_bdf) + return 0; /** We won't fail the probe if filter allocation failed here. The filters .