Commit graph android_kernel_sony_sdm845/include/soc
Message SHA1
Merge branch 'android-4.9-q' of https://android.googlesource.com/kernel/common into lineage-17.1-caf-sdm845
* 'android-4.9-q' of https://android.googlesource.com/kernel/common: (1829 commits)

Conflicts:
	arch/mips/include/uapi/asm/Kbuild
	arch/powerpc/include/uapi/asm/Kbuild
	drivers/irqchip/irq-gic.c
	drivers/scsi/ufs/ufs_quirks.h
	drivers/scsi/ufs/ufshcd.c
	drivers/usb/dwc3/core.c
	drivers/usb/gadget/function/f_accessory.c
	fs/ext4/namei.c
	include/uapi/drm/Kbuild
	include/uapi/linux/Kbuild
	include/uapi/linux/cifs/Kbuild
	include/uapi/linux/genwqe/Kbuild
	mm/page_alloc.c
	net/ipv6/datagram.c
	net/netfilter/xt_quota2.c
	net/netlink/genetlink.c
	sound/core/compress_offload.c

Change-Id: I42de3248e9c43e504df5c9bb4139cbf355d2d7de

Michael Bestas   commited 2021-01-17 05:04:08 +02:00
b441756bdb
irqchip/eznps: Fix build error for !ARC700 builds
[ Upstream commit 89d29997f103d08264b0685796b420d911658b96 ]

eznps driver is supposed to be platform independent however it ends up
including stuff from inside arch/arc headers leading to rand config
build errors.

