This message generated a parse failure. Raw output follows here. Please use 'back' to navigate. From devnull@lkml.org Fri Apr 26 03:01:45 2024 Delivery-date: Mon, 04 Aug 2008 18:06:25 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754377AbYHDQFH (ORCPT ); Mon, 4 Aug 2008 12:05:07 -0400 Received: from outbound-va3.frontbridge.com ([216.32.180.16]:21813 "EHLO VA3EHSOBE002.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753802AbYHDQFE (ORCPT ); Mon, 4 Aug 2008 12:05:04 -0400 Received: from mail110-va3-R.bigfish.com (10.7.14.251) by VA3EHSOBE002.bigfish.com (10.7.40.22) with Microsoft SMTP Server id 8.1.240.5; Mon, 4 Aug 2008 16:05:03 +0000 Received: from mail110-va3 (localhost.localdomain [127.0.0.1]) by mail110-va3-R.bigfish.com (Postfix) with ESMTP id 06BD88D0218; Mon, 4 Aug 2008 16:05:03 +0000 (UTC) X-BigFish: VPS4(zzzz10d3izzz32i43j63h) X-Spam-TCS-SCL: 2:0 X-FB-SS: 5, Received: by mail110-va3 (MessageSwitch) id 1217865901376596_5999; Mon, 4 Aug 2008 16:05:01 +0000 (UCT) Received: from svlb1extmailp02.amd.com (unknown [139.95.251.11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail110-va3.bigfish.com (Postfix) with ESMTP id 2E3961C70046; Mon, 4 Aug 2008 16:05:01 +0000 (UTC) Received: from svlb1twp02.amd.com ([139.95.250.35]) by svlb1extmailp02.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id m74G4pHw013944; Mon, 4 Aug 2008 09:04:56 -0700 X-WSS-ID: 0K533C2-04-0UE-01 Received: from SSVLEXBH1.amd.com (ssvlexbh1.amd.com [139.95.53.182]) by svlb1twp02.amd.com (Tumbleweed MailGate 3.5.1) with ESMTP id 210771103CA; Mon, 4 Aug 2008 09:04:49 -0700 (PDT) Received: from ssvlexmb2.amd.com ([139.95.53.7]) by SSVLEXBH1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 4 Aug 2008 09:04:56 -0700 Received: from SF36EXMB1.amd.com ([172.19.4.24]) by ssvlexmb2.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 4 Aug 2008 09:04:57 -0700 Received: from lemmy.localdomain ([165.204.77.10]) by SF36EXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 4 Aug 2008 18:04:51 +0200 Received: by lemmy.localdomain (Postfix, from userid 41430) id A682F54106; Mon, 4 Aug 2008 18:04:51 +0200 (CEST) From: Joerg Roedel To: Andrew Morton Cc: mingo@redhat.com, tglx@linutronix.de, hpa@zytor.com, rth@twiddle.net, paulus@samba.org, benh@kernel.crashing.org, davem@davemloft.net, FUJITA Tomonori , Muli Ben-Yehuda , linux-kernel@vger.kernel.org, Joerg Subject: [PATCH 09/10] alpha: use iommu_num_pages function in IOMMU code Date: Mon, 4 Aug 2008 18:04:49 +0200 Message-Id: <1217865890-3593-10-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.5.3.7 In-Reply-To: <1217865890-3593-1-git-send-email-joerg.roedel@amd.com> References: <1217865890-3593-1-git-send-email-joerg.roedel@amd.com> X-OriginalArrivalTime: 04 Aug 2008 16:04:51.0761 (UTC) FILETIME=[D3DE7210:01C8F64B] Mime-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-Id: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Joerg Roedel --- arch/alpha/kernel/pci_iommu.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index 2179c60..b9094da 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c @@ -41,13 +41,6 @@ mk_iommu_pte(unsigned long paddr) return (paddr >> (PAGE_SHIFT-1)) | 1; } -static inline long -calc_npages(long bytes) -{ - return (bytes + PAGE_SIZE - 1) >> PAGE_SHIFT; -} - - /* Return the minimum of MAX or the first power of two larger than main memory. */ @@ -287,7 +280,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size, if (!arena || arena->dma_base + arena->size - 1 > max_dma) arena = hose->sg_isa; - npages = calc_npages((paddr & ~PAGE_MASK) + size); + npages = iommu_num_pages(paddr, size, PAGE_SIZE); /* Force allocation to 64KB boundary for ISA bridges. */ if (pdev && pdev == isa_bridge) @@ -387,7 +380,7 @@ pci_unmap_single(struct pci_dev *pdev, dma_addr_t dma_addr, size_t size, BUG(); } - npages = calc_npages((dma_addr & ~PAGE_MASK) + size); + npages = iommu_num_pages(dma_addr, size, PAGE_SIZE); spin_lock_irqsave(&arena->lock, flags); @@ -580,7 +573,7 @@ sg_fill(struct device *dev, struct scatterlist *leader, struct scatterlist *end, contiguous. */ paddr &= ~PAGE_MASK; - npages = calc_npages(paddr + size); + npages = iommu_num_pages(paddr, size, PAGE_SIZE); dma_ofs = iommu_arena_alloc(dev, arena, npages, 0); if (dma_ofs < 0) { /* If we attempted a direct map above but failed, die. */ @@ -616,7 +609,7 @@ sg_fill(struct device *dev, struct scatterlist *leader, struct scatterlist *end, sg++; } - npages = calc_npages((paddr & ~PAGE_MASK) + size); + npages = iommu_num_pages(paddr, size, PAGE_SIZE); paddr &= PAGE_MASK; for (i = 0; i < npages; ++i, paddr += PAGE_SIZE) @@ -775,7 +768,7 @@ pci_unmap_sg(struct pci_dev *pdev, struct scatterlist *sg, int nents, DBGA(" (%ld) sg [%lx,%lx]\n", sg - end + nents, addr, size); - npages = calc_npages((addr & ~PAGE_MASK) + size); + npages = iommu_num_pages(addr, size, PAGE_SIZE); ofs = (addr - arena->dma_base) >> PAGE_SHIFT; iommu_arena_free(arena, ofs, npages); -- 1.5.3.7 -- 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/