]> www.infradead.org Git - users/willy/linux.git/log
users/willy/linux.git
6 years agoMerge remote-tracking branch 'sunxi/sunxi/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:23:48 +0000 (09:23 +1100)]
Merge remote-tracking branch 'sunxi/sunxi/for-next'

6 years agoMerge remote-tracking branch 'samsung-krzk/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:22:21 +0000 (09:22 +1100)]
Merge remote-tracking branch 'samsung-krzk/for-next'

6 years agoMerge remote-tracking branch 'rockchip/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:20:39 +0000 (09:20 +1100)]
Merge remote-tracking branch 'rockchip/for-next'

6 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Sun, 9 Dec 2018 22:18:23 +0000 (09:18 +1100)]
Merge remote-tracking branch 'renesas/next'

6 years agoMerge remote-tracking branch 'qcom/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:16:06 +0000 (09:16 +1100)]
Merge remote-tracking branch 'qcom/for-next'

6 years agoMerge remote-tracking branch 'reset/reset/next'
Stephen Rothwell [Sun, 9 Dec 2018 22:13:40 +0000 (09:13 +1100)]
Merge remote-tracking branch 'reset/reset/next'

6 years agoMerge remote-tracking branch 'omap/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:11:57 +0000 (09:11 +1100)]
Merge remote-tracking branch 'omap/for-next'

6 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:10:30 +0000 (09:10 +1100)]
Merge remote-tracking branch 'mvebu/for-next'

6 years agoMerge remote-tracking branch 'mediatek/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:09:03 +0000 (09:09 +1100)]
Merge remote-tracking branch 'mediatek/for-next'

6 years agoMerge remote-tracking branch 'keystone/next'
Stephen Rothwell [Sun, 9 Dec 2018 22:09:01 +0000 (09:09 +1100)]
Merge remote-tracking branch 'keystone/next'

6 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:06:51 +0000 (09:06 +1100)]
Merge remote-tracking branch 'imx-mxs/for-next'

6 years agoMerge remote-tracking branch 'bcm2835/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:05:13 +0000 (09:05 +1100)]
Merge remote-tracking branch 'bcm2835/for-next'

6 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:03:46 +0000 (09:03 +1100)]
Merge remote-tracking branch 'at91/at91-next'

6 years agoMerge remote-tracking branch 'aspeed/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:02:18 +0000 (09:02 +1100)]
Merge remote-tracking branch 'aspeed/for-next'

6 years agoMerge remote-tracking branch 'amlogic/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:00:39 +0000 (09:00 +1100)]
Merge remote-tracking branch 'amlogic/for-next'

6 years agoMerge remote-tracking branch 'actions/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 22:00:24 +0000 (09:00 +1100)]
Merge remote-tracking branch 'actions/for-next'

6 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 21:58:16 +0000 (08:58 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'

6 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Sun, 9 Dec 2018 21:54:26 +0000 (08:54 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

6 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 21:52:26 +0000 (08:52 +1100)]
Merge remote-tracking branch 'arm/for-next'

6 years agoMerge remote-tracking branch 'dma-mapping/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 21:43:09 +0000 (08:43 +1100)]
Merge remote-tracking branch 'dma-mapping/for-next'

6 years agoMerge remote-tracking branch 'leaks/leaks-next'
Stephen Rothwell [Sun, 9 Dec 2018 21:42:57 +0000 (08:42 +1100)]
Merge remote-tracking branch 'leaks/leaks-next'

6 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Sun, 9 Dec 2018 21:31:23 +0000 (08:31 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

6 years agoMerge remote-tracking branch 'mmc-fixes/fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:44 +0000 (08:23 +1100)]
Merge remote-tracking branch 'mmc-fixes/fixes'

6 years agoMerge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:44 +0000 (08:23 +1100)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'

6 years agoMerge remote-tracking branch 'scsi-fixes/fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:43 +0000 (08:23 +1100)]
Merge remote-tracking branch 'scsi-fixes/fixes'

6 years agoMerge remote-tracking branch 'btrfs-fixes/next-fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:39 +0000 (08:23 +1100)]
Merge remote-tracking branch 'btrfs-fixes/next-fixes'

6 years agoMerge remote-tracking branch 'nvdimm-fixes/libnvdimm-fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:38 +0000 (08:23 +1100)]
Merge remote-tracking branch 'nvdimm-fixes/libnvdimm-fixes'

6 years agoMerge remote-tracking branch 'omap-fixes/fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:36 +0000 (08:23 +1100)]
Merge remote-tracking branch 'omap-fixes/fixes'

6 years agoMerge remote-tracking branch 'mips-fixes/mips-fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:35 +0000 (08:23 +1100)]
Merge remote-tracking branch 'mips-fixes/mips-fixes'

6 years agoMerge remote-tracking branch 'v4l-dvb-fixes/fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:33 +0000 (08:23 +1100)]
Merge remote-tracking branch 'v4l-dvb-fixes/fixes'

6 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:29 +0000 (08:23 +1100)]
Merge remote-tracking branch 'ide/master'

6 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:24 +0000 (08:23 +1100)]
Merge remote-tracking branch 'input-current/for-linus'

6 years agoMerge remote-tracking branch 'spi-fixes/for-linus'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:20 +0000 (08:23 +1100)]
Merge remote-tracking branch 'spi-fixes/for-linus'

