Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754235AbYF2XMi (ORCPT ); Sun, 29 Jun 2008 19:12:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752434AbYF2XM2 (ORCPT ); Sun, 29 Jun 2008 19:12:28 -0400 Received: from sh.osrg.net ([192.16.179.4]:32994 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751870AbYF2XM1 (ORCPT ); Sun, 29 Jun 2008 19:12:27 -0400 Date: Mon, 30 Jun 2008 08:11:22 +0900 To: joerg.roedel@amd.com Cc: fujita.tomonori@lab.ntt.co.jp, tglx@linutronix.de, mingo@redhat.com, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, bhavna.sarathy@amd.com, Sebastian.Biemueller@amd.com, robert.richter@amd.com, joro@8bytes.org Subject: Re: [PATCH 21/34] AMD IOMMU: add address allocation and deallocation functions From: FUJITA Tomonori In-Reply-To: <20080629151715.GB6692@amd.com> References: <1214508490-29683-22-git-send-email-joerg.roedel@amd.com> <20080629234830P.fujita.tomonori@lab.ntt.co.jp> <20080629151715.GB6692@amd.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-Id: <20080630075342C.fujita.tomonori@lab.ntt.co.jp> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2550 Lines: 61 On Sun, 29 Jun 2008 17:17:15 +0200 Joerg Roedel wrote: > On Mon, Jun 30, 2008 at 12:07:10AM +0900, FUJITA Tomonori wrote: > > On Thu, 26 Jun 2008 21:27:57 +0200 > > Joerg Roedel wrote: > > > > > This patch adds the address allocator to the AMD IOMMU code. > > > > > > Signed-off-by: Joerg Roedel > > > --- > > > arch/x86/kernel/amd_iommu.c | 48 +++++++++++++++++++++++++++++++++++++++++++ > > > 1 files changed, 48 insertions(+), 0 deletions(-) > > > > > > diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c > > > index 1d70f5e..69d8d02 100644 > > > --- a/arch/x86/kernel/amd_iommu.c > > > +++ b/arch/x86/kernel/amd_iommu.c > > > @@ -266,3 +266,51 @@ static int init_unity_mappings_for_device(struct dma_ops_domain *dma_dom, > > > return 0; > > > } > > > > > > +static unsigned long dma_mask_to_pages(unsigned long mask) > > > +{ > > > + return (mask >> PAGE_SHIFT) + > > > + (PAGE_ALIGN(mask & ~PAGE_MASK) >> PAGE_SHIFT); > > > +} > > > + > > > +static unsigned long dma_ops_alloc_addresses(struct device *dev, > > > + struct dma_ops_domain *dom, > > > + unsigned int pages) > > > +{ > > > + unsigned long limit = dma_mask_to_pages(*dev->dma_mask); > > > + unsigned long address; > > > + unsigned long size = dom->aperture_size >> PAGE_SHIFT; > > > + unsigned long boundary_size; > > > + > > > + boundary_size = ALIGN(dma_get_seg_boundary(dev) + 1, > > > + PAGE_SIZE) >> PAGE_SHIFT; > > > + limit = limit < size ? limit : size; > > > + > > > + if (dom->next_bit >= limit) > > > + dom->next_bit = 0; > > > + > > > + address = iommu_area_alloc(dom->bitmap, limit, dom->next_bit, pages, > > > + 0 , boundary_size, 0); > > > + if (address == -1) > > > + address = iommu_area_alloc(dom->bitmap, limit, 0, pages, > > > + 0, boundary_size, 0); > > > + > > > + if (likely(address != -1)) { > > > + set_bit_string(dom->bitmap, address, pages); > > > > Is set_bit_string() necessary here? iommu_area_alloc calls it internally. > > > > Probably not. I added it during debugging because the GART driver has it > in that code path too. I will remove it with an follow-up patch. Oops, seems that I left set_bit_string in the GART driver when I converted it to use the IOMMU helpers. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/