From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Jul 2021 20:22:47 +0000 (-0700)
Subject: Merge tag 'iommu-updates-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: irq-urgent-2021-07-11~61
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cd3eb7efaa995db00db0ba64893814f9831be842;p=users%2Fdwmw2%2Flinux.git

Merge tag 'iommu-updates-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull iommu updates from Joerg Roedel:

 - SMMU Updates from Will Deacon:

     - SMMUv3:
        - Support stalling faults for platform devices
        - Decrease defaults sizes for the event and PRI queues
     - SMMUv2:
        - Support for a new '->probe_finalize' hook, needed by Nvidia
        - Even more Qualcomm compatible strings
        - Avoid Adreno TTBR1 quirk for DB820C platform

 - Intel VT-d updates from Lu Baolu:

     - Convert Intel IOMMU to use sva_lib helpers in iommu core
     - ftrace and debugfs supports for page fault handling
     - Support asynchronous nested capabilities
     - Various misc cleanups

 - Support for new VIOT ACPI table to make the VirtIO IOMMU
   available on x86

 - Add the amd_iommu=force_enable command line option to enable
   the IOMMU on platforms where they are known to cause problems

 - Support for version 2 of the Rockchip IOMMU

 - Various smaller fixes, cleanups and refactorings

* tag 'iommu-updates-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (66 commits)
  iommu/virtio: Enable x86 support
  iommu/dma: Pass address limit rather than size to iommu_setup_dma_ops()
  ACPI: Add driver for the VIOT table
  ACPI: Move IOMMU setup code out of IORT
  ACPI: arm64: Move DMA setup operations out of IORT
  iommu/vt-d: Fix dereference of pointer info before it is null checked
  iommu: Update "iommu.strict" documentation
  iommu/arm-smmu: Check smmu->impl pointer before dereferencing
  iommu/arm-smmu-v3: Remove unnecessary oom message
  iommu/arm-smmu: Fix arm_smmu_device refcount leak in address translation
  iommu/arm-smmu: Fix arm_smmu_device refcount leak when arm_smmu_rpm_get fails
  iommu/vt-d: Fix linker error on 32-bit
  iommu/vt-d: No need to typecast
  iommu/vt-d: Define counter explicitly as unsigned int
  iommu/vt-d: Remove unnecessary braces
  iommu/vt-d: Removed unused iommu_count in dmar domain
  iommu/vt-d: Use bitfields for DMAR capabilities
  iommu/vt-d: Use DEVICE_ATTR_RO macro
  iommu/vt-d: Fix out-bounds-warning in intel/svm.c
  iommu/vt-d: Add PRQ handling latency sampling
  ...
---

cd3eb7efaa995db00db0ba64893814f9831be842
diff --cc drivers/acpi/arm64/iort.c
index e34937e11186a,9efe7bcde8663..3b23fb775ac45
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@@ -975,8 -946,10 +946,10 @@@ static void iort_named_component_init(s
  	props[0] = PROPERTY_ENTRY_U32("pasid-num-bits",
  				      FIELD_GET(ACPI_IORT_NC_PASID_BITS,
  						nc->node_flags));
+ 	if (nc->node_flags & ACPI_IORT_NC_STALL_SUPPORTED)
+ 		props[1] = PROPERTY_ENTRY_BOOL("dma-can-stall");
  
 -	if (device_add_properties(dev, props))
 +	if (device_create_managed_software_node(dev, props, NULL))
  		dev_warn(dev, "Could not add device properties\n");
  }
  
diff --cc include/acpi/acpi_bus.h
index c6bd4f9a80ba4,41f092a269f6c..1ae993fee4a5d
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@@ -590,8 -586,11 +590,11 @@@ struct acpi_pci_root 
  
  /* helper */
  
 -bool acpi_dma_supported(struct acpi_device *adev);
 +bool acpi_dma_supported(const struct acpi_device *adev);
  enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev);
+ int acpi_iommu_fwspec_init(struct device *dev, u32 id,
+ 			   struct fwnode_handle *fwnode,
+ 			   const struct iommu_ops *ops);
  int acpi_dma_get_range(struct device *dev, u64 *dma_addr, u64 *offset,
  		       u64 *size);
  int acpi_dma_configure_id(struct device *dev, enum dev_dma_attr attr,