Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755131AbZFAPd0 (ORCPT ); Mon, 1 Jun 2009 11:33:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752367AbZFAPdH (ORCPT ); Mon, 1 Jun 2009 11:33:07 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:6975 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751803AbZFAPdG (ORCPT ); Mon, 1 Jun 2009 11:33:06 -0400 X-IronPort-AV: E=Sophos;i="4.41,284,1241409600"; d="scan'208";a="53320379" From: Ian Campbell To: CC: Ian Campbell , Becky Bruce , Benjamin Herrenschmidt , FUJITA Tomonori , Greg KH , Ingo Molnar , Jeremy Fitzhardinge , Kumar Gala , Olaf Kirch , Tony Luck , , , Subject: [PATCH 00/11] swiotlb: Introduce architecture-specific APIs to replace __weak functions (v2) Date: Mon, 1 Jun 2009 16:32:52 +0100 Message-ID: <1243870383-12954-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.5.6.5 MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2400 Lines: 52 This series: * removes the swiotlb_(arch_)_phys_to_bus and bus_to_phys __weak hooks, replacing them with an architecture-specific phys_to_dma and dma_to_phys interface. These are used by both PowerPC and Xen to provide the correct mapping from physical to DMA addresses. * removes the swiotlb_address_needs_mapping and swiotlb_range_needs_mapping __weak functions as well as is_buffer_dma_capable (which should never have been a generic function). All three are replaced by a single architecture-specific interface which meets the needs of both PowerPC and Xen. * removes the swiotlb_virt_to_bus __weak function and replaces it with a CONFIG_HIGHMEM compatible version when high memory is in use. This is needed for 32 bit PowerPC swiotlb support. * removes the swiotlb_alloc* __weak functions and replaces them with swiotlb_init_with_buffer which allows the use of a caller allocated buffer (and emergency pool). I think these new interfaces are cleaner than the existing __weak functions and isolate the swiotlb code from architecture internals. This series does not contain any Xen or PowerPC specific changes, those will follow in separate postings. The complete patchset has been boot tested under Xen and native-x86 and compiled for IA64 and PowerPC Changes since v1: - Fixed compile error in swiotlb_dma_to_virt highmem version. Moved #ifdef into function to avoid prototype drift. - checkpatch fixes. - missed a swiotlb_arch_range_needs_mapping in swiotlb.h and x86 pci-swiotlb.c and swiotlb_bus_to_phys/phys_to_bus implementations in x86. - additionally replaced __weak swiotlb_alloc* with swiotlb_init_with_buffer. Signed-off-by: Ian Campbell Cc: Becky Bruce Cc: Benjamin Herrenschmidt Cc: FUJITA Tomonori Cc: Greg KH Cc: Ingo Molnar Cc: Jeremy Fitzhardinge Cc: Kumar Gala Cc: Olaf Kirch Cc: Tony Luck Cc: linux-ia64@vger.kernel.org Cc: linuxppc-dev@ozlabs.org Cc: x86@kernel.org -- 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/