6 years agoMerge remote-tracking branch 'regulator-fixes/for-linus'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:19 +0000 (08:23 +1100)]
Merge remote-tracking branch 'regulator-fixes/for-linus'

6 years agoMerge remote-tracking branch 'sound-asoc-fixes/for-linus'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:18 +0000 (08:23 +1100)]
Merge remote-tracking branch 'sound-asoc-fixes/for-linus'

6 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:17 +0000 (08:23 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'

6 years agoMerge remote-tracking branch 'rdma-fixes/for-rc'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:17 +0000 (08:23 +1100)]
Merge remote-tracking branch 'rdma-fixes/for-rc'

6 years agoMerge remote-tracking branch 'netfilter/master'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:14 +0000 (08:23 +1100)]
Merge remote-tracking branch 'netfilter/master'

6 years agoMerge remote-tracking branch 'ipsec/master'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:13 +0000 (08:23 +1100)]
Merge remote-tracking branch 'ipsec/master'

6 years agoMerge remote-tracking branch 'bpf/master'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:12 +0000 (08:23 +1100)]
Merge remote-tracking branch 'bpf/master'

6 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:11 +0000 (08:23 +1100)]
Merge remote-tracking branch 'net/master'

6 years agoMerge remote-tracking branch 'powerpc-fixes/fixes'
Stephen Rothwell [Sun, 9 Dec 2018 21:23:09 +0000 (08:23 +1100)]
Merge remote-tracking branch 'powerpc-fixes/fixes'

6 years agoMerge remote-tracking branch 'fixes/master'
Stephen Rothwell [Sun, 9 Dec 2018 21:13:08 +0000 (08:13 +1100)]
Merge remote-tracking branch 'fixes/master'

6 years agonet/sched: cls_flower: Reject duplicated rules also under skip_sw
Or Gerlitz [Sun, 9 Dec 2018 16:10:24 +0000 (18:10 +0200)]
net/sched: cls_flower: Reject duplicated rules also under skip_sw

Currently, duplicated rules are rejected only for skip_hw or "none",
hence allowing users to push duplicates into HW for no reason.

Use the flower tables to protect for that.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Paul Blakey <paulb@mellanox.com>
Reported-by: Chris Mi <chrism@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agoMerge branch 'bnxt_en-Bug-fixes'
David S. Miller [Sun, 9 Dec 2018 19:46:59 +0000 (11:46 -0800)]
Merge branch 'bnxt_en-Bug-fixes'

Michael Chan says:

====================
bnxt_en: Bug fixes.

The first patch fixes a regression on CoS queue setup, introduced
recently by the 57500 new chip support patches.  The rest are
fixes related to ring and resource accounting on the new 57500 chips.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agobnxt_en: Fix _bnxt_get_max_rings() for 57500 chips.
Michael Chan [Sun, 9 Dec 2018 12:01:02 +0000 (07:01 -0500)]
bnxt_en: Fix _bnxt_get_max_rings() for 57500 chips.

The CP rings are accounted differently on the new 57500 chips.  There
must be enough CP rings for the sum of RX and TX rings on the new
chips.  The current logic may be over-estimating the RX and TX rings.

The output parameter max_cp should be the maximum NQs capped by
MSIX vectors available for networking in the context of 57500 chips.
The existing code which uses CMPL rings capped by the MSIX vectors
works most of the time but is not always correct.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agobnxt_en: Fix NQ/CP rings accounting on the new 57500 chips.
Michael Chan [Sun, 9 Dec 2018 12:01:01 +0000 (07:01 -0500)]
bnxt_en: Fix NQ/CP rings accounting on the new 57500 chips.

The new 57500 chips have introduced the NQ structure in addition to
the existing CP rings in all chips.  We need to introduce a new
bnxt_nq_rings_in_use().  On legacy chips, the 2 functions are the
same and one will just call the other.  On the new chips, they
refer to the 2 separate ring structures.  The new function is now
called to determine the resource (NQ or CP rings) associated with
MSIX that are in use.

On 57500 chips, the RDMA driver does not use the CP rings so
we don't need to do the subtraction adjustment.

Fixes: 41e8d7983752 ("bnxt_en: Modify the ring reservation functions for 57500 series chips.")
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agobnxt_en: Keep track of reserved IRQs.
Michael Chan [Sun, 9 Dec 2018 12:01:00 +0000 (07:01 -0500)]
bnxt_en: Keep track of reserved IRQs.

The new 57500 chips use 1 NQ per MSIX vector, whereas legacy chips use
1 CP ring per MSIX vector.  To better unify this, add a resv_irqs
field to struct bnxt_hw_resc.  On legacy chips, we initialize resv_irqs
with resv_cp_rings.  On new chips, we initialize it with the allocated
MSIX resources.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agobnxt_en: Fix CNP CoS queue regression.
Michael Chan [Sun, 9 Dec 2018 12:00:59 +0000 (07:00 -0500)]
bnxt_en: Fix CNP CoS queue regression.

Recent changes to support the 57500 devices have created this
regression.  The bnxt_hwrm_queue_qportcfg() call was moved to be
called earlier before the RDMA support was determined, causing
the CoS queues configuration to be set before knowing whether RDMA
was supported or not.  Fix it by moving it to the right place right
after RDMA support is determined.

