[deployment-guide/comm-rel: 113/727] procFS: fix BZ#615853: /proc/pci has moved

Jaromir Hradilek jhradile at fedoraproject.org
Tue Oct 19 12:33:42 UTC 2010


commit 40651809cc2b7b838b876737c50a7be3929a7097
Author: Douglas Silas <dhensley at redhat.com>
Date:   Thu Jul 22 17:18:24 2010 +0200

    procFS: fix BZ#615853: /proc/pci has moved

 en-US/The_proc_File_System.xml |  159 +++++++++++++++++++++++----------------
 1 files changed, 94 insertions(+), 65 deletions(-)
---
diff --git a/en-US/The_proc_File_System.xml b/en-US/The_proc_File_System.xml
index 692f346..6447ae4 100644
--- a/en-US/The_proc_File_System.xml
+++ b/en-US/The_proc_File_System.xml
@@ -36,9 +36,7 @@ configuration changes to the kernel.
   </para>
 
   <note>
-    <para>
-Later versions of the 2.6 kernel have made the <filename>/proc/ide/</filename> and <filename>/proc/pci/</filename> obsolete. The <command>/proc/ide/</command> file system is now superseded by files in <command>sysfs</command>; to retrieve information on PCI devices, use <command>lspci</command> instead. For more information on <command>sysfs</command> or <command>lspci</command>, refer to their respective <command>man</command> pages.
-</para>
+    <para>Later versions of the 2.6 kernel have made the <filename>/proc/ide/</filename> and <filename>/proc/pci/</filename> directories obsolete. The <command>/proc/ide/</command> file system is now superseded by files in <command>sysfs</command>; to retrieve information on PCI devices, use <command>lspci</command> instead. For more information on <command>sysfs</command> or <command>lspci</command>, refer to their respective <command>man</command> pages.</para>
   </note>
 
   <section
@@ -382,7 +380,98 @@ Node 0, zone  HighMem      2      0      0      1      1      ...
 </screen>
 
     </section>
+    <section
+      id="s2-proc-pci">
+      <title>
+        <filename>/proc/bus/pci</filename>
+      </title>
+      <indexterm
+        significance="normal">
+        <primary>
+          <filename>proc</filename> file system</primary>
+        <secondary>
+          <filename>/proc/bus/pci</filename>
+        </secondary>
+        <tertiary>viewing using <command>lspci</command>
+        </tertiary>
+      </indexterm>
+      <indexterm
+        significance="normal">
+        <primary>
+          <command>lspci</command>
+        </primary>
+      </indexterm>
+      <para>Later versions of the 2.6 Linux kernel have obsoleted the <filename>/proc/pci</filename> directory in favor of the <filename>/proc/bus/pci</filename> directory. Although you can get a list of all PCI devices present on the system using the command <command>cat /proc/bus/pci/devices</command>, the output is difficult to read and interpret.</para>
+      <para>For a human-readable list of PCI devices, run the following command:</para>
+      <screen>~]#&#160;<command>/sbin/lspci -vb</command>
+00:00.0 Host bridge: Intel Corporation 82X38/X48 Express DRAM Controller
+        Subsystem: Hewlett-Packard Company Device 1308
+        Flags: bus master, fast devsel, latency 0
+        Capabilities: [e0] Vendor Specific Information &lt;?&gt;
+        Kernel driver in use: x38_edac
+        Kernel modules: x38_edac
+
+00:01.0 PCI bridge: Intel Corporation 82X38/X48 Express Host-Primary PCI Express Bridge (prog-if 00 [Normal decode])
+        Flags: bus master, fast devsel, latency 0
+        Bus: primary=00, secondary=01, subordinate=01, sec-latency=0
+        I/O behind bridge: 00001000-00001fff
+        Memory behind bridge: f0000000-f2ffffff
+        Capabilities: [88] Subsystem: Hewlett-Packard Company Device 1308
+        Capabilities: [80] Power Management version 3
+        Capabilities: [90] MSI: Enable+ Count=1/1 Maskable- 64bit-
+        Capabilities: [a0] Express Root Port (Slot+), MSI 00
+        Capabilities: [100] Virtual Channel &lt;?&gt;
+        Capabilities: [140] Root Complex Link &lt;?&gt;
+        Kernel driver in use: pcieport
+        Kernel modules: shpchp
+
+00:1a.0 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #4 (rev 02) (prog-if 00 [UHCI])
+        Subsystem: Hewlett-Packard Company Device 1308
+        Flags: bus master, medium devsel, latency 0, IRQ 5
+        I/O ports at 2100
+        Capabilities: [50] PCI Advanced Features
+        Kernel driver in use: uhci_hcd
+<lineannotation>output truncated</lineannotation>
+      </screen>
+      <para>The output is a sorted list of all IRQ numbers and addresses as seen by the cards on the PCI bus instead of as seen by the kernel. Beyond providing the name and version of the device, this list also gives detailed IRQ information so an administrator can quickly look for conflicts.</para>
+      <!-- RHEL6: silas: fix BZ#615853
+       <para>This file contains a full listing of every PCI device on the
+	 system. Depending on the number of PCI devices, <filename>/proc/pci</filename> can be rather long. A
+	 sampling of this file from a basic system looks similar to
+	 the following:
+       </para>
 
