tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'iommu-fixes-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull IOMMU fixes from Joerg Roedel:

- two Kconfig fixes to fix dependencies that cause compile failures
when they are not fulfilled.

- a section mismatch fix for Intel VT-d

- a fix for PCI topology detection in ARM device-tree code

* tag 'iommu-fixes-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/of: Remove PCI host bridge node check
iommu/qcom: Depend on HAS_DMA to fix compile error
iommu/vt-d: Fix harmless section mismatch warning
iommu: Add missing dependencies

Linus Torvalds 9ae0b37e d21b8ea7

+5 -7
+3 -2
drivers/iommu/Kconfig
··· 278 278 config IPMMU_VMSA 279 279 bool "Renesas VMSA-compatible IPMMU" 280 280 depends on ARM || IOMMU_DMA 281 - depends on ARCH_RENESAS || COMPILE_TEST 281 + depends on ARCH_RENESAS || (COMPILE_TEST && !GENERIC_ATOMIC64) 282 282 select IOMMU_API 283 283 select IOMMU_IO_PGTABLE_LPAE 284 284 select ARM_DMA_USE_IOMMU ··· 373 373 config QCOM_IOMMU 374 374 # Note: iommu drivers cannot (yet?) be built as modules 375 375 bool "Qualcomm IOMMU Support" 376 - depends on ARCH_QCOM || COMPILE_TEST 376 + depends on ARCH_QCOM || (COMPILE_TEST && !GENERIC_ATOMIC64) 377 + depends on HAS_DMA 377 378 select IOMMU_API 378 379 select IOMMU_IO_PGTABLE_LPAE 379 380 select ARM_DMA_USE_IOMMU
+1 -1
drivers/iommu/dmar.c
··· 497 497 #define dmar_parse_one_rhsa dmar_res_noop 498 498 #endif 499 499 500 - static void __init 500 + static void 501 501 dmar_table_print_dmar_entry(struct acpi_dmar_header *header) 502 502 { 503 503 struct acpi_dmar_hardware_unit *drhd;
+1 -4
drivers/iommu/of_iommu.c
··· 157 157 158 158 err = of_iommu_xlate(info->dev, &iommu_spec); 159 159 of_node_put(iommu_spec.np); 160 - if (err) 161 - return err; 162 - 163 - return info->np == pdev->bus->dev.of_node; 160 + return err; 164 161 } 165 162 166 163 const struct iommu_ops *of_iommu_configure(struct device *dev,