]> git.kernelconcepts.de Git - karo-tx-linux.git/log
karo-tx-linux.git
8 years agoMerge branch 'linux-mfg' into tx6-mfg-devel karo-tx6-mfg kc/karo-tx6-mfg
Lothar Waßmann [Tue, 3 Nov 2015 11:34:12 +0000 (12:34 +0100)]
Merge branch 'linux-mfg' into tx6-mfg-devel

8 years agoARM: defconfig: add support for Ka-Ro TXUL modules KARO-TX6UL-2015-11-03
Lothar Waßmann [Tue, 3 Nov 2015 11:32:08 +0000 (12:32 +0100)]
ARM: defconfig: add support for Ka-Ro TXUL modules

8 years agoARM: defconfig: add support for Ka-Ro TX6Q, TX6U, TX6S modules
Lothar Waßmann [Tue, 3 Nov 2015 11:31:41 +0000 (12:31 +0100)]
ARM: defconfig: add support for Ka-Ro TX6Q, TX6U, TX6S modules

8 years agoARM: dts: imx6ul: add support for Ka-Ro TXUL modules
Lothar Waßmann [Tue, 3 Nov 2015 11:12:04 +0000 (12:12 +0100)]
ARM: dts: imx6ul: add support for Ka-Ro TXUL modules

8 years agoARM: dts: imx6: add more Ka-Ro TX6 board variants
Lothar Waßmann [Tue, 3 Nov 2015 11:09:24 +0000 (12:09 +0100)]
ARM: dts: imx6: add more Ka-Ro TX6 board variants

8 years agoARM: dts: imx6qdl-tx6: add mdio node for ethernet PHY
Lothar Waßmann [Tue, 3 Nov 2015 11:08:17 +0000 (12:08 +0100)]
ARM: dts: imx6qdl-tx6: add mdio node for ethernet PHY

8 years agoARM: dts: imx6ul.dtsi: add eLCDIF support
Lothar Waßmann [Tue, 3 Nov 2015 11:01:58 +0000 (12:01 +0100)]
ARM: dts: imx6ul.dtsi: add eLCDIF support

8 years agoARM: dts: imx6ul.dtsi: add GPMI NAND support
Lothar Waßmann [Tue, 3 Nov 2015 11:01:45 +0000 (12:01 +0100)]
ARM: dts: imx6ul.dtsi: add GPMI NAND support

8 years agodma: enable mxs-dma for i.MX6 SoCs other than i.MX6Q
Lothar Waßmann [Tue, 3 Nov 2015 11:00:41 +0000 (12:00 +0100)]
dma: enable mxs-dma for i.MX6 SoCs other than i.MX6Q

8 years agonet: fec: don't disable enet_out clock
Lothar Waßmann [Tue, 18 Aug 2015 16:51:30 +0000 (18:51 +0200)]
net: fec: don't disable enet_out clock

ENET_OUT is an optional clock which may be used as reference clock for
an ethernet PHY. Switching the clock off may adversely affect the
function of the PHY (experienced with an SMSC LAN8710A).

Conflicts:
drivers/net/ethernet/freescale/fec_main.c

8 years agopwm: imx: add support for output polarity inversion
Lothar Waßmann [Tue, 3 Nov 2015 10:21:01 +0000 (11:21 +0100)]
pwm: imx: add support for output polarity inversion

8 years agopwm: make the PWM_POLARITY flag optional
Lothar Waßmann [Tue, 3 Nov 2015 10:20:06 +0000 (11:20 +0100)]
pwm: make the PWM_POLARITY flag optional

8 years agodrm: imx-ldb: honor the 'native-mode' property when selecting the display_mode
Lothar Waßmann [Tue, 3 Nov 2015 10:19:07 +0000 (11:19 +0100)]
drm: imx-ldb: honor the 'native-mode' property when selecting the display_mode

8 years agoFSL: usb: gadget: utp:
Oliver Wendt [Wed, 18 Mar 2015 09:22:21 +0000 (10:22 +0100)]
FSL: usb: gadget: utp:

added secondary value for 3.16 syntax/data compatiblity.

