Linus Torvalds
8ceafbfa91
Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm ...
Pull DMA mask updates from Russell King:
"This series cleans up the handling of DMA masks in a lot of drivers,
fixing some bugs as we go.
Some of the more serious errors include:
- drivers which only set their coherent DMA mask if the attempt to
set the streaming mask fails.
- drivers which test for a NULL dma mask pointer, and then set the
dma mask pointer to a location in their module .data section -
which will cause problems if the module is reloaded.
To counter these, I have introduced two helper functions:
- dma_set_mask_and_coherent() takes care of setting both the
streaming and coherent masks at the same time, with the correct
error handling as specified by the API.
- dma_coerce_mask_and_coherent() which resolves the problem of
drivers forcefully setting DMA masks. This is more a marker for
future work to further clean these locations up - the code which
creates the devices really should be initialising these, but to fix
that in one go along with this change could potentially be very
disruptive.
The last thing this series does is prise away some of Linux's addition
to "DMA addresses are physical addresses and RAM always starts at
zero". We have ARM LPAE systems where all system memory is above 4GB
physical, hence having DMA masks interpreted by (eg) the block layers
as describing physical addresses in the range 0..DMAMASK fails on
these platforms. Santosh Shilimkar addresses this in this series; the
patches were copied to the appropriate people multiple times but were
ignored.
Fixing this also gets rid of some ARM weirdness in the setup of the
max*pfn variables, and brings ARM into line with every other Linux
architecture as far as those go"
* 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm: (52 commits)
ARM: 7805/1: mm: change max*pfn to include the physical offset of memory
ARM: 7797/1: mmc: Use dma_max_pfn(dev) helper for bounce_limit calculations
ARM: 7796/1: scsi: Use dma_max_pfn(dev) helper for bounce_limit calculations
ARM: 7795/1: mm: dma-mapping: Add dma_max_pfn(dev) helper function
ARM: 7794/1: block: Rename parameter dma_mask to max_addr for blk_queue_bounce_limit()
ARM: DMA-API: better handing of DMA masks for coherent allocations
ARM: 7857/1: dma: imx-sdma: setup dma mask
DMA-API: firmware/google/gsmi.c: avoid direct access to DMA masks
DMA-API: dcdbas: update DMA mask handing
DMA-API: dma: edma.c: no need to explicitly initialize DMA masks
DMA-API: usb: musb: use platform_device_register_full() to avoid directly messing with dma masks
DMA-API: crypto: remove last references to 'static struct device *dev'
DMA-API: crypto: fix ixp4xx crypto platform device support
DMA-API: others: use dma_set_coherent_mask()
DMA-API: staging: use dma_set_coherent_mask()
DMA-API: usb: use new dma_coerce_mask_and_coherent()
DMA-API: usb: use dma_set_coherent_mask()
DMA-API: parport: parport_pc.c: use dma_coerce_mask_and_coherent()
DMA-API: net: octeon: use dma_coerce_mask_and_coherent()
DMA-API: net: nxp/lpc_eth: use dma_coerce_mask_and_coherent()
...
2013-11-14 07:55:21 +09:00
usb: Remove unnecessary semicolons
2013-10-11 16:26:46 -07:00
DMA-API: usb: bcma: replace dma_set_mask()+dma_set_coherent_mask() with new helper
2013-10-31 14:48:34 +00:00
Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 07:55:21 +09:00
USB: EHCI: create per-TT bandwidth tables
2013-10-14 11:04:38 -07:00
Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 07:55:21 +09:00
Merge 3.12-rc3 into usb-next
2013-09-29 18:45:55 -07:00
powerpc/usb: fix bug of CPU hang when missing USB PHY clock
2012-09-05 16:52:08 -07:00
Revert "Revert "USB: EHCI: support running URB giveback in tasklet context""
2013-09-23 13:32:51 -07:00
USB: EHCI: add check for wakeup/suspend race
2013-10-19 14:10:16 -07:00
ehci: remove ehci_vdbg() verbose debugging statements
2013-08-30 12:02:07 -07:00
USB: EHCI: fix sparse errors
2013-10-19 14:08:04 -07:00
USB: ehci-msm: Add device tree support and binding information
2013-10-11 16:31:15 -07:00
Revert "Revert "USB: EHCI: support running URB giveback in tasklet context""
2013-09-23 13:32:51 -07:00
usb: ehci-mxc: check for pdata before dereferencing
2013-08-23 10:46:03 -07:00
DMA-API: usb: use dma_set_coherent_mask()
2013-10-31 14:49:01 +00:00
DMA-API: usb: use new dma_coerce_mask_and_coherent()
2013-10-31 14:49:04 +00:00
DMA-API: usb: use new dma_coerce_mask_and_coherent()
2013-10-31 14:49:04 +00:00
usb: ehci: use amd_chipset_type to filter for usb subsystem hang bug
2013-10-03 15:44:50 -07:00
DMA-API: usb: use new dma_coerce_mask_and_coherent()
2013-10-31 14:49:04 +00:00
Revert "Revert "USB: EHCI: support running URB giveback in tasklet context""
2013-09-23 13:32:51 -07:00
DeviceTree updates for 3.13. This is a bit larger pull request than
2013-11-12 16:52:17 +09:00
Revert "Revert "USB: EHCI: support running URB giveback in tasklet context""
2013-09-23 13:32:51 -07:00
USB: EHCI: use a bandwidth-allocation table
2013-10-11 16:45:43 -07:00
USB: EHCI: fix sparse errors
2013-10-19 14:08:04 -07:00
Revert "Revert "USB: EHCI: support running URB giveback in tasklet context""
2013-09-23 13:32:51 -07:00
Revert "Revert "USB: EHCI: support running URB giveback in tasklet context""
2013-09-23 13:32:51 -07:00
DMA-API: usb: use new dma_coerce_mask_and_coherent()
2013-10-31 14:49:04 +00:00
USB: EHCI: use a bandwidth-allocation table
2013-10-11 16:45:43 -07:00
Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 07:55:21 +09:00
Revert "Revert "USB: EHCI: support running URB giveback in tasklet context""
2013-09-23 13:32:51 -07:00
USB: EHCI: improve interrupt qh unlink
2013-08-12 11:43:48 -07:00
USB: EHCI: make ehci-w90X900 a separate driver
2013-09-26 09:47:22 -07:00
Revert "Revert "USB: EHCI: support running URB giveback in tasklet context""
2013-09-23 13:32:51 -07:00
USB: EHCI: create per-TT bandwidth tables
2013-10-14 11:04:38 -07:00
USB: FHCI: Reusing QUICC Engine USB Controller registers from immap_qe.h
2012-06-26 19:42:11 -07:00
drivers: clean-up prom.h implicit includes
2013-10-09 20:04:04 -05:00
USB: FHCI: Reusing QUICC Engine USB Controller registers from immap_qe.h
2012-06-26 19:42:11 -07:00
USB: FHCI: upgrade the isochronous API
2013-05-30 21:34:31 +09:00
USB: FHCI: Reusing QUICC Engine USB Controller registers from immap_qe.h
2012-06-26 19:42:11 -07:00
USB: FHCI: upgrade the isochronous API
2013-05-30 21:34:31 +09:00
usb: Remove unnecessary semicolons
2013-10-11 16:26:46 -07:00
usb: host: Faraday fotg210-hcd driver
2013-07-29 11:15:39 -07:00
usb: host: fsl-mph-dr-of: Staticize local symbols
2013-09-17 11:06:57 -05:00
usb: Remove unnecessary semicolons
2013-10-11 16:26:46 -07:00
usb host: Faraday USB2.0 FUSBH200-HCD driver
2013-05-17 10:12:52 -07:00
usb: wusbcore: add a quirk for Alereon HWA device isoc behavior
2013-10-29 16:44:49 -07:00
USB: iMX21: accept very late isochronous URBs
2013-09-25 17:05:34 -07:00
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
USB: host: use dev_get_platdata()
2013-07-31 17:53:50 -07:00
USB: isp116x: remove dependency on CONFIG_USB_DEBUG
2013-07-23 16:35:17 -07:00
usb: Remove unnecessary semicolons
2013-10-11 16:26:46 -07:00
USB: isp1362: move debug files from proc to debugfs
2013-07-24 14:43:05 -07:00
USB: remove remaining instances of USB_SUSPEND
2013-05-15 13:44:44 -04:00
USB: host: use dev_get_platdata()
2013-07-31 17:53:50 -07:00
usb: ohci: remove ep93xx bus glue platform driver
2013-10-29 16:43:37 -07:00
usb: ohci: remove ep93xx bus glue platform driver
2013-10-29 16:43:37 -07:00
Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 07:55:21 +09:00
Revert "USB: OHCI: Properly handle ohci-da8xx suspend"
2013-10-14 10:18:25 -07:00
usb: Remove unnecessary semicolons
2013-10-11 16:26:46 -07:00
Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 07:55:21 +09:00
Revert "USB: OHCI: Properly handle OHCI controller suspend"
2013-10-14 10:19:10 -07:00
USB: OHCI: fix and explain sparse errors
2013-10-19 14:08:04 -07:00
USB: ohci-jz4740: remove unnecessary platform_set_drvdata()
2013-05-16 17:47:17 -07:00
Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 07:55:21 +09:00
DMA-API: usb: use new dma_coerce_mask_and_coherent()
2013-10-31 14:49:04 +00:00
USB: OHCI: Properly handle ohci-omap suspend
2013-10-05 17:56:41 -07:00
Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 07:55:21 +09:00
usb: ohci: use amd_chipset_type to filter for SB800 prefetch
2013-10-03 15:44:51 -07:00
USB: OHCI: Properly handle ohci-platform suspend
2013-10-05 17:56:41 -07:00
drivers: clean-up prom.h implicit includes
2013-10-09 20:04:04 -05:00
usb: remove use of __devinit
2012-11-21 13:27:16 -08:00
Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 07:55:21 +09:00
USB: OHCI: accept very late isochronous URBs
2013-09-25 17:05:35 -07:00
ARM: SoC platform changes for 3.13
2013-11-11 16:49:45 +09:00
DMA-API: usb: ohci-sa1111: add a note about DMA masks
2013-10-31 14:48:44 +00:00
USB: OHCI: Properly handle ohci-sm501 suspend
2013-10-05 17:56:41 -07:00
Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 07:55:21 +09:00
USB: host: use dev_get_platdata()
2013-07-31 17:53:50 -07:00
usb: host: ohci-tmio: Remove redundant platform_set_drvdata()
2013-05-17 10:14:53 -07:00
USB: OHCI: add a name for the platform-private field
2013-06-03 11:03:18 -07:00
Merge 3.10-rc3 into usb-next
2013-05-27 11:00:52 +09:00
Merge 3.12-rc6 into usb-next.
2013-10-19 13:19:07 -07:00
usb: ohci: use amd_chipset_type to filter for SB800 prefetch
2013-10-03 15:44:51 -07:00
usb: r8a66597-hcd: use platform_{get,set}_drvdata()
2013-08-30 11:11:35 -07:00
usb/host/r8a66597: remove conditional compilation of clk code
2012-07-30 17:25:12 -07:00
usb: Remove unnecessary semicolons
2013-10-11 16:26:46 -07:00
USB: sl811: move debug files from proc to debugfs
2013-07-24 14:43:05 -07:00
drivers/usb: use module_pcmcia_driver() in pcmcia drivers
2013-03-15 12:26:38 -07:00
DMA-API: usb: ssb-hcd: replace dma_set_mask()+dma_set_coherent_mask() with new helper
2013-10-31 14:48:36 +00:00
USB: host: use dev_get_platdata()
2013-07-31 17:53:50 -07:00
USB/host: Use existing macros instead of hard-coded values in uhci-debug.c
2013-10-05 17:58:48 -07:00
USB: host: use platform_{get,set}_drvdata()
2013-05-30 21:32:54 +09:00
Merge 3.8-rc5 into usb-next
2013-01-25 12:41:02 -08:00
USB: UHCI: remove unused definition
2013-01-24 13:42:09 -08:00
USB/host: Bugfix: Return length of copied buffer in uhci_hub_control()
2013-10-07 00:07:17 -07:00
USB: UHCI: check for wakeup/suspend race
2013-10-19 14:12:14 -07:00
Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 07:55:21 +09:00
USB: UHCI: accept very late isochronous URBs
2013-09-25 17:05:34 -07:00
xhci: add traces for debug messages in xhci_address_device()
2013-08-13 16:05:38 -07:00
xhci: fix port BESL LPM capability checking
2013-08-27 08:54:42 -07:00
xhci: Final patches for 3.13
2013-10-19 14:03:44 -07:00
usb: Don't enable USB 2.0 Link PM by default.
2013-10-16 12:24:19 -07:00
xhci: Fix spurious wakeups after S5 on Haswell
2013-10-09 16:27:20 -07:00
xhci: Step 1 to fix usb-linus and usb-next.
2013-08-15 18:00:46 -07:00
usb: xhci: kill a conditional when toggling cycle
2013-10-16 15:48:31 -07:00
xhci: add traces for debug messages in xhci_address_device()
2013-08-13 16:05:38 -07:00
xhci: trace debug statements related to ring expansion
2013-08-13 21:14:44 -07:00
xhci: Final patches for 3.13
2013-10-19 14:03:44 -07:00
xhci: Final patches for 3.13
2013-10-19 14:03:44 -07:00
8ceafbfa91