Skip to content

Commit f0f52a9

Browse files
torvaldstorvalds
committed
Merge git://git.infradead.org/iommu-2.6
* git://git.infradead.org/iommu-2.6: intel-iommu: Fix off-by-one in RMRR setup intel-iommu: Add domain check in domain_remove_one_dev_info intel-iommu: Remove Host Bridge devices from identity mapping intel-iommu: Use coherent DMA mask when requested intel-iommu: Dont cache iova above 32bit intel-iommu: Speed up processing of the identity_mapping function intel-iommu: Check for identity mapping candidate using system dma mask intel-iommu: Only unlink device domains from iommu intel-iommu: Enable super page (2MiB, 1GiB, etc.) support intel-iommu: Flush unmaps at domain_exit intel-iommu: Remove obsolete comment from detect_intel_iommu intel-iommu: fix VT-d PMR disable for TXT on S3 resume
2 parents 0f48f26 + 70e535d commit f0f52a9

File tree

5 files changed

+220
-48
lines changed

5 files changed

+220
-48
lines changed

‎Documentation/kernel-parameters.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
999999
With this option on every unmap_single operation will
10001000
result in a hardware IOTLB flush operation as opposed
10011001
to batching them for performance.
1002-
1002+
sp_off [Default Off]
1003+
By default, super page will be supported if Intel IOMMU
1004+
has the capability. With this option, super page will
1005+
not be supported.
10031006
intremap= [X86-64, Intel-IOMMU]
10041007
Format: { on (default) | off | nosid }
10051008
on enable Interrupt Remapping (default)

‎drivers/pci/dmar.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -698,12 +698,7 @@ int __init detect_intel_iommu(void)
698698
{
699699
#ifdef CONFIG_INTR_REMAP
700700
struct acpi_table_dmar *dmar;
701-
/*
702-
* for now we will disable dma-remapping when interrupt
703-
* remapping is enabled.
704-
* When support for queued invalidation for IOTLB invalidation
705-
* is added, we will not need this any more.
706-
*/
701+
707702
dmar = (struct acpi_table_dmar *) dmar_tbl;
708703
if (ret && cpu_has_x2apic && dmar->flags & 0x1)
709704
printk(KERN_INFO

0 commit comments

Comments
 (0)