8 years agoENGR00161643-3 UTP : bugfix
Huang Shijie [Tue, 8 Nov 2011 09:39:35 +0000 (17:39 +0800)]
ENGR00161643-3 UTP : bugfix

The origin code lossed one line.
fix it.

Signed-off-by: Huang Shijie <b32955@freescale.com>
8 years agoENGR00160834 UTP : replace kzalloc() with vmalloc()
Huang Shijie [Wed, 26 Oct 2011 09:31:25 +0000 (17:31 +0800)]
ENGR00160834 UTP : replace kzalloc() with vmalloc()

When allocating large memory, such as 128K,
vmalloc() uses single page for the allocation process,
while kzalloc() has to consume a continuous pages for the allocation.

In low memory case, the kzalloc() may fails.
So use the vmalloc() instead.

Also add some sanity check for the NULL pointer.

Signed-off-by: Huang Shijie <b32955@freescale.com>
8 years agoENGR00140950 mfg: fix the bug that ubiformat utility breaks utp protocol
Peter Chen [Tue, 22 Mar 2011 09:27:17 +0000 (17:27 +0800)]
ENGR00140950 mfg: fix the bug that ubiformat utility breaks utp protocol

ubiformat includes command, data, command periods,
it breaks utp protocol for PUT commands. So we add two operations to fix it.
One is sending busy to host before the data periods begins.
The second is adding a new command to waiting ubiformat's command period.

Signed-off-by: Li Xingyu <b02754@freescale.com>
Signed-off-by: Peter Chen <peter.chen@freescale.com>
8 years agoENGR00217717 mfgtool firmware will crash during mfgtool running
Tony LIU [Fri, 20 Jul 2012 02:11:06 +0000 (10:11 +0800)]
ENGR00217717 mfgtool firmware will crash during mfgtool running

- the root cause of this issue is there is no protection for
  the resource which will be accessed by multiple thread

Signed-off-by: Tony LIU <junjie.liu@freescale.com>
8 years agoCheery picked:
Frank Li [Wed, 28 Aug 2013 21:02:06 +0000 (16:02 -0500)]
Cheery picked:

commit 125203588824fd5cb13822cb0b1fed7da91d7512
git://git.freescale.com/imx/linux-2.6-imx.git

ENGR00280494-1 make the kernel image for mfgtool

uboot needs pass down below parameters
removable = 1
stall = 0
idVendor = 0x066F
idProduct = 0x37FF
iSerialNumber = ""

Signed-off-by: Lu Lin <b37454@freescale.com>
Signed-off-by: Frank Li<frank.li@freescale.com>
resolved
Conflicts:
drivers/usb/gadget/f_mass_storage.c

Conflicts:
drivers/usb/gadget/Kconfig

8 years agoAdd linux-next specific files for 20151102
Stephen Rothwell [Mon, 2 Nov 2015 04:34:21 +0000 (15:34 +1100)]
Add linux-next specific files for 20151102

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
8 years agoMerge branch 'akpm/master'
Stephen Rothwell [Mon, 2 Nov 2015 03:55:54 +0000 (14:55 +1100)]
Merge branch 'akpm/master'

8 years agofs/binfmt_elf_fdpic.c: provide NOMMU loader for regular ELF binaries
Rich Felker [Wed, 21 Oct 2015 22:13:28 +0000 (09:13 +1100)]
fs/binfmt_elf_fdpic.c: provide NOMMU loader for regular ELF binaries

The ELF binary loader in binfmt_elf.c requires an MMU, making it
impossible to use regular ELF binaries on NOMMU archs.  However, the FDPIC
ELF loader in binfmt_elf_fdpic.c is fully capable as a loader for plain
ELF, which requires constant displacements between LOAD segments, since it
already supports FDPIC ELF files flagged as needing constant displacement.

This patch adjusts the FDPIC ELF loader to accept non-FDPIC ELF files on
NOMMU archs.  They are treated identically to FDPIC ELF files with the
constant-displacement flag bit set, except for personality, which must
match the ABI of the program being loaded; the PER_LINUX_FDPIC personality
controls how the kernel interprets function pointers passed to sigaction.

