Commit graph

883,772 commits

Author SHA1 Message Date
qctecmdr
09fd506f88 Merge "msm: kgsl: Add kobject sysfs ops for the /sys/kernel/gpu directory" 2020-05-21 18:18:22 -07:00
qctecmdr
484e534439 Merge "build.config.common: Revert the compiler back to clang-r370808" 2020-05-21 18:18:21 -07:00
qctecmdr
23d0cc5e97 Merge "soc: qcom: pil: allow subsystem to allocate extra memory" 2020-05-21 18:18:20 -07:00
qctecmdr
4834018094 Merge "net: qrtr: Remove rcu logic for port lookup/remove" 2020-05-21 18:18:19 -07:00
Nurit Lichtenstein
8585458497 soc: qcom: pil: allow subsystem to allocate extra memory
Allow the subsystem to use some extra memory allocated
after the end of the image, for the subsystem to use.

This is porting from Kona of commit SHA:1279fb070282.

Change-Id: I79d19c9e48b7893d10ac814fb42e5783651417b4
Signed-off-by: Nurit Lichtenstein <nuritl@codeaurora.org>
2020-05-21 15:42:04 +03:00
qctecmdr
f5e3002533 Merge "msm: cvp: Avoid sending DSP HFI buf twice" 2020-05-21 04:27:57 -07:00
qctecmdr
d4a46395f8 Merge "mhi: core: improve bandwidth switch events processing" 2020-05-21 04:27:57 -07:00
qctecmdr
a0f82a4ca9 Merge "cnss2: Assert if unexpected second QMI server arrive comes" 2020-05-21 04:27:56 -07:00
qctecmdr
1d3fc4577b Merge "ALSA: pcm: add macro SND_PCM_ADD_VOLUME_CTL and SND_PCM_ADD_USR_CTL" 2020-05-21 04:27:56 -07:00
qctecmdr
e64b030a69 Merge "cpufreq: qcom: Update the scheduler of throttle removal" 2020-05-21 04:27:56 -07:00
qctecmdr
70c723e217 Merge "msm: cvp: Avoids DSP memory leak" 2020-05-21 00:50:56 -07:00
qctecmdr
5e13fc010c Merge "crypto: msm: make qcrypto and qcedev independent of DEBUG_FS" 2020-05-21 00:50:56 -07:00
qctecmdr
16b8d19f54 Merge "Merge android-5.4.30 (5cfdde5) into msm-5.4" 2020-05-20 19:17:35 -07:00
Bhaumik Bhatt
649971df7a mhi: core: improve bandwidth switch events processing
We may unnecessarily wake up the device when there is no pending
bandwidth switch request. Avoid that by only asserting device wake if
one is pending. We can also have the underlying MHI bus go to suspend
while a device requested bandwidth switch is yet to be processed.
Prevent host suspends by capturing both bus and device votes and
increment pending packets to reject suspends while the processing is
ongoing.

Change-Id: I4eddb6bf9eaa973be5c0b0ac516269e54599b9f2
Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
2020-05-20 14:39:08 -07:00
Raghavendra Rao Ananta
e52a433a54 build.config.common: Revert the compiler back to clang-r370808
Due to the recent issues seen while parsing the va_args(), the compiler
is switched back to the older version,  clang-r370808, which is much
stable than the current one. Update the ABI snapshot accordingly.

Change-Id: Ib3c6b23ba40a9c036b961e839b89280aaa1cfd4e
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
2020-05-20 14:12:42 -07:00
Yue Ma
8420494178 cnss2: Assert if unexpected second QMI server arrive comes
Only one QMI server arrive should come for WLFW service. Hence only
assert if unexpected second server arrive comes for debug purpose.

Change-Id: Ib8cf80a544038904685a3d3a054fc7f3189a4a30
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2020-05-20 14:09:45 -07:00
Jordan Crouse
88ff0b5ea0 msm: kgsl: Add kobject sysfs ops for the /sys/kernel/gpu directory
Commit 2726e792a2 ("msm: kgsl: Fix linked sysfs files") thought it was
clever by reusing the callbacks for the sysfs nodes that were linked to
/sys/kernel/gpu. Unfortunately, since the /sys/kernel/gpu kobject didn't
have a device attached the callback function ended up dereferencing
nothing.

Instead, create a full kobject infrastructure with sysfs_ops and a built
in kobj to access the KGSL device. We can still use the callbacks albeit
with a wrapper to make them work from both locations. While we are in
the midst of this, make a header for the new attributes and macros so
that we can later move some of the nodes out of kgsl_pwrctrl.c with
less disruption.

Change-Id: Ic0dedbad5b9d7323d4f43328540dce91cc58015e
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2020-05-20 07:13:09 -06:00
Prerna Kalla
80acd2bcf5 crypto: msm: make qcrypto and qcedev independent of DEBUG_FS
qcrypto_init() and qcedev_init() should not be dependent on
DEBUG_FS API's returning success. Continue device init,when
DEBUG_FS is disabled.

Change-Id: I32cca791db545f5f2f9ea7871c091b121082dfbc
Signed-off-by: Prerna Kalla <prernak@codeaurora.org>
2020-05-19 21:56:21 -07:00
Taniya Das
4b15241f15 cpufreq: qcom: Update the scheduler of throttle removal
There can be a case where the frequency at the time of throttle removal
was not the max frequency. Thus the scheduler update sent would not be
the max frequency, which would result in wrong capacity calculation,
even though the CPU frequency is bumped to max frequency later.

Thus update the scheduler with the cpuinfo max frequency before enabling
the throttle IRQ.

Change-Id: I3fe95e326a81fba9af1e0ea86d5281d291a2c9b6
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2020-05-19 20:35:11 -07:00
Chris Lew
28ed3ab34f net: qrtr: Remove rcu logic for port lookup/remove
synchronize_rcu() is slow and can create delays on creating/removing
sockets.

Some clients have latency requirements for spinning off a
thread that creates a client and lookup sockets for some sessions. They
close the lookup socket during this sequence which causes delays. Each
call to synchronize_rcu takes 20-40 ms which is too long.

Remove the rcu logic and change qrtr_port_lock to a spinlock so it can
be used in qrtr_port_lookup which may be used in atomic context.

Change-Id: I3244e31d3ca0599df794d3936033735bcdd3e972
Signed-off-by: Chris Lew <clew@codeaurora.org>
2020-05-19 19:09:59 -07:00
Chris Lew
9f4ad55602 net: qrtr: Do not take sock lock on blocking recv
Socket client's should be able to block on recv without blocking other
socket operations such as sending. The qrtr core logic should also be
able to operate on the sock while a client is blocked in recv. Remove
the sock lock from around the recv_datagram to allow execution to
continue while a client is blocked in recv.

Change-Id: I6adb09b8e44c5ff3542b88db87b376a3ae5cb5ba
Signed-off-by: Chris Lew <clew@codeaurora.org>
2020-05-19 19:03:56 -07:00
Meng Wang
49a132aa9c ALSA: pcm: add macro SND_PCM_ADD_VOLUME_CTL and SND_PCM_ADD_USR_CTL
Add macro SND_PCM_ADD_CTL to identify if snd_pcm_add_usr_ctls
and snd_pcm_add_volume_ctls are called from ASoC.

Change-Id: I7542b180fcf3861b9adbf1d36780613703fcdcad
Signed-off-by: Meng Wang <mengw@codeaurora.org>
2020-05-20 08:23:52 +08:00
George Shen
021b9bfe46 msm: cvp: Avoids DSP memory leak
Call dma_buf put function to decrement dma_buf use count after
the buffer is un-mapped from CVP address space.