+
+      <screen>
+Bus  0, device 0, function 0: Host bridge: Intel Corporation 440BX/ZX - 82443BX/ZX Host bridge (rev 3). Master Capable. Latency=64. Prefetchable 32 bit memory at 0xe4000000 [0xe7ffffff].
+Bus  0, device 1, function 0: PCI bridge: Intel Corporation 440BX/ZX - 82443BX/ZX AGP bridge (rev 3).   Master Capable. Latency=64. Min Gnt=128.
+Bus  0, device 4, function 0: ISA bridge: Intel Corporation 82371AB PIIX4 ISA (rev 2).
+Bus  0, device 4, function 1: IDE interface: Intel Corporation 82371AB PIIX4 IDE (rev 1). Master Capable. Latency=32. I/O at 0xd800 [0xd80f].
+Bus  0, device 4, function 2: USB Controller: Intel Corporation 82371AB PIIX4 USB (rev 1). IRQ 5. Master Capable. Latency=32. I/O at 0xd400 [0xd41f].
+Bus  0, device 4, function 3: Bridge: Intel Corporation 82371AB PIIX4 ACPI (rev 2). IRQ 9.
+Bus  0, device 9, function 0: Ethernet controller: Lite-On Communications Inc LNE100TX (rev 33). IRQ 5. Master Capable. Latency=32. I/O at 0xd000 [0xd0ff].
+Bus  0, device 12, function  0: VGA compatible controller: S3 Inc. ViRGE/DX or /GX (rev 1). IRQ 11. Master Capable. Latency=32. Min Gnt=4.Max Lat=255.
+</screen>
+
+      <para>
+	  This output shows a list of all PCI devices, sorted in the
+	  order of bus, device, and function. Beyond providing the
+	  name and version of the device, this list also gives
+	  detailed IRQ information so an administrator can quickly
+	  look for conflicts.
+	</para>
+
+      <note>
+        <title>Tip</title>
+        <para>
+	  To get a more readable version of this information, type:
+	</para>
+
+        <screen>
+/sbin/lspci -vb
+</screen>
+      </note>-->
+    </section>
     <section
       id="s2-proc-cmdline">
       <title>
@@ -1804,67 +1893,6 @@ major minor  #blocks  name
         </listitem>
       </itemizedlist>
     </section>
-
-    <section
-      id="s2-proc-pci">
-      <title>
-        <filename>/proc/pci</filename>
-      </title>
-      <indexterm
-        significance="normal">
-        <primary>
-          <filename>proc</filename> file system</primary>
-        <secondary>
-          <filename>/proc/pci</filename>
-        </secondary>
-        <tertiary>viewing using <command>lspci</command>
-        </tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>
-          <command>lspci</command>
-        </primary>
-      </indexterm>
-      <para>
-	 This file contains a full listing of every PCI device on the
-	 system. Depending on the number of PCI devices, <filename>/proc/pci</filename> can be rather long. A
-	 sampling of this file from a basic system looks similar to
-	 the following:
-       </para>
-
-
-      <screen>
-Bus  0, device 0, function 0: Host bridge: Intel Corporation 440BX/ZX - 82443BX/ZX Host bridge (rev 3). Master Capable. Latency=64. Prefetchable 32 bit memory at 0xe4000000 [0xe7ffffff].
-Bus  0, device 1, function 0: PCI bridge: Intel Corporation 440BX/ZX - 82443BX/ZX AGP bridge (rev 3).   Master Capable. Latency=64. Min Gnt=128.
-Bus  0, device 4, function 0: ISA bridge: Intel Corporation 82371AB PIIX4 ISA (rev 2).
-Bus  0, device 4, function 1: IDE interface: Intel Corporation 82371AB PIIX4 IDE (rev 1). Master Capable. Latency=32. I/O at 0xd800 [0xd80f].
-Bus  0, device 4, function 2: USB Controller: Intel Corporation 82371AB PIIX4 USB (rev 1). IRQ 5. Master Capable. Latency=32. I/O at 0xd400 [0xd41f].
-Bus  0, device 4, function 3: Bridge: Intel Corporation 82371AB PIIX4 ACPI (rev 2). IRQ 9.
-Bus  0, device 9, function 0: Ethernet controller: Lite-On Communications Inc LNE100TX (rev 33). IRQ 5. Master Capable. Latency=32. I/O at 0xd000 [0xd0ff].
-Bus  0, device 12, function  0: VGA compatible controller: S3 Inc. ViRGE/DX or /GX (rev 1). IRQ 11. Master Capable. Latency=32. Min Gnt=4.Max Lat=255.
-</screen>
-
-      <para>
-	  This output shows a list of all PCI devices, sorted in the
-	  order of bus, device, and function. Beyond providing the
-	  name and version of the device, this list also gives
-	  detailed IRQ information so an administrator can quickly
-	  look for conflicts.
-	</para>
-
-      <note>
-        <title>Tip</title>
-        <para>
-	  To get a more readable version of this information, type:
-	</para>
-
-        <screen>
-/sbin/lspci -vb
-</screen>
-      </note>
-    </section>
-
     <section
       id="s2-proc-slabinfo">
       <title>
@@ -2707,7 +2735,8 @@ batt_status     : okay
 	  /proc/fs/nfsd/exports</command> displays the file systems
 	  being shared and the permissions granted for those file
 	  systems. For more on file system sharing with NFS, refer to
-	  the <citetitle pubwork="chapter">Network File System (NFS)</citetitle> chapter of the <citetitle>Storage Administration Guide</citetitle>.
+	  the <citetitle
+          pubwork="chapter">Network File System (NFS)</citetitle> chapter of the <citetitle>Storage Administration Guide</citetitle>.
 	</para>
     </section>
 


More information about the docs-commits mailing list