ARM: Fix regression in IXP4xx network drivers DMA masks.
PATCH 1/1 ARM: Fix regression in IXP4xx network drivers DMA masks.
Hi,
the following patch is still needed with 3.13-rc6. Affected are non-PCI devices using coherent allocations.
Without the patch:
# ifconfig eth0 up net eth0: coherent DMA mask is unset ifconfig: SIOCSIFFLAGS: Cannot allocate memory
IXP4xx: Fix DMA masks.
Now, devices will have 32-bit default DMA masks (0xFFFFFFFF) as per DMA API.
arch/arm/mach-ixp4xx/common-pci.c +0 -38
@@ -316,32 +316,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 ) {unsigned long cpuid =read_cpuid_id ();
@@ -475,20 +449,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
Signature · 4 lines
Krzysztof Halasa Research Institute for Automation and Measurements PIAP Al. Jerozolimskie 202, 02-486 Warsaw, Poland
Russell et al.,
anything wrong with this fix?
the following patch is still needed with 3.13-rc6. Affected are non-PCI devices using coherent allocations.
Without the patch:
# ifconfig eth0 up net eth0: coherent DMA mask is unset ifconfig: SIOCSIFFLAGS: Cannot allocate memory
IXP4xx: Fix DMA masks.
Now, devices will have 32-bit default DMA masks (0xFFFFFFFF) as per DMA API.
arch/arm/mach-ixp4xx/common-pci.c +0 -38
@@ -316,32 +316,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 ) {unsigned long cpuid =read_cpuid_id ();
@@ -475,20 +449,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
Signature · 4 lines
Krzysztof Halasa Research Institute for Automation and Measurements PIAP Al. Jerozolimskie 202, 02-486 Warsaw, Poland
Quoted 3 lines · Krzysztof Ha?asa
Russell et al.,
anything wrong with this fix?
Well, I don't understand why moving this code around fixes a problem. After all, if PCI is enabled, then presumably common-pci.c will always be built and run - it has to be for the PCI bus to be probed.
Oh, are you trying to use the platform notify callback to set the DMA mask on statically defined platform devices? No, don't do that, initialise it in the declarations instead.
Signature · 3 lines
FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up. Estimation in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad. Estimate before purchase was "up to 13.2Mbit".