fix-filter-support-for-subtress-in-tree-mode
This commit is contained in:
Wang_M
parent
62e6defadd
commit
14728417be
206
0003-lspci-fix-filter-support-for-subtress-in-tree-mode.patch
Normal file
206
0003-lspci-fix-filter-support-for-subtress-in-tree-mode.patch
Normal file
@ -0,0 +1,206 @@
|
||||
From 82dfc66797637859ca86b45b6b6007dd7c06a226 Mon Sep 17 00:00:00 2001
|
||||
From: Pali Rohar <pali@kernel.org>
|
||||
Date: Sat, 29 Oct 2022 14:09:51 +0200
|
||||
Subject: [PATCH] lspci: Fix filter support (-s/-d) for subtrees in tree mode
|
||||
(-t)
|
||||
|
||||
---
|
||||
ls-tree.c | 127 +++++++++++++++++++++++++++++++++++++++---------------
|
||||
1 file changed, 93 insertions(+), 34 deletions(-)
|
||||
|
||||
diff --git a/ls-tree.c b/ls-tree.c
|
||||
index cc65ac47..af1e6591 100644
|
||||
--- a/ls-tree.c
|
||||
+++ b/ls-tree.c
|
||||
@@ -219,7 +219,7 @@ print_it(char *line, char *p)
|
||||
*p = ' ';
|
||||
}
|
||||
|
||||
-static void show_tree_bridge(struct bridge *, char *, char *);
|
||||
+static void show_tree_bridge(struct pci_filter *filter, struct bridge *, char *, char *);
|
||||
|
||||
static char * FORMAT_CHECK(printf, 3, 4)
|
||||
tree_printf(char *line, char *p, char *fmt, ...)
|
||||
@@ -252,7 +252,7 @@ tree_printf(char *line, char *p, char *fmt, ...)
|
||||
}
|
||||
|
||||
static void
|
||||
-show_tree_dev(struct device *d, char *line, char *p)
|
||||
+show_tree_dev(struct pci_filter *filter, struct device *d, char *line, char *p)
|
||||
{
|
||||
struct pci_dev *q = d->dev;
|
||||
struct bridge *b;
|
||||
@@ -268,7 +268,7 @@ show_tree_dev(struct device *d, char *line, char *p)
|
||||
p = tree_printf(line, p, "-[%02x]-", b->secondary);
|
||||
else
|
||||
p = tree_printf(line, p, "-[%02x-%02x]-", b->secondary, b->subordinate);
|
||||
- show_tree_bridge(b, line, p);
|
||||
+ show_tree_bridge(filter, b, line, p);
|
||||
return;
|
||||
}
|
||||
if (verbose)
|
||||
@@ -279,53 +279,127 @@ show_tree_dev(struct device *d, char *line, char *p)
|
||||
print_it(line, p);
|
||||
}
|
||||
|
||||
+static int
|
||||
+check_bus_filter(struct pci_filter *filter, struct bus *b);
|
||||
+
|
||||
+static int
|
||||
+check_dev_filter(struct pci_filter *filter, struct device *d)
|
||||
+{
|
||||
+ struct bridge *br;
|
||||
+ struct bus *b;
|
||||
+
|
||||
+ if (!filter)
|
||||
+ return 1;
|
||||
+
|
||||
+ if (pci_filter_match(filter, d->dev))
|
||||
+ return 1;
|
||||
+
|
||||
+ for (br = &host_bridge; br; br = br->chain)
|
||||
+ if (br->br_dev == d)
|
||||
+ {
|
||||
+ for (b = br->first_bus; b; b = b->sibling)
|
||||
+ if (check_bus_filter(filter, b))
|
||||
+ return 1;
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int
|
||||
+check_bus_filter(struct pci_filter *filter, struct bus *b)
|
||||
+{
|
||||
+ struct device *d;
|
||||
+
|
||||
+ if (!filter)
|
||||
+ return 1;
|
||||
+
|
||||
+ for (d = b->first_dev; d; d = d->bus_next)
|
||||
+ if (check_dev_filter(filter, d))
|
||||
+ return 1;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
static void
|
||||
-show_tree_bus(struct bus *b, char *line, char *p)
|
||||
+show_tree_bus(struct pci_filter *filter, struct bus *b, char *line, char *p)
|
||||
{
|
||||
if (!b->first_dev)
|
||||
print_it(line, p);
|
||||
else if (!b->first_dev->bus_next)
|
||||
{
|
||||
- p = tree_printf(line, p, "--");
|
||||
- show_tree_dev(b->first_dev, line, p);
|
||||
+ if (check_dev_filter(filter, b->first_dev))
|
||||
+ {
|
||||
+ p = tree_printf(line, p, "--");
|
||||
+ show_tree_dev(filter, b->first_dev, line, p);
|
||||
+ }
|
||||
+ else
|
||||
+ print_it(line, p);
|
||||
}
|
||||
else
|
||||
{
|
||||
+ int empty = 1;
|
||||
struct device *d = b->first_dev;
|
||||
while (d->bus_next)
|
||||
{
|
||||
- char *p2 = tree_printf(line, p, "+-");
|
||||
- show_tree_dev(d, line, p2);
|
||||
+ if (check_dev_filter(filter, d))
|
||||
+ {
|
||||
+ char *p2 = tree_printf(line, p, "+-");
|
||||
+ show_tree_dev(filter, d, line, p2);
|
||||
+ empty = 0;
|
||||
+ }
|
||||
d = d->bus_next;
|
||||
}
|
||||
- p = tree_printf(line, p, "\\-");
|
||||
- show_tree_dev(d, line, p);
|
||||
+ if (check_dev_filter(filter, d))
|
||||
+ {
|
||||
+ p = tree_printf(line, p, "\\-");
|
||||
+ show_tree_dev(filter, d, line, p);
|
||||
+ empty = 0;
|
||||
+ }
|
||||
+ if (empty)
|
||||
+ print_it(line, p);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
-show_tree_bridge(struct bridge *b, char *line, char *p)
|
||||
+show_tree_bridge(struct pci_filter *filter, struct bridge *b, char *line, char *p)
|
||||
{
|
||||
*p++ = '-';
|
||||
if (!b->first_bus->sibling)
|
||||
{
|
||||
- if (b == &host_bridge)
|
||||
- p = tree_printf(line, p, "[%04x:%02x]-", b->domain, b->first_bus->number);
|
||||
- show_tree_bus(b->first_bus, line, p);
|
||||
+ if (check_bus_filter(filter, b->first_bus))
|
||||
+ {
|
||||
+ if (b == &host_bridge)
|
||||
+ p = tree_printf(line, p, "[%04x:%02x]-", b->domain, b->first_bus->number);
|
||||
+ show_tree_bus(filter, b->first_bus, line, p);
|
||||
+ }
|
||||
+ else
|
||||
+ print_it(line, p);
|
||||
}
|
||||
else
|
||||
{
|
||||
+ int empty = 1;
|
||||
struct bus *u = b->first_bus;
|
||||
char *k;
|
||||
|
||||
while (u->sibling)
|
||||
{
|
||||
- k = tree_printf(line, p, "+-[%04x:%02x]-", u->domain, u->number);
|
||||
- show_tree_bus(u, line, k);
|
||||
+ if (check_bus_filter(filter, u))
|
||||
+ {
|
||||
+ k = tree_printf(line, p, "+-[%04x:%02x]-", u->domain, u->number);
|
||||
+ show_tree_bus(filter, u, line, k);
|
||||
+ empty = 0;
|
||||
+ }
|
||||
u = u->sibling;
|
||||
}
|
||||
- k = tree_printf(line, p, "\\-[%04x:%02x]-", u->domain, u->number);
|
||||
- show_tree_bus(u, line, k);
|
||||
+ if (check_bus_filter(filter, u))
|
||||
+ {
|
||||
+ k = tree_printf(line, p, "\\-[%04x:%02x]-", u->domain, u->number);
|
||||
+ show_tree_bus(filter, u, line, k);
|
||||
+ empty = 0;
|
||||
+ }
|
||||
+ if (empty)
|
||||
+ print_it(line, p);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -333,20 +407,5 @@ void
|
||||
show_forest(struct pci_filter *filter)
|
||||
{
|
||||
char line[LINE_BUF_SIZE];
|
||||
- if (filter == NULL)
|
||||
- show_tree_bridge(&host_bridge, line, line);
|
||||
- else
|
||||
- {
|
||||
- struct bridge *b;
|
||||
- for (b=&host_bridge; b; b=b->chain)
|
||||
- {
|
||||
- if (b->br_dev && pci_filter_match(filter, b->br_dev->dev))
|
||||
- {
|
||||
- struct pci_dev *d = b->br_dev->dev;
|
||||
- char *p = line;
|
||||
- p = tree_printf(line, p, "%04x:%02x:", d->domain_16, d->bus);
|
||||
- show_tree_dev(b->br_dev, line, p);
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
+ show_tree_bridge(filter, &host_bridge, line, line);
|
||||
}
|
||||
@ -1,17 +1,19 @@
|
||||
Name: pciutils
|
||||
Version: 3.8.0
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: PCI bus related utilities
|
||||
License: GPLv2+
|
||||
URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
|
||||
Source0: https://mirrors.edge.kernel.org/pub/software/utils/pciutils/%{name}-%{version}.tar.gz
|
||||
|
||||
# patch0 is from fedora, change pci.ids directory from /usr/share to /usr/share/hwdata
|
||||
Patch0: 0000-pciutils-2.2.1-idpath.patch
|
||||
Patch0000: 0000-pciutils-2.2.1-idpath.patch
|
||||
# patch1 is from fedora, rhbz#195327
|
||||
Patch1: 0001-pciutils-dir-d.patch
|
||||
Patch0001: 0001-pciutils-dir-d.patch
|
||||
#https://github.com/openwrt/packages/pull/19215
|
||||
Patch2: 0002-avoid-addng-multiple-version-tags.patch
|
||||
Patch0002: 0002-avoid-addng-multiple-version-tags.patch
|
||||
#https://github.com/pciutils/pciutils/pull/112
|
||||
Patch0003: 0003-lspci-fix-filter-support-for-subtress-in-tree-mode.patch
|
||||
|
||||
ExclusiveOS: Linux
|
||||
BuildRequires: gcc sed kmod-devel pkgconfig zlib-devel
|
||||
@ -112,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/hwdata/pci.ids*
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%changelog
|
||||
* Wed Sep 25 2024 wangmian <wangmian@h-partners.com> - 3.8.0-2
|
||||
- Fix filter support (-s/-d) for subtrees in tree mode
|
||||
|
||||
* Tue Nov 7 2023 liyanan <liyanan61@h-partners.com> - 3.8.0-1
|
||||
- update to v3.8.0
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user