From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) by ozlabs.org (Postfix) with ESMTP id 9F03ADE23F for ; Tue, 2 Jun 2009 01:33:41 +1000 (EST) From: Ian Campbell To: Subject: [PATCH 08/11] swiotlb: support HIGHMEM in swiotlb_bus_to_virt Date: Mon, 1 Jun 2009 16:33:00 +0100 Message-ID: <1243870383-12954-9-git-send-email-ian.campbell@citrix.com> In-Reply-To: <1243870383-12954-1-git-send-email-ian.campbell@citrix.com> References: <1243870383-12954-1-git-send-email-ian.campbell@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Cc: Fitzhardinge , Jeremy, Ian Campbell , Tomonori , linuxppc-dev@ozlabs.org, Ingo Molnar , FUJITA List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Rather than supplying a __weak hook which architectures which support highmem can overide simply provide a version of swiotlb_bus_to_virt which works with high memory. Make it conditional since it is a more expensive variant than the non-highmem version. Acutal function contents taken from the PowerPC swiotlb patchset by Becky Bruce. Signed-off-by: Ian Campbell Cc: Becky Bruce Cc: Benjamin Herrenschmidt Cc: Kumar Gala Cc: FUJITA Tomonori Cc: Ingo Molnar Cc: Jeremy Fitzhardinge Cc: linuxppc-dev@ozlabs.org --- lib/swiotlb.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/lib/swiotlb.c b/lib/swiotlb.c index d37499b..d2b296a 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -130,9 +130,18 @@ static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev, return phys_to_dma(hwdev, virt_to_phys(address)); } -void * __weak swiotlb_bus_to_virt(struct device *hwdev, dma_addr_t address) +static void *swiotlb_bus_to_virt(struct device *hwdev, dma_addr_t address) { +#ifdef CONFIG_HIGHMEM + unsigned long pfn = PFN_DOWN(dma_to_phys(hwdev, address)); + void *pageaddr = page_address(pfn_to_page(pfn)); + + if (pageaddr != NULL) + return pageaddr + (address % PAGE_SIZE); + return NULL; +#else return phys_to_virt(dma_to_phys(hwdev, address)); +#endif } static void swiotlb_print_info(unsigned long bytes) -- 1.5.6.5