Files that do not set a stack size requirement explicitly are given a
default stack size (matching the amount of committed stack the normal ELF
loader for MMU archs would give them) rather than being rejected; this is
necessary because plain ELF files generally do not declare stack
requirements in theit program headers.

Only ET_DYN (PIE) format ELF files are supported, since loading at a fixed
virtual address is not possible on NOMMU.

This patch was developed and tested on J2 (SH2-compatible) but should
be usable immediately on all archs where binfmt_elf_fdpic is
available. Moreover, by providing dummy definitions of the
elf_check_fdpic() and elf_check_const_displacement() macros for archs
which lack an FDPIC ABI, it should be possible to enable building of
binfmt_elf_fdpic on all other NOMMU archs and thereby give them ELF
binary support, but I have not yet tested this.

The motivation for using binfmt_elf_fdpic.c rather than adapting
binfmt_elf.c to NOMMU is that the former already has all the necessary
code to work properly on NOMMU and has already received widespread
real-world use and testing. I hope this is not controversial.

I'm not really happy with having to unset the FDPIC_FUNCPTRS
personality bit when loading non-FDPIC ELF. This bit should really
reset automatically on execve, since otherwise, executing non-ELF
binaries (e.g. bFLT) from an FDPIC process will leave the personality
in the wrong state and severely break signal handling. But that's a
separate, existing bug and I don't know the right place to fix it.

Signed-off-by: Rich Felker <dalias@libc.org>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Matt Mackall <mpm@selenic.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: David Howells <dhowells@redhat.com>
Cc: Oleg Endo <oleg.endo@t-online.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agofs/ubifs/: remove unnecessary new_valid_dev() checks
Yaowei Bai [Wed, 21 Oct 2015 22:13:28 +0000 (09:13 +1100)]
fs/ubifs/: remove unnecessary new_valid_dev() checks

new_valid_dev() always returns 1, so the !new_valid_dev() checks are not
needed.  Remove them.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Acked-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agofs/stat.c: remove unnecessary new_valid_dev() check
Yaowei Bai [Wed, 21 Oct 2015 22:13:28 +0000 (09:13 +1100)]
fs/stat.c: remove unnecessary new_valid_dev() check

new_valid_dev() always returns 1, so the !new_valid_dev() check is not
needed.  Remove it.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agofs/reiserfs/namei.c: remove unnecessary new_valid_dev() check
Yaowei Bai [Wed, 21 Oct 2015 22:13:28 +0000 (09:13 +1100)]
fs/reiserfs/namei.c: remove unnecessary new_valid_dev() check

new_valid_dev() always returns 1, so the !new_valid_dev() check is not
needed.  Remove it.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agofs/nilfs2/namei.c: remove unnecessary new_valid_dev() check
Yaowei Bai [Wed, 21 Oct 2015 22:13:28 +0000 (09:13 +1100)]
fs/nilfs2/namei.c: remove unnecessary new_valid_dev() check

new_valid_dev() always returns 1, so the !new_valid_dev() check is not
needed.  Remove it.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Acked-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agofs/nfs/dir.c: remove unnecessary new_valid_dev() check
Yaowei Bai [Wed, 21 Oct 2015 22:13:28 +0000 (09:13 +1100)]
fs/nfs/dir.c: remove unnecessary new_valid_dev() check

new_valid_dev() always returns 1, so the !new_valid_dev() check is not
needed.  Remove it.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Trond Myklebust <trond.myklebust@primarydata.com>
Cc: Anna Schumaker <anna.schumaker@netapp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agofs/ncpfs/dir.c: remove unnecessary new_valid_dev() check
Yaowei Bai [Wed, 21 Oct 2015 22:13:27 +0000 (09:13 +1100)]
fs/ncpfs/dir.c: remove unnecessary new_valid_dev() check

