From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:60177 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1945889AbcHRK5J (ORCPT ); Thu, 18 Aug 2016 06:57:09 -0400 Subject: Patch "iommu/amd: Init unity mappings only for dma_ops domains" has been added to the 4.4-stable tree To: jroedel@suse.de, gregkh@linuxfoundation.org Cc: , From: Date: Thu, 18 Aug 2016 12:57:01 +0200 Message-ID: <147151782188144@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled iommu/amd: Init unity mappings only for dma_ops domains to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: iommu-amd-init-unity-mappings-only-for-dma_ops-domains.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From b548e786ce47017107765bbeb0f100202525ea83 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Wed, 13 Jul 2016 12:35:24 +0200 Subject: iommu/amd: Init unity mappings only for dma_ops domains From: Joerg Roedel commit b548e786ce47017107765bbeb0f100202525ea83 upstream. The default domain for a device might also be identity-mapped. In this case the kernel would crash when unity mappings are defined for the device. Fix that by making sure the domain is a dma_ops domain. Fixes: 0bb6e243d7fb ('iommu/amd: Support IOMMU_DOMAIN_DMA type allocation') Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman --- drivers/iommu/amd_iommu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -352,9 +352,11 @@ static void init_iommu_group(struct devi if (!domain) goto out; - dma_domain = to_pdomain(domain)->priv; + if (to_pdomain(domain)->flags == PD_DMA_OPS_MASK) { + dma_domain = to_pdomain(domain)->priv; + init_unity_mappings_for_device(dev, dma_domain); + } - init_unity_mappings_for_device(dev, dma_domain); out: iommu_group_put(group); } Patches currently in stable-queue which might be from jroedel@suse.de are queue-4.4/iommu-amd-handle-iommu_domain_dma-in-ops-domain_free-call-back.patch queue-4.4/iommu-amd-update-alias-dte-in-update_device_table.patch queue-4.4/iommu-amd-init-unity-mappings-only-for-dma_ops-domains.patch queue-4.4/iommu-vt-d-return-error-code-in-domain_context_mapping_one.patch queue-4.4/iommu-exynos-suppress-unbinding-to-prevent-system-failure.patch