Fixes: 98f04cf0f1fc ("bnxt_en: Check context memory requirements from firmware.")
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agoMerge tag 'char-misc-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
Linus Torvalds [Sun, 9 Dec 2018 18:43:17 +0000 (10:43 -0800)]
Merge tag 'char-misc-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver fixes from Greg KH:
 "Here are some small driver fixes for 4.20-rc6.

  There is a hyperv fix that for some reaon took forever to get into a
  shape that could be applied to the tree properly, but resolves a much
  reported issue. The others are some gnss patches, one a bugfix and the
  two others updates to the MAINTAINERS file to properly match the gnss
  files in the tree.

  All have been in linux-next for a while with no reported issues"

* tag 'char-misc-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  MAINTAINERS: exclude gnss from SIRFPRIMA2 regex matching
  MAINTAINERS: add gnss scm tree
  gnss: sirf: fix activation retry handling
  Drivers: hv: vmbus: Offload the handling of channels to two workqueues

6 years agoMerge tag 'staging-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
Linus Torvalds [Sun, 9 Dec 2018 18:35:33 +0000 (10:35 -0800)]
Merge tag 'staging-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging fixes from Greg KH:
 "Here are two staging driver bugfixes for 4.20-rc6.

  One is a revert of a previously incorrect patch that was merged a
  while ago, and the other resolves a possible buffer overrun that was
  found by code inspection.

  Both of these have been in the linux-next tree with no reported
  issues"

* tag 'staging-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  Revert commit ef9209b642f "staging: rtl8723bs: Fix indenting errors and an off-by-one mistake in core/rtw_mlme_ext.c"
  staging: rtl8712: Fix possible buffer overrun

6 years agoMerge branch 'fixes' into for-next
Olof Johansson [Sun, 9 Dec 2018 18:28:34 +0000 (10:28 -0800)]
Merge branch 'fixes' into for-next

* fixes:
  ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
  ARM: imx: update the cpu power up timing setting on i.mx6sx
  Revert "arm64: dts: marvell: add CPU Idle power state support on Armada 7K/8K"
  ARM: dts: imx7d-pico: Describe the Wifi clock
  ARM: dts: sun8i: a83t: bananapi-m3: increase vcc-pd voltage to 3.3V

6 years agoMerge tag 'mvebu-fixes-4.20-1' of git://git.infradead.org/linux-mvebu into fixes
Olof Johansson [Sun, 9 Dec 2018 18:28:02 +0000 (10:28 -0800)]
Merge tag 'mvebu-fixes-4.20-1' of git://git.infradead.org/linux-mvebu into fixes

mvebu fixes for 4.20

Adding CPU Idle state in the device tree for Armada 8040 seems to
breaks boot on some board, so let's revert it waiting for a better
solution.

* tag 'mvebu-fixes-4.20-1' of git://git.infradead.org/linux-mvebu:
  Revert "arm64: dts: marvell: add CPU Idle power state support on Armada 7K/8K"

Signed-off-by: Olof Johansson <olof@lixom.net>
6 years agoMerge tag 'sunxi-fixes-for-4.20' of https://git.kernel.org/pub/scm/linux/kernel/git...
Olof Johansson [Sun, 9 Dec 2018 18:27:17 +0000 (10:27 -0800)]
Merge tag 'sunxi-fixes-for-4.20' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes

Allwinner fixes for 4.20

One small fix for a regulator range on the Banana Pi M3

* tag 'sunxi-fixes-for-4.20' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: dts: sun8i: a83t: bananapi-m3: increase vcc-pd voltage to 3.3V

Signed-off-by: Olof Johansson <olof@lixom.net>
6 years agoMerge tag 'imx-fixes-4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawngu...
Olof Johansson [Sun, 9 Dec 2018 18:26:36 +0000 (10:26 -0800)]
Merge tag 'imx-fixes-4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

i.MX fixes for 4.20, round 3:
 - A couple of fixes on imx7d-pico and imx7d-nitrogen7 boards to correct
   the description of the Wifi clock.
 - Change SW2ISO count to get a safer ARM LDO ramp-up time, so that
   different boards can be covered. This fixes the ARM LDO failure seen
   on some customer boards.

* tag 'imx-fixes-4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
  ARM: imx: update the cpu power up timing setting on i.mx6sx
  ARM: dts: imx7d-pico: Describe the Wifi clock

Signed-off-by: Olof Johansson <olof@lixom.net>
6 years agoMerge tag 'tty-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Linus Torvalds [Sun, 9 Dec 2018 18:24:29 +0000 (10:24 -0800)]
Merge tag 'tty-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty driver fixes from Greg KH:
 "Here are three small tty driver fixes for 4.20-rc6

  Nothing major, just some bug fixes for reported issues. Full details
  are in the shortlog.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'tty-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  kgdboc: fix KASAN global-out-of-bounds bug in param_set_kgdboc_var()
  tty: serial: 8250_mtk: always resume the device in probe.
  tty: do not set TTY_IO_ERROR flag if console port

