IXP4xx: Fix DMA masks.
PATCH 1/1 IXP4xx: Fix DMA masks.
Now, devices will have 32-bit default DMA masks (0xFFFFFFFF) as per DMA API.
Signed-off-by Krzysztof Ha?asa <[email protected]>
arch/arm/mach-ixp4xx/common-pci.c +0 -38
@@ -301,32 +301,6 @@ static int abort_handler(unsigned long addr, unsigned int fsr, struct pt_regs *r } -static int ixp4xx_needs_bounce (struct device *dev,dma_addr_t dma_addr,size_t size) -{ -return (dma_addr + size) >=SZ_64M ; -} - -/* -* Setup DMA mask to 64MB on PCI devices. Ignore all other devices. -*/ -static int ixp4xx_pci_platform_notify (struct device *dev) -{ -if (dev->bus == &pci_bus_type) { - *dev->dma_mask =SZ_64M -1 ; - dev->coherent_dma_mask =SZ_64M -1 ; -dmabounce_register_dev (dev,2048 ,4096 , ixp4xx_needs_bounce); - } -return 0 ; -} - -static int ixp4xx_pci_platform_notify_remove (struct device *dev) -{ -if (dev->bus == &pci_bus_type) { -dmabounce_unregister_dev (dev); - } -return 0 ; -} -void __init ixp4xx_pci_preinit (void ) {#ifdef CONFIG_IXP4XX_INDIRECT_PCI
@@ -446,20 +420,8 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys)pci_add_resource_offset (&sys->resources, &res[0 ], sys->io_offset);pci_add_resource_offset (&sys->resources, &res[1 ], sys->mem_offset); - platform_notify = ixp4xx_pci_platform_notify; - platform_notify_remove = ixp4xx_pci_platform_notify_remove; -return 1 ; } -int dma_set_coherent_mask (struct device *dev,u64 mask) -{ -if (mask >=SZ_64M -1 ) -return 0 ; - -return -EIO ; -} -EXPORT_SYMBOL (ixp4xx_pci_read);EXPORT_SYMBOL (ixp4xx_pci_write); -EXPORT_SYMBOL (dma_set_coherent_mask);
arch/arm/mach-ixp4xx/common.c +51 -5
84 lines not on this page · raw message