new_valid_dev() always returns 1, so the !new_valid_dev() check is not
needed.  Remove it.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Petr Vandrovec <petr@vandrovec.name>
Cc: Jan Kara <jack@suse.cz>
Cc: Jens Axboe <axboe@fb.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Fabian Frederick <fabf@skynet.be>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agofs/jfs: remove unnecessary new_valid_dev() checks
Yaowei Bai [Wed, 21 Oct 2015 22:13:27 +0000 (09:13 +1100)]
fs/jfs: remove unnecessary new_valid_dev() checks

new_valid_dev() always returns 1, so the !new_valid_dev() checks are not
needed.  Remove them.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Acked-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agofs/hpfs/namei.c: remove unnecessary new_valid_dev() check
Yaowei Bai [Wed, 21 Oct 2015 22:13:27 +0000 (09:13 +1100)]
fs/hpfs/namei.c: remove unnecessary new_valid_dev() check

new_valid_dev() always returns 1, so the !new_valid_dev() check is not
needed.  Remove it.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agofs/f2fs/namei.c: remove unnecessary new_valid_dev() check
Yaowei Bai [Wed, 21 Oct 2015 22:13:27 +0000 (09:13 +1100)]
fs/f2fs/namei.c: remove unnecessary new_valid_dev() check

new_valid_dev() always returns 1, so the !new_valid_dev() check is not
needed.  Remove it.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Changman Lee <cm224.lee@samsung.com>
Cc: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agofs/ext4/namei.c: remove unnecessary new_valid_dev() check
Yaowei Bai [Wed, 21 Oct 2015 22:13:27 +0000 (09:13 +1100)]
fs/ext4/namei.c: remove unnecessary new_valid_dev() check

new_valid_dev() always returns 1, so the !new_valid_dev() check is not
needed.  Remove it.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Andreas Dilger <adilger.kernel@dilger.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agofs/ext2/namei.c: remove unnecessary new_valid_dev() check
Yaowei Bai [Wed, 21 Oct 2015 22:13:27 +0000 (09:13 +1100)]
fs/ext2/namei.c: remove unnecessary new_valid_dev() check

new_valid_dev() always returns 1, so the !new_valid_dev() check is not
needed.  Remove it.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Jan Kara <jack@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agofs/exofs/namei.c: remove unnecessary new_valid_dev() check
Yaowei Bai [Wed, 21 Oct 2015 22:13:26 +0000 (09:13 +1100)]
fs/exofs/namei.c: remove unnecessary new_valid_dev() check

new_valid_dev() always returns 1, so the !new_valid_dev() check is not
needed.  Remove it.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Acked-by: Boaz Harrosh <ooo@electrozaur.com>
Cc: Benny Halevy <bhalevy@primarydata.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agofs/btrfs/inode.c: remove unnecessary new_valid_dev() check
Yaowei Bai [Wed, 21 Oct 2015 22:13:26 +0000 (09:13 +1100)]
fs/btrfs/inode.c: remove unnecessary new_valid_dev() check

new_valid_dev() always returns 1, so the !new_valid_dev() check is not
needed.  Remove it.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Chris Mason <clm@fb.com>
Cc: Josef Bacik <jbacik@fb.com>
Acked-by: David Sterba <dsterba@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agofs/9p: remove unnecessary new_valid_dev() checks
Yaowei Bai [Wed, 21 Oct 2015 22:13:26 +0000 (09:13 +1100)]
fs/9p: remove unnecessary new_valid_dev() checks

new_valid_dev() always returns 1, so the !new_valid_dev() check is not
needed.  Remove it.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Ron Minnich <rminnich@sandia.gov>
Cc: Latchesar Ionkov <lucho@ionkov.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agoinclude/linux/kdev_t.h: old/new_valid_dev() can return bool
Yaowei Bai [Wed, 21 Oct 2015 22:13:26 +0000 (09:13 +1100)]
include/linux/kdev_t.h: old/new_valid_dev() can return bool

Make old/new_valid_dev return bool due to these two particular functions
only using either one or zero as their return value.

No functional change.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agoinclude/linux/kdev_t.h: remove unused huge_valid_dev()
Yaowei Bai [Wed, 21 Oct 2015 22:13:25 +0000 (09:13 +1100)]
include/linux/kdev_t.h: remove unused huge_valid_dev()