6 years agoMerge tag 'usb-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Linus Torvalds [Sun, 9 Dec 2018 18:18:24 +0000 (10:18 -0800)]
Merge tag 'usb-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB fixes from Greg KH:
 "Here are some small USB fixes for 4.20-rc6

  The "largest" here are some xhci fixes for reported issues. Also here
  is a USB core fix, some quirk additions, and a usb-serial fix which
  required the export of one of the tty layer's functions to prevent
  code duplication. The tty maintainer agreed with this change.

  All of these have been in linux-next with no reported issues"

* tag 'usb-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  xhci: Prevent U1/U2 link pm states if exit latency is too long
  xhci: workaround CSS timeout on AMD SNPS 3.0 xHC
  USB: check usb_get_extra_descriptor for proper size
  USB: serial: console: fix reported terminal settings
  usb: quirk: add no-LPM quirk on SanDisk Ultra Flair device
  USB: Fix invalid-free bug in port_over_current_notify()
  usb: appledisplay: Add 27" Apple Cinema Display

6 years agoMerge tag '4.20-rc5-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6
Linus Torvalds [Sun, 9 Dec 2018 18:15:13 +0000 (10:15 -0800)]
Merge tag '4.20-rc5-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fixes from Steve French:
 "Three small fixes: a fix for smb3 direct i/o, a fix for CIFS DFS for
  stable and a minor cifs Kconfig fix"

* tag '4.20-rc5-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Avoid returning EBUSY to upper layer VFS
  cifs: Fix separator when building path from dentry
  cifs: In Kconfig CONFIG_CIFS_POSIX needs depends on legacy (insecure cifs)

6 years agoMerge tag 'dax-fixes-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim...
Linus Torvalds [Sun, 9 Dec 2018 17:54:04 +0000 (09:54 -0800)]
Merge tag 'dax-fixes-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

Pull dax fixes from Dan Williams:
 "The last of the known regression fixes and fallout from the Xarray
  conversion of the filesystem-dax implementation.

  On the path to debugging why the dax memory-failure injection test
  started failing after the Xarray conversion a couple more fixes for
  the dax_lock_mapping_entry(), now called dax_lock_page(), surfaced.
  Those plus the bug that started the hunt are now addressed. These
  patches have appeared in a -next release with no issues reported.

  Note the touches to mm/memory-failure.c are just the conversion to the
  new function signature for dax_lock_page().

  Summary:

   - Fix the Xarray conversion of fsdax to properly handle
     dax_lock_mapping_entry() in the presense of pmd entries

   - Fix inode destruction racing a new lock request"

* tag 'dax-fixes-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  dax: Fix unlock mismatch with updated API
  dax: Don't access a freed inode
  dax: Check page->mapping isn't NULL

6 years agoMerge tag 'libnvdimm-fixes-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Sun, 9 Dec 2018 17:46:54 +0000 (09:46 -0800)]
Merge tag 'libnvdimm-fixes-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

Pull libnvdimm fixes from Dan Williams:
 "A regression fix for the Address Range Scrub implementation, yes
  another one, and support for platforms that misalign persistent memory
  relative to the Linux memory hotplug section constraint. Longer term,
  support for sub-section memory hotplug would alleviate alignment
  waste, but until then this hack allows a 'struct page' memmap to be
  established for these misaligned memory regions.

  These have all appeared in a -next release, and thanks to Patrick for
  reporting and testing the alignment padding fix.

  Summary:

   - Unless and until the core mm handles memory hotplug units smaller
     than a section (128M), persistent memory namespaces must be padded
     to section alignment.

     The libnvdimm core already handled section collision with "System
     RAM", but some configurations overlap independent "Persistent
     Memory" ranges within a section, so additional padding injection is
     added for that case.

   - The recent reworks of the ARS (address range scrub) state machine
     to reduce the number of state flags inadvertantly missed a
     conversion of acpi_nfit_ars_rescan() call sites. Fix the regression
     whereby user-requested ARS results in a "short" scrub rather than a
     "long" scrub.

   - Fixup the unit tests to handle / test the 128M section alignment of
     mocked test resources.

* tag 'libnvdimm-fixes-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  acpi/nfit: Fix user-initiated ARS to be "ARS-long" rather than "ARS-short"
  libnvdimm, pfn: Pad pfn namespaces relative to other regions
  tools/testing/nvdimm: Align test resources to 128M

6 years agoMerge branch 'imx/defconfig' into for-next
Shawn Guo [Sun, 9 Dec 2018 13:03:42 +0000 (21:03 +0800)]
Merge branch 'imx/defconfig' into for-next

6 years agoMerge branch 'imx7ulp/dt' into for-next
Shawn Guo [Sun, 9 Dec 2018 13:03:36 +0000 (21:03 +0800)]
Merge branch 'imx7ulp/dt' into for-next

6 years agoMerge branch 'imx7d/pico' into for-next
Shawn Guo [Sun, 9 Dec 2018 13:03:30 +0000 (21:03 +0800)]
Merge branch 'imx7d/pico' into for-next

6 years agoMerge branch 'imx/dt' into for-next
Shawn Guo [Sun, 9 Dec 2018 13:03:24 +0000 (21:03 +0800)]
Merge branch 'imx/dt' into for-next

6 years agoMerge branch 'imx/soc' into for-next
Shawn Guo [Sun, 9 Dec 2018 13:03:14 +0000 (21:03 +0800)]
Merge branch 'imx/soc' into for-next

