[tip:,x86/cleanups] doc: Remove references to IBM Calgary
diff mbox series

Message ID 162334246092.29796.9005969074055956442.tip-bot2@tip-bot2
State Accepted
Commit 0e5a89dbb49920cea22193044bbbfd76a9b0f458
Headers show
  • [tip:,x86/cleanups] doc: Remove references to IBM Calgary
Related show

Commit Message

tip-bot2 for C├ędric Le Goater June 10, 2021, 4:27 p.m. UTC
The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     0e5a89dbb49920cea22193044bbbfd76a9b0f458
Gitweb:        https://git.kernel.org/tip/0e5a89dbb49920cea22193044bbbfd76a9b0f458
Author:        Hubert Jasudowicz <hubert.jasudowicz@gmail.com>
AuthorDate:    Wed, 09 Jun 2021 23:51:12 +02:00
Committer:     Borislav Petkov <bp@suse.de>
CommitterDate: Thu, 10 Jun 2021 18:19:36 +02:00

doc: Remove references to IBM Calgary

The Calgary IOMMU driver has been removed in

  90dc392fc445 ("x86: Remove the calgary IOMMU driver")

Clean up stale docs that refer to it.

Signed-off-by: Hubert Jasudowicz <hubert.jasudowicz@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/1bd2b57dd1db53df09e520b8170ff61418805de4.1623274832.git.hubert.jasudowicz@gmail.com
 Documentation/x86/x86_64/boot-options.rst | 31 +----------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff mbox series

diff --git a/Documentation/x86/x86_64/boot-options.rst b/Documentation/x86/x86_64/boot-options.rst
index 324ceff..5f62b3b 100644
--- a/Documentation/x86/x86_64/boot-options.rst
+++ b/Documentation/x86/x86_64/boot-options.rst
@@ -247,16 +247,11 @@  Multiple x86-64 PCI-DMA mapping implementations exist, for example:
       Kernel boot message: "PCI-DMA: Using software bounce buffering
       for IO (SWIOTLB)"
-   4. <arch/x86_64/pci-calgary.c> : IBM Calgary hardware IOMMU. Used in IBM
-      pSeries and xSeries servers. This hardware IOMMU supports DMA address
-      mapping with memory protection, etc.
-      Kernel boot message: "PCI-DMA: Using Calgary IOMMU"
-  [,noaperture][,calgary]
+  [,noaperture]
 General iommu options:
@@ -295,8 +290,6 @@  iommu options only relevant to the AMD GART hardware IOMMU:
       Don't initialize the AGP driver and use full aperture.
       Always panic when IOMMU overflows.
-    calgary
-      Use the Calgary IOMMU if it is available
 iommu options only relevant to the software bounce buffering (SWIOTLB) IOMMU
@@ -307,28 +300,6 @@  implementation:
         Force all IO through the software TLB.
-Settings for the IBM Calgary hardware IOMMU currently found in IBM
-pSeries and xSeries machines
-    calgary=[64k,128k,256k,512k,1M,2M,4M,8M]
-      Set the size of each PCI slot's translation table when using the
-      Calgary IOMMU. This is the size of the translation table itself
-      in main memory. The smallest table, 64k, covers an IO space of
-      32MB; the largest, 8MB table, can cover an IO space of 4GB.
-      Normally the kernel will make the right choice by itself.
-    calgary=[translate_empty_slots]
-      Enable translation even on slots that have no devices attached to
-      them, in case a device will be hotplugged in the future.
-    calgary=[disable=<PCI bus number>]
-      Disable translation on a given PHB. For
-      example, the built-in graphics adapter resides on the first bridge
-      (PCI bus number 0); if translation (isolation) is enabled on this
-      bridge, X servers that access the hardware directly from user
-      space might stop working. Use this option if you have devices that
-      are accessed from userspace directly on some PCI host bridge.
-    panic
-      Always panic when IOMMU overflows