There's no user of huge_valid_dev() any more, so remove it.

No functional change.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agokmap_atomic_to_page() has no users, remove it
Nicolas Pitre [Wed, 21 Oct 2015 22:13:25 +0000 (09:13 +1100)]
kmap_atomic_to_page() has no users, remove it

Removal started in 5bbeed12bdc3 ("sparc32: drop unused
kmap_atomic_to_page").  Let's do it across the whole tree.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agodrivers/scsi/cxgbi: fix build with EXTRA_CFLAGS
Jiri Slaby [Wed, 21 Oct 2015 22:13:25 +0000 (09:13 +1100)]
drivers/scsi/cxgbi: fix build with EXTRA_CFLAGS

EXTRA_CFLAGS are intended to be used on the command line, not by Kbuild.
In case of cxgbi drivers, use of EXTRA_CFLAGS results in a compilation
failure:

drivers/scsi/cxgbi/cxgb4i/cxgb4i.c:24:21: fatal error: t4_regs.h: No such file or directory

when building like:

$ make drivers/scsi/cxgbi/ EXTRA_CFLAGS=-Wwhatever

Use ccflags-y instead of EXTRA_CFLAGS.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agodma: remove external references to dma_supported
Christoph Hellwig [Wed, 21 Oct 2015 22:13:24 +0000 (09:13 +1100)]
dma: remove external references to dma_supported

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agopci: remove pci_dma_supported
Christoph Hellwig [Wed, 21 Oct 2015 22:13:24 +0000 (09:13 +1100)]
pci: remove pci_dma_supported

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agousbnet: remove ifdefed out call to dma_supported
Christoph Hellwig [Wed, 21 Oct 2015 22:13:24 +0000 (09:13 +1100)]
usbnet: remove ifdefed out call to dma_supported

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agokaweth: remove ifdefed out call to dma_supported
Christoph Hellwig [Wed, 21 Oct 2015 22:13:24 +0000 (09:13 +1100)]
kaweth: remove ifdefed out call to dma_supported

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Oliver Neukum <oliver@neukum.org>
Cc: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agosfc: don't call dma_supported
Christoph Hellwig [Wed, 21 Oct 2015 22:13:24 +0000 (09:13 +1100)]
sfc: don't call dma_supported

dma_set_mask already checks for a supported DMA mask before updating it,
the call to dma_supported is redundant.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Solarflare linux maintainers <linux-net-drivers@solarflare.com>
Cc: Shradha Shah <sshah@solarflare.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agonouveau: don't call pci_dma_supported
Christoph Hellwig [Wed, 21 Oct 2015 22:13:23 +0000 (09:13 +1100)]
nouveau: don't call pci_dma_supported

Just try to set a 64-bit DMA mask first and retry with the smaller dma_mask
if dma_set_mask failed.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Alexandre Courbot <acourbot@nvidia.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Thierry Reding <treding@nvidia.com>
Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agonetup_unidvb: use pci_set_dma_mask insted of pci_dma_supported
Christoph Hellwig [Wed, 21 Oct 2015 22:13:23 +0000 (09:13 +1100)]
netup_unidvb: use pci_set_dma_mask insted of pci_dma_supported

This ensures the dma mask that is supported by the driver is recorded
in the device structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Sergey Kozlov <serjk@netup.ru>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agocx23885: use pci_set_dma_mask insted of pci_dma_supported
Christoph Hellwig [Wed, 21 Oct 2015 22:13:23 +0000 (09:13 +1100)]
cx23885: use pci_set_dma_mask insted of pci_dma_supported

This ensures the dma mask that is supported by the driver is recorded
in the device structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Pawel Osciak <pawel@osciak.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agocx25821: use pci_set_dma_mask insted of pci_dma_supported
Christoph Hellwig [Wed, 21 Oct 2015 22:13:23 +0000 (09:13 +1100)]
cx25821: use pci_set_dma_mask insted of pci_dma_supported

This ensures the dma mask that is supported by the driver is recorded
in the device structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agocx88: use pci_set_dma_mask insted of pci_dma_supported
Christoph Hellwig [Wed, 21 Oct 2015 22:13:23 +0000 (09:13 +1100)]
cx88: use pci_set_dma_mask insted of pci_dma_supported

This ensures the dma mask that is supported by the driver is recorded
in the device structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agosaa7134: use pci_set_dma_mask insted of pci_dma_supported
Christoph Hellwig [Wed, 21 Oct 2015 22:13:22 +0000 (09:13 +1100)]
saa7134: use pci_set_dma_mask insted of pci_dma_supported

This ensures the dma mask that is supported by the driver is recorded
in the device structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Pawel Osciak <pawel@osciak.com>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agosaa7164: use pci_set_dma_mask insted of pci_dma_supported
Christoph Hellwig [Wed, 21 Oct 2015 22:13:22 +0000 (09:13 +1100)]
saa7164: use pci_set_dma_mask insted of pci_dma_supported

This ensures the dma mask that is supported by the driver is recorded
in the device structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agotw68-core: use pci_set_dma_mask insted of pci_dma_supported
Christoph Hellwig [Wed, 21 Oct 2015 22:13:22 +0000 (09:13 +1100)]
tw68-core: use pci_set_dma_mask insted of pci_dma_supported

This ensures the dma mask that is supported by the driver is recorded
in the device structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Pawel Osciak <pawel@osciak.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agopcnet32: use pci_set_dma_mask insted of pci_dma_supported
Christoph Hellwig [Wed, 21 Oct 2015 22:13:22 +0000 (09:13 +1100)]
pcnet32: use pci_set_dma_mask insted of pci_dma_supported

All drivers should be using dma_set_mask / pci_set_dma_mask to try
to set the dma mask instead of just querying it.  Without that some
iommu implementations may not work.

pci_dma_supported is removed entirely, but dma_supported stays for
dma_ops implementations for now.

This patch (of 15):

This ensures the dma mask that is supported by the driver is recorded
in the device structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Don Fry <pcnet32@frontier.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Alexandre Courbot <acourbot@nvidia.com>
Cc: Alexey Khoroshilov <khoroshilov@ispras.ru>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dave Airlie <airlied@redhat.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Helge Deller <deller@gmx.de>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Pawel Osciak <pawel@osciak.com>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: Sergey Kozlov <serjk@netup.ru>
Cc: Shradha Shah <sshah@solarflare.com>
Cc: Solarflare linux maintainers <linux-net-drivers@solarflare.com>
Cc: Steven Toth <stoth@kernellabs.com>
Cc: Thierry Reding <treding@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agoDocumentation/sysctl/vm.txt: fix misleading code reference of overcommit_memory
Chun Chen [Wed, 21 Oct 2015 22:13:22 +0000 (09:13 +1100)]
Documentation/sysctl/vm.txt: fix misleading code reference of overcommit_memory

The origin document references to cap_vm_enough_memory is because
cap_vm_enough_memory invoked __vm_enough_memory before and it no longer
does now.

Signed-off-by: Chun Chen <ramichen@tencent.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agoremove-abs64-fix-fix
Andrew Morton [Wed, 21 Oct 2015 22:13:22 +0000 (09:13 +1100)]
remove-abs64-fix-fix

Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agoremove-abs64-fix
Andrew Morton [Wed, 21 Oct 2015 22:13:21 +0000 (09:13 +1100)]
remove-abs64-fix

Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agoRemove abs64()
Andrew Morton [Wed, 21 Oct 2015 22:13:21 +0000 (09:13 +1100)]
Remove abs64()

Switch everything to the new and more capable implementation of abs().
Mainly to give the new abs() a bit of a workout.

Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agokernel.h: make abs() work with 64-bit types
Michal Nazarewicz [Wed, 21 Oct 2015 22:13:21 +0000 (09:13 +1100)]
kernel.h: make abs() work with 64-bit types

For 64-bit arguments, the abs macro casts it to an int which leads to lost
precision and may cause incorrect results.  To deal with 64-bit types
abs64 macro has been introduced but still there are places where abs macro
is used incorrectly.

To deal with the problem, expand abs macro such that it operates on s64
type when dealing with 64-bit types while still returning long when
dealing with smaller types.

This fixes one known bug (per John):

The internal clocksteering done for fine-grained error correction uses a
: logarithmic approximation, so any time adjtimex() adjusts the clock
: steering, timekeeping_freqadjust() quickly approximates the correct clock
: frequency over a series of ticks.
:
: Unfortunately, the logic in timekeeping_freqadjust(), introduced in commit
dc491596f639438 (Rework frequency adjustments to work better w/ nohz),
: used the abs() function with a s64 error value to calculate the size of
: the approximated adjustment to be made.
:
: Per include/linux/kernel.h: "abs() should not be used for 64-bit types
: (s64, u64, long long) - use abs64()".
:
: Thus on 32-bit platforms, this resulted in the clocksteering to take a
: quite dampended random walk trying to converge on the proper frequency,
: which caused the adjustments to be made much slower then intended (most
: easily observed when large adjustments are made).

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Reported-by: John Stultz <john.stultz@linaro.org>
Tested-by: John Stultz <john.stultz@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agosparc/sparc64: allocate sys_membarrier system call number
Mathieu Desnoyers [Wed, 21 Oct 2015 22:13:21 +0000 (09:13 +1100)]
sparc/sparc64: allocate sys_membarrier system call number

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agomips: add entry for new mlock2 syscall
Eric B Munson [Wed, 21 Oct 2015 22:13:21 +0000 (09:13 +1100)]
mips: add entry for new mlock2 syscall

A previous commit introduced the new mlock2 syscall, add entries for the
MIPS architecture.

Signed-off-by: Eric B Munson <emunson@akamai.com>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Shuah Khan <shuahkh@osg.samsung.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agonet/ipv4/route.c: prevent oops
Andrew Morton [Wed, 21 Oct 2015 22:13:20 +0000 (09:13 +1100)]
net/ipv4/route.c: prevent oops

Fix oops in ip_route_input_slow()

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
8 years agoMerge branch 'akpm-current/current'
Stephen Rothwell [Mon, 2 Nov 2015 03:45:18 +0000 (14:45 +1100)]
Merge branch 'akpm-current/current'

8 years agoMerge remote-tracking branch 'nvdimm/libnvdimm-for-next'
Stephen Rothwell [Mon, 2 Nov 2015 03:23:28 +0000 (14:23 +1100)]
Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'

8 years agoMerge remote-tracking branch 'rtc/rtc-next'
Stephen Rothwell [Mon, 2 Nov 2015 03:22:13 +0000 (14:22 +1100)]
Merge remote-tracking branch 'rtc/rtc-next'

8 years agoMerge remote-tracking branch 'coresight/next'
Stephen Rothwell [Mon, 2 Nov 2015 03:20:58 +0000 (14:20 +1100)]
Merge remote-tracking branch 'coresight/next'

8 years agoMerge remote-tracking branch 'livepatching/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 03:20:56 +0000 (14:20 +1100)]
Merge remote-tracking branch 'livepatching/for-next'

8 years agoMerge remote-tracking branch 'access_once/linux-next'
Stephen Rothwell [Mon, 2 Nov 2015 03:20:51 +0000 (14:20 +1100)]
Merge remote-tracking branch 'access_once/linux-next'

8 years agoMerge remote-tracking branch 'y2038/y2038'
Stephen Rothwell [Mon, 2 Nov 2015 03:19:04 +0000 (14:19 +1100)]
Merge remote-tracking branch 'y2038/y2038'

8 years agoMerge remote-tracking branch 'kselftest/next'
Stephen Rothwell [Mon, 2 Nov 2015 03:17:40 +0000 (14:17 +1100)]
Merge remote-tracking branch 'kselftest/next'

8 years agoMerge remote-tracking branch 'llvmlinux/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 03:17:26 +0000 (14:17 +1100)]
Merge remote-tracking branch 'llvmlinux/for-next'

8 years agoMerge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Mon, 2 Nov 2015 03:15:36 +0000 (14:15 +1100)]
Merge remote-tracking branch 'clk/clk-next'