Change-Id: I3007ff8fc55796ae21ee3995ff3456a6e207f804
Signed-off-by: George Shen <sqiao@codeaurora.org>
2020-05-19 16:15:07 -07:00
qctecmdr
a6ae9f824c Merge "pwm: qti-lpg: Fix erroneous clearing of LUT" 2020-05-19 15:13:24 -07:00
qctecmdr
466f575715 Merge "CSR: Keep qdss clk being on for msr register before msr_reset" 2020-05-19 15:13:23 -07:00
qctecmdr
8adf183fac Merge "Revert "sched: reduce sleep duration in wait_task_inactive()"" 2020-05-19 15:13:23 -07:00
qctecmdr
8881fa7683 Merge "Enable RTIC MPGen using QGKI" 2020-05-19 15:13:23 -07:00
qctecmdr
e56d3f86ae Merge "cpufreq: qcom: Update logic to register for GT Limits Management interrupt" 2020-05-19 15:13:23 -07:00
qctecmdr
2601fc5629 Merge "thermal: qcom-spmi-temp-alarm: Don't suppress negative temp" 2020-05-19 15:13:22 -07:00
qctecmdr
dc1ab573de Merge "msm: adsprpc: add support to print logs on VERIFY failures" 2020-05-19 15:13:21 -07:00
Blagovest Kolenichev
8ec8dcf3dd Merge android-5.4.30 (5cfdde5) into msm-5.4
* refs/heads/tmp-5cfdde5:
  Revert "ANDROID: gki_defconfig: enabled UAPI header compile testing"
  Linux 5.4.30
  arm64: dts: ls1046ardb: set RGMII interfaces to RGMII_ID mode
  arm64: dts: ls1043a-rdb: correct RGMII delay mode to rgmii-id
  ARM: dts: sun8i: r40: Move AHCI device node based on address order
  ARM: dts: N900: fix onenand timings
  ARM: dts: imx6: phycore-som: fix arm and soc minimum voltage
  ARM: bcm2835-rpi-zero-w: Add missing pinctrl name
  ARM: dts: oxnas: Fix clear-mask property
  perf map: Fix off by one in strncpy() size argument
  arm64: alternative: fix build with clang integrated assembler
  libceph: fix alloc_msg_with_page_vector() memory leaks
  clk: ti: am43xx: Fix clock parent for RTC clock
  clk: imx: Align imx sc clock parent msg structs to 4
  clk: imx: Align imx sc clock msg structs to 4
  net: ks8851-ml: Fix IO operations, again
  gpiolib: acpi: Add quirk to ignore EC wakeups on HP x2 10 CHT + AXP288 model
  bpf: Explicitly memset some bpf info structures declared on the stack
  bpf: Explicitly memset the bpf_attr structure
  platform/x86: pmc_atom: Add Lex 2I385SW to critclk_systems DMI table
  vt: vt_ioctl: fix use-after-free in vt_in_use()
  vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
  vt: vt_ioctl: remove unnecessary console allocation checks
  vt: switch vt_dont_switch to bool
  vt: ioctl, switch VT_IS_IN_USE and VT_BUSY to inlines
  vt: selection, introduce vc_is_sel
  serial: sprd: Fix a dereference warning
  mac80211: fix authentication with iwlwifi/mvm
  mac80211: Check port authorization in the ieee80211_tx_dequeue() case
  ANDROID: 5.4.29 ABI update
  ANDROID: GKI: remove kernel_read/write from whitelists
  ANDROID: GKI: Fix ABI for scsi/ufs patches
  FROMGIT: scsi: ufs-qcom: Override devfreq parameters
  BACKPORT: FROMGIT: scsi: ufshcd: Let vendor override devfreq parameters
  FROMGIT: scsi: ufshcd: Update the set frequency to devfreq
  FROMLIST: scsi: ufs: full reinit upon resume if link was off
  FROMGIT: scsi: ufs: set device as active power mode after resetting device
  FROMGIT: scsi: ufs: Enable block layer runtime PM for well-known logical units
  UPSTREAM: scsi: ufs: Fix possible unclocked access to auto hibern8 timer register
  ANDROID: db845c build: Use merge_configs
  ANDROID: ABI/Whitelist: update whitelist of unisoc
  Linux 5.4.29
  net: Fix CONFIG_NET_CLS_ACT=n and CONFIG_NFT_FWD_NETDEV={y, m} build
  media: v4l2-core: fix a use-after-free bug of sd->devnode
  media: xirlink_cit: add missing descriptor sanity checks
  media: stv06xx: add missing descriptor sanity checks
  media: dib0700: fix rc endpoint lookup
  media: ov519: add missing endpoint sanity checks
  libfs: fix infoleak in simple_attr_read()
  ahci: Add Intel Comet Lake H RAID PCI ID
  staging: wlan-ng: fix use-after-free Read in hfa384x_usbin_callback
  staging: wlan-ng: fix ODEBUG bug in prism2sta_disconnect_usb
  staging: rtl8188eu: Add ASUS USB-N10 Nano B1 to device table
  staging: kpc2000: prevent underflow in cpld_reconfigure()
  media: usbtv: fix control-message timeouts
  media: flexcop-usb: fix endpoint sanity check
  usb: musb: fix crash with highmen PIO and usbmon
  USB: serial: io_edgeport: fix slab-out-of-bounds read in edge_interrupt_callback
  USB: cdc-acm: restore capability check order
  USB: serial: option: add Wistron Neweb D19Q1
  USB: serial: option: add BroadMobi BM806U
  USB: serial: option: add support for ASKEY WWHC050
  bpf: Undo incorrect __reg_bound_offset32 handling
  clocksource/drivers/hyper-v: Untangle stimers and timesync from clocksources
  r8169: fix PHY driver check on platforms w/o module softdeps
  vti6: Fix memory leak of skb if input policy check fails
  ARM: dts: sun8i-a83t-tbs-a711: Fix USB OTG mode detection
  bpf, sockmap: Remove bucket->lock from sock_{hash|map}_free
  bpf/btf: Fix BTF verification of enum members in struct/union
  bpf: Initialize storage pointers to NULL to prevent freeing garbage pointer
  bpf, x32: Fix bug with JMP32 JSET BPF_X checking upper bits
  i2c: nvidia-gpu: Handle timeout correctly in gpu_i2c_check_status()
  netfilter: nft_fwd_netdev: allow to redirect to ifb via ingress
  netfilter: nft_fwd_netdev: validate family and chain type
  netfilter: flowtable: reload ip{v6}h in nf_flow_tuple_ip{v6}
  mac80211: set IEEE80211_TX_CTRL_PORT_CTRL_PROTO for nl80211 TX
  ieee80211: fix HE SPR size calculation
  afs: Fix unpinned address list during probing
  afs: Fix some tracing details
  afs: Fix client call Rx-phase signal handling
  xfrm: policy: Fix doulbe free in xfrm_policy_timer
  xfrm: add the missing verify_sec_ctx_len check in xfrm_add_acquire
  xfrm: fix uctx len check in verify_sec_ctx_len
  RDMA/mlx5: Block delay drop to unprivileged users
  RDMA/mlx5: Fix access to wrong pointer while performing flush due to error
  RDMA/mlx5: Fix the number of hwcounters of a dynamic counter
  vti[6]: fix packet tx through bpf_redirect() in XinY cases
  xfrm: handle NETDEV_UNREGISTER for xfrm device
  genirq: Fix reference leaks on irq affinity notifiers
  afs: Fix handling of an abort from a service handler
  RDMA/core: Ensure security pkey modify is not lost
  bpf: Fix cgroup ref leak in cgroup_bpf_inherit on out-of-memory
  gpiolib: acpi: Add quirk to ignore EC wakeups on HP x2 10 BYT + AXP288 model
  gpiolib: acpi: Rework honor_wakeup option into an ignore_wake option
  gpiolib: acpi: Correct comment for HP x2 10 honor_wakeup quirk
  mm: fork: fix kernel_stack memcg stats for various stack implementations
  mm/sparse: fix kernel crash with pfn_section_valid check
  drivers/base/memory.c: indicate all memory blocks as removable
  mm/swapfile.c: move inode_lock out of claim_swapfile
  mac80211: mark station unauthorized before key removal
  mac80211: drop data frames without key on encrypted links
  nl80211: fix NL80211_ATTR_CHANNEL_WIDTH attribute type
  scsi: sd: Fix optimal I/O size for devices that change reported values
  scripts/dtc: Remove redundant YYLOC global declaration
  tools: Let O= makes handle a relative path with -C option
  rtlwifi: rtl8188ee: Fix regression due to commit d1d1a96bdb
  perf probe: Do not depend on dwfl_module_addrsym()
  perf probe: Fix to delete multiple probe event
  x86/ioremap: Fix CONFIG_EFI=n build
  ARM: dts: omap5: Add bus_dma_limit for L3 bus
  ARM: dts: dra7: Add bus_dma_limit for L3 bus
  ceph: fix memory leak in ceph_cleanup_snapid_map()
  ceph: check POOL_FLAG_FULL/NEARFULL in addition to OSDMAP_FULL/NEARFULL
  RDMA/mad: Do not crash if the rdma device does not have a umad interface
  RDMA/nl: Do not permit empty devices names during RDMA_NLDEV_CMD_NEWLINK/SET
  gpiolib: Fix irq_disable() semantics
  RDMA/core: Fix missing error check on dev_set_name()
  IB/rdmavt: Free kernel completion queue when done
  Input: avoid BIT() macro usage in the serio.h UAPI header
  Input: synaptics - enable RMI on HP Envy 13-ad105ng
  Input: fix stale timestamp on key autorepeat events
  Input: raydium_i2c_ts - fix error codes in raydium_i2c_boot_trigger()
  i2c: hix5hd2: add missed clk_disable_unprepare in remove
  iwlwifi: mvm: fix non-ACPI function
  iommu/vt-d: Populate debugfs if IOMMUs are detected
  iommu/vt-d: Fix debugfs register reads
  net: hns3: fix "tc qdisc del" failed issue
  sxgbe: Fix off by one in samsung driver strncpy size arg
  dpaa_eth: Remove unnecessary boolean expression in dpaa_get_headroom
  mac80211: Do not send mesh HWMP PREQ if HWMP is disabled
  scsi: ipr: Fix softlockup when rescanning devices in petitboot
  s390/qeth: handle error when backing RX buffer
  s390/qeth: don't reset default_out_queue
  iommu/vt-d: Silence RCU-list debugging warnings
  drm/exynos: Fix cleanup of IOMMU related objects
  drm/amdgpu: correct ROM_INDEX/DATA offset for VEGA20
  drm/amd/display: update soc bb for nv14
  fsl/fman: detect FMan erratum A050385
  arm64: dts: ls1043a: FMan erratum A050385
  dt-bindings: net: FMan erratum A050385
  cgroup1: don't call release_agent when it is ""
  drivers/of/of_mdio.c:fix of_mdiobus_register()
  cpupower: avoid multiple definition with gcc -fno-common
  nfs: add minor version to nfs_server_key for fscache
  cgroup-v1: cgroup_pidlist_next should update position index
  net/mlx5e: Do not recover from a non-fatal syndrome
  net/mlx5e: Fix ICOSQ recovery flow with Striding RQ
  net/mlx5e: Fix missing reset of SW metadata in Striding RQ reset
  net/mlx5e: Enhance ICOSQ WQE info fields
  net/mlx5: DR, Fix postsend actions write length
  hsr: set .netnsok flag
  hsr: add restart routine into hsr_get_node_list()
  hsr: use rcu_read_lock() in hsr_get_node_{list/status}()
  net: ip_gre: Accept IFLA_INFO_DATA-less configuration
  net: ip_gre: Separate ERSPAN newlink / changelink callbacks
  bnxt_en: Reset rings if ring reservation fails during open()
  bnxt_en: Free context memory after disabling PCI in probe error path.
  bnxt_en: Return error if bnxt_alloc_ctx_mem() fails.
  bnxt_en: fix memory leaks in bnxt_dcbnl_ieee_getets()
  bnxt_en: Fix Priority Bytes and Packets counters in ethtool -S.
  vxlan: check return value of gro_cells_init()
  tcp: repair: fix TCP_QUEUE_SEQ implementation
  tcp: ensure skb->dev is NULL before leaving TCP stack
  tcp: also NULL skb->dev when copy was needed
  slcan: not call free_netdev before rtnl_unlock in slcan_open
  r8169: re-enable MSI on RTL8168c
  NFC: fdp: Fix a signedness bug in fdp_nci_send_patch()
  net: stmmac: dwmac-rk: fix error path in rk_gmac_probe
  net_sched: keep alloc_hash updated after hash allocation
  net_sched: hold rtnl lock in tcindex_partial_destroy_work()
  net_sched: cls_route: remove the right filter from hashtable
  net/sched: act_ct: Fix leak of ct zone template on replace
  net: qmi_wwan: add support for ASKEY WWHC050
  net: phy: mdio-mux-bcm-iproc: check clk_prepare_enable() return value
  net: phy: mdio-bcm-unimac: Fix clock handling
  net: phy: dp83867: w/a for fld detect threshold bootstrapping issue
  net/packet: tpacket_rcv: avoid a producer race condition
  net: mvneta: Fix the case where the last poll did not process all rx
  net: ena: Add PCI shutdown handler to allow safe kexec
  net: dsa: tag_8021q: replace dsa_8021q_remove_header with __skb_vlan_pop
  net: dsa: mt7530: Change the LINK bit to reflect the link status
  net: dsa: Fix duplicate frames flooded by learning
  net: cbs: Fix software cbs to consider packet sending time
  net/bpfilter: fix dprintf usage for /dev/kmsg
  mlxsw: spectrum_mr: Fix list iteration in error path
  mlxsw: pci: Only issue reset when system is ready
  macsec: restrict to ethernet devices
  ipv4: fix a RCU-list lock in inet_dump_fib()
  hsr: fix general protection fault in hsr_addr_is_self()
  geneve: move debug check after netdev unregister
  cxgb4: fix Txq restart check during backpressure
  cxgb4: fix throughput drop during Tx backpressure
  ACPI: PM: s2idle: Rework ACPI events synchronization
  mmc: sdhci-tegra: Fix busy detection by enabling MMC_CAP_NEED_RSP_BUSY
  mmc: sdhci-omap: Fix busy detection by enabling MMC_CAP_NEED_RSP_BUSY
  mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for eMMC sleep command
  mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for erase/trim/discard
  mmc: core: Allow host controllers to require R1B for CMD6
  ANDROID: GKI: defconfig: enable CONFIG_THERMAL_GOV_POWER_ALLOCATOR
  UPSTREAM: usb: raw_gadget: fix compilation warnings in uapi headers
  BACKPORT: usb: gadget: add raw-gadget interface
  UPSTREAM: usb: gadget: move choice ... endchoice to legacy/Kconfig
  ANDROID: GKI: Added goldfish whitelist to aarch64 abi
  ANDROID: GKI: update cf whitelist + gki whitelist
  UPSTREAM: ipv6: ndisc: add support for 'PREF64' dns64 prefix identifier
  ANDROID: ABI: Add initial ABI whitelist for QCOM
  ANDROID: GKI: Removed cuttlefish configs
  ANDROID: ABI/Whitelist: update for db845c
  ANDROID: clang: update to 10.0.5
  FROMLIST: arm64: define __alloc_zeroed_user_highpage
  BACKPORT: extcon: Mark extcon_get_edev_name() function as exported symbol
  ANDROID: Incremental fs: Fix two typos
  ANDROID: gki_defconfig: Enable CONFIG_REMOTEPROC
  ANDROID: GKI: Add CONFIG_RPMSG to gki_defconfig
  Revert "sched/core: Prevent race condition between cpuset and __sched_setscheduler()"
  Revert "ANDROID: binder: fix sleeping from invalid function caused by RT inheritance"
  ANDROID: Incremental fs: Add INCFS_IOC_GET_FILLED_BLOCKS
  ANDROID: GKI: defconfig: Enable CONFIG_SHUFFLE_PAGE_ALLOCATOR
  ANDROID: gki_defconfig: disable CONFIG_HARDENED_USERCOPY_FALLBACK
  ANDROID: gki_defconfig: enable CONFIG_DEBUG_LIST
  ANDROID: Follow aosp/1233812 to update ABI whitelists post-TPM addition.
  ANDROID: dm-bow: Fix free_show value is incorrect
  ANDROID: GKI: workqueue.h: add Android ABI padding to some structures
  ANDROID: gki_defconfig: enabled UAPI header compile testing
  ANDROID: GKI: fs.h: add Android ABI padding to some structures
  FROMLIST: media: v4l2-fh: define v4l2_fh struct regardless of condition
  ANDROID: update ABI for 5.4.28
  ANDROID: kbuild: do not merge .section..* into .section in modules
  Linux 5.4.28
  staging: greybus: loopback_test: fix potential path truncations
  staging: greybus: loopback_test: fix potential path truncation
  drm/bridge: dw-hdmi: fix AVI frame colorimetry
  nvmet-tcp: set MSG_MORE only if we actually have more to send
  arm64: smp: fix crash_smp_send_stop() behaviour
  arm64: smp: fix smp_send_stop() behaviour
  ALSA: hda/realtek: Fix pop noise on ALC225
  futex: Unbreak futex hashing
  futex: Fix inode life-time issue
  x86/mm: split vmalloc_sync_all()
  page-flags: fix a crash at SetPageError(THP_SWAP)
  mm, slub: prevent kmalloc_node crashes and memory leaks
  mm: slub: be more careful about the double cmpxchg of freelist
  epoll: fix possible lost wakeup on epoll_ctl() path
  mm: do not allow MADV_PAGEOUT for CoW pages
  mm/hotplug: fix hot remove failure in SPARSEMEM|!VMEMMAP case
  mm, memcg: throttle allocators based on ancestral memory.high
  mm, memcg: fix corruption on 64-bit divisor in memory.high throttling
  memcg: fix NULL pointer dereference in __mem_cgroup_usage_unregister_event
  stm class: sys-t: Fix the use of time_after()
  drm/lease: fix WARNING in idr_destroy
  drm/amd/amdgpu: Fix GPR read from debugfs (v2)
  btrfs: fix log context list corruption after rename whiteout error
  xhci: Do not open code __print_symbolic() in xhci trace events
  arm64: compat: Fix syscall number of compat_clock_getres
  rtc: max8907: add missing select REGMAP_IRQ
  modpost: move the namespace field in Module.symvers last
  intel_th: pci: Add Elkhart Lake CPU support
  intel_th: Fix user-visible error codes
  intel_th: msu: Fix the unexpected state warning
  staging/speakup: fix get_word non-space look-ahead
  staging: greybus: loopback_test: fix poll-mask build breakage
  staging: rtl8188eu: Add device id for MERCUSYS MW150US v2
  kbuild: Disable -Wpointer-to-enum-cast
  CIFS: fiemap: do not return EINVAL if get nothing
  mmc: sdhci-cadence: set SDHCI_QUIRK2_PRESET_VALUE_BROKEN for UniPhier
  mmc: sdhci-of-at91: fix cd-gpios for SAMA5D2
  mmc: rtsx_pci: Fix support for speed-modes that relies on tuning
  iio: light: vcnl4000: update sampling periods for vcnl4040
  iio: light: vcnl4000: update sampling periods for vcnl4200
  iio: adc: at91-sama5d2_adc: fix differential channels in triggered mode
  iio: adc: stm32-dfsdm: fix sleep in atomic context
  iio: magnetometer: ak8974: Fix negative raw values in sysfs
  iio: accel: adxl372: Set iio_chan BE
  iio: trigger: stm32-timer: disable master mode when stopping
  iio: st_sensors: remap SMO8840 to LIS2DH12
  iio: chemical: sps30: fix missing triggered buffer dependency
  tty: fix compat TIOCGSERIAL checking wrong function ptr
  tty: fix compat TIOCGSERIAL leaking uninitialized memory
  ALSA: pcm: oss: Remove WARNING from snd_pcm_plug_alloc() checks
  ALSA: pcm: oss: Avoid plugin buffer overflow
  ALSA: seq: oss: Fix running status after receiving sysex
  ALSA: seq: virmidi: Fix running status after receiving sysex
  ALSA: hda/realtek - Enable the headset of Acer N50-600 with ALC662
  ALSA: hda/realtek - Enable headset mic of Acer X2660G with ALC662
  ALSA: line6: Fix endless MIDI read loop
  USB: cdc-acm: fix rounding error in TIOCSSERIAL
  USB: cdc-acm: fix close_delay and closing_wait units in TIOCSSERIAL
  usb: typec: ucsi: displayport: Fix a potential race during registration
  usb: typec: ucsi: displayport: Fix NULL pointer dereference
  usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c
  USB: serial: pl2303: add device-id for HP LD381
  usb: host: xhci-plat: add a shutdown
  USB: serial: option: add ME910G1 ECM composition 0x110b
  usb: quirks: add NO_LPM quirk for RTL8153 based ethernet adapters
  USB: Disable LPM on WD19's Realtek Hub
  Revert "drm/fbdev: Fallback to non tiled mode if all tiles not present"
  binderfs: use refcount for binder control devices too
  parse-maintainers: Mark as executable
  block, bfq: fix overwrite of bfq_group pointer in bfq_find_set_group()
  xenbus: req->err should be updated before req->state
  xenbus: req->body should be updated before req->state
  drm/amd/display: fix dcc swath size calculations on dcn1
  drm/amd/display: Clear link settings on MST disable connector
  drm/amdgpu: clean wptr on wb when gpu recovery
  riscv: Fix range looking for kernel image memblock
  riscv: Force flat memory model with no-mmu
  spi: spi_register_controller(): free bus id on error paths
  ASoC: stm32: sai: manage rebind issue
  riscv: avoid the PIC offset of static percpu data in module beyond 2G limits
  dm integrity: use dm_bio_record and dm_bio_restore
  dm bio record: save/restore bi_end_io and bi_integrity
  altera-stapl: altera_get_note: prevent write beyond end of 'key'
  drivers/perf: arm_pmu_acpi: Fix incorrect checking of gicc pointer
  drivers/perf: fsl_imx8_ddr: Correct the CLEAR bit definition
  drm/exynos: hdmi: don't leak enable HDMI_EN regulator if probe fails
  drm/exynos: dsi: fix workaround for the legacy clock name
  drm/exynos: dsi: propagate error value and silence meaningless warning
  spi/zynqmp: remove entry that causes a cs glitch
  spi: pxa2xx: Add CS control clock quirk
  ARM: dts: dra7: Add "dma-ranges" property to PCIe RC DT nodes
  cifs: add missing mount option to /proc/mounts
  cifs: fix potential mismatch of UNC paths
  powerpc: Include .BTF section
  spi: qup: call spi_qup_pm_resume_runtime before suspending
  ARM: dts: dra7-l4: mark timer13-16 as pwm capable
  phy: ti: gmii-sel: do not fail in case of gmii
  phy: ti: gmii-sel: fix set of copy-paste errors
  drm/mediatek: Find the cursor plane instead of hard coding it
  spi: spi-omap2-mcspi: Support probe deferral for DMA channels
  locks: reinstate locks_delete_block optimization
  locks: fix a potential use-after-free problem when wakeup a waiter
  ANDROID: ABI/Whitelist: update whitelist of unisoc
  ANDROID: staging: ion: Allow for attach and detach ops to be overridden
  ANDROID: scsi: ufs: add ->map_sg_crypto() variant op
  ANDROID: ABI/Whitelist: update for db845c
  ANDROID: GKI: Add CONFIG_SOC_BUS to gki_defconfig
  ANDROID: ABI/Whitelist: update for hikey960
  ANDROID: hikey960: Add external mali driver support to build.config.hikey960
  ANDROID: hikey960: Add build.config.hikey960
  ANDROID: config: Add hikey960_gki fragment
  ANDROID: misc: hisi_hikey_usb: Driver to support usb functionality of Hikey960
  ANDROID: dt-bindings: misc: Add bindings for HiSilicon usb hub and data role switch functionality on HiKey960
  FROMGIT: usb: dwc3: Rework resets initialization to be more flexible
  FROMGIT: usb: dwc3: Rework clock initialization to be more flexible
  FROMGIT: dt-bindings: usb: dwc3: Allow clock list & resets to be more flexible
  FROMGIT: usb: dwc3: Add support for role-switch-default-mode binding
  FROMGIT: dt-bindings: usb: generic: Add role-switch-default-mode binding
  FROMGIT: usb: dwc3: Registering a role switch in the DRD code.
  UPSTREAM: bpf: Explicitly memset some bpf info structures declared on the stack
  UPSTREAM: bpf: Explicitly memset the bpf_attr structure
  FROMGIT: BACKPORT: driver core: Add device links from fwnode only for the primary device
  Linux 5.4.27
  ipv4: ensure rcu_read_lock() in cipso_v4_error()
  ARM: 8961/2: Fix Kbuild issue caused by per-task stack protector GCC plugin
  HID: add ALWAYS_POLL quirk to lenovo pixart mouse
  HID: google: add moonball USB id
  mm: slub: add missing TID bump in kmem_cache_alloc_bulk()
  ARM: 8958/1: rename missed uaccess .fixup section
  ARM: 8957/1: VDSO: Match ARMv8 timer in cntvct_functional()
  net: qrtr: fix len of skb_put_padto in qrtr_node_enqueue
  blk-mq: insert flush request to the front of dispatch queue
  jbd2: fix data races at struct journal_head
  sfc: fix timestamp reconstruction at 16-bit rollover points
  net: rmnet: fix packet forwarding in rmnet bridge mode
  net: rmnet: fix bridge mode bugs
  net: rmnet: use upper/lower device infrastructure
  net: rmnet: do not allow to change mux id if mux id is duplicated
  net: rmnet: remove rcu_read_lock in rmnet_force_unassociate_device()
  net: rmnet: fix suspicious RCU usage
  net: rmnet: fix NULL pointer dereference in rmnet_changelink()
  net: rmnet: fix NULL pointer dereference in rmnet_newlink()
  hinic: fix a bug of rss configuration
  hinic: fix a bug of setting hw_ioctxt
  hinic: fix a irq affinity bug
  net: phy: mscc: fix firmware paths
  slip: not call free_netdev before rtnl_unlock in slip_open
  signal: avoid double atomic counter increments for user accounting
  kbuild: add dt_binding_check to PHONY in a correct place
  kbuild: add dtbs_check to PHONY
  drm/amdgpu: fix memory leak during TDR test(v2)
  blk-mq: insert passthrough request into hctx->dispatch directly
  net: ll_temac: Handle DMA halt condition caused by buffer underrun
  net: ll_temac: Fix RX buffer descriptor handling on GFP_ATOMIC pressure
  net: ll_temac: Add more error handling of dma_map_single() calls
  net: ll_temac: Fix race condition causing TX hang
  mac80211: rx: avoid RCU list traversal under mutex
  net: ks8851-ml: Fix IRQ handling and locking
  net: usb: qmi_wwan: restore mtu min/max values after raw_ip switch
  scsi: libfc: free response frame from GPN_ID
  cfg80211: check reg_rule for NULL in handle_channel_custom()
  tracing: Fix number printing bug in print_synth_event()
  selftests/rseq: Fix out-of-tree compilation
  HID: hid-bigbenff: fix race condition for scheduled work during removal
  HID: hid-bigbenff: call hid_hw_stop() in case of error
  HID: hid-bigbenff: fix general protection fault caused by double kfree
  HID: i2c-hid: add Trekstor Surfbook E11B to descriptor override
  ACPI: watchdog: Set default timeout in probe
  HID: apple: Add support for recent firmware on Magic Keyboards
  ACPI: watchdog: Allow disabling WDAT at boot
  drm/amdgpu: Fix TLB invalidation request when using semaphore
  netfilter: xt_hashlimit: unregister proc file before releasing mutex
  netfilter: hashlimit: do not use indirect calls during gc
  ANDROID: staging: ion: Export query function to be used in modules
  UPSTREAM: Bluetooth: hci_qca: Add support for Qualcomm Bluetooth SoC WCN3991
  UPSTREAM: Bluetooth: btqca: Rename ROME specific variables to generic variables
  ANDROID: ABI: Update abi after enabling CONFIG_USB_PHY
  ANDROID: GKI: Enable CONFIG_USB_PHY for usb drivers like dwc3
  ANDROID: Update abi_gki_aarch64_unisoc_whitelist
  ANDROID: GKI: USB: add Android ABI padding to some structures
  FROMLIST: ubifs: wire up FS_IOC_GET_ENCRYPTION_NONCE
  FROMLIST: f2fs: wire up FS_IOC_GET_ENCRYPTION_NONCE
  FROMLIST: ext4: wire up FS_IOC_GET_ENCRYPTION_NONCE
  FROMLIST: fscrypt: add FS_IOC_GET_ENCRYPTION_NONCE ioctl
  ANDROID: GKI: mm: add Android ABI padding to some structures
  ANDROID: GKI: mount.h: add Android ABI padding to some structures
  ANDROID: GKI: sched.h: add Android ABI padding to some structures
  ANDROID: GKI: sock.h: add Android ABI padding to some structures
  ANDROID: GKI: module.h: add Android ABI padding to some structures
  UPSTREAM: driver core: Skip unnecessary work when device doesn't have sync_state()
  ANDROID: Incremental fs: Add INCFS_IOC_PERMIT_FILL
  ANDROID: Incremental fs: Remove signature checks from kernel
  ANDROID: Incremental fs: Pad hash blocks
  ANDROID: Incremental fs: Make fill block an ioctl
  ANDROID: Incremental fs: Remove all access_ok checks
  ANDROID: GKI: device.h: add Android ABI padding to some structures
  ANDROID: GKI: phy: add Android ABI padding to some structures
  ANDROID: ABI update for 5.4.26