6 years agoMerge branch 'imx/drivers' into for-next
Shawn Guo [Sun, 9 Dec 2018 13:03:09 +0000 (21:03 +0800)]
Merge branch 'imx/drivers' into for-next

6 years agoARM: dts: imx7d-pico: Add the imx7d-pico-hobbit variant
Fabio Estevam [Thu, 6 Dec 2018 10:09:05 +0000 (08:09 -0200)]
ARM: dts: imx7d-pico: Add the imx7d-pico-hobbit variant

The imx7d-pico-hobbit contains a imx7d-pico SoM and a hobbit baseboard.

Add support for it.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
6 years agoARM: dts: imx7d-pico-pi: Extend peripherals support
Fabio Estevam [Thu, 6 Dec 2018 10:09:04 +0000 (08:09 -0200)]
ARM: dts: imx7d-pico-pi: Extend peripherals support

This adds following peripherals for the imx7d-pico-pi as:

 - LED
 - Touchscreen
 - GPIO

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
6 years agoARM: dts: imx7d-pico: Extend peripherals support
Fabio Estevam [Thu, 6 Dec 2018 10:09:03 +0000 (08:09 -0200)]
ARM: dts: imx7d-pico: Extend peripherals support

This extends the peripherals supported by the imx7d-pico.dtsi. It
adds:

 - I2C2
 - Flexcan (flexcan1 and flexcan2 ports)
 - USDHC1
 - UART (6 and 7 ports)
 - PWM (4 ports)
 - eCSPI3

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
6 years agoARM: dts: imx7d-pico: Improve WiFi regulator name
Otavio Salvador [Thu, 6 Dec 2018 10:09:02 +0000 (08:09 -0200)]
ARM: dts: imx7d-pico: Improve WiFi regulator name

There are different models of WiFi being used in the SoM and the
handle name was too restrictive. This reworks it to a more generic and
meaningful name.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
6 years agoARM: dts: imx7d-pico: Pass the Ethernet PHY reset GPIO
Fabio Estevam [Thu, 6 Dec 2018 10:09:01 +0000 (08:09 -0200)]
ARM: dts: imx7d-pico: Pass the Ethernet PHY reset GPIO

Pass the "phy-reset-gpios" property in order to describe the GPIO
that performs the Ethernet PHY reset.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
6 years agoARM: dts: imx7d-pico: Pass the USBOTG1_PWR pinctrl
Fabio Estevam [Thu, 6 Dec 2018 10:09:00 +0000 (08:09 -0200)]
ARM: dts: imx7d-pico: Pass the USBOTG1_PWR pinctrl

Pass the USBOTG1_PWR pinctrl description in the USBOTG GPIO
controlled regulator.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
6 years agoARM: dts: imx7d-pico-pi: Move SoM related part to imx7d-pico.dtsi
Fabio Estevam [Thu, 6 Dec 2018 10:08:59 +0000 (08:08 -0200)]
ARM: dts: imx7d-pico-pi: Move SoM related part to imx7d-pico.dtsi

imx7d-pico-pi board contains:

- One SoM board (imx7d pico)
- One base board (pi).

In order to make it easier for adding support for other board variants,
move the commom SoM part to the imx7d-pico.dtsi file.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
6 years agoARM: dts: imx7d-pico: Switch to SPDX identifier
Fabio Estevam [Thu, 6 Dec 2018 10:08:58 +0000 (08:08 -0200)]
ARM: dts: imx7d-pico: Switch to SPDX identifier

Adopt the SPDX license identifier headers to ease license compliance
management.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
6 years agoARM: dts: imx7d-pico: Do not harcode the memory size
Fabio Estevam [Thu, 6 Dec 2018 10:08:57 +0000 (08:08 -0200)]
ARM: dts: imx7d-pico: Do not harcode the memory size

Currently the memory size described in dts is 2GB, which is incorrect.

There are 512MB and 1GB versions of imx7d-pico boards, so remove
the hardcoded memory size and let the bootloader pass the correct
value to the kernel.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
6 years agoMerge tag 'imx-fixes-4.20-3' into imx7d/pico
Shawn Guo [Sun, 9 Dec 2018 13:00:27 +0000 (21:00 +0800)]
Merge tag 'imx-fixes-4.20-3' into imx7d/pico

i.MX fixes for 4.20, round 3:
 - A couple of fixes on imx7d-pico and imx7d-nitrogen7 boards to correct
   the description of the Wifi clock.
 - Change SW2ISO count to get a safer ARM LDO ramp-up time, so that
   different boards can be covered. This fixes the ARM LDO failure seen
   on some customer boards.

6 years agoARM: dts: imx51-zii-rdu1: Do not specify "power-gpio" for hpa1
Andrey Smirnov [Thu, 6 Dec 2018 23:41:17 +0000 (21:41 -0200)]
ARM: dts: imx51-zii-rdu1: Do not specify "power-gpio" for hpa1

TPA6130A2 SD pin on RDU1 is not really controlled by SoC and instead
is only meant to notify the system that audio was "muted" by external
actors. To accommodate that, drop "power-gpio" property of hpa1 node as
well as specify a name for that GPIO so that userspace can access it.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Tested-by: Chris Healy <cphealy@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
6 years agoARM: dts: imx6ul: Remove extra space between node name and brace
Leonard Crestez [Thu, 6 Dec 2018 19:22:16 +0000 (19:22 +0000)]
ARM: dts: imx6ul: Remove extra space between node name and brace

