mbox series

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

Message ID 20181211200847.GB5218@edgewater-inn.cambridge.arm.com (mailing list archive)
State Mainlined, archived
Commit 89cddc563743cb1e0068867ac97013b2a5bf86aa
Headers show
Series [GIT,PULL] iommu/arm-smmu: Updates for 4.21 | expand

Pull-request

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

Message

Will Deacon Dec. 11, 2018, 8:08 p.m. UTC
Hi Joerg,

Please pull the following arm-smmu updates for 4.21. This includes the
clock and pm_runtime updates to the arm-smmu driver, as well as some
non-critical fixes for the arm-smmu-v3 driver.

Cheers,

Will

--->8

The following changes since commit 9ff01193a20d391e8dbce4403dd5ef87c7eaaca6:

  Linux 4.20-rc3 (2018-11-18 13:33:44 -0800)

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 89cddc563743cb1e0068867ac97013b2a5bf86aa:

  iommu/arm-smmu: Add support for qcom,smmu-v2 variant (2018-12-10 14:56:00 +0000)

----------------------------------------------------------------
Robin Murphy (1):
      iommu/arm-smmu-v3: Fix big-endian CMD_SYNC writes

Sricharan R (3):
      iommu/arm-smmu: Add pm_runtime/sleep ops
      iommu/arm-smmu: Invoke pm_runtime across the driver
      iommu/arm-smmu: Add the device_link between masters and smmu

Vivek Gautam (2):
      dt-bindings: arm-smmu: Add bindings for qcom,smmu-v2
      iommu/arm-smmu: Add support for qcom,smmu-v2 variant

Will Deacon (1):
      iommu/arm-smmu-v3: Use explicit mb() when moving cons pointer

Zhen Lei (1):
      iommu/arm-smmu-v3: Avoid memory corruption from Hisilicon MSI payloads

 .../devicetree/bindings/iommu/arm,smmu.txt         |  39 +++++
 drivers/iommu/arm-smmu-v3.c                        |  22 ++-
 drivers/iommu/arm-smmu.c                           | 170 +++++++++++++++++++--
 3 files changed, 216 insertions(+), 15 deletions(-)

Comments

Joerg Roedel Dec. 12, 2018, 9:17 a.m. UTC | #1
On Tue, Dec 11, 2018 at 08:08:48PM +0000, Will Deacon wrote:
> The following changes since commit 9ff01193a20d391e8dbce4403dd5ef87c7eaaca6:
> 
>   Linux 4.20-rc3 (2018-11-18 13:33:44 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git for-joerg/arm-smmu/updates

Pulled, thanks Will.

Btw, there was a merge conflict with the patches to unmodularize the
IOMMU drivers in drivers/iommu/arm-smmu.c. I think I fixed it up, but it
would be good if you can check it later when I pushed it out.

Thanks,

	Joerg
Will Deacon Dec. 13, 2018, 1:06 p.m. UTC | #2
On Wed, Dec 12, 2018 at 10:17:02AM +0100, Joerg Roedel wrote:
> On Tue, Dec 11, 2018 at 08:08:48PM +0000, Will Deacon wrote:
> > The following changes since commit 9ff01193a20d391e8dbce4403dd5ef87c7eaaca6:
> > 
> >   Linux 4.20-rc3 (2018-11-18 13:33:44 -0800)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git for-joerg/arm-smmu/updates
> 
> Pulled, thanks Will.
> 
> Btw, there was a merge conflict with the patches to unmodularize the
> IOMMU drivers in drivers/iommu/arm-smmu.c. I think I fixed it up, but it
> would be good if you can check it later when I pushed it out.

Looks fine to me, thanks Joerg.

Will