Conflicts:
	Documentation/devicetree/bindings
	Documentation/devicetree/bindings/net/fsl-fman.txt
	Documentation/devicetree/bindings/usb/dwc3.txt
	Documentation/devicetree/bindings/usb/generic.txt
	abi_gki_aarch64_qcom_whitelist
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/scsi/ufs/ufs-qcom.c
	drivers/usb/dwc3/core.c
	drivers/usb/gadget/Kconfig
	include/linux/device.h
	net/qrtr/qrtr.c

Change-Id: I43806ae33997efaf3265461e15fdbe49de74d741
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2020-05-19 13:22:43 -07:00
Blagovest Kolenichev
4e2b270d2c Merge android-5.4.26 (0d3cca0c) into msm-5.4
* refs/heads/tmp-0d3cca0c:
  UPSTREAM: driver core: Skip unnecessary work when device doesn't have sync_state()
  Linux 5.4.26
  net/smc: cancel event worker during device removal
  net/smc: check for valid ib_client_data
  ipv6: restrict IPV6_ADDRFORM operation
  iommu/amd: Fix IOMMU AVIC not properly update the is_run bit in IRTE
  i2c: acpi: put device when verifying client fails
  iommu/vt-d: Ignore devices with out-of-spec domain number
  iommu/vt-d: Fix the wrong printing in RHSA parsing
  netfilter: nft_chain_nat: inet family is missing module ownership
  netfilter: nf_tables: dump NFTA_CHAIN_FLAGS attribute
  netfilter: nft_tunnel: add missing attribute validation for tunnels
  netfilter: nft_payload: add missing attribute validation for payload csum flags
  netfilter: cthelper: add missing attribute validation for cthelper
  perf bench futex-wake: Restore thread count default to online CPU count
  nl80211: add missing attribute validation for channel switch
  nl80211: add missing attribute validation for beacon report scanning
  nl80211: add missing attribute validation for critical protocol indication
  i2c: gpio: suppress error on probe defer
  iommu/vt-d: Fix RCU-list bugs in intel_iommu_init()
  driver code: clarify and fix platform device DMA mask allocation
  drm/i915/gvt: Fix unnecessary schedule timer when no vGPU exits
  pinctrl: core: Remove extra kref_get which blocks hogs being freed
  drm/i915/gvt: Fix dma-buf display blur issue on CFL
  virtio_ring: Fix mem leak with vring_new_virtqueue()
  pinctrl: imx: scu: Align imx sc msg structs to 4
  pinctrl: meson-gxl: fix GPIOX sdio pins
  clk: imx8mn: Fix incorrect clock defines
  batman-adv: Don't schedule OGM for disabled interface
  iommu/vt-d: Fix a bug in intel_iommu_iova_to_phys() for huge page
  iommu/vt-d: Fix RCU list debugging warnings
  iommu/vt-d: dmar: replace WARN_TAINT with pr_warn + add_taint
  iommu/dma: Fix MSI reservation allocation
  x86/mce: Fix logic and comments around MSR_PPIN_CTL
  perf/amd/uncore: Replace manual sampling check with CAP_NO_INTERRUPT flag
  mt76: fix array overflow on receiving too many fragments for a packet
  i2c: designware-pci: Fix BUG_ON during device removal
  efi: Add a sanity check to efivar_store_raw()
  efi: Fix a race and a buffer overflow while reading efivars via sysfs
  x86/ioremap: Map EFI runtime services data as encrypted for SEV
  macintosh: windfarm: fix MODINFO regression
  fscrypt: don't evict dirty inodes after removing key
  blk-iocost: fix incorrect vtime comparison in iocg_is_idle()
  ipmi_si: Avoid spurious errors for optional IRQs
  s390/dasd: fix data corruption for thin provisioned devices
  fuse: fix stack use after return
  ARC: define __ALIGN_STR and __ALIGN symbols for ARC
  KVM: nVMX: avoid NULL pointer dereference with incorrect EVMCS GPAs
  KVM: x86: clear stale x86_emulate_ctxt->intercept value
  gfs2_atomic_open(): fix O_EXCL|O_CREAT handling on cold dcache
  cifs_atomic_open(): fix double-put on late allocation failure
  ktest: Add timeout for ssh sync testing
  pinctrl: falcon: fix syntax error
  mmc: sdhci-pci-gli: Enable MSI interrupt for GL975x
  drm/i915: Defer semaphore priority bumping to a workqueue
  drm/i915: be more solid in checking the alignment
  drm/amd/display: remove duplicated assignment to grph_obj_type
  workqueue: don't use wq_select_unbound_cpu() for bound works
  netfilter: x_tables: xt_mttg_seq_next should increase position index
  netfilter: xt_recent: recent_seq_next should increase position index
  netfilter: synproxy: synproxy_cpu_seq_next should increase position index
  netfilter: nf_conntrack: ct_cpu_seq_next should increase position index
  iommu/vt-d: quirk_ioat_snb_local_iommu: replace WARN_TAINT with pr_warn + add_taint
  virtio-blk: fix hw_queue stopped on arbitrary error
  iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices
  netfilter: nf_tables: fix infinite loop when expr is not available
  cgroup: Iterate tasks that did not finish do_exit()
  cgroup: cgroup_procs_next should increase position index
  net: phy: Avoid multiple suspends
  net: dsa: Don't instantiate phylink for CPU/DSA ports unless needed
  selftests/net/fib_tests: update addr_metric_test for peer route testing
  net/ipv6: remove the old peer route if change it to a new one
  net/ipv6: need update peer route when modify metric
  net: phy: fix MDIO bus PM PHY resuming
  net: phy: avoid clearing PHY interrupts twice in irq handler
  nfc: add missing attribute validation for vendor subcommand
  nfc: add missing attribute validation for deactivate target
  nfc: add missing attribute validation for SE API
  tipc: add missing attribute validation for MTU property
  team: add missing attribute validation for array index
  team: add missing attribute validation for port ifindex
  net: taprio: add missing attribute validation for txtime delay
  net: fq: add missing attribute validation for orphan mask
  macsec: add missing attribute validation for port
  can: add missing attribute validation for termination
  nl802154: add missing attribute validation for dev_type
  nl802154: add missing attribute validation
  fib: add missing attribute validation for tun_id
  devlink: validate length of region addr/len
  devlink: validate length of param values
  net: memcg: fix lockdep splat in inet_csk_accept()
  net: memcg: late association of sock to memcg
  cgroup: memcg: net: do not associate sock with unrelated cgroup
  bnxt_en: fix error handling when flashing from file
  bnxt_en: reinitialize IRQs when MTU is modified
  bonding/alb: make sure arp header is pulled before accessing it
  taprio: Fix sending packets without dequeueing them
  slip: make slhc_compress() more robust against malicious packets
  sfc: detach from cb_page in efx_copy_channel()
  r8152: check disconnect status after long sleep
  net: systemport: fix index check to avoid an array out of bounds access
  net: stmmac: dwmac1000: Disable ACS if enhanced descs are not used
  net: phy: bcm63xx: fix OOPS due to missing driver name
  net/packet: tpacket_rcv: do not increment ring index on drop
  net: nfc: fix bounds checking bugs on "pipe"
  net: macsec: update SCI upon MAC address change.
  netlink: Use netlink header as base to calculate bad attribute offset
  net/ipv6: use configured metric when add peer route
  net: hns3: fix a not link up issue when fibre port supports autoneg
  net: fec: validate the new settings in fec_enet_set_coalesce()
  net: dsa: mv88e6xxx: fix lockup on warm boot
  net: dsa: fix phylink_start()/phylink_stop() calls
  macvlan: add cond_resched() during multicast processing
  ipvlan: don't deref eth hdr before checking it's set
  ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast()
  ipvlan: do not add hardware address of master to its unicast filter list
  ipvlan: add cond_resched_rcu() while processing muticast backlog
  ipv6/addrconf: call ipv6_mc_up() for non-Ethernet interface
  inet_diag: return classid for all socket types
  gre: fix uninit-value in __iptunnel_pull_header
  cgroup, netclassid: periodically release file_lock on classid updating
  ALSA: hda/realtek - Fixed one of HP ALC671 platform Headset Mic supported
  ALSA: hda/realtek - Add Headset Mic supported for HP cPC
  ALSA: hda/realtek - More constifications
  virtio_balloon: Adjust label in virtballoon_probe
  ANDROID: GKI: Revert "mm: unexport free_reserved_area"
  ANDROID: Export functions to be used with dma_map_ops in modules
  ANDROID: GKI: add android_kabi.h
  ANDROID: GKI: update abi due to CONFIG_JUMP_LABEL being enabled
  ANDROID: GKI: enable CONFIG_JUMP_LABEL
  ANDROID: Add build.config.gki-debug.x86_64
  ANDROID: update the abi signatures
  ANDROID: Add build.config.gki-debug.aarch64
  Revert "ANDROID: drm: edid: add support for additional CEA extension blocks"
  Revert "ANDROID: drm: Parse Colorimetry data block from EDID"
  ANDROID: Add build.config files for ARM 32-bit
  ANDROID: Kconfig.gki: Add FRAME_VECTOR
  UPSTREAM: cgroup: Iterate tasks that did not finish do_exit()
  ANDROID: gki_defconfig: Enable more USB_CONFIGFS gadgets
  Revert "ANDROID: tty: serdev: Fix broken serial console input"
  ANDROID: serdev: restrict claim of platform devices
  ANDROID: Add TPM support and the vTPM proxy to Cuttlefish.
  FROMGIT: ASoC: sprd: Allow the MCDT driver to build into modules
  FROMGIT: thermal: sprd: Add Spreadtrum thermal driver support
  FROMGIT: dt-bindings: thermal: sprd: Add the Spreadtrum thermal documentation
  ANDROID: ABI update due to power supply patches being merged
  FROMGIT: pinctrl: sprd: Fix the kconfig warning
  FROMGIT: pinctrl: sprd: Allow the SPRD pinctrl driver building into a module
  FROMGIT: pinctrl: Export some needed symbols at module load time
  FROMGIT: power: reset: sc27xx: Allow the SC27XX poweroff driver building into a module
  FROMGIT: power: reset: sc27xx: Change to use cpu_down()
  FROMGIT: power: reset: sc27xx: Power off the external subsystems' connection
  FROMGIT: power: supply: sc27xx: Add POWER_SUPPLY_PROP_CHARGE_NOW attribute
  UPSTREAM: power: supply: sc27xx: Calibrate the resistance of coulomb counter
  UPSTREAM: dt-bindings: power: sc27xx: Add a new property to describe the real resistance of coulomb counter chip
  UPSTREAM: power: supply: sc27xx: Optimize the battery resistance with measuring temperature
  UPSTREAM: power: supply: core: Add battery internal resistance temperature table support
  UPSTREAM: dt-bindings: power: Introduce one property to describe the battery resistance with temperature changes
  ANDROID: abi_gki_aarch64_whitelist: update after whitelist changes
  ANDROID: update abi_gki_aarch64_cuttlefish_whitelist
  ANDROID: update abi_gki_aarch64_db845c_whitelist
  ANDROID: update abi due to interconnect changes
  UPSTREAM: interconnect: Handle memory allocation errors
  UPSTREAM: interconnect: Add basic tracepoints
  UPSTREAM: interconnect: Add a name to struct icc_path
  UPSTREAM: interconnect: Move internal structs into a separate file
  Linux 5.4.25
  drm/virtio: module_param_named() requires linux/moduleparam.h
  csky: Implement copy_thread_tls
  block, bfq: remove ifdefs from around gets/puts of bfq groups
  block, bfq: get a ref to a group when adding it to a service tree
  efi: READ_ONCE rng seed size before munmap
  efi/x86: Handle by-ref arguments covering multiple pages in mixed mode
  efi/x86: Align GUIDs to their size in the mixed mode runtime wrapper
  powerpc: fix hardware PMU exception bug on PowerVM compatibility mode systems
  EDAC/synopsys: Do not print an error with back-to-back snprintf() calls
  bus: ti-sysc: Fix 1-wire reset quirk
  arm64: dts: meson: fix gxm-khadas-vim2 wifi
  dmaengine: coh901318: Fix a double lock bug in dma_tc_handle()
  dma-buf: free dmabuf->name in dma_buf_release()
  hwmon: (adt7462) Fix an error return in ADT7462_REG_VOLT()
  ARM: dts: imx7-colibri: Fix frequency for sd/mmc
  ARM: dts: dra7xx-clocks: Fixup IPU1 mux clock parent source
  ARM: dts: am437x-idk-evm: Fix incorrect OPP node names
  ARM: imx: build v7_cpu_resume() unconditionally
  IB/hfi1, qib: Ensure RCU is locked when accessing list
  RMDA/cm: Fix missing ib_cm_destroy_id() in ib_cm_insert_listen()
  regulator: stm32-vrefbuf: fix a possible overshoot when re-enabling
  RDMA/core: Fix protection fault in ib_mr_pool_destroy
  RDMA/iwcm: Fix iwcm work deallocation
  RDMA/siw: Fix failure handling during device creation
  RDMA/nldev: Fix crash when set a QP to a new counter but QPN is missing
  RDMA/rw: Fix error flow during RDMA context initialization
  Revert "RDMA/cma: Simplify rdma_resolve_addr() error flow"
  soc: imx-scu: Align imx sc msg structs to 4
  firmware: imx: Align imx_sc_msg_req_cpu_start to 4
  firmware: imx: scu-pd: Align imx sc msg structs to 4
  firmware: imx: misc: Align imx sc msg structs to 4
  arm64: dts: imx8qxp-mek: Remove unexisting Ethernet PHY
  ARM: dts: imx6: phycore-som: fix emmc supply
  phy: mapphone-mdm6600: Fix write timeouts with shorter GPIO toggle interval
  phy: mapphone-mdm6600: Fix timeouts by adding wake-up handling
  drm/i915/selftests: Fix return in assert_mmap_offset()
  drm/i915: Program MBUS with rmw during initialization
  drm/sun4i: de2/de3: Remove unsupported VI layer formats
  drm/sun4i: Fix DE2 VI layer format support
  drm/sun4i: Add separate DE3 VI layer formats
  drm: kirin: Revert "Fix for hikey620 display offset problem"
  drm/panfrost: Don't try to map on error faults
  spi: atmel-quadspi: fix possible MMIO window size overrun
  ASoC: dapm: Correct DAPM handling of active widgets during shutdown
  ASoC: Intel: Skylake: Fix available clock counter incrementation
  ASoC: pcm512x: Fix unbalanced regulator enable call in probe error path
  ASoC: pcm: Fix possible buffer overflow in dpcm state sysfs output
  powerpc/mm: Fix missing KUAP disable in flush_coherent_icache()
  powerpc: Convert flush_icache_range & friends to C
  powerpc: define helpers to get L1 icache sizes
  ASoC: intel: skl: Fix possible buffer overflow in debug outputs
  ASoC: intel: skl: Fix pin debug prints
  ASoC: SOF: Fix snd_sof_ipc_stream_posn()
  ASoC: topology: Fix memleak in soc_tplg_manifest_load()
  ASoC: topology: Fix memleak in soc_tplg_link_elems_load()
  drm/virtio: fix resource id creation race
  drm/virtio: make resource id workaround runtime switchable.
  spi: bcm63xx-hsspi: Really keep pll clk enabled
  ARM: dts: ls1021a: Restore MDIO compatible to gianfar
  arm64: dts: meson-sm1-sei610: add missing interrupt-names
  dm: fix congested_fn for request-based device
  dm zoned: Fix reference counter initial value of chunk works
  dm writecache: verify watermark during resume
  dm: report suspended device during destroy
  dm cache: fix a crash due to incorrect work item cancelling
  dm integrity: fix invalid table returned due to argument count mismatch
  dm integrity: fix a deadlock due to offloading to an incorrect workqueue
  dm integrity: fix recalculation when moving from journal mode to bitmap mode
  dmaengine: tegra-apb: Prevent race conditions of tasklet vs free list
  dmaengine: tegra-apb: Fix use-after-free
  dmaengine: imx-sdma: Fix the event id check to include RX event for UART6
  dmaengine: imx-sdma: fix context cache
  s390/mm: fix panic in gup_fast on large pud
  s390/pci: Fix unexpected write combine on resource
  x86/pkeys: Manually set X86_FEATURE_OSPKE to preserve existing changes
  spi: spidev: Fix CS polarity if GPIO descriptors are used
  perf arm-spe: Fix endless record after being terminated
  perf cs-etm: Fix endless record after being terminated
  perf intel-bts: Fix endless record after being terminated
  perf intel-pt: Fix endless record after being terminated
  media: v4l2-mem2mem.c: fix broken links
  media: vicodec: process all 4 components for RGB32 formats
  media: mc-entity.c: use & to check pad flags, not ==
  media: hantro: Fix broken media controller links
  vt: selection, push sel_lock up
  vt: selection, push console lock down
  vt: selection, close sel_buffer race
  serial: 8250_exar: add support for ACCES cards
  tty: serial: fsl_lpuart: free IDs allocated by IDA
  tty:serial:mvebu-uart:fix a wrong return
  arm: dts: dra76x: Fix mmc3 max-frequency
  arm64: dts: socfpga: agilex: Fix gmac compatible
  btrfs: fix RAID direct I/O reads with alternate csums
  fat: fix uninit-memory access for partial initialized inode
  mm, hotplug: fix page online with DEBUG_PAGEALLOC compiled but not enabled
  mm: fix possible PMD dirty bit lost in set_pmd_migration_entry()
  mm, numa: fix bad pmd by atomically check for pmd_trans_huge when marking page tables prot_numa
  vgacon: Fix a UAF in vgacon_invert_region
  usb: core: port: do error out if usb_autopm_get_interface() fails
  usb: core: hub: do error out if usb_autopm_get_interface() fails
  usb: core: hub: fix unhandled return by employing a void function
  usb: cdns3: gadget: toggle cycle bit before reset endpoint
  usb: cdns3: gadget: link trb should point to next request
  usb: dwc3: gadget: Update chain bit correctly when using sg list
  usb: quirks: add NO_LPM quirk for Logitech Screen Share
  usb: storage: Add quirk for Samsung Fit flash
  cifs: fix rename() by ensuring source handle opened with DELETE bit
  cifs: don't leak -EAGAIN for stat() during reconnect
  ALSA: hda/realtek - Enable the headset of ASUS B9450FA with ALC294
  ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Master
  ALSA: hda/realtek - Add Headset Button supported for ThinkPad X1
  ALSA: hda/realtek - Add Headset Mic supported
  binder: prevent UAF for binderfs devices II
  binder: prevent UAF for binderfs devices
  firmware: imx: scu: Ensure sequential TX
  selftests: forwarding: vxlan_bridge_1d: use more proper tos value
  arch/csky: fix some Kconfig typos
  csky: Fixup compile warning for three unimplemented syscalls
  csky: Fixup ftrace modify panic
  csky/smp: Fixup boot failed when CONFIG_SMP
  csky: Set regs->usp to kernel sp, when the exception is from kernel
  csky/mm: Fixup export invalid_pte_table symbol
  net: thunderx: workaround BGX TX Underflow issue
  x86/xen: Distribute switch variables for initialization
  ice: Don't tell the OS that link is going down
  nvme: Fix uninitialized-variable warning
  s390/qdio: fill SL with absolute addresses
  x86/boot/compressed: Don't declare __force_order in kaslr_64.c
  nvme-pci: Use single IRQ vector for old Apple models
  nvme/pci: Add sleep quirk for Samsung and Toshiba drives
  iommu/amd: Disable IOMMU on Stoney Ridge systems
  net/mlx5: DR, Fix matching on vport gvmi
  efi: Only print errors about failing to get certs if EFI vars are found
  s390: make 'install' not depend on vmlinux
  s390/cio: cio_ignore_proc_seq_next should increase position index
  watchdog: da9062: do not ping the hw during stop()
  net: ethernet: dm9000: Handle -EPROBE_DEFER in dm9000_parse_dt()
  net: ks8851-ml: Fix 16-bit IO operation
  net: ks8851-ml: Fix 16-bit data access
  net: ks8851-ml: Remove 8-bit bus accessors
  net: atlantic: check rpc result and wait for rpc address
  selftests: forwarding: vxlan_bridge_1d: fix tos value
  selftests: forwarding: use proto icmp for {gretap, ip6gretap}_mac testing
  drm/msm/dsi/pll: call vco set rate explicitly
  drm/msm/dsi: save pll state before dsi host is powered off
  scsi: megaraid_sas: silence a warning
  drm/modes: Allow DRM_MODE_ROTATE_0 when applying video mode parameters
  drm/modes: Make sure to parse valid rotation value from cmdline
  drm: msm: Fix return type of dsi_mgr_connector_mode_valid for kCFI
  drm/msm/mdp5: rate limit pp done timeout warnings
  habanalabs: patched cb equals user cb in device memset
  habanalabs: do not halt CoreSight during hard reset
  habanalabs: halt the engines before hard-reset
  usb: gadget: serial: fix Tx stall after buffer overflow
  usb: gadget: ffs: ffs_aio_cancel(): Save/restore IRQ flags
  usb: gadget: composite: Support more than 500mA MaxPower
  selftests: fix too long argument
  serial: ar933x_uart: set UART_CS_{RX,TX}_READY_ORIDE
  ALSA: hda: do not override bus codec_mask in link_get()
  blktrace: fix dereference after null check
  kprobes: Fix optimize_kprobe()/unoptimize_kprobe() cancellation logic
  kbuild: fix 'No such file or directory' warning when cleaning
  RDMA/core: Fix use of logical OR in get_new_pps
  RDMA/core: Fix pkey and port assignment in get_new_pps
  dm thin metadata: fix lockdep complaint
  net: stmmac: fix notifier registration
  net: dsa: bcm_sf2: Forcibly configure IMP port for 1Gb/sec
  ALSA: hda/realtek - Fix a regression for mute led on Lenovo Carbon X1
  block, bfq: do not insert oom queue into position tree
  block, bfq: get extra ref to prevent a queue from being freed during a group move
  FROMGIT: kallsyms: unexport kallsyms_lookup_name() and kallsyms_on_each_symbol()
  FROMGIT: samples/hw_breakpoint: drop use of kallsyms_lookup_name()
  FROMGIT: samples/hw_breakpoint: drop HW_BREAKPOINT_R when reporting writes
  UPSTREAM: fscrypt: don't evict dirty inodes after removing key
  ANDROID: ABI/Whitelist: update whitelist of unisoc upstream code
  ANDROID: gki_defconfig: Enable CONFIG_VM_EVENT_COUNTERS
  ANDROID: gki_defconfig: Enable CONFIG_CLEANCACHE
  ANDROID: arm64: update the abi with the new gki_defconfig
  ANDROID: gki_defconfig: disable CONFIG_DEBUG_DEVRES
  ANDROID: Update the abi xml file
  ANDROID: GKI: arm64: reserve space in cpu_hwcaps and cpu_hwcap_keys arrays
  FROMGIT: power: supply: Allow charger manager can be built as a module
  ANDROID: arm64: gki_defconfig: disable CONFIG_DEBUG_PREEMPT
  ANDROID: iommu/iova: Fix to use __alloc_and_insert_iova_best_fit
  ANDROID: enable CONFIG_WATCHDOG_CORE=y
  ANDROID: kbuild: align UNUSED_KSYMS_WHITELIST with upstream
  FROMLIST: f2fs: fix wrong check on F2FS_IOC_FSSETXATTR
  ANDROID: gki_defconfig: enable CONFIG_TYPEC
  UPSTREAM: scsi: ufs: ufs-mediatek: add waiting time for reference clock
  UPSTREAM: scsi: ufs: introduce common function to disable host TX LCC
  UPSTREAM: scsi: ufs: ufs-mediatek: fix TX LCC disabling timing
  UPSTREAM: scsi: ufs: ufs-mediatek: gate ref-clk during Auto-Hibern8
  UPSTREAM: scsi: ufs: fix Auto-Hibern8 error detection
  UPSTREAM: scsi: ufs: ufs-mediatek: support linkoff state during suspend
  UPSTREAM: scsi: ufs: ufs-mediatek: ensure UniPro is not powered down before linkup
  UPSTREAM: scsi: ufs: Move ufshcd_get_max_pwr_mode() to ufshcd_device_params_init()
  BACKPORT: scsi: ufs: Split ufshcd_probe_hba() based on its called flow
  FROMGIT: driver core: Reevaluate dev->links.need_for_probe as suppliers are added
  FROMGIT: driver core: Call sync_state() even if supplier has no consumers
  ANDROID: cpufreq: times: Remove per-UID time in state tracking
  Revert "ANDROID: proc: Add /proc/uid directory"
  Revert "ANDROID: cpufreq: Add time_in_state to /proc/uid directories"
  ANDROID: cpufreq: times: Remove /proc/uid_concurrent_{active,policy}_time
  ANDROID: drm: Add support for DP 1.4 Compliance edid corruption test
  Revert "ANDROID: drm: Add support for DP 1.4 Compliance edid corruption test"
  ANDROID: staging: ion: Add an in-kernel interface to request heap info.
  FROMLIST: lib: test_stackinit.c: XFAIL switch variable init tests
  UPSTREAM: scsi: ufs: Abort gating if clock on request is pending
  UPSTREAM: scsi: ufs: Fix irq return code
  UPSTREAM: scsi: ufs: Fix register dump caused sleep in atomic context
  UPSTREAM: scsi: ufs-qcom: Add reset control support for host controller
  UPSTREAM: scsi: ufs: Add device reset in link recovery path
  FROMGIT: scsi: ufs-qcom: Delay specific time before gate ref clk
  BACKPORT: FROMGIT: scsi: ufs: Add dev ref clock gating wait time support
  Revert "FROMLIST: scsi: ufs: Add dev ref clock gating wait time support"
  FROMGIT: scsi: ufs-qcom: Adjust bus bandwidth voting and unvoting
  Revert "FROMLIST: scsi: ufs-qcom: Adjust bus bandwidth voting and unvoting"
  ANDROID: CC_FLAGS_CFI add -fno-sanitize-blacklist

