The patch titled dma-mapping: arm: use generic pci_set_dma_mask and pci_set_consistent_dma_mask has been removed from the -mm tree. Its filename was dma-mapping-arm-use-generic-pci_set_dma_mask-and-pci_set_consistent_dma_mask.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: dma-mapping: arm: use generic pci_set_dma_mask and pci_set_consistent_dma_mask From: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> This converts arm to the generic pci_set_dma_mask and pci_set_consistent_dma_mask (removes HAVE_ARCH_PCI_SET_DMA_MASK for dmabounce). Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Looked-over-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx> Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Cc: Kay Sievers <kay.sievers@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/arm/common/it8152.c | 27 ----------------- arch/arm/include/asm/dma-mapping.h | 8 +++++ arch/arm/mach-ixp4xx/common-pci.c | 26 ---------------- arch/arm/mach-ixp4xx/include/mach/hardware.h | 5 --- arch/arm/mach-pxa/include/mach/hardware.h | 1 5 files changed, 8 insertions(+), 59 deletions(-) diff -puN arch/arm/common/it8152.c~dma-mapping-arm-use-generic-pci_set_dma_mask-and-pci_set_consistent_dma_mask arch/arm/common/it8152.c --- a/arch/arm/common/it8152.c~dma-mapping-arm-use-generic-pci_set_dma_mask-and-pci_set_consistent_dma_mask +++ a/arch/arm/common/it8152.c @@ -272,33 +272,6 @@ int dma_needs_bounce(struct device *dev, ((dma_addr + size - PHYS_OFFSET) >= SZ_64M); } -/* - * We override these so we properly do dmabounce otherwise drivers - * are able to set the dma_mask to 0xffffffff and we can no longer - * trap bounces. :( - * - * We just return true on everyhing except for < 64MB in which case - * we will fail miseralby and die since we can't handle that case. - */ -int pci_set_dma_mask(struct pci_dev *dev, u64 mask) -{ - dev_dbg(&dev->dev, "%s: %llx\n", __func__, mask); - if (mask >= PHYS_OFFSET + SZ_64M - 1) - return 0; - - return -EIO; -} - -int -pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) -{ - dev_dbg(&dev->dev, "%s: %llx\n", __func__, mask); - if (mask >= PHYS_OFFSET + SZ_64M - 1) - return 0; - - return -EIO; -} - int __init it8152_pci_setup(int nr, struct pci_sys_data *sys) { it8152_io.start = IT8152_IO_BASE + 0x12000; diff -puN arch/arm/include/asm/dma-mapping.h~dma-mapping-arm-use-generic-pci_set_dma_mask-and-pci_set_consistent_dma_mask arch/arm/include/asm/dma-mapping.h --- a/arch/arm/include/asm/dma-mapping.h~dma-mapping-arm-use-generic-pci_set_dma_mask-and-pci_set_consistent_dma_mask +++ a/arch/arm/include/asm/dma-mapping.h @@ -128,6 +128,14 @@ static inline int dma_supported(struct d static inline int dma_set_mask(struct device *dev, u64 dma_mask) { +#ifdef CONFIG_DMABOUNCE + if (dev->archdata.dmabounce) { + if (dma_mask >= ISA_DMA_THRESHOLD) + return 0; + else + return -EIO; + } +#endif if (!dev->dma_mask || !dma_supported(dev, dma_mask)) return -EIO; diff -puN arch/arm/mach-ixp4xx/common-pci.c~dma-mapping-arm-use-generic-pci_set_dma_mask-and-pci_set_consistent_dma_mask arch/arm/mach-ixp4xx/common-pci.c --- a/arch/arm/mach-ixp4xx/common-pci.c~dma-mapping-arm-use-generic-pci_set_dma_mask-and-pci_set_consistent_dma_mask +++ a/arch/arm/mach-ixp4xx/common-pci.c @@ -502,32 +502,6 @@ struct pci_bus * __devinit ixp4xx_scan_b return pci_scan_bus(sys->busnr, &ixp4xx_ops, sys); } -/* - * We override these so we properly do dmabounce otherwise drivers - * are able to set the dma_mask to 0xffffffff and we can no longer - * trap bounces. :( - * - * We just return true on everyhing except for < 64MB in which case - * we will fail miseralby and die since we can't handle that case. - */ -int -pci_set_dma_mask(struct pci_dev *dev, u64 mask) -{ - if (mask >= SZ_64M - 1 ) - return 0; - - return -EIO; -} - -int -pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) -{ - if (mask >= SZ_64M - 1 ) - return 0; - - return -EIO; -} - EXPORT_SYMBOL(ixp4xx_pci_read); EXPORT_SYMBOL(ixp4xx_pci_write); diff -puN arch/arm/mach-ixp4xx/include/mach/hardware.h~dma-mapping-arm-use-generic-pci_set_dma_mask-and-pci_set_consistent_dma_mask arch/arm/mach-ixp4xx/include/mach/hardware.h --- a/arch/arm/mach-ixp4xx/include/mach/hardware.h~dma-mapping-arm-use-generic-pci_set_dma_mask-and-pci_set_consistent_dma_mask +++ a/arch/arm/mach-ixp4xx/include/mach/hardware.h @@ -26,11 +26,6 @@ #define PCIBIOS_MAX_MEM 0x4BFFFFFF #endif -/* - * We override the standard dma-mask routines for bouncing. - */ -#define HAVE_ARCH_PCI_SET_DMA_MASK - #define pcibios_assign_all_busses() 1 /* Register locations and bits */ diff -puN arch/arm/mach-pxa/include/mach/hardware.h~dma-mapping-arm-use-generic-pci_set_dma_mask-and-pci_set_consistent_dma_mask arch/arm/mach-pxa/include/mach/hardware.h --- a/arch/arm/mach-pxa/include/mach/hardware.h~dma-mapping-arm-use-generic-pci_set_dma_mask-and-pci_set_consistent_dma_mask +++ a/arch/arm/mach-pxa/include/mach/hardware.h @@ -314,7 +314,6 @@ extern unsigned long get_clock_tick_rate #define PCIBIOS_MIN_IO 0 #define PCIBIOS_MIN_MEM 0 #define pcibios_assign_all_busses() 1 -#define HAVE_ARCH_PCI_SET_DMA_MASK 1 #endif _ Patches currently in -mm which might be from fujita.tomonori@xxxxxxxxxxxxx are origin.patch linux-next.patch scsi-add-__init-__exit-macros-to-ibmvstgtc.patch ssb-add-dma_dev-to-ssb_device-structure.patch b43legacy-replace-the-ssb_dma-api-with-the-generic-dma-api.patch b43-replace-the-ssb_dma-api-with-the-generic-dma-api.patch b44-replace-the-ssb_dma-api-with-the-generic-dma-api.patch ssb-remove-the-ssb-dma-api.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html