* [PATCH] doc: Remove references to IBM Calgary
@ 2021-06-09 21:51 Hubert Jasudowicz
2021-06-13 23:06 ` Jonathan Corbet
0 siblings, 1 reply; 3+ messages in thread
From: Hubert Jasudowicz @ 2021-06-09 21:51 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, Borislav Petkov, x86,
H. Peter Anvin, Jonathan Corbet
Cc: linux-kernel, linux-doc
Calgary IOMMU driver has been removed in 90dc392fc445.
Clean up stale docs that refer to it.
Signed-off-by: Hubert Jasudowicz <hubert.jasudowicz@gmail.com>
---
Documentation/x86/x86_64/boot-options.rst | 31 +----------------------
1 file changed, 1 insertion(+), 30 deletions(-)
diff --git a/Documentation/x86/x86_64/boot-options.rst b/Documentation/x86/x86_64/boot-options.rst
index 324cefff92e7..5f62b3b86357 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"
-
::
iommu=[<size>][,noagp][,off][,force][,noforce]
[,memaper[=<order>]][,merge][,fullflush][,nomerge]
- [,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.
panic
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
implementation:
@@ -307,28 +300,6 @@ implementation:
force
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
-
Miscellaneous
=============
--
2.32.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] doc: Remove references to IBM Calgary
2021-06-09 21:51 [PATCH] doc: Remove references to IBM Calgary Hubert Jasudowicz
@ 2021-06-13 23:06 ` Jonathan Corbet
2021-06-14 7:32 ` Borislav Petkov
0 siblings, 1 reply; 3+ messages in thread
From: Jonathan Corbet @ 2021-06-13 23:06 UTC (permalink / raw)
To: Hubert Jasudowicz, Thomas Gleixner, Ingo Molnar, Borislav Petkov,
x86, H. Peter Anvin
Cc: linux-kernel, linux-doc
Hubert Jasudowicz <hubert.jasudowicz@gmail.com> writes:
> Calgary IOMMU driver has been removed in 90dc392fc445.
> Clean up stale docs that refer to it.
>
> Signed-off-by: Hubert Jasudowicz <hubert.jasudowicz@gmail.com>
> ---
> Documentation/x86/x86_64/boot-options.rst | 31 +----------------------
> 1 file changed, 1 insertion(+), 30 deletions(-)
Applied, thanks.
jon
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] doc: Remove references to IBM Calgary
2021-06-13 23:06 ` Jonathan Corbet
@ 2021-06-14 7:32 ` Borislav Petkov
0 siblings, 0 replies; 3+ messages in thread
From: Borislav Petkov @ 2021-06-14 7:32 UTC (permalink / raw)
To: Jonathan Corbet
Cc: Hubert Jasudowicz, Thomas Gleixner, Ingo Molnar, x86,
H. Peter Anvin, linux-kernel, linux-doc
On Sun, Jun 13, 2021 at 05:06:21PM -0600, Jonathan Corbet wrote:
> Applied, thanks.
I took it already:
https://git.kernel.org/tip/0e5a89dbb49920cea22193044bbbfd76a9b0f458
You can drop yours. :-)
Thx.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-14 7:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-09 21:51 [PATCH] doc: Remove references to IBM Calgary Hubert Jasudowicz
2021-06-13 23:06 ` Jonathan Corbet
2021-06-14 7:32 ` Borislav Petkov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.