Conflicts:
	Documentation/devicetree/bindings
	Documentation/devicetree/bindings/power/supply/battery.txt
	Documentation/devicetree/bindings/power/supply/sc27xx-fg.txt
	drivers/dma-buf/dma-buf.c
	drivers/interconnect/core.c
	drivers/interconnect/internal.h
	drivers/scsi/ufs/ufs-qcom.c
	drivers/scsi/ufs/ufs-qcom.h
	drivers/scsi/ufs/ufshcd.h
	drivers/thermal/Makefile
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/composite.c
	drivers/usb/gadget/function/f_fs.c
	scripts/gen_autoksyms.sh

Change-Id: Ic3227858328ceef3f34273428d1c4f81b78757b2
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2020-05-19 12:58:11 -07:00
qctecmdr
98c66447db Merge "aarch64: ABI: Update the ABI whitelist with __ioread32_copy" 2020-05-19 12:26:16 -07:00
qctecmdr
af265a84de Merge "qseecom: Set max size for dma segment" 2020-05-19 08:38:39 -07:00
qctecmdr
f8c1e68b24 Merge "soc: qcom: dcc: Set transaction timeout for dcc linklist" 2020-05-19 08:38:39 -07:00
qctecmdr
9158dd1104 Merge "drivers: pinctrl: Add pinctrl support for SDXLEMUR target" 2020-05-19 08:38:38 -07:00
Raghavendra Rao Ananta
6de2cd588d aarch64: ABI: Update the ABI whitelist with __ioread32_copy
Add __ioread32_copy to the ABI whitelist and update the ABI
snapshot accordingly.