Fixes: 7d1cd2978664 ("ARM: dts: imx6ul: add gpmi support")
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
6 years agoARM: imx6qdl-sabresd: Use GPIO_ACTIVE_HIGH for regulators
Fabio Estevam [Thu, 6 Dec 2018 10:36:41 +0000 (08:36 -0200)]
ARM: imx6qdl-sabresd: Use GPIO_ACTIVE_HIGH for regulators

Passing GPIO_ACTIVE_HIGH as GPIO flags for the GPIO controlled
regulator improves the readability, so use it instead of the
hardcoded number.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
6 years agoARM: dts: imx6ul: add flexcan support
Dong Aisheng [Thu, 6 Dec 2018 03:51:27 +0000 (03:51 +0000)]
ARM: dts: imx6ul: add flexcan support

Add flexcan support for i.MX6UL board. Change the place of CAN node delete
due to i.MX6ULZ include i.MX6UL dts but not support flexcan.

Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
6 years agoALSA: fireface: fix reference to wrong register for clock configuration
Takashi Sakamoto [Sun, 9 Dec 2018 08:04:19 +0000 (17:04 +0900)]
ALSA: fireface: fix reference to wrong register for clock configuration

In an initial commit, 'SYNC_STATUS' register is referred to get
clock configuration, however this is wrong, according to my local
note at hand for reverse-engineering about packet dump. It should
be 'CLOCK_CONFIG' register. Actually, ff400_dump_clock_config()
is correctly programmed.

This commit fixes the bug.

Cc: <stable@vger.kernel.org> # v4.12+
Fixes: 76fdb3a9e13a ('ALSA: fireface: add support for Fireface 400')
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
6 years agoALSA: hda/realtek - Fix the mute LED regresion on Lenovo X1 Carbon
Hui Wang [Sun, 9 Dec 2018 01:16:43 +0000 (09:16 +0800)]
ALSA: hda/realtek - Fix the mute LED regresion on Lenovo X1 Carbon

Users reported a mute LED regression on Lenovo X1 Carbon, the root
cause is we applied the fixup of ALC285_FIXUP_LENOVO_HEADPHONE_NOISE
to this machine, then the machine can't apply the fixup of
ALC269_FIXUP_THINKPAD_ACPI anymore. To fix it, we chain two fixup
together.

Fixes: c4cfcf6f4297 ("ALSA: hda/realtek - fix the pop noise on headphone for lenovo laptops")
Cc: <stable@vger.kernel.org>
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
6 years agoInput: synaptics - enable RMI on ThinkPad T560
Yussuf Khalil [Sun, 9 Dec 2018 04:13:35 +0000 (20:13 -0800)]
Input: synaptics - enable RMI on ThinkPad T560

Before commit 7fd6d98b89f3 ("i2c: i801: Allow ACPI AML access I/O
ports not reserved for SMBus"), enabling RMI on the T560 would cause
the touchpad to stop working after resuming from suspend. Now that
this issue is fixed, RMI can be enabled safely and works fine.

Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Yussuf Khalil <dev@pp3345.net>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
6 years agoInput: omap-keypad - fix idle configuration to not block SoC idle states
Tony Lindgren [Tue, 4 Dec 2018 21:52:49 +0000 (13:52 -0800)]
Input: omap-keypad - fix idle configuration to not block SoC idle states

With PM enabled, I noticed that pressing a key on the droid4 keyboard will
block deeper idle states for the SoC. Let's fix this by using IRQF_ONESHOT
and stop constantly toggling the device OMAP4_KBD_IRQENABLE register as
suggested by Dmitry Torokhov <dmitry.torokhov@gmail.com>.

From the hardware point of view, looks like we need to manage the registers
for OMAP4_KBD_IRQENABLE and OMAP4_KBD_WAKEUPENABLE together to avoid
blocking deeper SoC idle states. And with toggling of OMAP4_KBD_IRQENABLE
register now gone with IRQF_ONESHOT, also the SoC idle state problem is
gone during runtime. We still also need to clear OMAP4_KBD_WAKEUPENABLE in
omap4_keypad_close() though to pair it with omap4_keypad_open() to prevent
blocking deeper SoC idle states after rmmod omap4-keypad.

Reported-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
6 years agonet/mlx4_core: Correctly set PFC param if global pause is turned off.
Tarick Bedeir [Fri, 7 Dec 2018 08:30:26 +0000 (00:30 -0800)]
net/mlx4_core: Correctly set PFC param if global pause is turned off.

rx_ppp and tx_ppp can be set between 0 and 255, so don't clamp to 1.

Fixes: 6e8814ceb7e8 ("net/mlx4_en: Fix mixed PFC and Global pause user control requests")
Signed-off-by: Tarick Bedeir <tarick@google.com>
Reviewed-by: Eran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agoMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
Linus Torvalds [Sun, 9 Dec 2018 01:45:20 +0000 (17:45 -0800)]
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal

Pull thermal SoC fixes from Eduardo Valentin:
 "Fixes for armada and broadcom thermal drivers"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
  thermal: broadcom: constify thermal_zone_of_device_ops structure
  thermal: armada: constify thermal_zone_of_device_ops structure
  thermal: bcm2835: Switch to SPDX identifier
  thermal: armada: fix legacy resource fixup
  thermal: armada: fix legacy validity test sense

6 years agoMerge tag 'asm-generic-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...
Linus Torvalds [Sat, 8 Dec 2018 19:44:04 +0000 (11:44 -0800)]
Merge tag 'asm-generic-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

Pull asm-generic fix from Arnd Bergmann:
 "Multiple people reported a bug I introduced in asm-generic/unistd.h in
  4.20, this is the obvious bugfix to get glibc and others to correctly
  build again on new architectures that no longer provide the old
  fstatat64() family of system calls"

* tag 'asm-generic-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic: unistd.h: fixup broken macro include.

6 years agoMerge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Sat, 8 Dec 2018 19:33:26 +0000 (11:33 -0800)]
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

