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
DMA-API: amba: get rid of separate dma_mask
2013-10-31 14:48:38 +00:00
bcma: make bcma_core_pci_{up,down}() callable from atomic context
2013-09-26 14:02:33 -04:00
ARM: mxs: remove custom .init_time hook
2013-09-29 21:09:34 +02:00
extcon: gpio: Add support for active-low presence to detect pins
2013-09-27 09:37:01 +09:00
fsl /bestcomm
gpiolib: provide a declaration of seq_file in gpio/driver.h
2013-10-29 18:26:15 -07:00
usb: phy: twl4030: use the new generic PHY framework
2013-09-27 17:36:58 -07:00
iio: Remove unused iio_sw_buffer_preenable()
2013-10-16 19:17:06 +01:00
irqchip: bcm2835: Convert to use IRQCHIP_DECLARE macro
2013-11-07 10:37:37 +01:00
rtc: s5m-rtc: add real-time clock driver for s5m8767
2013-11-13 12:09:31 +09:00
net/mlx4_en: Datapath structures are allocated per NUMA node
2013-11-07 19:22:48 -05:00
IB/mlx5: Fix eq names to display nicely in /proc/interrupts
2013-10-10 09:23:59 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2013-11-04 19:46:58 -05:00
drivers: phy: add generic PHY framework
2013-09-27 17:35:41 -07:00
pinctrl/gpio: non-linear GPIO ranges accesible from gpiolib
2013-10-16 15:33:50 +02:00
backlight: lm3630: apply chip revision
2013-11-13 12:09:15 +09:00
md update for v3.12
2013-09-10 13:03:41 -07:00
Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
2013-10-24 11:11:39 +01:00
sched/numa: Remove the numa_balancing_scan_period_reset sysctl
2013-10-09 14:48:18 +02:00
Merge remote-tracking branch 'spi/topic/wr' into spi-next
2013-10-25 09:51:41 +01:00
ssb: provide phy address for Gigabit Ethernet driver
2013-10-02 15:40:57 -04:00
SUNRPC: Add a helper to switch the transport of an rpc_clnt
2013-10-28 15:21:32 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-11-13 17:40:34 +09:00
ACPI, x86: Extended error log driver for x86 platform
2013-10-23 10:09:07 -07:00
gpiolib / ACPI: allow passing GPIOF_ACTIVE_LOW for GpioInt resources
2013-10-19 23:32:14 +02:00
... and kill anon_inode_getfile_private()
2013-11-09 00:16:28 -05:00
libata: Add some missing command descriptions
2013-10-27 08:40:39 -04:00
tty/serial: at91: add a fallback option to determine uart/usart property
2013-10-17 13:31:19 -07:00
mm/page-writeback.c: add strictlimit feature
2013-09-11 15:58:04 -07:00
mm: avoid reinserting isolated balloon pages into LRU lists
2013-09-30 14:31:02 -07:00
Merge branch 'akpm' (patches from Andrew Morton)
2013-11-13 15:45:43 +09:00
bitops: Introduce a more generic BITMASK macro
2013-10-21 15:12:01 -07:00
block: Add nr_bios to block_rq_remap tracepoint
2013-09-21 13:57:47 -06:00
cgroup: kill css_id
2013-09-23 21:44:16 -04:00
clk: of: helper for determining number of parent clocks
2013-10-07 23:13:33 -07:00
clockchips: Add FEAT_PERCPU clockevent flag
2013-10-02 11:33:23 +02:00
block: support embedded device command line partition
2013-09-11 15:56:57 -07:00
Merge branch 'akpm' (patches from Andrew Morton)
2013-11-13 15:45:43 +09:00
compiler/gcc4: Add quirk for 'asm goto' miscompilation bug
2013-10-11 07:39:14 +02:00
sched: Move completion code from core.c to completion.c
2013-11-06 07:49:19 +01:00
constify do_coredump() argument
2013-11-09 00:16:29 -05:00
ACPI, APEI, CPER: Add UEFI 2.4 support for memory error
2013-10-23 10:10:20 -07:00
of: Make cpu node handling more portable.
2013-10-15 20:09:10 +01:00
Remove GENERIC_HARDIRQ config option
2013-09-13 15:09:52 +02:00
Revert "cpufreq: make sure frequency transitions are serialized"
2013-09-10 02:54:50 +02:00
vmcore: introduce remap_oldmem_pfn_range()
2013-09-11 15:59:10 -07:00
lib: crc32: add functionality to combine two crc32{, c}s in GF(2)
2013-11-03 23:04:56 -05:00
VFS: Put a small type field into struct dentry::d_flags
2013-11-09 00:16:30 -05:00
fs/debugfs: add declaration for no CONFIG_DEBUG_FS
2013-10-03 16:14:12 -07:00
dm mpath: disable WRITE SAME if it fails
2013-09-20 10:36:34 -04:00
device: Make dev_WARN/dev_WARN_ONCE print device as well as driver name
2013-10-29 16:06:07 -07:00
ARM: 7795/1: mm: dma-mapping: Add dma_max_pfn(dev) helper function
2013-10-31 14:49:24 +00:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2013-09-10 13:37:36 -07:00
DMI: Parse memory device (type 17) in SMBIOS
2013-10-23 10:10:12 -07:00
EDAC, GHES: Update ghes error record info
2013-10-23 10:11:00 -07:00
efi: Add proper definitions for some EFI function pointers.
2013-09-25 12:34:33 +01:00
switch elf_coredump_extra_notes_write() to dump_emit()
2013-11-09 00:16:24 -05:00
switch elf_core_write_extra_data() to dump_emit()
2013-11-09 00:16:23 -05:00
[networking]device.h: Remove extern from function prototypes
2013-09-26 15:06:58 -07:00
extcon: Simplify extcon_dev_register() prototype by removing unnecessary parameter
2013-09-27 09:37:01 +09:00
[networking]device.h: Remove extern from function prototypes
2013-09-26 15:06:58 -07:00
[networking]device.h: Remove extern from function prototypes
2013-09-26 15:06:58 -07:00
net: fix unsafe set_memory_rw from softirq
2013-10-07 15:16:45 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-11-13 15:34:18 +09:00
vfs: move get_fs_root_and_pwd() to single caller
2013-09-12 10:12:47 -07:00
FS-Cache: Provide the ability to enable/disable cookies
2013-09-27 18:40:25 +01:00
FS-Cache: Provide the ability to enable/disable cookies
2013-09-27 18:40:25 +01:00
lib/genalloc: add a helper function for DMA buffer allocation
2013-11-13 12:09:22 +09:00
GPIO bulk changes for the v3.13 development cycle
2013-11-12 15:50:46 +09:00
sched: Extract the basic add/sub preempt_count modifiers
2013-09-25 14:07:54 +02:00
hashtable: add hash_for_each_possible_rcu_notrace()
2013-10-11 17:21:14 +11:00
HID: Delay opening HID device
2013-10-01 16:19:08 +01:00
HID: provide a helper for validating hid reports
2013-09-13 15:11:21 +02:00
[networking]device.h: Remove extern from function prototypes
2013-09-26 15:06:58 -07:00
thp: consolidate code between handle_mm_fault() and do_huge_pmd_anonymous_page()
2013-09-12 15:38:03 -07:00
mm: migrate: check movability of hugepage in unmap_and_move_huge_page()
2013-09-11 15:57:49 -07:00
hwmon: (atxp1) Set and use error code from vid_to_reg()
2013-10-13 16:16:26 -07:00
hwmon: Provide managed hwmon registration
2013-10-13 16:16:28 -07:00
Merge 3.12-rc3 into char-misc-next
2013-09-29 18:27:03 -07:00
ide: convert bus code to use dev_groups
2013-10-16 18:40:57 -07:00
mac80211: process the CSA frame for mesh accordingly
2013-10-28 15:05:28 +01:00
net: Add layer 2 hardware acceleration operations for macvlan devices
2013-11-07 19:11:41 -05:00
vlan: Implement vlan_dev_get_egress_qos_mask as an inline.
2013-11-11 00:42:07 -05:00
[networking]device.h: Remove extern from function prototypes
2013-09-26 15:06:58 -07:00
init.h: document the existence of __initconst
2013-11-13 12:09:26 +09:00
x86/iommu: correct ICS register offset
2013-09-24 13:04:07 +02:00
irq: Consolidate do_softirq() arch overriden implementations
2013-10-01 12:53:25 +02:00
ipc, msg: forbid negative values for "msg{max,mnb,mni}"
2013-11-03 10:53:11 -08:00
ipv6: Remove privacy config option.
2013-10-28 20:07:50 -04:00
Remove GENERIC_HARDIRQ config option
2013-09-13 15:09:52 +02:00
Remove GENERIC_HARDIRQ config option
2013-09-13 15:09:52 +02:00
Remove GENERIC_HARDIRQ config option
2013-09-13 15:09:52 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-11-13 17:40:34 +09:00
static_key: WARN on usage before jump_label_init was called
2013-10-19 19:45:35 -04:00
kdb: Add support for external NMI handler to call KGDB/KDB
2013-10-03 18:47:54 +02:00
tools/vm/page-types.c: support KPF_SOFTDIRTY bit
2013-11-13 12:09:07 +09:00
lib: introduce upper case hex ascii helpers
2013-09-20 15:38:26 -04:00
Remove GENERIC_HARDIRQ config option
2013-09-13 15:09:52 +02:00
kdb: Add support for external NMI handler to call KGDB/KDB
2013-10-03 18:47:54 +02:00
kobject: introduce kobj_completion
2013-09-26 16:17:33 -07:00
sysfs: remove ktype->namespace() invocations in directory code
2013-09-26 15:30:22 -07:00
kprobes: allow to specify custom allocator for insn caches
2013-09-11 15:58:52 -07:00
KVM: mmu: allow page tables to be in read-only slots
2013-09-17 12:52:31 +03:00
no need to keep brlock macros anymore...
2013-11-09 00:16:21 -05:00
list: introduce list_last_entry(), use list_{first,last}_entry()
2013-11-13 12:09:24 +09:00
list_lru: dynamically adjust node arrays
2013-09-10 18:56:32 -04:00
GFS2: Use lockref for glocks
2013-10-15 15:18:08 +01:00
lz4: fix compression/decompression signedness mismatch
2013-09-11 15:59:45 -07:00
mm/memblock.c: introduce bottom-up allocation mode
2013-11-13 12:09:08 +09:00
mm: memcg: handle non-error OOM situations more gracefully
2013-10-16 21:35:53 -07:00
mm/sparsemem: use PAGES_PER_SECTION to remove redundant nr_pages parameter
2013-11-13 12:09:06 +09:00
mm, mempolicy: make mpol_to_str robust and always succeed
2013-11-13 12:09:05 +09:00
mm: numa: Scan pages with elevated page_mapcount
2013-10-09 12:40:32 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
2013-11-13 15:27:00 +09:00
mm/memblock.c: introduce bottom-up allocation mode
2013-11-13 12:09:08 +09:00
mm: vmscan: fix do_try_to_free_pages() livelock
2013-09-11 15:58:01 -07:00
sched/numa: Remove the numa_balancing_scan_period_reset sysctl
2013-10-09 14:48:18 +02:00
mm: factor commit limit calculation
2013-11-13 12:09:11 +09:00
mm: vmscan: fix do_try_to_free_pages() livelock
2013-09-11 15:58:01 -07:00
RCU'd vfsmounts
2013-11-09 00:16:19 -05:00
ipc, msg: fix message length check for negative values
2013-11-13 12:09:36 +09:00
mutex: replace CONFIG_HAVE_ARCH_MUTEX_CPU_RELAX with simple ifdef
2013-09-28 12:46:21 +02:00
RCU'd vfsmounts
2013-11-09 00:16:19 -05:00
net: make net_get_random_once irq safe
2013-10-25 19:03:39 -04:00
net: Add layer 2 hardware acceleration operations for macvlan devices
2013-11-07 19:11:41 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-11-13 17:40:34 +09:00
netfilter: add nftables
2013-10-14 17:15:48 +02:00
netfilter: Remove extern from function prototypes
2013-09-26 14:48:15 -07:00
netfilter: Remove extern from function prototypes
2013-09-26 14:48:15 -07:00
netfilter: Remove extern from function prototypes
2013-09-26 14:48:15 -07:00
netpoll: fix rx_hook() interface by passing the skb
2013-10-25 19:26:58 -04:00
NFSv4: Sanity check the server reply in _nfs4_server_capabilities
2013-11-04 16:42:52 -05:00
NFS: Use i_writecount to control whether to get an fscache cookie in nfs_open()
2013-09-27 18:40:25 +01:00
NFS: cache parsed auth_info in nfs_server
2013-10-28 15:37:43 -04:00
NFS: add support for multiple sec= mount options
2013-10-28 15:38:02 -04:00
DeviceTree updates for 3.13. This is a bit larger pull request than
2013-11-12 16:52:17 +09:00
of: move of_translate_dma_address to of_address.h
2013-10-09 20:04:10 -05:00
of: introduce common FDT machine related functions
2013-10-09 20:03:54 -05:00
gpiolib: include gpio/consumer.h in of_gpio.h for desc_to_gpio()
2013-10-29 18:26:14 -07:00
dt/irq: add empty of_irq_count for !OF_IRQ
2013-11-08 10:47:28 -06:00
of/irq: Create of_irq_parse_and_map_pci() to consolidate arch code.
2013-10-24 11:50:36 +01:00
mm: add a helper function to check may oom condition
2013-11-13 12:09:04 +09:00
mm: numa: Change page last {nid,pid} into {cpu,pid}
2013-10-09 14:47:45 +02:00
powerpc: Prepare to support kernel handling of IOMMU map/unmap
2013-10-11 17:24:39 +11:00
SCSI misc on 20130915
2013-09-15 17:41:30 -04:00
Merge branch 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2013-11-13 15:17:16 +09:00
perf: Add generic transaction flags
2013-10-04 10:06:08 +02:00
pid_namespace: make freeing struct pid_namespace rcu-delayed
2013-10-24 23:43:29 -04:00
driver core: prevent deferred probe with platform_driver_probe
2013-09-26 16:18:32 -07:00
sched, x86: Optimize the preempt_schedule() call
2013-09-25 14:23:07 +02:00
printk: pr_debug_ratelimited: check state first to reduce "callbacks suppressed" messages
2013-10-29 16:50:52 -07:00
lib/radix-tree.c: make radix_tree_node_alloc() work correctly within interrupt
2013-09-11 15:59:36 -07:00
initmpfs: move rootfs code from fs/ramfs/ to init/
2013-09-11 15:59:37 -07:00
random32: upgrade taus88 generator to taus113 from errata paper
2013-11-11 14:32:15 -05:00
rbtree: fix rbtree_postorder_for_each_entry_safe() iterator
2013-11-13 12:09:33 +09:00
rcu: Make list_splice_init_rcu() account for RCU readers
2013-09-23 09:13:49 -07:00
rcu: Consistent rcu_is_watching() naming
2013-09-25 06:45:06 -07:00
rcu: Consistent rcu_is_watching() naming
2013-09-25 06:45:06 -07:00
rcu: Consistent rcu_is_watching() naming
2013-09-25 06:45:06 -07:00
Merge remote-tracking branch 'regmap/topic/spmi' into regmap-next
2013-10-28 13:01:35 -07:00
memcg: rename RESOURCE_MAX to RES_COUNTER_MAX
2013-09-12 15:38:02 -07:00
net: fix rtnl notification in atomic context
2013-10-25 19:03:45 -04:00
exec/ptrace: fix get_dumpable() incorrect tests
2013-11-13 12:09:33 +09:00
sched_clock: Remove sched_clock_func() hook
2013-10-09 16:54:39 -07:00
seqlock: Add a new locking reader type
2013-09-12 09:25:23 -07:00
serial: core: delete .set_wake() callback
2013-10-16 13:16:19 -07:00
Drop support for Renesas H8/300 (h8300) architecture
2013-09-16 18:19:04 -07:00
intel_mid: Move platform device setups to their own platform_<device>.* files
2013-10-17 16:41:50 -07:00
shrinker: Kill old ->shrink API.
2013-09-10 18:56:32 -04:00
netfilter: push reasm skb through instead of original frag skbs
2013-11-11 00:19:35 -05:00
watchdog: update watchdog_thresh properly
2013-09-24 17:00:25 -07:00
stop_machine: Introduce stop_two_cpus()
2013-10-09 12:40:45 +02:00
mm: make lru_add_drain_all() selective
2013-09-12 15:38:02 -07:00
syscalls.h: use gcc alias instead of assembler aliases for syscalls
2013-11-13 12:09:12 +09:00
sysfs: clean up sysfs_get_dirent()
2013-09-26 15:33:18 -07:00
sysrq: Allow magic SysRq key functions to be disabled through Kconfig
2013-10-16 13:01:44 -07:00
ARM: tegra: Add Tegra114 powergate support
2013-10-18 16:28:11 -06:00
thinkpad-acpi: Add mute and mic-mute LED functionality
2013-10-17 14:38:44 +02:00
sched, idle: Fix the idle polling state logic
2013-09-25 13:53:10 +02:00
These patches are designed to enable improvements to /dev/random for
2013-10-10 12:31:43 -07:00
sched/balancing: Periodically decay max cost of idle balance
2013-09-20 12:03:46 +02:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-11-12 10:20:12 +09:00
sched: Extract the basic add/sub preempt_count modifiers
2013-09-25 14:07:54 +02:00
uprobes: Export write_opcode() as uprobe_write_opcode()
2013-11-06 20:00:09 +01:00
usb: Don't enable USB 2.0 Link PM by default.
2013-10-16 12:24:19 -07:00
usb-storage: add quirk for mandatory READ_CAPACITY_16
2013-10-16 13:32:04 -07:00
Revert "i915: Update VGA arbiter support for newer devices"
2013-10-11 15:19:22 +10:00
mm: numa: return the number of base pages altered by protection changes
2013-11-13 12:09:11 +09:00
mm: vmscan: fix do_try_to_free_pages() livelock
2013-09-11 15:58:01 -07:00
sched/wait: Fix __wait_event_interruptible_lock_irq_timeout()
2013-11-01 08:42:44 +01:00
writeback: do not sync data dirtied after sync start
2013-11-13 12:09:07 +09:00
yam: integer underflow in yam_ioctl()
2013-10-17 15:53:09 -04:00