Change-Id: I92a42471848c30d2cb174287d59b7c721eacc8cb
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
2020-05-18 21:57:49 -07:00
qctecmdr
218848f9ed Merge "soc: altmode: Remove altmode device name" 2020-05-18 14:26:26 -07:00
qctecmdr
3272d7797e Merge "clk: qcom: Add support to proxy vote until clk controllers sync states" 2020-05-18 07:55:00 -07:00
qctecmdr
29c0add321 Merge "dt-bindings: clock: dispcc: Remove mdss dp crypto clocks" 2020-05-18 07:55:00 -07:00
qctecmdr
ec45186e15 Merge "drivers: cpuidle: lpm-levels: check for valid LPM stats" 2020-05-18 07:54:59 -07:00
qctecmdr
27c11f8d49 Merge "usb: gadget: Allow f_rndis and f_gsi to coexist as modules" 2020-05-18 07:54:59 -07:00
qctecmdr
d740f47368 Merge "msm: kgsl: Disable GBIF_CLIENT_QOS on all A660 GPU revisions" 2020-05-18 03:55:12 -07:00
qctecmdr
eb69de564d Merge "pinctrl: qcom: Update configuration for Shima" 2020-05-18 03:55:12 -07:00
qctecmdr
23da5f5a93 Merge "PM / devfreq: qoslat: implement get_dev_status()" 2020-05-18 03:55:12 -07:00
qctecmdr
7c117711a4 Merge "cnss2: Enable io-coherency" 2020-05-18 03:55:11 -07:00
qctecmdr
b085b73a1f Merge "clk: qcom: Add common regulator handle initialization" 2020-05-18 03:55:11 -07:00
qctecmdr
2626b594a4 Merge "defconfig: Enable Glink over RPM defconfig for Holi" 2020-05-18 03:55:11 -07:00
qctecmdr
100515801c Merge "cnss2: Reject idle restart if fails to get driver ops lock" 2020-05-17 23:58:35 -07:00
qctecmdr
9657f724eb Merge "ANDROID: dm-default-key: Update key size for wrapped keys" 2020-05-17 23:58:35 -07:00