The quick hack to fix this (proper fix is too much chrun for non active
user-base) is to add following to nps platform agnostic header.
 - copy AUX_IENABLE from arch/arc header
 - move CTOP_AUX_IACK from arch/arc/plat-eznps/*/**

Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Link: https://lkml.kernel.org/r/20200824095831.5lpkmkafelnvlpi2@linutronix.de
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

Vineet Gupta   authored and   Greg Kroah-Hartman   commited 2020-09-23 08:46:10 +02:00
ad892d310e
soc: qcom: sideband: add helper APIs for sideband notifications
This commit introduces helper APIs and header files to be used
by sideband events publishers and subscribers.

Change-Id: I713b5b2a8dda2309453b433d922546f16a6f7e7e
Signed-off-by: Rishi Gupta <rishgupt@codeaurora.org>

Rishi Gupta   authored and   Gerrit - the friendly Code Review server   commited 2020-07-09 10:59:21 -07:00
42704c8c6e
soc: qcom: socinfo: Add support for SDA429W soc-id
Add socinfo support for SDA429W SoC and update the bindings
for the same.

Change-Id: I9d1e48be7e1f65f42c5d1fd3c0f1bf4fbf9973f5
Signed-off-by: mengjian <mengjian@codeaurora.org>

mengjiang   authored and   mengjian   commited 2019-10-18 14:21:57 +08:00
c371b03b4a
soc: qcom: socinfo: Add supprot for QCM2150 QRD soc-id
Add socinfo support for QCM2150 QRD Soc and update the
bindings for the same.

Change-Id: I5b7ee61bf9410844de42d8351400619e0d768ac1
Signed-off-by: Vishwanath Raju K <vishk@codeaurora.org>

Vishwanath Raju K   commited 2019-08-30 11:48:41 +05:30
d8796fd9ac
icnss: Synchronize idle shutdown and restart
If WLAN interface is not brought up for certain amount of time
after it is created, idle shutdown will happen to power off WLAN
device. Idle restart will happen to power up WLAN device if WLAN
is needed by user again. Add the support in platform driver.

Change-Id: I63e85c7de20536fc4146e05146e72537095025e5
Signed-off-by: Naman Padhiar <npadhiar@codeaurora.org>

Naman Padhiar   commited 2019-08-04 01:40:03 +05:30
ec9c04b81d
Merge "icnss: Thermal mitigation support in WLAN"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2019-06-20 09:51:01 -07:00
9d1dd8c887
soc: qcom: socinfo: Add support for SDM429W soc-id
Add socinfo support for SDM429W SoC and update the bindings
for the same.

Change-Id: I0dc811a23f07e7f3dcdd1f51b2cae2acbd0063bd
Signed-off-by: Shaoxing <shaoxing@codeaurora.org>

shaoxing   authored and   Gerrit - the friendly Code Review server   commited 2019-06-17 19:36:27 -07:00
2b289c81a6
icnss: Thermal mitigation support in WLAN
Add support for WLAN Host to register as cooling device through
icnss platform driver.

Change-Id: I9d3c2bfa18ea6b4a473c2d54b3a99cd7b4e62a68
Signed-off-by: Naman Padhiar <npadhiar@codeaurora.org>

Naman Padhiar   commited 2019-06-17 15:50:19 +05:30
7649fde8d3
msm: boot markers: Add boot markers driver
Add boot marker driver and make support for boot stats.

Change-Id: Ie37cb7c5b44a391eb180499cf86ac50fcbbb544b
Signed-off-by: Venkata Rao Kakani <vkakani@codeaurora.org>
Signed-off-by: Sunil Paidimarri <hisunil@codeaurora.org>

Venkata Rao Kakani   authored and   Sunil Paidimarri   commited 2019-06-04 18:54:23 -07:00
6e0b10d5f2
icnss: Add a flag to indicate PDR
During pdr case wlan host driver is not doing the cleanup of
ipa module. So after sap mode recovery in pdr case
data packets are not going on ipa path even ipa is enabled.
To address this issue send pdr indication to wlan host driver.

Change-Id: Ib0480870d3218da61edb0309725787c0382957ab
Signed-off-by: Sandeep Singh <sandsing@codeaurora.org>

Sandeep Singh   commited 2019-05-06 14:12:31 +05:30
2066d3ad3f
soc: qcom: socinfo: Rename sdmnobelium to sdm712
Rename sdmnobelium to sdm712.

Change-Id: I9fdfbf3ebde32c7f6aa97968668f03e5ba80fdfa
Signed-off-by: Kaushal Kumar <kaushalk@codeaurora.org>

Kaushal Kumar   commited 2019-03-25 18:20:57 +05:30
1b2a9b1507
qseecom: Fix clang compilation in qseecom driver
Make changes to ensure qseecom driver compiles
fine with clang enabled.

Change-Id: I390a1438425d77c23438fceb5c2c52063b472c90
Signed-off-by: Anmolpreet Kaur <anmolpre@codeaurora.org>

Anmolpreet Kaur   authored and   Gerrit - the friendly Code Review server   commited 2019-03-17 04:33:06 -07:00
dd006fea32
icnss: Add Api to Block/Unblock modem shutdown
Add API to Block/Unblock modem graceful shutdown.

Change-Id: I69b061fc7d25762b2c36d9590802addfc170f91f
Signed-off-by: Anurag Chouhan <achouhan@codeaurora.org>

Anurag Chouhan   authored and   Gerrit - the friendly Code Review server   commited 2019-02-11 21:07:39 -08:00
274fe76b53
Merge "drivers: cpuidle: lpm_levels: Correctly update lpm stats"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2018-12-17 06:49:35 -08:00
c827d785de
drivers: cpuidle: lpm_levels: Correctly update lpm stats
Correctly update LPM stats for cluster level to indicate
success. Update system_pm_ops as well to use correct exit
status for rpmh master stats update.

Change-Id: Ia50dcb21cd041db0ed17d25897fe346afe06dab2
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>

Maulik Shah   commited 2018-12-03 09:36:22 +05:30
083e22a8ad
soc: qcom: sysmon-qmi: Fix duplicate BEFORE_POWERUP SSCTL events
Currently, when sending an SSCTL SSR event, the event is
obtained by blindly following a map from the notification ID
provided by the subsystem notifier framework to an SSCTL
SSR event.

Since all the entries in the map that are not explicitly defined
are initialized to 0 (SSCTL_SSR_EVENT_BEFORE_POWERUP), then
notifications, such as SUBSYS_PROXY_VOTE, that do not map
to an actual SSCTL event map to SSCTL_SSR_EVENT_BEFORE_POWERUP,
resulting in multiple SSCTL_SSR_EVENT_BEFORE_POWERUP
notifications being sent.

To avoid this, mark all the notification ID to SSCTL event
mappings that are not defined, as SSCTL_EVENT_SSR_INVALID,
and prior to sending an SSCTL SSR event for a notification ID,
check to ensure that the notification ID maps to a defined
SSCTL event.

Change-Id: If4e4fcd12f7acc6eb82f9776a9db8bc9066d3c4e
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>

Isaac J. Manjarres   commited 2018-11-27 09:25:14 -08:00
30a5d8997f
Merge "Merge android-4.9.117 (8b21e85) into msm-4.9"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2018-11-01 13:26:01 -07:00
b41877da9b
Merge android-4.9.117 (8b21e85) into msm-4.9
* refs/heads/tmp-8b21e85:
  Revert "scsi: ufs: fix exception event handling"
  Linux 4.9.117
  net: dsa: qca8k: Allow overwriting CPU port setting
  net: dsa: qca8k: Add QCA8334 binding documentation
  net: dsa: qca8k: Enable RXMAC when bringing up a port
  net: dsa: qca8k: Force CPU port to its highest bandwidth
  RDMA/uverbs: Protect from attempts to create flows on unsupported QP
  ext4: check for allocation block validity with block group locked
  ext4: fix inline data updates with checksums enabled
  squashfs: be more careful about metadata corruption
  random: mix rdrand with entropy sent in from userspace
  drm: Add DP PSR2 sink enable bit
  media: si470x: fix __be16 annotations
  scsi: megaraid_sas: Increase timeout by 1 sec for non-RAID fastpath IOs
  scsi: scsi_dh: replace too broad "TP9" string with the exact models
  media: omap3isp: fix unbalanced dma_iommu_mapping
  crypto: authenc - don't leak pointers to authenc keys
  crypto: authencesn - don't leak pointers to authenc keys
  usb: hub: Don't wait for connect state at resume for powered-off ports
  microblaze: Fix simpleImage format generation
  serial: core: Make sure compiler barfs for 16-byte earlycon names
  staging: lustre: ldlm: free resource when ldlm_lock_create() fails.
  staging: lustre: llite: correct removexattr detection
  audit: allow not equal op for audit by executable
  rsi: Fix 'invalid vdd' warning in mmc
  ipconfig: Correctly initialise ic_nameservers
  drm/gma500: fix psb_intel_lvds_mode_valid()'s return type
  arm64: defconfig: Enable Rockchip io-domain driver
  memory: tegra: Apply interrupts mask per SoC
  memory: tegra: Do not handle spurious interrupts
  stop_machine: Use raw spinlocks
  dt-bindings: net: meson-dwmac: new compatible name for AXG SoC
  dt-bindings: pinctrl: meson: add support for the Meson8m2 SoC
  mmc: pwrseq: Use kmalloc_array instead of stack VLA
  mmc: dw_mmc: update actual clock for mmc debugfs
  ALSA: hda/ca0132: fix build failure when a local macro is defined
  drm/atomic: Handling the case when setting old crtc for plane
  media: siano: get rid of __le32/__le16 cast warnings
  bpf: fix references to free_bpf_prog_info() in comments
  thermal: exynos: fix setting rising_threshold for Exynos5433
  staging: lustre: o2iblnd: fix race at kiblnd_connect_peer
  scsi: megaraid: silence a static checker bug
  scsi: 3w-xxxx: fix a missing-check bug
  scsi: 3w-9xxx: fix a missing-check bug
  bnxt_en: Check unsupported speeds in bnxt_update_link() on PF only.
  perf: fix invalid bit in diagnostic entry
  s390/cpum_sf: Add data entry sizes to sampling trailer entry
  brcmfmac: Add support for bcm43364 wireless chipset
  mtd: rawnand: fsl_ifc: fix FSL NAND driver to read all ONFI parameter pages
  media: saa7164: Fix driver name in debug output
  media: media-device: fix ioctl function types
  libata: Fix command retry decision
  media: rcar_jpu: Add missing clk_disable_unprepare() on error in jpu_open()
  dma-iommu: Fix compilation when !CONFIG_IOMMU_DMA
  tty: Fix data race in tty_insert_flip_string_fixed_flag
  nvmem: properly handle returned value nvmem_reg_read
  ARM: dts: sh73a0: Add missing interrupt-affinity to PMU node
  ARM: dts: emev2: Add missing interrupt-affinity to PMU node
  EDAC, altera: Fix ARM64 build warning
  HID: i2c-hid: check if device is there before really probing
  powerpc/embedded6xx/hlwd-pic: Prevent interrupts from being handled by Starlet
  drm/radeon: fix mode_valid's return type
  HID: hid-plantronics: Re-resend Update to map button for PTT products
  arm64: cmpwait: Clear event register before arming exclusive monitor
  ALSA: usb-audio: Apply rate limit to warning messages in URB complete callback
  net: ethernet: ti: cpsw-phy-sel: check bus_find_device() ret value
  media: smiapp: fix timeout checking in smiapp_read_nvm
  ixgbevf: fix MAC address changes through ixgbevf_set_mac()
  md: fix NULL dereference of mddev->pers in remove_and_add_spares()
  regulator: pfuze100: add .is_enable() for pfuze100_swb_regulator_ops
  ALSA: emu10k1: Rate-limit error messages about page errors
  scsi: ufs: fix exception event handling
  fscrypt: use unbound workqueue for decryption
  drivers/perf: arm-ccn: don't log to dmesg in event_init
  ima: based on policy verify firmware signatures (pre-allocated buffer)
  mwifiex: correct histogram data with appropriate index
  net: dsa: qca8k: Add support for QCA8334 switch
  PCI: pciehp: Request control of native hotplug only if supported
  bpf: powerpc64: pad function address loads with NOPs
  pinctrl: at91-pio4: add missing of_node_put
  powerpc/8xx: fix invalid register expression in head_8xx.S
  powerpc/powermac: Mark variable x as unused
  powerpc/powermac: Add missing prototype for note_bootable_part()
  powerpc/chrp/time: Make some functions static, add missing header include
  powerpc/32: Add a missing include header
  ath: Add regulatory mapping for Bahamas
  ath: Add regulatory mapping for Bermuda
  ath: Add regulatory mapping for Serbia
  ath: Add regulatory mapping for Tanzania
  ath: Add regulatory mapping for Uganda
  ath: Add regulatory mapping for APL2_FCCA
  ath: Add regulatory mapping for APL13_WORLD
  ath: Add regulatory mapping for ETSI8_WORLD
  ath: Add regulatory mapping for FCC3_ETSIC
  PCI: Prevent sysfs disable of device while driver is attached
  btrfs: qgroup: Finish rescan when hit the last leaf of extent tree
  btrfs: add barriers to btrfs_sync_log before log_commit_wait wakeups
  media: videobuf2-core: don't call memop 'finish' when queueing
  media: tw686x: Fix incorrect vb2_mem_ops GFP flags
  wlcore: sdio: check for valid platform device data before suspend
  mwifiex: handle race during mwifiex_usb_disconnect
  mfd: cros_ec: Fail early if we cannot identify the EC
  ASoC: dpcm: fix BE dai not hw_free and shutdown
  Bluetooth: btusb: Add a new Realtek 8723DE ID 2ff8:b011
  Bluetooth: hci_qca: Fix "Sleep inside atomic section" warning
  iwlwifi: pcie: fix race in Rx buffer allocator
  selftests/intel_pstate: Improve test, minor fixes
  perf/x86/intel/uncore: Correct fixed counter index check for NHM
  perf/x86/intel/uncore: Correct fixed counter index check in generic code
  usbip: usbip_detach: Fix memory, udev context and udev leak
  f2fs: fix race in between GC and atomic open
  f2fs: Fix deadlock in shutdown ioctl
  f2fs: fix to wait page writeback during revoking atomic write
  f2fs: fix to don't trigger writeback during recovery
  f2fs: fix error path of move_data_page
  disable loading f2fs module on PAGE_SIZE > 4KB
  pnfs: Don't release the sequence slot until we've processed layoutget on open
  netfilter: nf_tables: check msg_type before nft_trans_set(trans)
  RDMA/mad: Convert BUG_ONs to error flows
  powerpc/64s: Fix compiler store ordering to SLB shadow area
  hvc_opal: don't set tb_ticks_per_usec in udbg_init_opal_common()
  powerpc/eeh: Fix use-after-release of EEH driver
  infiniband: fix a possible use-after-free bug
  netfilter: ipset: List timing out entries with "timeout 1" instead of zero
  perf tools: Fix pmu events parsing rule
  rtc: ensure rtc_set_alarm fails when alarms are not supported
  mm/slub.c: add __printf verification to slab_err()
  mm: vmalloc: avoid racy handling of debugobjects in vunmap
  vfio: platform: Fix reset module leak in error path
  nfsd: fix potential use-after-free in nfsd4_decode_getdeviceinfo
  ALSA: fm801: add error handling for snd_ctl_add
  ALSA: emu10k1: add error handling for snd_ctl_add
  xen/netfront: raise max number of slots in xennet_get_responses()
  kcov: ensure irq code sees a valid area
  usb: dwc2: Fix DMA alignment to start at allocated boundary
  arm64: fix vmemmap BUILD_BUG_ON() triggering on !vmemmap setups
  tracing: Quiet gcc warning about maybe unused link variable
  tracing/kprobes: Fix trace_probe flags on enable_trace_kprobe() failure
  kthread, tracing: Don't expose half-written comm when creating kthreads
  tracing: Fix possible double free in event_enable_trigger_func()
  tracing: Fix double free of event_trigger_data
  kvm, mm: account shadow page tables to kmemcg
  Input: elan_i2c - add another ACPI ID for Lenovo Ideapad 330-15AST
  Input: i8042 - add Lenovo LaVie Z to the i8042 reset list
  Input: elan_i2c - add ACPI ID for lenovo ideapad 330
  ANDROID: arm64: Fix 4.9.114 merge

Change-Id: Ic998a92c8875a18bffd10206cdf59b57eeecf41a
Signed-off-by: Minming Qi <mqi@codeaurora.org>

Minming Qi   commited 2018-10-31 17:08:44 +08:00
a5718e30ae
ARM: dts: msm: Add device tree support for msm8940
Add initial set of device tree files to build the
msm8940 target. This implementation is based on
snapshot of the msm8940 device tree from msm-3.18.
commit d0eb392e8733c
("ARM: dts: msm: Add support for MSM8940").

Change-Id: Icc0d37dbde746b9ad82286c192585d7d047ba70e
Signed-off-by: Naitik Bharadiya <bharad@codeaurora.org>
Signed-off-by: Chetan C R <cravin@codeaurora.org>

Chetan C R   authored and   Gerrit - the friendly Code Review server   commited 2018-10-22 23:04:39 -07:00
95b6ac40b6
Merge "Minidump: Add update region support for minidump regions"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2018-10-14 23:29:58 -07:00
e4c33baa3f
Merge "soc: qcom: socinfo: Rename sdmdolphin"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2018-10-09 08:58:19 -07:00
6195669667
Merge "ARM: qcom: Add board config support for sda450"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2018-10-09 08:58:12 -07:00
294a532a74
soc: qcom: socinfo: Rename sdmdolphin
Rename sdmdolphin to avoid a possible keyword
overlap.

Change-Id: I35f7a437acac825585108f7227ecf0d3858e4a0c
Signed-off-by: Kaushal Kumar <kaushalk@codeaurora.org>

Kaushal Kumar   commited 2018-10-09 17:38:22 +05:30
8647da800f
soc: qcom: socinfo: Add support for SDA450 soc-id
Add socinfo support for SDA450 SoC.

Change-Id: Ibbfe56e0150e0401d8f8eeb50021f2b6d79e101b
Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>

Tingwei Zhang   commited 2018-10-09 14:55:00 +08:00
4c2d2fd7db
soc: qcom: socinfo: Add support for sdmdolphin soc-id
Add support for getting soc-id and dummy handle
on sdmdolphin.

Change-Id: I06f52d5093fb7f1646725fee70c7d18cd00a135e
Signed-off-by: Kaushal Kumar <kaushalk@codeaurora.org>

Kaushal Kumar   commited 2018-10-01 16:31:17 +05:30
ac38d125b3
Minidump: Add update region support for minidump regions
Add support to update client's entry physical/virtual addresses,
which is useful for DLKM, dynamic address changing clients.

Currently, msm_minidump_add_region() returns 0 on success, instead
of that, return 'region number' of the entry in the minidump table.

So clients who wants to update their address in future, needs to
book keep their entry in minidump table.

Change-Id: I03abbbd87bf6d2e11cf637525412d352772821cf
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>

Lingutla Chandrasekhar   commited 2018-09-28 15:56:17 +05:30
1e46167840
soc: qcom: socinfo: Add supprot for QM215 QRD soc-id
Add socinfo support for QM215 QRD Soc and update the
bindings for the same.

Change-Id: I3496560c94f920bd6be577f54aca6cf69919521a
Signed-off-by: Teng Fei Fan <tengfei@codeaurora.org>

Teng Fei Fan   commited 2018-09-17 10:54:46 +08:00
bd372b455b
soc: qcom: pil: Incorporate timeouts for notifications
Currently the SSR notification framework will allow the kernel
to silently get stuck if there is a large delay introduced by
sysmon communication between subsystems, or a callback
registered with a subsystem's notifications through the
subsystem notifier framework.This could be an indicator that
something has gone wrong.

Implement initial framework to detect these type of issues.
In case the framework does detect an issue, trigger kernel
panic or emit warning based on configuration flags.

Change-Id: Ia09cc74dd7a961c83e6470cbd66102f133de5c97
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>

Isaac J. Manjarres   commited 2018-08-10 09:27:52 -07:00
bfe53e5e76
memory: tegra: Apply interrupts mask per SoC
[ Upstream commit 1c74d5c0de0c2cc29fef97a19251da2ad6f579bd ]

Currently we are enabling handling of interrupts specific to Tegra124+
which happen to overlap with previous generations. Let's specify
interrupts mask per SoC generation for consistency and in a preparation
of squashing of Tegra20 driver into the common one that will enable
handling of GART faults which may be undesirable by newer generations.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Dmitry Osipenko   authored and   Greg Kroah-Hartman   commited 2018-08-03 07:55:24 +02:00
dc6afdde4b
icnss: Add a flag to indicare FW rejuvenate
Add a flag to maintain fw rejuvenate state,
set if fw rejuvenate happens and reset at fw ready.
export an API to the wlan host driver to distinguish the
case of ssr or pdr with the FW rejuventae.

Change-Id: I7a01cc4996f68f78aa13eacf36648331a701882a
Signed-off-by: Anurag Chouhan <achouhan@codeaurora.org>

Anurag Chouhan   authored and   Gerrit - the friendly Code Review server   commited 2018-07-24 02:01:41 -07:00
c499734902
Merge "msm: camera: Write a few registers before camera probe"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2018-06-23 07:54:31 -07:00
85b5ec7a19
msm: camera: Write a few registers before camera probe
Some sensors need software to write some registers
before reading ID register.

Change-Id: I01f3aab0132d741560eaa40ee84ed989084b92f1
Signed-off-by: Vijay kumar Tumati <vtumati@codeaurora.org>

Vijay kumar Tumati   commited 2018-06-13 14:38:51 +05:30
13e62deb41
Merge "qseecom: fix a race condition when loading TA"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2018-06-12 23:47:01 -07:00
f82ab04ca4
Merge "soc: qcom: socinfo: Add support for msm8917 soc-id"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2018-06-12 23:46:52 -07:00
e9b9475065
Merge "soc: qcom: socinfo: add support for sxr1120"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2018-06-12 14:50:10 -07:00
c704ca0487
soc: qcom: socinfo: Add support for msm8917 soc-id
Add support for getting soc-id and dummy handle on msm8917.

Change-Id: Id5a5984b57d05ef7ecea9af4e6d604d0837a35bb
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>

Swetha Chikkaboraiah   authored and   Gerrit - the friendly Code Review server   commited 2018-06-11 23:35:08 -07:00
630e245c05
Merge "soc: qcom: socinfo: add support for sxr1130"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2018-06-11 02:21:19 -07:00
28104a213c
Merge "ARM: qcom: Add MSM Legacy hotplug low power mode APIs"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2018-06-07 07:41:39 -07:00
14cc2678fe
soc: qcom: socinfo: add support for sxr1130
Add support for getting soc-id and dummy handle
on sxr1130.

Change-Id: I92ae715e6a3030123cca4cc7e5ea6d0f4e19e72b
Signed-off-by: Kaushal Kumar <kaushalk@codeaurora.org>

Kaushal Kumar   commited 2018-06-07 13:11:22 +05:30
108561ee7a
ARM: qcom: Add MSM Legacy hotplug low power mode APIs
Add low power mode support for hotplug CPUs.

Remove pen release logic, forloop & gic pending
irqs print from legacy hotplug code.

Remove vfp_resume call as current vfp module has
pm notifiers.

Add 'cpu_can_disable' smp callback to enable hotplug
support for bootcore CPU

Change-Id: Ic830bbea1260c34bd383d7c07e2c6fef05677ded
Signed-off-by: Chinkit Kumar,Kirti Kumar Parmar <parma@codeaurora.org>

Raja Mallik   authored and   Chinkit Kumar,Kirti Kumar Parmar   commited 2018-06-06 18:27:56 +05:30
f936802626
qseecom: fix a race condition when loading TA
Userspace and kernel clients may load a same TA at the same time.
To fix potential race condition, first kernel side need to release
mutex before sleep when failed to do ion allocation from QSEECOM_TA
heap. Besides, since kernel client may fail to load TA if this TA is
just being loaded by userspace client when mutex is released, it need
to recheck if this TA exists if TA loading error code is TA already
loaded.

Change-Id: Ie6af9c67b867dfae7b25e4ade6948dea67e476d6
Signed-off-by: Zhen Kong <zkong@codeaurora.org>

Zhen Kong   commited 2018-06-05 11:13:58 -07:00
5d02be98b0
clk: msm: Add delay of 50uSec before polling lock_detect status
Some PLL HWs require an additional delay for the PLL lock detect
to stabilize after being brought out of reset and SW to poll for
lock detect status. Add delay of 50uSec before polling lock_det
bit by introducing new pll ops.
Also if PLL fails to lock, record additional PLL debug information
in the kernel log before panic().

Change-Id: I1b04dccc8d3c3e45d4aa7a3c1c60311331e490fa
Signed-off-by: Odelu Kukatla <okukatla@codeaurora.org>

Odelu Kukatla   commited 2018-06-05 19:48:30 +05:30
90cb5ecd7c
soc: qcom: socinfo: add support for sxr1120
Add support for getting soc-id and dummy handle
on sxr1120.

Change-Id: Ibcba4703f3c0daee90f12ec64868df2e175777d3
Signed-off-by: Kaushal Kumar <kaushalk@codeaurora.org>

Kaushal Kumar   commited 2018-06-04 16:21:57 +05:30
9575aef291
drivers: lpm-levels-legacy: Allow rpm handshake only with cluster LPM
CPU spm is programmed to handshake with rpm for single cpu devices.
If cluster level LPM is not selected even then spm handshakes with
rpm.

Fix this issue by allowing rpm handshake only if cluster level
LPM is selected.

CRs-Fixed: 1043098
Change-Id: I54babda27ecf7a931f844b8c7219a9582221abca
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
Signed-off-by: Chinkit Kumar,Kirti Kumar Parmar <parma@codeaurora.org>

Maulik Shah   authored and   Gerrit - the friendly Code Review server   commited 2018-05-22 02:18:01 -07:00
735e1e7d5e
cpuidle: lpm-workarounds: Skip L2 SPM enabling in HLOS
Due to a hardware issue on 8909, secure world needs to disable
and enable L2 SPM to get the proper context in secure watchdog
bite cases.

With this workaround there is a race in programming L2 SPM between
HLOS and secure world. This leads to stability issues. To avoid
this program L2 SPM enable in secure world.

Change-Id: I426289e1fc66664ed9c4ecf81c4106ce2c7c1145
Signed-off-by: Anil Kumar Mamidala <amami@codeaurora.org>
Signed-off-by: Chinkit Kumar,Kirti Kumar Parmar <parma@codeaurora.org>

Anil Kumar Mamidala   authored and   Gerrit - the friendly Code Review server   commited 2018-05-22 02:17:31 -07:00
3b23717246
drivers: soc: qcom: pm: Add legacy PM and Warmboot set address API support
Add legacy msm pm sleep mode support for MSM8909 target.

Add warmboot set address support for multi cluster cpu's.

Snapshot is taken from msm-3.18 kernel version @ commit 9bbf4c38e5b9e8
("soc: qcom: bgrsb: Increase time out for RSB channel opening")

Change-Id: Ia90f7b97e4cfaf6a691d178968cb515da6e9ddc0
Signed-off-by: Chinkit Kumar,Kirti Kumar Parmar <parma@codeaurora.org>
Signed-off-by: Sundara Vinayagam <sundvi@codeaurora.org>

Raja Mallik   authored and   Gerrit - the friendly Code Review server   commited 2018-05-22 02:16:51 -07:00
078db46952
cpuidle: lpm-levels: Enable LPM support for non psci target
Add non psci legacy lpm support. Modify and align changes
for clock event, MPM and cpu hotplug for LPM callback notification.

Remove deprecated scheduler c-state(idle cpu), d-state(idle cluster)
setting from lpm driver.

Snapshot is taken from msm-3.18 kernel version @commit 9bbf4c38e5b9e8
("soc: qcom: bgrsb: Increase time out for RSB channel opening")

Change-Id: I2d81dbb81efdc9593cdfcca8f56806acdb210b81
Signed-off-by: Raja Mallik <rmallik@codeaurora.org>
Signed-off-by: Chinkit Kumar,Kirti Kumar Parmar <parma@codeaurora.org>
Signed-off-by: Sundara Vinayagam <sundvi@codeaurora.org>

Raja Mallik   authored and   Gerrit - the friendly Code Review server   commited 2018-05-22 02:10:46 -07:00
b9ad452666
Merge android-4.9.94 (8683408) into msm-4.9
* refs/heads/tmp-8683408:
  ANDROID: Add build server config for cuttlefish.
  ANDROID: Add defconfig for cuttlefish.
  FROMLIST: staging: Android: Add 'vsoc' driver for cuttlefish.
  Revert "ANDROID: proc: make oom adjustment files user read-only"
  Revert "ANDROID: fixup! proc: make oom adjustment files user read-only"
  Linux 4.9.94
  Revert "xhci: plat: Register shutdown for xhci_plat"
  vrf: Fix use after free and double free in vrf_finish_output
  net sched actions: fix dumping which requires several messages to user space
  strparser: Fix sign of err codes
  net/mlx4_core: Fix memory leak while delete slave's resources
  vhost_net: add missing lock nesting notation
  team: move dev_mc_sync after master_upper_dev_link in team_port_add
  route: check sysctl_fib_multipath_use_neigh earlier than hash
  vhost: validate log when IOTLB is enabled
  net/mlx4_en: Fix mixed PFC and Global pause user control requests
  net/sched: fix NULL dereference on the error path of tcf_skbmod_init()
  net/sched: fix NULL dereference in the error path of tunnel_key_init()
  net/mlx5e: Sync netdev vxlan ports at open
  vti6: better validate user provided tunnel names
  ip6_tunnel: better validate user provided tunnel names
  ip6_gre: better validate user provided tunnel names
  ipv6: sit: better validate user provided tunnel names
  ip_tunnel: better validate user provided tunnel names
  net: fool proof dev_valid_name()
  bonding: process the err returned by dev_set_allmulti properly in bond_enslave
  bonding: move dev_mc_sync after master_upper_dev_link in bond_enslave
  bonding: fix the err path for dev hwaddr sync in bond_enslave
  vlan: also check phy_driver ts_info for vlan's real device
  vhost: correctly remove wait queue during poll failure
  sky2: Increase D3 delay to sky2 stops working after suspend
  sctp: sctp_sockaddr_af must check minimal addr length for AF_INET6
  sctp: do not leak kernel memory to user space
  r8169: fix setting driver_data after register_netdev
  pptp: remove a buggy dst release in pptp_connect()
  net/sched: fix NULL dereference in the error path of tcf_bpf_init()
  netlink: make sure nladdr has correct size in netlink_connect()
  net/ipv6: Increment OUTxxx counters after netfilter hook
  net/ipv6: Fix route leaking between VRFs
  net: fix possible out-of-bound read in skb_network_protocol()
  ipv6: the entire IPv6 header chain must fit the first fragment
  arp: fix arp_filter on l3slave devices
  clk: at91: fix clk-generated compilation
  random: use lockless method of accessing and updating f->reg_idx
  virtio_net: check return value of skb_to_sgvec in one more location
  virtio_net: check return value of skb_to_sgvec always
  rxrpc: check return value of skb_to_sgvec always
  ipsec: check return value of skb_to_sgvec always
  perf tools: Fix copyfile_offset update of output offset
  mtd: mtd_oobtest: Handle bitflips during reads
  Input: goodix - disable IRQs while suspended
  sdhci: Advertise 2.0v supply on SDIO host controller
  cxgb4vf: Fix SGE FL buffer initialization logic for 64K pages
  EDAC, mv64x60: Fix an error handling path
  tty: n_gsm: Allow ADM response in addition to UA for control dlci
  blk-mq: fix kernel oops in blk_mq_tag_idle()
  scsi: libsas: initialize sas_phy status according to response of DISCOVER
  scsi: libsas: fix error when getting phy events
  scsi: libsas: fix memory leak in sas_smp_get_phy_events()
  bcache: segregate flash only volume write streams
  bcache: stop writeback thread after detaching
  drm/vc4: Fix resource leak in 'vc4_get_hang_state_ioctl()' in error handling path
  selftests: kselftest_harness: Fix compile warning
  hsr: fix incorrect warning
  vxlan: dont migrate permanent fdb entries during learn
  s390/dasd: fix hanging safe offline
  ACPICA: Disassembler: Abort on an invalid/unknown AML opcode
  ACPICA: Events: Add runtime stub support for event APIs
  ACPICA: OSL: Add support to exclude stdarg.h
  cpuidle: dt: Add missing 'of_node_put()'
  Bluetooth: Send HCI Set Event Mask Page 2 command only when needed
  clk: meson: meson8b: add compatibles for Meson8 and Meson8m2
  net: ena: disable admin msix while working in polling mode
  net: ena: add missing unmap bars on device removal
  net: ena: add missing return when ena_com_get_io_handlers() fails
  net: ena: fix race condition between submit and completion admin command
  net: ena: fix rare uncompleted admin command false alarm
  iio: magnetometer: st_magn_spi: fix spi_device_id table
  sparc64: ldc abort during vds iso boot
  net: fec: Add a fec_enet_clear_ethtool_stats() stub for CONFIG_M5272
  sctp: fix recursive locking warning in sctp_do_peeloff
  bnx2x: Allow vfs to disable txvlan offload
  crypto: omap-sham - fix closing of hash with separate finalize call
  crypto: omap-sham - buffer handling fixes for hashing later
  geneve: add missing rx stats accounting
  stmmac: fix ptp header for GMAC3 hw timestamp
  coresight: tmc: Configure DMA mask appropriately
  coresight: Fix reference count for software sources
  pinctrl: meson-gxbb: remove non-existing pin GPIOX_22
  X.509: Fix error code in x509_cert_parse()
  xen: avoid type warning in xchg_xen_ulong
  skbuff: only inherit relevant tx_flags
  perf tests: Decompress kernel module before objdump
  perf tools: Decompress kernel module when reading DSO data
  net: emac: fix reset timeout with AR8035 phy
  Fix loop device flush before configure v3
  ARM: dts: armadillo800eva: Split LCD mux and gpio
  MIPS: kprobes: flush_insn_slot should flush only if probe initialised
  MIPS: mm: adjust PKMAP location
  MIPS: mm: fixed mappings: correct initialisation
  sched/deadline: Use the revised wakeup rule for suspending constrained dl tasks
  perf/core: Correct event creation with PERF_FORMAT_GROUP
  e1000e: Undo e1000e_pm_freeze if __e1000_shutdown fails
  KVM: nVMX: Update vmcs12->guest_linear_address on nested VM-exit
  nvme: fix hang in remove path
  nvme-pci: fix multiple ctrl removal scheduling
  ARM: imx: Add MXC_CPU_IMX6ULL and cpu_is_imx6ull
  net: phy: avoid genphy_aneg_done() for PHYs without clause 22 support
  mceusb: sporadic RX truncation corruption fix
  cx25840: fix unchecked return values
  cxl: Unlock on error in probe
  igb: fix race condition with PTP_TX_IN_PROGRESS bits
  e1000e: fix race condition around skb_tstamp_tx()
  ARM: dts: qcom: ipq4019: fix i2c_0 node
  tags: honor COMPILED_SOURCE with apart output directory
  iwlwifi: fix min API version for 7265D, 3168, 8000 and 8265
  iwlwifi: pcie: only use d0i3 in suspend/resume if system_pm is set to d0i3
  iwlwifi: tt: move ucode_loaded check under mutex
  iwlwifi: mvm: Fix command queue number on d0i3 flow
  watchdog: f71808e_wdt: Add F71868 support
  iwlwifi: mvm: fix firmware debug restart recording
  perf report: Ensure the perf DSO mapping matches what libdw sees
  perf header: Set proper module name when build-id event found
  net/mlx4: Check if Granular QoS per VF has been enabled before updating QP qos_vport
  net/mlx4: Fix the check in attaching steering rules
  sit: reload iphdr in ipip6_rcv
  macsec: check return value of skb_to_sgvec always
  skbuff: return -EMSGSIZE in skb_to_sgvec to prevent overflow
  ip6_tunnel: fix traffic class routing for tunnels
  bio-integrity: Do not allocate integrity context for bio w/o data
  Fix serial console on SNI RM400 machines
  cxgb4: fix incorrect cim_la output for T6
  powerpc/8xx: fix mpc8xx_get_irq() return on no irq
  drm/omap: fix tiled buffer stride calculations
  RDMA/hfi1: fix array termination by appending NULL to attr array
  RDMA/iw_cxgb4: Avoid touch after free error in ARP failure handlers
  net: phy: micrel: Restore led_mode and clk_sel on resume
  mISDN: Fix a sleep-in-atomic bug
  arm64: kernel: restrict /dev/mem read() calls to linear region
  qlcnic: Fix a sleep-in-atomic bug in qlcnic_82xx_hw_write_wx_2M and qlcnic_82xx_hw_read_wx_2M
  perf trace: Add mmap alias for s390
  ath10k: add BMI parameters to fix calibration from DT/pre-cal
  drm/amdkfd: NULL dereference involving create_process()
  powerpc/spufs: Fix coredump of SPU contexts
  clk: Fix __set_clk_rates error print-string
  clk: scpi: fix return type of __scpi_dvfs_round_rate
  KVM: SVM: do not zero out segment attributes if segment is unusable or not present
  mtd: nand: check ecc->total sanity in nand_scan_tail
  mtd: nand: gpmi: Fix gpmi_nand_init() error path
  dt-bindings: display: sun4i: Add allwinner,tcon-channel property
  drm/sun4i: Ignore the generic connectors for components
  clk: at91: fix clk-generated parenting
  net: freescale: fix potential null pointer dereference
  SUNRPC: ensure correct error is reported by xs_tcp_setup_socket()
  rtc: interface: Validate alarm-time before handling rollover
  rtc: opal: Handle disabled TPO in opal_get_tpo_time()
  i40evf: fix merge error in older patch
  rtc: m41t80: fix SQW dividers override when setting a date
  cxgb4: Fix netdev_features flag
  cxgb4: FW upgrade fixes
  net/mlx5: avoid build warning for uniprocessor
  arm64: futex: Fix undefined behaviour with FUTEX_OP_OPARG_SHIFT usage
  backlight: Report error on failure
  dmaengine: imx-sdma: Handle return value of clk_prepare_enable
  powerpc/[booke|4xx]: Don't clobber TCR[WP] when setting TCR[DIE]
  ovl: filter trusted xattr for non-admin
  HID: i2c: Call acpi_device_fix_up_power for ACPI-enumerated devices
  netfilter: conntrack: don't call iter for non-confirmed conntracks
  x86/efi: Disable runtime services on kexec kernel if booted with efi=old_map
  hdlcdrv: Fix divide by zero in hdlcdrv_ioctl
  wl1251: check return from call to wl1251_acx_arp_ip_filter
  rt2x00: do not pause queue unconditionally on error path
  ASoC: Intel: sst: Fix the return value of 'sst_send_byte_stream_mrfld()'
  pinctrl: baytrail: Enable glitch filter for GPIOs used as interrupts
  backlight: tdo24m: Fix the SPI CS between transfers
  blk-mq: fix race between updating nr_hw_queues and switching io sched
  IB/rdmavt: Allocate CQ memory on the correct node
  gpio: label descriptors using the device name
  vfb: fix video mode and line_length being set when loaded
  mac80211: Fix setting TX power on monitor interfaces
  ACPI: EC: Fix debugfs_create_*() usage
  irqchip/gic-v3: Fix the driver probe() fail due to disabled GICC entry
  scsi: mpt3sas: Proper handling of set/clear of "ATA command pending" flag.
  scsi: libiscsi: Allow sd_shutdown on bad transport
  ASoC: Intel: cht_bsw_rt5645: Analog Mic support
  ASoC: Intel: Skylake: Disable clock gating during firmware and library download
  media: videobuf2-core: don't go out of the buffer range
  hwmon: (ina2xx) Make calibration register value fixed
  PM / devfreq: Fix potential NULL pointer dereference in governor_store
  VFS: close race between getcwd() and d_move()
  net/mlx4_en: Change default QoS settings
  ACPI / video: Default lcd_only to true on Win8-ready and newer machines
  rds; Reset rs->rs_bound_addr in rds_add_bound() failure path
  l2tp: fix missing print session offset info
  perf probe: Add warning message if there is unexpected event name
  thermal: power_allocator: fix one race condition issue for thermal_instances list
  ARM: dts: ls1021a: add "fsl,ls1021a-esdhc" compatible string to esdhc node
  i40iw: Correct Q1/XF object count equation
  i40iw: Fix sequence number for the first partial FPDU
  drm/msm: Take the mutex before calling msm_gem_new_impl
  net: llc: add lock_sock in llc_ui_bind to avoid a race condition
  KVM: nVMX: Fix handling of lmsw instruction
  KVM: X86: Fix preempt the preemption timer cancel
  PCI/msi: fix the pci_alloc_irq_vectors_affinity stub
  cpuhotplug: Link lock stacks for hotplug callbacks
  bonding: Don't update slave->link until ready to commit
  Input: elan_i2c - clear INT before resetting controller
  net: move somaxconn init from sysctl code
  tcp: better validation of received ack sequences
  ARM64: PCI: Fix struct acpi_pci_root_ops allocation failure path
  ext4: fix off-by-one on max nr_pages in ext4_find_unwritten_pgoff()
  fix race in drivers/char/random.c:get_reg()
  scsi: bnx2fc: fix race condition in bnx2fc_get_host_stats()
  ASoC: rsnd: SSI PIO adjust to 24bit mode
  pNFS/flexfiles: missing error code in ff_layout_alloc_lseg()
  netfilter: ctnetlink: fix incorrect nf_ct_put during hash resize
  perf report: Fix off-by-one for non-activation frames
  libceph: NULL deref on crush_decode() error path
  net: ieee802154: fix net_device reference release too early
  mlx5: fix bug reading rss_hash_type from CQE
  block: fix an error code in add_partition()
  selinux: do not check open permission on sockets
  net/mlx5: Tolerate irq_set_affinity_hint() failures
  gpio: crystalcove: Do not write regular gpio registers for virtual GPIOs
  sched/numa: Use down_read_trylock() for the mmap_sem
  perf/core: Fix error handling in perf_event_alloc()
  leds: pca955x: Correct I2C Functionality
  net/wan/fsl_ucc_hdlc: fix muram allocation error
  ray_cs: Avoid reading past end of buffer
  ARM: davinci: da8xx: Create DSP device only when assigned memory
  md-cluster: fix potential lock issue in add_new_disk
  ext4: handle the rest of ext4_mb_load_buddy() ENOMEM errors
  iio: light: rpr0521 poweroff for probe fails
  iio: hi8435: cleanup reset gpio
  iio: hi8435: avoid garbage event at first enable
  ASoC: simple-card: fix mic jack initialization
  xfrm: fix state migration copy replay sequence numbers
  selftests/powerpc: Fix TM resched DSCR test with some compilers
  ath5k: fix memory leak on buf on failed eeprom read
  powerpc/mm: Fix virt_addr_valid() etc. on 64-bit hash
  scsi: csiostor: fix use after free in csio_hw_use_fwconfig()
  mlxsw: spectrum: Avoid possible NULL pointer dereference
  sh_eth: Use platform device for printing before register_netdev()
  fsl/qe: add bit description for SYNL register for GUMR
  net/wan/fsl_ucc_hdlc: fix incorrect memory allocation
  net/wan/fsl_ucc_hdlc: fix unitialized variable warnings
  serial: sh-sci: Fix race condition causing garbage during shutdown
  serial: 8250: omap: Disable DMA for console UART
  USB: ene_usb6250: fix SCSI residue overwriting
  net: x25: fix one potential use-after-free issue
  USB: ene_usb6250: fix first command execution
  pxa_camera: fix module remove codepath for v4l2 clock
  usb: chipidea: properly handle host or gadget initialization failure
  ARM: dts: rockchip: fix rk322x i2s1 pinctrl error
  arp: honour gratuitous ARP _replies_
  neighbour: update neigh timestamps iff update is effective
  uio: fix incorrect memory leak cleanup
  ipmr: vrf: Find VIFs using the actual device
  ata: libahci: properly propagate return value of platform_get_irq()
  btrfs: fix incorrect error return ret being passed to mapping_set_error
  usb: dwc3: keystone: check return value
  KVM: arm64: Restore host physical timer access on hyp_panic()
  KVM: arm: Restore banked registers and physical timer access on hyp_panic()
  async_tx: Fix DMA_PREP_FENCE usage in do_async_gen_syndrome()
  ipv6: avoid dad-failures for addresses with NODAD
  mdio: mux: fix device_node_continue.cocci warnings
  arm64: perf: Ignore exclude_hv when kernel is running in HYP
  i2c: mux: reg: put away the parent i2c adapter on probe failure
  ARM: dts: imx6qdl-wandboard: Fix audio channel swap
  powerpc/modules: If mprofile-kernel is enabled add it to vermagic
  x86/tsc: Provide 'tsc=unstable' boot parameter
  clk: renesas: rcar-gen2: Fix PLL0 on R-Car V2H and E2
  staging: wlan-ng: prism2mgmt.c: fixed a double endian conversion before calling hfa384x_drvr_setconfig16, also fixes relative sparse warning
  ARM: dts: imx53-qsrb: Pulldown PMIC IRQ pin
  iio: pressure: zpa2326: report interrupted case as failure
  PowerCap: Fix an error code in powercap_register_zone()
  bus: brcmstb_gisb: correct support for 64-bit address output
  bus: brcmstb_gisb: Use register offsets with writes too
  SMB2: Fix share type handling
  mm, vmstat: Remove spurious WARN() during zoneinfo print
  vmxnet3: ensure that adapter is in proper state during force_close
  irqchip/mbigen: Fix the clear register offset calculation
  KVM: PPC: Book3S PR: Check copy_to/from_user return values
  Input: elantech - force relative mode on a certain module
  Input: elan_i2c - check if device is there before really probing
  mdio: mux: Correct mdio_mux_init error path issues
  netxen_nic: set rcode to the return status from the call to netxen_issue_cmd
  net: qca_spi: Fix alignment issues in rx path
  blk-mq: NVMe 512B/4K+T10 DIF/DIX format returns I/O error on dd with split op
  perf/callchain: Force USER_DS when invoking perf_callchain_user()
  CIFS: silence lockdep splat in cifs_relock_file()
  NFSv4.1: Work around a Linux server bug...
  qed: Correct doorbell configuration for !4Kb pages
  net/mlx4_en: Avoid adding steering rules with invalid ring
  s390: move _text symbol to address higher than zero
  pidns: disable pid allocation if pid_ns_prepare_proc() is failed in alloc_pid()
  drivers/misc/vmw_vmci/vmci_queue_pair.c: fix a couple integer overflow tests
  lockd: fix lockd shutdown race
  net: ethernet: ti: cpsw: adjust cpsw fifos depth for fullduplex flow control
  net: cdc_ncm: Fix TX zero padding
  ipmi_ssif: unlock on allocation failure
  ubi: fastmap: Fix slab corruption
  qlge: Avoid reading past end of buffer
  bna: Avoid reading past end of buffer
  mac80211: bail out from prep_connection() if a reconfig is ongoing
  af_key: Fix slab-out-of-bounds in pfkey_compile_policy.
  IB/srpt: Avoid that aborting a command triggers a kernel warning
  IB/srpt: Fix abort handling
  x86/boot: Declare error() as noreturn
  NFSv4.1: RECLAIM_COMPLETE must handle NFS4ERR_CONN_NOT_BOUND_TO_SESSION
  ovl: persistent inode numbers for upper hardlinks
  x86/mm/kaslr: Use the _ASM_MUL macro for multiplication to work around Clang incompatibility
  x86/asm: Don't use RBP as a temporary register in csum_partial_copy_generic()
  rtc: snvs: fix an incorrect check of return value
  md/raid5: make use of spin_lock_irq over local_irq_disable + spin_lock
  cfg80211: make RATE_INFO_BW_20 the default
  qed: Fix overriding of supported autoneg value.
  ANDROID: proc: add null check in proc_uid_init
  f2fs/fscrypt: updates to v4.17-rc1
  Revert "ANDROID: sched/tune: Initialize raw_spin_lock in boosted_groups"
  ANDROID: uid_sys_stats: Replace tasklist lock with RCU in uid_cputime_show
  ANDROID: arm64: mark kpti_install_ng_mappings as __nocfi

Conflicts:
	arch/arm64/kernel/perf_event.c
	drivers/gpu/drm/msm/msm_gem.c
	drivers/hwtracing/coresight/coresight-tmc.c
	drivers/hwtracing/coresight/coresight.c

Change-Id: I3a1bd6216f55601cff0a2b4344c480b2e1a771a6
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>

Blagovest Kolenichev   commited 2018-05-11 03:07:46 -07:00
2e229cb024
Merge "Merge android-4.9.90 (dd1e37e) into msm-4.9"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2018-05-03 09:02:10 -07:00
78667dedc6