8 years agoMerge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 03:13:40 +0000 (14:13 +1100)]
Merge remote-tracking branch 'userns/for-next'

8 years agoMerge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 03:12:25 +0000 (14:12 +1100)]
Merge remote-tracking branch 'pwm/for-next'

8 years agoMerge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 03:10:24 +0000 (14:10 +1100)]
Merge remote-tracking branch 'gpio/for-next'

8 years agoMerge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Mon, 2 Nov 2015 03:09:06 +0000 (14:09 +1100)]
Merge remote-tracking branch 'vhost/linux-next'

8 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 03:01:11 +0000 (14:01 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'

8 years agoMerge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Mon, 2 Nov 2015 02:59:55 +0000 (13:59 +1100)]
Merge remote-tracking branch 'target-merge/for-next-merge'

8 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:58:35 +0000 (13:58 +1100)]
Merge remote-tracking branch 'target-updates/for-next'

8 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:57:21 +0000 (13:57 +1100)]
Merge remote-tracking branch 'scsi/for-next'

8 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:49:04 +0000 (13:49 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

8 years agoMerge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:42:19 +0000 (13:42 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'

8 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:39:47 +0000 (13:39 +1100)]
Merge remote-tracking branch 'staging/staging-next'

8 years agoMerge remote-tracking branch 'usb-chipidea-next/ci-for-usb-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:38:32 +0000 (13:38 +1100)]
Merge remote-tracking branch 'usb-chipidea-next/ci-for-usb-next'

8 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:36:14 +0000 (13:36 +1100)]
Merge remote-tracking branch 'usb/usb-next'

