Skip to content

Commit 6a785f9

Browse files
committed
doc: talk explicitly about PCI switches as an example of bridges
Signed-off-by: Brice Goglin <[email protected]>
1 parent 0b6e5ca commit 6a785f9

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

doc/hwloc.doxy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,7 +1064,7 @@ following environment variables.
10641064
</ul>
10651065
Domain/bus specifications should usually match entire hierarchies of buses
10661066
behind a bridge (including primary, secondary and subordinate buses).
1067-
For instance, if hostbridge 0000:00 is above other bridges with buses 0000:01 to 0000:09,
1067+
For instance, if hostbridge 0000:00 is above other bridges/switches with buses 0000:01 to 0000:09,
10681068
the variable should be HWLOC_PCI_LOCALITY="0000:00-09 <cpuset>".
10691069
It supersedes the old HWLOC_PCI_0000_00_LOCALCPUS=&lt;cpuset&gt;
10701070
which only works when hostbridges exist in the topology.
@@ -1351,7 +1351,7 @@ before loading the topology, for instance with <tt>hwloc_topology_set_io_types_f
13511351

13521352
Note that I/O discovery requires significant help from the operating system.
13531353
The pciaccess library (the development package is usually <tt>libpciaccess-devel</tt>
1354-
or <tt>libpciaccess-dev</tt>) is needed to fully detect PCI devices and bridges.
1354+
or <tt>libpciaccess-dev</tt>) is needed to fully detect PCI devices and bridges/switches.
13551355
On Linux, PCI discovery may still be performed even if <tt>libpciaccess</tt> cannot
13561356
be used. But it misses PCI device names.
13571357
Moreover, some operating systems require privileges for probing PCI devices,
@@ -1376,7 +1376,7 @@ handle such as the <em>sda</em> drive or the <em>eth0</em> network interface.
13761376
See \ref iodevices_osdev.
13771377
</li><li>
13781378
<tt>::HWLOC_OBJ_PCI_DEVICE</tt> and <tt>::HWLOC_OBJ_BRIDGE</tt> build up
1379-
a PCI hierarchy made of bridges and devices.
1379+
a PCI hierarchy made of bridges (that may be actually be switches) and devices.
13801380
See \ref iodevices_pci.
13811381
</li></ul>
13821382
Any of these types may be filtered individually with <tt>hwloc_topology_set_type_filter()</tt>.
@@ -1499,7 +1499,7 @@ different places, but all PCI devices are below one of them
14991499
(unless the Bridge object type is filtered-out).
15001500

15011501
Each hostbridge contains one or several children, either other bridges
1502-
(usually PCI to PCI) or PCI devices (<tt>::HWLOC_OBJ_PCI_DEVICE</tt>).
1502+
(usually PCI to PCI switches) or PCI devices (<tt>::HWLOC_OBJ_PCI_DEVICE</tt>).
15031503
The number of bridges between the hostbridge and a PCI device depends
15041504
on the machine.
15051505

include/hwloc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ typedef enum {
255255
*/
256256

257257
HWLOC_OBJ_BRIDGE, /**< \brief Bridge (filtered out by default).
258-
* Any bridge that connects the host or an I/O bus,
258+
* Any bridge (or PCI switch) that connects the host or an I/O bus,
259259
* to another I/O bus.
260260
* They are not added to the topology unless I/O discovery
261261
* is enabled with hwloc_topology_set_flags().

utils/lstopo/lstopo-no-graphics.1in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,19 +218,19 @@ These flags are passed to \fIhwloc_topology_restrict()\fR.
218218
Do not show any I/O device or bridge.
219219
This is identical to \fB\-\-filter io:none\fR.
220220
By default, common devices (GPUs, NICs, block devices, ...) and
221-
interesting bridges are shown.
221+
interesting bridges/switches are shown.
222222
.TP
223223
\fB\-\-no\-bridges\fB
224224
Do not show any I/O bridge except hostbridges.
225225
This is identical to \fB\-\-filter bridge:none\fR.
226226
By default, common devices (GPUs, NICs, block devices, ...) and
227-
interesting bridges are shown.
227+
interesting bridges/switches are shown.
228228
.TP
229229
\fB\-\-whole\-io\fB
230230
Show all I/O devices and bridges.
231231
This is identical to \fB\-\-filter io:all\fR.
232232
By default, only common devices (GPUs, NICs, block devices, ...) and
233-
interesting bridges are shown.
233+
interesting bridges/switches are shown.
234234
.TP
235235
\fB\-\-thissystem\fR
236236
Assume that the selected backend provides the topology for the
@@ -544,7 +544,7 @@ they are drawn as boxes immediately above them.
544544

545545
.SS PCI bridges, PCI devices and OS devices
546546
The PCI hierarchy is not drawn as a set of included boxes but rather
547-
as a tree of bridges with links between them.
547+
as a tree of bridges (that may actually be switches) with links between them.
548548
The tree starts with a small square on the left for the
549549
hostbridge or root complex.
550550
It ends with PCI device boxes on the right.

0 commit comments

Comments
 (0)