[GIT,PULL] iommu/arm-smmu: Updates for 5.2

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git for-joerg/arm-smmu/updates

Message

Will Deacon April 24, 2019, 11:52 a.m. UTC

Hi Joerg,

Please can you pull these ARM SMMU updates for 5.2? The highlight is ATS
support in the SMMUv3 driver from Jean-Philippe. I have collected the
appropriate Acks from the PCI and IORT sides.

There is a trivial conflict with your api-features branch due to the diff
context in linux/iommu.h.

Cheers,

Will

--->8

The following changes since commit 79a3aaa7b82e3106be97842dedfd8429248896e6:

  Linux 5.1-rc3 (2019-03-31 14:39:29 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git for-joerg/arm-smmu/updates

for you to fetch changes up to bc580b56cb7888d1f09fff8a50270228fb834ae8:

  iommu/arm-smmu: Log CBFRSYNRA register on context fault (2019-04-23 12:23:16 +0100)

----------------------------------------------------------------
Douglas Anderson (1):
      iommu/arm-smmu: Break insecure users by disabling bypass by default

Jean-Philippe Brucker (9):
      PCI: Move ATS declarations outside of CONFIG_PCI
      PCI: Add a stub for pci_ats_disabled()
      ACPI/IORT: Check ATS capability in root complex nodes
      iommu/arm-smmu-v3: Rename arm_smmu_master_data to arm_smmu_master
      iommu/arm-smmu-v3: Store SteamIDs in master
      iommu/arm-smmu-v3: Add a master->domain pointer
      iommu/arm-smmu-v3: Link domains and devices
      iommu/arm-smmu-v3: Add support for PCI ATS
      iommu/arm-smmu-v3: Disable tagged pointers

Vivek Gautam (1):
      iommu/arm-smmu: Log CBFRSYNRA register on context fault

Will Deacon (1):
      iommu/arm-smmu-v3: Don't disable SMMU in kdump kernel

 drivers/acpi/arm64/iort.c     |  11 ++
 drivers/iommu/Kconfig         |  25 +++
 drivers/iommu/arm-smmu-regs.h |   2 +
 drivers/iommu/arm-smmu-v3.c   | 355 +++++++++++++++++++++++++++++++++---------
 drivers/iommu/arm-smmu.c      |  11 +-
 include/linux/iommu.h         |   4 +
 include/linux/pci.h           |  31 ++--
 7 files changed, 344 insertions(+), 95 deletions(-)

Comments

Joerg Roedel April 26, 2019, 1:50 p.m. UTC | #1

On Wed, Apr 24, 2019 at 12:52:52PM +0100, Will Deacon wrote:
>   git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git for-joerg/arm-smmu/updates

Pulled, thanks Will.