From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755916Ab1E1SPJ (ORCPT ); Sat, 28 May 2011 14:15:09 -0400 Received: from relay3.sgi.com ([192.48.152.1]:33845 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754978Ab1E1SPF (ORCPT ); Sat, 28 May 2011 14:15:05 -0400 Message-Id: <20110528181502.478636217@gulag1.americas.sgi.com> References: <20110528181501.896092225@gulag1.americas.sgi.com> User-Agent: quilt/0.46-1 Date: Sat, 28 May 2011 13:15:05 -0500 From: Mike Travis To: David Woodhouse , Chris Wright , Andrew Morton , Ingo Molnar Cc: Mike Habeck , Dimitri Sivanich , Derek Fults , Jesse Barnes , stable@kernel.org, iommu@lists.linux-foundation.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/7] Intel pci: Use coherent DMA mask when requested Content-Disposition: inline; filename=use-coherent-dma-mask.patch 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 Acked-by: Chris Wright Reviewed-by: Mike Habeck Cc: stable@kernel.org --- 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 @@ -2603,8 +2603,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; --