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
aacraid: missing capable() check in compat ioctl
2013-10-30 12:24:49 -07:00
[SCSI] aic7xxx: fix swapped arguments in ahc_find_pci_device
2013-09-10 14:48:16 -07:00
scsi: Spelling hsot -> host
2013-05-28 12:02:12 +02:00
[SCSI] libsas: implement > 16 byte CDB support
2013-06-04 11:15:59 -07:00
workqueue: deprecate flush[_delayed]_work_sync()
2012-08-20 14:51:24 -07:00
acornscsi: switch to ->show_info()
2013-04-09 14:13:27 -04:00
drivers: avoid format strings in names passed to alloc_workqueue()
2013-07-03 16:07:41 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-09-06 09:36:28 -07:00
bnx2x, cnic, bnx2i, bnx2fc: Fix bnx2i and bnx2fc regressions.
2013-09-18 12:24:32 -04:00
bnx2x, cnic, bnx2i, bnx2fc: Fix bnx2i and bnx2fc regressions.
2013-09-18 12:24:32 -04:00
[SCSI] csiostor: Retain default adapter configuration in absence of config file.
2013-06-04 11:16:28 -07:00
treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks
2013-08-20 13:06:40 +02:00
[SCSI] scsi_dh_alua: Add module parameter to allow failover to non preferred path without STPG
2013-04-11 16:00:31 -07:00
[SCSI] esas2r: Remove null test for stack allocated fw_coredump_buffer
2013-09-06 11:22:35 -07:00
scsi: fcoe: fix build error
2013-09-26 16:15:02 -07:00
[SCSI] fnic: fnic Driver Tuneables Exposed through CLI
2013-09-11 15:59:25 -07:00
[SCSI] ibmvfc: Fix for offlining devices during error recovery
2013-09-06 11:41:34 -07:00
[SCSI] isci: Fix a infinite loop.
2013-08-26 12:51:30 +04:00
A short series of fixes to libfc, libfcoe and fcoe.
2013-07-13 08:22:56 +04:00
[SCSI] libsas: implement > 16 byte CDB support
2013-06-04 11:15:59 -07:00
SCSI misc on 20130915
2013-09-15 17:41:30 -04:00
SCSI misc on 20130915
2013-09-15 17:41:30 -04:00
[SCSI] mpt2sas: Remove phys on topology change.
2013-09-03 07:27:58 -07:00
[SCSI] Allow MPT Fusion SAS 3.0 driver to be built into the kernel
2013-09-06 11:42:53 -07:00
[SCSI] mvsas: Fix kernel panic on tile due to unaligned data access
2013-07-23 15:23:08 -07:00
SCSI: OSD: convert class code to use dev_groups
2013-07-25 16:34:39 -07:00
nsp_cs: switch to ->show_info()
2013-04-09 14:13:21 -04:00
SCSI misc on 20130903
2013-09-03 15:48:06 -07:00
[SCSI] qla2xxx: Fix request queue null dereference.
2013-10-23 14:09:18 +01:00
[SCSI] qla4xxx: Update driver version to 5.04.00-k1
2013-09-03 07:27:57 -07:00
sym53c8xx_2: switch to ->show_info()
2013-04-09 14:13:15 -04:00
[SCSI] ufs: configure the attribute for power mode
2013-09-06 16:08:37 -07:00
new helper: file_inode(file)
2013-02-22 23:31:31 -05:00
new helper: file_inode(file)
2013-02-22 23:31:31 -05:00
[SCSI] 3w-xxxx: Create sense buffer for unsupported commands
2013-06-24 16:32:22 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
switch wd33c93 to ->show_info()
2013-04-09 14:13:15 -04:00
[SCSI] a3000: use module_platform_driver_probe()
2013-06-24 19:44:18 +02:00
[SCSI] a4000t: use module_platform_driver_probe()
2013-06-24 19:44:18 +02:00
advansys: fix buggered formats - unsigned long != u32 on 64bit
2013-04-09 14:13:22 -04:00
aha152x: switch to ->show_info()
2013-04-09 14:13:22 -04:00
treewide: Put a space between #include and FILE
2012-06-28 11:44:36 +02:00
aha1740: switch to ->show_info()
2013-04-09 14:13:23 -04:00
aix7xxx_old: switch to ->show_info()
2013-04-09 14:13:28 -04:00
atari_scsi: switch to ->show_info()
2013-04-09 14:13:29 -04:00
atari_scsi: switch to ->show_info()
2013-04-09 14:13:29 -04:00
atari_scsi: switch to ->show_info()
2013-04-09 14:13:29 -04:00
atp870u: switch to ->show_info()
2013-04-09 14:13:24 -04:00
[SCSI] BusLogic: Fix an oops when intializing multimaster adapter
2013-10-16 13:57:14 +01:00
[SCSI] BusLogic: Port driver to 64-bit.
2013-06-26 18:32:47 -07:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
scsi: convert to idr_alloc()
2013-02-27 19:10:18 -08:00
[SCSI] scsi constants: command, sense key + additional sense strings
2013-07-09 22:52:29 +01:00
dc395x: switch to ->show_info()
2013-04-09 14:13:24 -04:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
dpt_i2o: switch to ->show_info()
2013-04-09 14:13:24 -04:00
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
[SCSI] eata_pio: off by one in eata_pio_detect()
2013-09-03 07:27:58 -07:00
esp_scsi: Fix tag state corruption when autosensing.
2013-08-01 18:08:34 -07:00
esp_scsi: Fix tag state corruption when autosensing.
2013-08-01 18:08:34 -07:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
[SCSI] BusLogic: Port driver to 64-bit.
2013-06-26 18:32:47 -07:00
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
gdth: switch to ->show_info()
2013-04-09 14:13:16 -04:00
gdth: switch to ->show_info()
2013-04-09 14:13:16 -04:00
gdth: switch to ->show_info()
2013-04-09 14:13:16 -04:00
gdth: switch to ->show_info()
2013-04-09 14:13:16 -04:00
switch wd33c93 to ->show_info()
2013-04-09 14:13:15 -04:00
driver-core: constify data for class_find_device()
2013-02-06 12:18:56 -08:00
SCSI misc on 20130915
2013-09-15 17:41:30 -04:00
[SCSI] hpsa: remove unneeded variable
2013-08-26 12:51:31 +04:00
[SCSI] hpsa: dial down lockup detection during firmware flash
2012-05-10 09:19:39 +01:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
[SCSI] hptiop: Support HighPoint RR4520/RR4522 HBA
2012-11-27 08:59:43 +04:00
imm: switch to ->show_info()
2013-04-09 14:13:16 -04:00
in2000: switch to ->show_info()
2013-04-09 14:13:25 -04:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
[SCSI] ipr: Add sereral new CCIN definitions for new adapters support
2013-08-26 12:51:32 +04:00
[SCSI] ipr: Add sereral new CCIN definitions for new adapters support
2013-08-26 12:51:32 +04:00
ips: fix format bugs exposed by previous commit
2013-04-09 14:13:27 -04:00
ips: switch to ->show_info()
2013-04-09 14:13:27 -04:00
[SCSI] iscsi_tcp: support PF_MEMALLOC/__GFP_MEMALLOC
2013-04-11 16:55:04 -07:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
SCSI misc on 20130903
2013-09-03 15:48:06 -07:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
[SCSI] IB/iser: Add Discovery support
2013-08-26 18:53:49 +04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
[SCSI] esas2r: ATTO Technology ExpressSAS 6G SAS/SATA RAID Adapter Driver
2013-09-03 07:27:58 -07:00
PCI: Convert alloc_pci_dev(void) to pci_alloc_dev(bus)
2013-06-05 13:49:36 -06:00
megaraid: Don't use create_proc_read_entry()
2013-04-29 15:41:57 -04:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
switch wd33c93 to ->show_info()
2013-04-09 14:13:15 -04:00
[SCSI] mvumi: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
2013-04-15 14:30:44 -06:00
[SCSI] mvumi: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
2013-04-15 14:30:44 -06:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
[SCSI] nsp32: use mdelay instead of large udelay constants
2013-06-19 17:53:35 +02:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
treewide: Fix typo in printk
2013-06-18 13:48:45 +02:00
ppa: switch to ->show_info()
2013-04-09 14:13:17 -04:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
[SCSI] Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
2013-08-02 13:20:21 -07:00
[SCSI] scsi_debug: fix logical block provisioning support when unmap_alignment != 0
2013-09-03 07:28:08 -07:00
[SCSI] Workaround for disks that report bad optimal transfer length
2013-06-24 13:00:10 -07:00
[SCSI] Generate uevents on certain unit attention codes
2013-08-26 18:52:27 +04:00
ARM: 7796/1: scsi: Use dma_max_pfn(dev) helper for bounce_limit calculations
2013-10-31 14:49:26 +00:00
scsi: replace obsolete NLMSG_* with type safe nlmsg_*
2013-03-28 14:27:24 -04:00
PM / Runtime: Rework the "runtime idle" helper routine
2013-06-03 21:49:52 +02:00
[SCSI] async: introduce 'async_domain' type
2012-07-20 09:05:54 +01:00
fix buffer leak after "scsi: saner replacements for ->proc_info()"
2013-05-31 15:16:51 -04:00
[SCSI] Workaround for disks that report bad optimal transfer length
2013-06-24 13:00:10 -07:00
[SCSI] Generate uevents on certain unit attention codes
2013-08-26 18:52:27 +04:00
drivers: avoid format strings in names passed to alloc_workqueue()
2013-07-03 16:07:41 -07:00
[SCSI] scsi_transport_iscsi: Exporting new attrs for iscsi session and connection in sysfs
2013-08-23 13:08:30 -04:00
[SCSI] scsi_transport_sas: add 12GB definitions for mpt3sas
2012-12-01 10:08:41 +00:00
[SCSI] scsi_transport_spi: fix for unbalanced reference counting
2012-05-10 09:06:12 +01:00
IB/srp: Allow SRP disconnect through sysfs
2012-11-30 17:40:33 -08:00
[SCSI] sd: call blk_pm_runtime_init before add_disk
2013-10-23 14:09:18 +01:00
[SCSI] sd: Update WRITE SAME heuristics
2013-06-26 17:56:18 -07:00
[SCSI] sd_dif: problem with verify of type 1 protection information (PI)
2013-05-02 15:37:03 -07:00
[SCSI] Revert "sg: use rwsem to solve race during exclusive open"
2013-10-25 10:59:54 +01:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
block_device_operations->release() should return void
2013-05-07 02:16:21 -04:00
[SCSI] st: convert class code to use dev_groups
2013-08-21 10:10:50 -07:00
[SCSI] st: raise device limit
2012-09-14 17:59:29 +01:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
Drivers: hv: remove HV_DRV_VERSION
2013-08-02 11:34:30 +08:00
sun3_scsi: add ->show_info()
2013-05-04 14:50:16 -04:00
sun3_scsi: add ->show_info()
2013-05-04 14:50:16 -04:00
sun3_scsi: add ->show_info()
2013-05-04 14:50:16 -04:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
virtio-scsi: Fix virtqueue affinity setup
2013-08-01 11:37:19 +09:30
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
[SCSI] vmw_pvscsi: Try setting host->max_id as suggested by the device.
2012-03-27 08:26:36 +01:00
switch wd33c93 to ->show_info()
2013-04-09 14:13:15 -04:00
switch wd33c93 to ->show_info()
2013-04-09 14:13:15 -04:00
wd7000: switch to ->show_info()
2013-04-09 14:13:15 -04:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
8ceafbfa91