Pull clk fixes from Stephen Boyd:
 "A few clk driver fixes this time:

   - Introduce protected-clock DT binding to fix breakage on qcom
     sdm845-mtp boards where the qspi clks introduced this merge window
     cause the firmware on those boards to take down the system if we
     try to read the clk registers

   - Fix a couple off-by-one errors found by Dan Carpenter

   - Handle failure in zynq fixed factor clk driver to avoid using
     uninitialized data"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: zynqmp: Off by one in zynqmp_is_valid_clock()
  clk: mmp: Off by one in mmp_clk_add()
  clk: mvebu: Off by one bugs in cp110_of_clk_get()
  arm64: dts: qcom: sdm845-mtp: Mark protected gcc clocks
  clk: qcom: Support 'protected-clocks' property
  dt-bindings: clk: Introduce 'protected-clocks' property
  clk: zynqmp: handle fixed factor param query error

6 years agoMerge tag 'xfs-4.20-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Linus Torvalds [Sat, 8 Dec 2018 19:25:02 +0000 (11:25 -0800)]
Merge tag 'xfs-4.20-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

Pull xfs fixes from Darrick Wong:
 "Here are hopefully the last set of fixes for 4.20.

  There's a fix for a longstanding statfs reporting problem with project
  quotas, a correction for page cache invalidation behaviors when
  fallocating near EOF, and a fix for a broken metadata verifier return
  code.

  Finally, the most important fix is to the pipe splicing code (aka the
  generic copy_file_range fallback) to avoid pointless short directio
  reads by only asking the filesystem for as much data as there are
  available pages in the pipe buffer. Our previous fix (simulated short
  directio reads because the number of pages didn't match the length of
  the read requested) caused subtle problems on overlayfs, so that part
  is reverted.

  Anyhow, this series passes fstests -g all on xfs and overlay+xfs, and
  has passed 17 billion fsx operations problem-free since I started
  testing

  Summary:

   - Fix broken project quota inode counts

   - Fix incorrect PAGE_MASK/PAGE_SIZE usage

   - Fix incorrect return value in btree verifier

   - Fix WARN_ON remap flags false positive

   - Fix splice read overflows"

* tag 'xfs-4.20-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  iomap: partially revert 4721a601099 (simulated directio short read on EFAULT)
  splice: don't read more than available pipe space
  vfs: allow some remap flags to be passed to vfs_clone_file_range
  xfs: fix inverted return from xfs_btree_sblock_verify_crc
  xfs: fix PAGE_MASK usage in xfs_free_file_space
  fs/xfs: fix f_ffree value for statfs when project quota is set

6 years agoRevert "mm, thp: consolidate THP gfp handling into alloc_hugepage_direct_gfpmask"
David Rientjes [Fri, 7 Dec 2018 22:50:16 +0000 (14:50 -0800)]
Revert "mm, thp: consolidate THP gfp handling into alloc_hugepage_direct_gfpmask"

This reverts commit 89c83fb539f95491be80cdd5158e6f0ce329e317.

