Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755916AbZCXVqY (ORCPT ); Tue, 24 Mar 2009 17:46:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752922AbZCXVo2 (ORCPT ); Tue, 24 Mar 2009 17:44:28 -0400 Received: from az33egw02.freescale.net ([192.88.158.103]:34831 "EHLO az33egw02.freescale.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753378AbZCXVoZ (ORCPT ); Tue, 24 Mar 2009 17:44:25 -0400 From: Becky Bruce To: linux-kernel@vger.kernel.org Cc: mingo@elte.hu, fujita.tomonori@lab.ntt.co.jp, ian.campbell@citrix.com, jeremy@goop.org, Becky Bruce Subject: [PATCH 5/5] swiotlb: Allow arch override of address_needs_mapping Date: Tue, 24 Mar 2009 16:28:46 -0500 Message-Id: <1237930126-6741-6-git-send-email-beckyb@kernel.crashing.org> X-Mailer: git-send-email 1.5.6.6 In-Reply-To: <1237930126-6741-5-git-send-email-beckyb@kernel.crashing.org> References: <1237930126-6741-1-git-send-email-beckyb@kernel.crashing.org> <1237930126-6741-2-git-send-email-beckyb@kernel.crashing.org> <1237930126-6741-3-git-send-email-beckyb@kernel.crashing.org> <1237930126-6741-4-git-send-email-beckyb@kernel.crashing.org> <1237930126-6741-5-git-send-email-beckyb@kernel.crashing.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1473 Lines: 47 Some architectures require additional checking to determine if a device can dma to an address and need to provide their own address_needs_mapping.. Signed-off-by: Becky Bruce --- lib/swiotlb.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/swiotlb.c b/lib/swiotlb.c index b33180e..f365735 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -145,6 +145,12 @@ void __weak *swiotlb_bus_to_virt(struct device *hwdev, dma_addr_t address) return phys_to_virt(swiotlb_bus_to_phys(hwdev, address)); } +int __weak swiotlb_arch_address_needs_mapping(struct device *hwdev, + dma_addr_t addr, size_t size) +{ + return !is_buffer_dma_capable(dma_get_mask(hwdev), addr, size); +} + int __weak swiotlb_arch_range_needs_mapping(phys_addr_t paddr, size_t size) { return 0; @@ -309,10 +315,10 @@ cleanup1: return -ENOMEM; } -static int +static inline int address_needs_mapping(struct device *hwdev, dma_addr_t addr, size_t size) { - return !is_buffer_dma_capable(dma_get_mask(hwdev), addr, size); + return swiotlb_arch_address_needs_mapping(hwdev, addr, size); } static inline int range_needs_mapping(phys_addr_t paddr, size_t size) -- 1.5.6.6 -- 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/