Skip to content

Commit 0e5a89d

Browse files
chivaysuryasaimadhu
authored andcommitted
doc: Remove references to IBM Calgary
The Calgary IOMMU driver has been removed in 90dc392 ("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
1 parent ec35d1d commit 0e5a89d

1 file changed

Lines changed: 1 addition & 30 deletions

File tree

Documentation/x86/x86_64/boot-options.rst

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -247,16 +247,11 @@ Multiple x86-64 PCI-DMA mapping implementations exist, for example:
247247
Kernel boot message: "PCI-DMA: Using software bounce buffering
248248
for IO (SWIOTLB)"
249249

250-
4. <arch/x86_64/pci-calgary.c> : IBM Calgary hardware IOMMU. Used in IBM
251-
pSeries and xSeries servers. This hardware IOMMU supports DMA address
252-
mapping with memory protection, etc.
253-
Kernel boot message: "PCI-DMA: Using Calgary IOMMU"
254-
255250
::
256251

257252
iommu=[<size>][,noagp][,off][,force][,noforce]
258253
[,memaper[=<order>]][,merge][,fullflush][,nomerge]
259-
[,noaperture][,calgary]
254+
[,noaperture]
260255

261256
General iommu options:
262257

@@ -295,8 +290,6 @@ iommu options only relevant to the AMD GART hardware IOMMU:
295290
Don't initialize the AGP driver and use full aperture.
296291
panic
297292
Always panic when IOMMU overflows.
298-
calgary
299-
Use the Calgary IOMMU if it is available
300293

301294
iommu options only relevant to the software bounce buffering (SWIOTLB) IOMMU
302295
implementation:
@@ -307,28 +300,6 @@ implementation:
307300
force
308301
Force all IO through the software TLB.
309302

310-
Settings for the IBM Calgary hardware IOMMU currently found in IBM
311-
pSeries and xSeries machines
312-
313-
calgary=[64k,128k,256k,512k,1M,2M,4M,8M]
314-
Set the size of each PCI slot's translation table when using the
315-
Calgary IOMMU. This is the size of the translation table itself
316-
in main memory. The smallest table, 64k, covers an IO space of
317-
32MB; the largest, 8MB table, can cover an IO space of 4GB.
318-
Normally the kernel will make the right choice by itself.
319-
calgary=[translate_empty_slots]
320-
Enable translation even on slots that have no devices attached to
321-
them, in case a device will be hotplugged in the future.
322-
calgary=[disable=<PCI bus number>]
323-
Disable translation on a given PHB. For
324-
example, the built-in graphics adapter resides on the first bridge
325-
(PCI bus number 0); if translation (isolation) is enabled on this
326-
bridge, X servers that access the hardware directly from user
327-
space might stop working. Use this option if you have devices that
328-
are accessed from userspace directly on some PCI host bridge.
329-
panic
330-
Always panic when IOMMU overflows
331-
332303

333304
Miscellaneous
334305
=============

0 commit comments

Comments
 (0)