Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753974AbYKQQZW (ORCPT ); Mon, 17 Nov 2008 11:25:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753500AbYKQQY5 (ORCPT ); Mon, 17 Nov 2008 11:24:57 -0500 Received: from netops-testserver-3-out.sgi.com ([192.48.171.28]:46419 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752902AbYKQQYz (ORCPT ); Mon, 17 Nov 2008 11:24:55 -0500 From: John Keller To: linux-ia64@vger.kernel.org Cc: linux-kernel@vger.kernel.org, John Keller Date: Mon, 17 Nov 2008 10:24:54 -0600 Message-Id: <20081117162454.169426.74531.sendpatchset@attica.americas.sgi.com> Subject: [PATCH] ia64: SN specific version of dma_get_required_mask() Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 9484 Lines: 213 Create a platform specific version of dma_get_required_mask() for ia64 SN Altix. All SN Altix platforms support 64 bit DMA addressing regardless of the size of system memory. Create a ia64 machvec for dma_get_required_mask, with the SN version unconditionally returning DMA_64BIT_MASK. Signed-off-by: John Keller --- Documentation/DMA-API.txt | 9 ++++----- arch/ia64/include/asm/dma-mapping.h | 3 +++ arch/ia64/include/asm/machvec.h | 7 +++++++ arch/ia64/include/asm/machvec_init.h | 1 + arch/ia64/include/asm/machvec_sn2.h | 2 ++ arch/ia64/pci/pci.c | 21 +++++++++++++++++++++ arch/ia64/sn/pci/pci_dma.c | 6 ++++++ include/linux/dma-mapping.h | 2 ++ 8 files changed, 46 insertions(+), 5 deletions(-) Index: linux-2.6/arch/ia64/include/asm/machvec_sn2.h =================================================================== --- linux-2.6.orig/arch/ia64/include/asm/machvec_sn2.h 2008-11-17 08:38:00.763580614 -0600 +++ linux-2.6/arch/ia64/include/asm/machvec_sn2.h 2008-11-17 08:39:50.473272192 -0600 @@ -67,6 +67,7 @@ extern ia64_mv_dma_sync_single_for_devic extern ia64_mv_dma_sync_sg_for_device sn_dma_sync_sg_for_device; extern ia64_mv_dma_mapping_error sn_dma_mapping_error; extern ia64_mv_dma_supported sn_dma_supported; +extern ia64_mv_dma_get_required_mask sn_dma_get_required_mask; extern ia64_mv_migrate_t sn_migrate; extern ia64_mv_kernel_launch_event_t sn_kernel_launch_event; extern ia64_mv_setup_msi_irq_t sn_setup_msi_irq; @@ -123,6 +124,7 @@ extern ia64_mv_pci_fixup_bus_t sn_pci_f #define platform_dma_sync_sg_for_device sn_dma_sync_sg_for_device #define platform_dma_mapping_error sn_dma_mapping_error #define platform_dma_supported sn_dma_supported +#define platform_dma_get_required_mask sn_dma_get_required_mask #define platform_migrate sn_migrate #define platform_kernel_launch_event sn_kernel_launch_event #ifdef CONFIG_PCI_MSI Index: linux-2.6/Documentation/DMA-API.txt =================================================================== --- linux-2.6.orig/Documentation/DMA-API.txt 2008-11-17 08:37:57.963231137 -0600 +++ linux-2.6/Documentation/DMA-API.txt 2008-11-17 08:39:50.481273191 -0600 @@ -170,16 +170,15 @@ Returns: 0 if successful and a negative u64 dma_get_required_mask(struct device *dev) -After setting the mask with dma_set_mask(), this API returns the -actual mask (within that already set) that the platform actually -requires to operate efficiently. Usually this means the returned mask +This API returns the mask that the platform requires to +operate efficiently. Usually this means the returned mask is the minimum required to cover all of memory. Examining the required mask gives drivers with variable descriptor sizes the opportunity to use smaller descriptors as necessary. Requesting the required mask does not alter the current mask. If you -wish to take advantage of it, you should issue another dma_set_mask() -call to lower the mask again. +wish to take advantage of it, you should issue a dma_set_mask() +call to set the mask to the value returned. Part Id - Streaming DMA mappings Index: linux-2.6/arch/ia64/include/asm/dma-mapping.h =================================================================== --- linux-2.6.orig/arch/ia64/include/asm/dma-mapping.h 2008-11-17 08:38:00.755579616 -0600 +++ linux-2.6/arch/ia64/include/asm/dma-mapping.h 2008-11-17 08:39:50.497275188 -0600 @@ -103,6 +103,9 @@ static inline void dma_unmap_sg(struct d #define dma_unmap_page(dev, dma_addr, size, dir) \ dma_unmap_single(dev, dma_addr, size, dir) +#define ARCH_HAS_DMA_GET_REQUIRED_MASK +#define dma_get_required_mask platform_dma_get_required_mask + /* * Rest of this file is part of the "Advanced DMA API". Use at your own risk. * See Documentation/DMA-API.txt for details. Index: linux-2.6/arch/ia64/include/asm/machvec.h =================================================================== --- linux-2.6.orig/arch/ia64/include/asm/machvec.h 2008-11-17 08:38:00.763580614 -0600 +++ linux-2.6/arch/ia64/include/asm/machvec.h 2008-11-17 08:39:50.517277684 -0600 @@ -62,6 +62,7 @@ typedef dma_addr_t ia64_mv_dma_map_singl typedef void ia64_mv_dma_unmap_single_attrs (struct device *, dma_addr_t, size_t, int, struct dma_attrs *); typedef int ia64_mv_dma_map_sg_attrs (struct device *, struct scatterlist *, int, int, struct dma_attrs *); typedef void ia64_mv_dma_unmap_sg_attrs (struct device *, struct scatterlist *, int, int, struct dma_attrs *); +typedef u64 ia64_mv_dma_get_required_mask (struct device *); /* * WARNING: The legacy I/O space is _architected_. Platforms are @@ -159,6 +160,7 @@ extern void machvec_tlb_migrate_finish ( # define platform_dma_sync_sg_for_device ia64_mv.dma_sync_sg_for_device # define platform_dma_mapping_error ia64_mv.dma_mapping_error # define platform_dma_supported ia64_mv.dma_supported +# define platform_dma_get_required_mask ia64_mv.dma_get_required_mask # define platform_irq_to_vector ia64_mv.irq_to_vector # define platform_local_vector_to_irq ia64_mv.local_vector_to_irq # define platform_pci_get_legacy_mem ia64_mv.pci_get_legacy_mem @@ -213,6 +215,7 @@ struct ia64_machine_vector { ia64_mv_dma_sync_sg_for_device *dma_sync_sg_for_device; ia64_mv_dma_mapping_error *dma_mapping_error; ia64_mv_dma_supported *dma_supported; + ia64_mv_dma_get_required_mask *dma_get_required_mask; ia64_mv_irq_to_vector *irq_to_vector; ia64_mv_local_vector_to_irq *local_vector_to_irq; ia64_mv_pci_get_legacy_mem_t *pci_get_legacy_mem; @@ -263,6 +266,7 @@ struct ia64_machine_vector { platform_dma_sync_sg_for_device, \ platform_dma_mapping_error, \ platform_dma_supported, \ + platform_dma_get_required_mask, \ platform_irq_to_vector, \ platform_local_vector_to_irq, \ platform_pci_get_legacy_mem, \ @@ -366,6 +370,9 @@ extern void machvec_init_from_cmdline(co #ifndef platform_dma_supported # define platform_dma_supported swiotlb_dma_supported #endif +#ifndef platform_dma_get_required_mask +# define platform_dma_get_required_mask ia64_dma_get_required_mask +#endif #ifndef platform_irq_to_vector # define platform_irq_to_vector __ia64_irq_to_vector #endif Index: linux-2.6/arch/ia64/sn/pci/pci_dma.c =================================================================== --- linux-2.6.orig/arch/ia64/sn/pci/pci_dma.c 2008-11-17 08:38:00.899597589 -0600 +++ linux-2.6/arch/ia64/sn/pci/pci_dma.c 2008-11-17 08:39:50.537280180 -0600 @@ -356,6 +356,12 @@ int sn_dma_mapping_error(struct device * } EXPORT_SYMBOL(sn_dma_mapping_error); +u64 sn_dma_get_required_mask(struct device *dev) +{ + return DMA_64BIT_MASK; +} +EXPORT_SYMBOL_GPL(sn_dma_get_required_mask); + char *sn_pci_get_legacy_mem(struct pci_bus *bus) { if (!SN_PCIBUS_BUSSOFT(bus)) Index: linux-2.6/arch/ia64/pci/pci.c =================================================================== --- linux-2.6.orig/arch/ia64/pci/pci.c 2008-11-17 08:38:00.871594094 -0600 +++ linux-2.6/arch/ia64/pci/pci.c 2008-11-17 08:39:50.553282177 -0600 @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -748,6 +749,26 @@ static void __init set_pci_cacheline_siz pci_cache_line_size = (1 << cci.pcci_line_size) / 4; } +u64 ia64_dma_get_required_mask(struct device *dev) +{ + u32 low_totalram = ((max_pfn - 1) << PAGE_SHIFT); + u32 high_totalram = ((max_pfn - 1) >> (32 - PAGE_SHIFT)); + u64 mask; + + if (!high_totalram) { + /* convert to mask just covering totalram */ + low_totalram = (1 << (fls(low_totalram) - 1)); + low_totalram += low_totalram - 1; + mask = low_totalram; + } else { + high_totalram = (1 << (fls(high_totalram) - 1)); + high_totalram += high_totalram - 1; + mask = (((u64)high_totalram) << 32) + 0xffffffff; + } + return mask; +} +EXPORT_SYMBOL_GPL(ia64_dma_get_required_mask); + static int __init pcibios_init(void) { set_pci_cacheline_size(); Index: linux-2.6/include/linux/dma-mapping.h =================================================================== --- linux-2.6.orig/include/linux/dma-mapping.h 2008-11-17 08:38:07.740451313 -0600 +++ linux-2.6/include/linux/dma-mapping.h 2008-11-17 08:39:50.573284674 -0600 @@ -70,7 +70,9 @@ static inline u64 dma_get_mask(struct de return DMA_32BIT_MASK; } +#ifndef CONFIG_IA64 extern u64 dma_get_required_mask(struct device *dev); +#endif static inline unsigned int dma_get_max_seg_size(struct device *dev) { Index: linux-2.6/arch/ia64/include/asm/machvec_init.h =================================================================== --- linux-2.6.orig/arch/ia64/include/asm/machvec_init.h 2008-11-17 08:38:00.763580614 -0600 +++ linux-2.6/arch/ia64/include/asm/machvec_init.h 2008-11-17 08:39:50.589286671 -0600 @@ -3,6 +3,7 @@ extern ia64_mv_send_ipi_t ia64_send_ipi; extern ia64_mv_global_tlb_purge_t ia64_global_tlb_purge; +extern ia64_mv_dma_get_required_mask ia64_dma_get_required_mask; extern ia64_mv_irq_to_vector __ia64_irq_to_vector; extern ia64_mv_local_vector_to_irq __ia64_local_vector_to_irq; extern ia64_mv_pci_get_legacy_mem_t ia64_pci_get_legacy_mem; -- 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/