8 years agoMerge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:34:17 +0000 (13:34 +1100)]
Merge remote-tracking branch 'tty/tty-next'

8 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:26:10 +0000 (13:26 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'

8 years agoMerge remote-tracking branch 'ipmi/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:24:58 +0000 (13:24 +1100)]
Merge remote-tracking branch 'ipmi/for-next'

8 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:23:15 +0000 (13:23 +1100)]
Merge remote-tracking branch 'leds/for-next'

8 years agoMerge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:22:03 +0000 (13:22 +1100)]
Merge remote-tracking branch 'hsi/for-next'

8 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:20:00 +0000 (13:20 +1100)]
Merge remote-tracking branch 'regmap/for-next'

8 years agoMerge remote-tracking branch 'chrome-platform/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:11:52 +0000 (13:11 +1100)]
Merge remote-tracking branch 'chrome-platform/for-next'

8 years agoMerge remote-tracking branch 'drivers-x86/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:10:40 +0000 (13:10 +1100)]
Merge remote-tracking branch 'drivers-x86/for-next'

8 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:08:57 +0000 (13:08 +1100)]
Merge remote-tracking branch 'workqueues/for-next'

8 years agoMerge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Mon, 2 Nov 2015 02:01:21 +0000 (13:01 +1100)]
Merge remote-tracking branch 'percpu/for-next'

8 years agoMerge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Mon, 2 Nov 2015 01:53:06 +0000 (12:53 +1100)]
Merge remote-tracking branch 'xen-tip/linux-next'

8 years agoMerge remote-tracking branch 'kvms390/next'
Stephen Rothwell [Mon, 2 Nov 2015 01:51:54 +0000 (12:51 +1100)]
Merge remote-tracking branch 'kvms390/next'

8 years agoMerge remote-tracking branch 'kvm-ppc-paulus/kvm-ppc-next'
Stephen Rothwell [Mon, 2 Nov 2015 01:50:41 +0000 (12:50 +1100)]
Merge remote-tracking branch 'kvm-ppc-paulus/kvm-ppc-next'

8 years agoMerge remote-tracking branch 'kvm-arm/next'
Stephen Rothwell [Mon, 2 Nov 2015 01:49:25 +0000 (12:49 +1100)]
Merge remote-tracking branch 'kvm-arm/next'

8 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Mon, 2 Nov 2015 01:47:32 +0000 (12:47 +1100)]
Merge remote-tracking branch 'kvm/linux-next'