From: "T.J. Mercier" <tjmercier@google.com>
To: tjmercier@google.com, Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Jonathan Corbet <corbet@lwn.net>
Cc: petr@tesarici.cz, mhklinux@outlook.com, robin.murphy@arm.com,
linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org
Subject: [PATCH v2 3/3] doc: x86/iommu: Update and reorder iommu options
Date: Tue, 7 May 2024 01:35:00 +0000 [thread overview]
Message-ID: <20240507013502.3095744-3-tjmercier@google.com> (raw)
In-Reply-To: <20240507013502.3095744-1-tjmercier@google.com>
Several options were missing from the top of the IOMMU section that were
detailed below. Add the missing options and reorder them to match the
order in which they are documented.
Signed-off-by: T.J. Mercier <tjmercier@google.com>
---
Documentation/arch/x86/x86_64/boot-options.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/arch/x86/x86_64/boot-options.rst b/Documentation/arch/x86/x86_64/boot-options.rst
index 18161657b301..04baefcc1712 100644
--- a/Documentation/arch/x86/x86_64/boot-options.rst
+++ b/Documentation/arch/x86/x86_64/boot-options.rst
@@ -242,9 +242,9 @@ Multiple x86-64 PCI-DMA mapping implementations exist, for example:
::
- iommu=[<size>][,noagp][,off][,force][,noforce]
- [,memaper[=<order>]][,merge][,fullflush][,nomerge]
- [,noaperture]
+ iommu=[off][,noforce][,force][,soft][,<size>]
+ [,allowed][,fullflush][,nofullflush][,memaper[=<order>]]
+ [,merge][,nomerge][,noaperture][,noagp][,panic]
General iommu options:
--
2.45.0.rc1.225.g2a3ae87e7f-goog
next prev parent reply other threads:[~2024-05-07 1:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 1:34 [PATCH v2 1/3] doc: swiotlb: iommu/dma: Clarify swiotlb=force option applies only to dma-direct T.J. Mercier
2024-05-07 1:34 ` [PATCH v2 2/3] doc: swiotlb: Document SWIOTLB areas parameter T.J. Mercier
2024-05-09 6:14 ` Petr Tesařík
2024-05-09 16:04 ` T.J. Mercier
2024-05-09 20:01 ` Petr Tesařík
2024-05-07 1:35 ` T.J. Mercier [this message]
2024-05-09 5:52 ` [PATCH v2 1/3] doc: swiotlb: iommu/dma: Clarify swiotlb=force option applies only to dma-direct Petr Tesařík
2024-05-09 20:18 ` Dave Hansen
2024-05-09 21:03 ` T.J. Mercier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240507013502.3095744-3-tjmercier@google.com \
--to=tjmercier@google.com \
--cc=bp@alien8.de \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhklinux@outlook.com \
--cc=mingo@redhat.com \
--cc=petr@tesarici.cz \
--cc=robin.murphy@arm.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®