diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-08 15:34:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-08 15:34:10 -0800 |
| commit | 2e277fa0893936bb4ab8432828f5d422a9ed0a7f (patch) | |
| tree | 6ece07f94b618bfd6880c3307f0c6204564b7531 /Documentation | |
| parent | 70be9ac2b64c0d0db4f0e3004b764df33b1098e2 (diff) | |
| parent | 8950dcd83ae7d62bdc2a60507949acebd85399f2 (diff) | |
| download | linux-2e277fa0893936bb4ab8432828f5d422a9ed0a7f.tar.gz linux-2e277fa0893936bb4ab8432828f5d422a9ed0a7f.tar.bz2 linux-2e277fa0893936bb4ab8432828f5d422a9ed0a7f.zip | |
Merge tag 'iommu-fixes-v5.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU fix from Joerg Roedel:
"Intel decided to leave the newly added Scalable Mode Feature
default-disabled for now. The patch here accomplishes that"
* tag 'iommu-fixes-v5.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/vt-d: Leave scalable mode default off
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index b799bcf67d7b..858b6c0b9a15 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -1696,12 +1696,11 @@ By default, super page will be supported if Intel IOMMU has the capability. With this option, super page will not be supported. - sm_off [Default Off] - By default, scalable mode will be supported if the + sm_on [Default Off] + By default, scalable mode will be disabled even if the hardware advertises that it has support for the scalable mode translation. With this option set, scalable mode - will not be used even on hardware which claims to support - it. + will be used on hardware which claims to support it. tboot_noforce [Default Off] Do not force the Intel IOMMU enabled under tboot. By default, tboot will force Intel IOMMU on, which |