This should have been done as part of 2f0799a0ffc0 ("mm, thp: restore
node-local hugepage allocations").  The movement of the thp allocation
policy from alloc_pages_vma() to alloc_hugepage_direct_gfpmask() was
intended to only set __GFP_THISNODE for mempolicies that are not
MPOL_BIND whereas the revert could set this regardless of mempolicy.

While the check for MPOL_BIND between alloc_hugepage_direct_gfpmask()
and alloc_pages_vma() was racy, that has since been removed since the
revert.  What is left is the possibility to use __GFP_THISNODE in
policy_node() when it is unexpected because the special handling for
hugepages in alloc_pages_vma()  was removed as part of the consolidation.

Secondly, prior to 89c83fb539f9, alloc_pages_vma() implemented a somewhat
different policy for hugepage allocations, which were allocated through
alloc_hugepage_vma().  For hugepage allocations, if the allocating
process's node is in the set of allowed nodes, allocate with
__GFP_THISNODE for that node (for MPOL_PREFERRED, use that node with
__GFP_THISNODE instead).  This was changed for shmem_alloc_hugepage() to
allow fallback to other nodes in 89c83fb539f9 as it did for new_page() in
mm/mempolicy.c which is functionally different behavior and removes the
requirement to only allocate hugepages locally.

So this commit does a full revert of 89c83fb539f9 instead of the partial
revert that was done in 2f0799a0ffc0.  The result is the same thp
allocation policy for 4.20 that was in 4.19.

Fixes: 89c83fb539f9 ("mm, thp: consolidate THP gfp handling into alloc_hugepage_direct_gfpmask")
Fixes: 2f0799a0ffc0 ("mm, thp: restore node-local hugepage allocations")
Signed-off-by: David Rientjes <rientjes@google.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
6 years agoMerge branch 'mvebu/dt64' into mvebu/for-next
Gregory CLEMENT [Sat, 8 Dec 2018 08:32:01 +0000 (09:32 +0100)]
Merge branch 'mvebu/dt64' into mvebu/for-next

6 years agoarm64: dts: clearfog-gt-8k: describe mini-PCIe CON2 USB
Baruch Siach [Thu, 6 Dec 2018 11:19:09 +0000 (13:19 +0200)]
arm64: dts: clearfog-gt-8k: describe mini-PCIe CON2 USB

Enable the USB3 peripheral that is wired to CON2 on the Clearfog GT-8K
board.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
6 years agoarm64: dts: add support for Macchiatobin Single Shot board
Russell King [Mon, 5 Nov 2018 17:25:41 +0000 (17:25 +0000)]
arm64: dts: add support for Macchiatobin Single Shot board

Add DT support for the Macchiatobin Single Shot board from SolidRun,
which is similar to the Double Shot board, but does not have the
10G 3310 PHYs - the two ethernet ports are instead connected directly
to the SFP+ cages.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
6 years agoarm64: dts: marvell: armada-37xx: Enable emmc on espressobin
Ding Tao [Fri, 26 Oct 2018 11:50:28 +0000 (11:50 +0000)]
arm64: dts: marvell: armada-37xx: Enable emmc on espressobin

The ESPRESSObin board has a emmc interface available on U11: declare it
and let the bootloader enable it if the emmc is present.

[gregory.clement@bootlin.com: disable the emmc by default]
Signed-off-by: Ding Tao <miyatsu@qq.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
6 years agoRevert "net/ibm/emac: wrong bit is used for STA control"
Benjamin Herrenschmidt [Fri, 7 Dec 2018 04:05:04 +0000 (15:05 +1100)]
Revert "net/ibm/emac: wrong bit is used for STA control"

This reverts commit 624ca9c33c8a853a4a589836e310d776620f4ab9.

This commit is completely bogus. The STACR register has two formats, old
and new, depending on the version of the IP block used. There's a pair of
device-tree properties that can be used to specify the format used:

has-inverted-stacr-oc
has-new-stacr-staopc

What this commit did was to change the bit definition used with the old
parts to match the new parts. This of course breaks the driver on all
the old ones.

Instead, the author should have set the appropriate properties in the
device-tree for the variant used on his board.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
6 years agoMerge branch 'sunxi/dt-for-4.21' into sunxi/for-next
Chen-Yu Tsai [Sat, 8 Dec 2018 04:07:53 +0000 (12:07 +0800)]
Merge branch 'sunxi/dt-for-4.21' into sunxi/for-next

6 years agoscsi: t10-pi: Return correct ref tag when queue has no integrity profile
Martin K. Petersen [Wed, 5 Dec 2018 01:58:33 +0000 (20:58 -0500)]
scsi: t10-pi: Return correct ref tag when queue has no integrity profile

Commit ddd0bc756983 ("block: move ref_tag calculation func to the block
layer") moved ref tag calculation from SCSI to a library function. However,
this change broke returning the correct ref tag for devices operating in
DIF mode since these do not have an associated block integrity profile.
This in turn caused read/write failures on PI-formatted disks attached to
an mpt3sas controller.

Fixes: ddd0bc756983 ("block: move ref_tag calculation func to the block layer")
Cc: stable@vger.kernel.org # 4.19+
Reported-by: John Garry <john.garry@huawei.com>
Tested-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
6 years agoARM: dts: imx5: add gpu nodes
Jonathan Marek [Tue, 4 Dec 2018 15:17:00 +0000 (10:17 -0500)]
ARM: dts: imx5: add gpu nodes

This adds the gpu nodes for the adreno 200 GPU on iMX51 and iMX53, now
supported by the freedreno driver.

The compatible for the iMX51 uses a patchid of 1, which is used by drm/msm
driver to identify the smaller 128KiB GMEM size.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
6 years agoscsi: bnx2fc: Fix NULL dereference in error handling
Dan Carpenter [Thu, 1 Nov 2018 05:25:30 +0000 (08:25 +0300)]
scsi: bnx2fc: Fix NULL dereference in error handling

If "interface" is NULL then we can't release it and trying to will only
lead to an Oops.

Fixes: aea71a024914 ("[SCSI] bnx2fc: Introduce interface structure for each vlan interface")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
6 years agoRevert "scsi: qla2xxx: Fix NVMe Target discovery"
Himanshu Madhani [Fri, 7 Dec 2018 05:49:42 +0000 (21:49 -0800)]
Revert "scsi: qla2xxx: Fix NVMe Target discovery"

This reverts commit db186382af21e926e90df19499475f2552192b77.

This commit introduced regression with FCP discovery so revert it to fix
discovery for FCP luns.

Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>