From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756875Ab1DGTwI (ORCPT ); Thu, 7 Apr 2011 15:52:08 -0400 Received: from relay3.sgi.com ([192.48.152.1]:57084 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756565Ab1DGTwF (ORCPT ); Thu, 7 Apr 2011 15:52:05 -0400 Message-ID: <4D9E15E0.5060000@sgi.com> Date: Thu, 07 Apr 2011 12:52:00 -0700 From: Mike Travis User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: David Woodhouse , Jesse Barnes Cc: Mike Habeck , iommu@lists.linux-foundation.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Wright Subject: [PATCH 4/4] Intel pci: Use coherent DMA mask when requested References: <20110329233602.272459647@gulag1.americas.sgi.com> In-Reply-To: <20110329233602.272459647@gulag1.americas.sgi.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The __intel_map_single function is not honoring the passed in DMA mask. This results in not using the coherent DMA mask when called from intel_alloc_coherent(). Signed-off-by: Mike Travis Reviewed-by: Mike Habeck Acked-by: Chris Wright --- drivers/pci/intel-iommu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- linux.orig/drivers/pci/intel-iommu.c +++ linux/drivers/pci/intel-iommu.c @@ -2582,8 +2582,7 @@ static dma_addr_t __intel_map_single(str iommu = domain_get_iommu(domain); size = aligned_nrpages(paddr, size); - iova = intel_alloc_iova(hwdev, domain, dma_to_mm_pfn(size), - pdev->dma_mask); + iova = intel_alloc_iova(hwdev, domain, dma_to_mm_pfn(size), dma_mask); if (!iova) goto error; --