Commit graph

590705 commits

Author SHA1 Message Date
Linux Build Service Account
de6917af67 Merge "msm: mdss: Update msm8998 HDMI PHY sequence for bridge chip" 2017-06-07 20:57:50 -07:00
Linux Build Service Account
f10af35ab9 Merge "msm: mdss: update polarity based on HDMI resolution" 2017-06-07 20:57:49 -07:00
Linux Build Service Account
eaeca093b4 Merge "power: qpnp-fg-gen3: Fix possible integer overflow" 2017-06-07 20:57:48 -07:00
Linux Build Service Account
b420cddf1f Merge "soc: qcom: subsys-pil-tz: Initialize subsys_dev pointer" 2017-06-07 20:57:46 -07:00
Linux Build Service Account
edc5117530 Merge "policy_engine: Add module parameter to start USB stack" 2017-06-07 20:57:45 -07:00
Guchun Chen
a14f22c34c Revert "msm: smmu: add re-route calling for specified iova."
This reverts commit ae94b477af.

This change brings side effect of smmu fault in apq8098 project. It blocks their regression test.

Change-Id: Ia479188eca74ec988026f7d42207435da2f79bfc
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2017-06-07 20:00:30 -07:00
Jack Pham
c8735c7530 usb: pd: Increment MessageID only on successful TX
According to the PD 2.0 Spec, Section 6.2.1.3, the MessageID
field shall only be incremented upon successful transmission
(meaning GoodCRC was received). Thus, increment the counter
only when pd_phy_write() succeeds.

Change-Id: I73dce5736c473a1f79db9be868442c7941d13c44
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2017-06-07 15:39:31 -07:00
Linux Build Service Account
8efb4552d1 Merge "msm: mdss: do not print error in case sync_trigger is enabled" 2017-06-07 13:13:41 -07:00
Linux Build Service Account
590ba42a33 Merge "ARM: dts: msm: Enable dynamic fps for msm8998" 2017-06-07 13:13:40 -07:00
Linux Build Service Account
3ba7511de8 Merge "msm: mdss: disable AVR for msm8998" 2017-06-07 13:13:39 -07:00
Linux Build Service Account
b13c09c779 Merge "msm: mdss: Check if secure display is enabled during non-secure validate" 2017-06-07 13:13:38 -07:00
Linux Build Service Account
bed622b809 Merge "msm: mdss: Avoid NULL mixer during partial update ROI setup" 2017-06-07 13:13:37 -07:00
Linux Build Service Account
2a70296f1a Merge "ARM: dts: msm: enable null packet on msm8998" 2017-06-07 13:13:36 -07:00
Linux Build Service Account
b8639a8f8c Merge "msm: mdss: Fix QSEED3 MDP clock calculation for cmd mode panel" 2017-06-07 13:13:35 -07:00
Linux Build Service Account
19bce2b047 Merge "ARM: dts: msm: specify a PWM mode threshold for PMI8998 BoB on MSM8998" 2017-06-07 13:13:33 -07:00
Linux Build Service Account
39ce0d62ff Merge "regulator: rpm-smd-regulator: add support for load based mode control" 2017-06-07 13:13:33 -07:00
Linux Build Service Account
e3954e1572 Merge "drivers: Warning fixes to disable CC_OPTIMIZE_FOR_SIZE" 2017-06-07 13:13:31 -07:00
Linux Build Service Account
9dc0febd05 Merge "ARM: dts: msm: control avdd enable gpio for msm8998 QVR/SKUK HDK" 2017-06-07 13:13:29 -07:00
Linux Build Service Account
4c6e5c55cd Merge "msm: mdss: control avdd enable gpio when doing panel reset" 2017-06-07 13:13:29 -07:00
Subhash Jadavani
ed58ffc218 scsi: ufs: fix unclocked register access
When we try to update UFS driver's sysfs attribute hibern8_on_idle_delay_ms
(echo <val> > /sys/bus/platform/devices/*.ufshc/hibern8_on_idle_delay_ms)
and if auto-hibern8 is enabled, we try to update the new timeout value into
auto-hibern8 timer register without making sure the controller clocks are
enabled, this may cause the unclocked register access. So we are now
making sure that clocks are enabled and we are also making sure that
there are no transfers active on controller when we modify the auto
hibern8 timeout.

Change-Id: I603b3f405d3a69c594edd45037a2ca4535ebd1ca
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
2017-06-07 10:55:31 -07:00
Blagovest Kolenichev
2025064255 Merge branch 'android-4.4@9bc4622' into branch 'msm-4.4'
* refs/heads/tmp-9bc4622:
  Linux 4.4.70
  drivers: char: mem: Check for address space wraparound with mmap()
  nfsd: encoders mustn't use unitialized values in error cases
  drm/edid: Add 10 bpc quirk for LGD 764 panel in HP zBook 17 G2
  PCI: Freeze PME scan before suspending devices
  PCI: Fix pci_mmap_fits() for HAVE_PCI_RESOURCE_TO_USER platforms
  tracing/kprobes: Enforce kprobes teardown after testing
  osf_wait4(): fix infoleak
  genirq: Fix chained interrupt data ordering
  uwb: fix device quirk on big-endian hosts
  metag/uaccess: Check access_ok in strncpy_from_user
  metag/uaccess: Fix access_ok()
  iommu/vt-d: Flush the IOTLB to get rid of the initial kdump mappings
  staging: rtl8192e: rtl92e_get_eeprom_size Fix read size of EPROM_CMD.
  staging: rtl8192e: fix 2 byte alignment of register BSSIDR.
  mm/huge_memory.c: respect FOLL_FORCE/FOLL_COW for thp
  xc2028: Fix use-after-free bug properly
  arm64: documentation: document tagged pointer stack constraints
  arm64: uaccess: ensure extension of access_ok() addr
  arm64: xchg: hazard against entire exchange variable
  ARM: dts: at91: sama5d3_xplained: not all ADC channels are available
  ARM: dts: at91: sama5d3_xplained: fix ADC vref
  powerpc/64e: Fix hang when debugging programs with relocated kernel
  powerpc/pseries: Fix of_node_put() underflow during DLPAR remove
  powerpc/book3s/mce: Move add_taint() later in virtual mode
  cx231xx-cards: fix NULL-deref at probe
  cx231xx-audio: fix NULL-deref at probe
  cx231xx-audio: fix init error path
  dvb-frontends/cxd2841er: define symbol_rate_min/max in T/C fe-ops
  zr364xx: enforce minimum size when reading header
  dib0700: fix NULL-deref at probe
  s5p-mfc: Fix unbalanced call to clock management
  gspca: konica: add missing endpoint sanity check
  ceph: fix recursion between ceph_set_acl() and __ceph_setattr()
  iio: proximity: as3935: fix as3935_write
  ipx: call ipxitf_put() in ioctl error path
  USB: hub: fix non-SS hub-descriptor handling
  USB: hub: fix SS hub-descriptor handling
  USB: serial: io_ti: fix div-by-zero in set_termios
  USB: serial: mct_u232: fix big-endian baud-rate handling
  USB: serial: qcserial: add more Lenovo EM74xx device IDs
  usb: serial: option: add Telit ME910 support
  USB: iowarrior: fix info ioctl on big-endian hosts
  usb: musb: tusb6010_omap: Do not reset the other direction's packet size
  ttusb2: limit messages to buffer size
  mceusb: fix NULL-deref at probe
  usbvision: fix NULL-deref at probe
  net: irda: irda-usb: fix firmware name on big-endian hosts
  usb: host: xhci-mem: allocate zeroed Scratchpad Buffer
  xhci: apply PME_STUCK_QUIRK and MISSING_CAS quirk for Denverton
  usb: host: xhci-plat: propagate return value of platform_get_irq()
  sched/fair: Initialize throttle_count for new task-groups lazily
  sched/fair: Do not announce throttled next buddy in dequeue_task_fair()
  fscrypt: avoid collisions when presenting long encrypted filenames
  f2fs: check entire encrypted bigname when finding a dentry
  fscrypt: fix context consistency check when key(s) unavailable
  net: qmi_wwan: Add SIMCom 7230E
  ext4 crypto: fix some error handling
  ext4 crypto: don't let data integrity writebacks fail with ENOMEM
  USB: serial: ftdi_sio: add Olimex ARM-USB-TINY(H) PIDs
  USB: serial: ftdi_sio: fix setting latency for unprivileged users
  pid_ns: Fix race between setns'ed fork() and zap_pid_ns_processes()
  pid_ns: Sleep in TASK_INTERRUPTIBLE in zap_pid_ns_processes
  iio: dac: ad7303: fix channel description
  of: fix sparse warning in of_pci_range_parser_one
  proc: Fix unbalanced hard link numbers
  cdc-acm: fix possible invalid access when processing notification
  drm/nouveau/tmr: handle races with hw when updating the next alarm time
  drm/nouveau/tmr: avoid processing completed alarms when adding a new one
  drm/nouveau/tmr: fix corruption of the pending list when rescheduling an alarm
  drm/nouveau/tmr: ack interrupt before processing alarms
  drm/nouveau/therm: remove ineffective workarounds for alarm bugs
  drm/amdgpu: Make display watermark calculations more accurate
  drm/amdgpu: Avoid overflows/divide-by-zero in latency_watermark calculations.
  ath9k_htc: fix NULL-deref at probe
  ath9k_htc: Add support of AirTies 1eda:2315 AR9271 device
  s390/cputime: fix incorrect system time
  s390/kdump: Add final note
  regulator: tps65023: Fix inverted core enable logic.
  KVM: X86: Fix read out-of-bounds vulnerability in kvm pio emulation
  KVM: x86: Fix load damaged SSEx MXCSR register
  ima: accept previously set IMA_NEW_FILE
  mwifiex: pcie: fix cmd_buf use-after-free in remove/reset
  rtlwifi: rtl8821ae: setup 8812ae RFE according to device type
  md: update slab_cache before releasing new stripes when stripes resizing
  dm space map disk: fix some book keeping in the disk space map
  dm thin metadata: call precommit before saving the roots
  dm bufio: make the parameter "retain_bytes" unsigned long
  dm cache metadata: fail operations if fail_io mode has been established
  dm bufio: check new buffer allocation watermark every 30 seconds
  dm bufio: avoid a possible ABBA deadlock
  dm raid: select the Kconfig option CONFIG_MD_RAID0
  dm btree: fix for dm_btree_find_lowest_key()
  infiniband: call ipv6 route lookup via the stub interface
  tpm_crb: check for bad response size
  ARM: tegra: paz00: Mark panel regulator as enabled on boot
  USB: core: replace %p with %pK
  char: lp: fix possible integer overflow in lp_setup()
  watchdog: pcwd_usb: fix NULL-deref at probe
  USB: ene_usb6250: fix DMA to the stack
  usb: misc: legousbtower: Fix memory leak
  usb: misc: legousbtower: Fix buffers on stack
  ANDROID: uid_sys_stats: defer io stats calulation for dead tasks
  ANDROID: AVB: Fix linter errors.
  ANDROID: AVB: Fix invalidate_vbmeta_submit().
  ANDROID: sdcardfs: Check for NULL in revalidate
  Linux 4.4.69
  ipmi: Fix kernel panic at ipmi_ssif_thread()
  wlcore: Add RX_BA_WIN_SIZE_CHANGE_EVENT event
  wlcore: Pass win_size taken from ieee80211_sta to FW
  mac80211: RX BA support for sta max_rx_aggregation_subframes
  mac80211: pass block ack session timeout to to driver
  mac80211: pass RX aggregation window size to driver
  Bluetooth: hci_intel: add missing tty-device sanity check
  Bluetooth: hci_bcm: add missing tty-device sanity check
  Bluetooth: Fix user channel for 32bit userspace on 64bit kernel
  tty: pty: Fix ldisc flush after userspace become aware of the data already
  serial: omap: suspend device on probe errors
  serial: omap: fix runtime-pm handling on unbind
  serial: samsung: Use right device for DMA-mapping calls
  arm64: KVM: Fix decoding of Rt/Rt2 when trapping AArch32 CP accesses
  padata: free correct variable
  CIFS: add misssing SFM mapping for doublequote
  cifs: fix CIFS_IOC_GET_MNT_INFO oops
  CIFS: fix mapping of SFM_SPACE and SFM_PERIOD
  SMB3: Work around mount failure when using SMB3 dialect to Macs
  Set unicode flag on cifs echo request to avoid Mac error
  fs/block_dev: always invalidate cleancache in invalidate_bdev()
  ceph: fix memory leak in __ceph_setxattr()
  fs/xattr.c: zero out memory copied to userspace in getxattr
  ext4: evict inline data when writing to memory map
  IB/mlx4: Reduce SRIOV multicast cleanup warning message to debug level
  IB/mlx4: Fix ib device initialization error flow
  IB/IPoIB: ibX: failed to create mcg debug file
  IB/core: Fix sysfs registration error flow
  vfio/type1: Remove locked page accounting workqueue
  dm era: save spacemap metadata root after the pre-commit
  crypto: algif_aead - Require setkey before accept(2)
  block: fix blk_integrity_register to use template's interval_exp if not 0
  KVM: arm/arm64: fix races in kvm_psci_vcpu_on
  KVM: x86: fix user triggerable warning in kvm_apic_accept_events()
  um: Fix PTRACE_POKEUSER on x86_64
  x86, pmem: Fix cache flushing for iovec write < 8 bytes
  selftests/x86/ldt_gdt_32: Work around a glibc sigaction() bug
  x86/boot: Fix BSS corruption/overwrite bug in early x86 kernel startup
  usb: hub: Do not attempt to autosuspend disconnected devices
  usb: hub: Fix error loop seen after hub communication errors
  usb: Make sure usb/phy/of gets built-in
  usb: misc: add missing continue in switch
  staging: comedi: jr3_pci: cope with jiffies wraparound
  staging: comedi: jr3_pci: fix possible null pointer dereference
  staging: gdm724x: gdm_mux: fix use-after-free on module unload
  staging: vt6656: use off stack for out buffer USB transfers.
  staging: vt6656: use off stack for in buffer USB transfers.
  USB: Proper handling of Race Condition when two USB class drivers try to call init_usb_class simultaneously
  USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit
  usb: host: xhci: print correct command ring address
  iscsi-target: Set session_fall_back_to_erl0 when forcing reinstatement
  target: Convert ACL change queue_depth se_session reference usage
  target/fileio: Fix zero-length READ and WRITE handling
  target: Fix compare_and_write_callback handling for non GOOD status
  xen: adjust early dom0 p2m handling to xen hypervisor behavior
  ANDROID: AVB: Only invalidate vbmeta when told to do so.
  ANDROID: sdcardfs: Move top to its own struct
  ANDROID: lowmemorykiller: account for unevictable pages
  ANDROID: usb: gadget: fix NULL pointer issue in mtp_read()
  ANDROID: usb: f_mtp: return error code if transfer error in receive_file_work function

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

Conflicts:
	drivers/usb/gadget/function/f_mtp.c
	fs/ext4/page-io.c
	net/mac80211/agg-rx.c

Change-Id: Id65e75bf3bcee4114eb5d00730a9ef2444ad58eb
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-06-07 09:31:32 -07:00
Abhinav Kumar
d9bdeba0e1 drm/msm : fix hdmi controller register programming
Currently, there is an incorrect programming of the
hdmi controller register where default value of the
datapath mode bit is being toggled along with the
scrambler enable/disable.

This bit should be untouched as per the hardware
programming sequence and kept at the default state.

Fix the register programming to avoid toggling this
bit.

Change-Id: I2e8f74c0abaddd27b5d8a2136afc4e1b82f96e7d
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-06-07 02:45:08 -07:00
Vijayavardhan Vennapusa
cd75223d5d Revert "ARM: dts: msm: Remove TCSR_QUSB2_PHY_CLAMP_DIG_N_1P8 for SDM660"
Commit c20c74d49c ("ARM: dts: msm: Remove TCSR_QUSB2_PHY_CLAMP_DIG_N_1P8
for SDM660") is added to remove enabling/disabling clamp during
disconnect/connect. But it is required to enable clamp input to QUSB2PHY,
whenever 0.9V LDO is collapsed. Hence revert the change to add dtsi
property for enable/disable clamp.

Change-Id: I12009bd56d214499a73f7ea3e73d1c979c107ac9
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-06-07 15:05:57 +05:30
Arun Kumar Neelakantam
db93e4263c ARM: dts: msm: Add new property to DSPS IPC router node for MSM8998
Add the dynamic wakeup source property to IPC router dsps xprt.

CRs-Fixed: 2057391
Change-Id: I5003ff5c5f43ee5c1d4da8e19168be1a112f23d0
Signed-off-by: Arun Kumar Neelakantam <aneela@codeaurora.org>
2017-06-07 11:38:34 +05:30
Arun Kumar Neelakantam
10ed66867a net: ipc_router: Add dynamic enable/disable wakeup source feature
By default IPC Router core uses edge and port specific wakeup sources
which are blocking system suspend in special use cases like streaming
non wakeup sensors data at high speed.

Add dynamic wakeup source enable/disable functionality to acquire the
wakeup source only during the APPS suspend stage.

CRs-Fixed: 2057391
Change-Id: I2a5ea4e2c31432a9dd195c702ef7001b26eed33d
Signed-off-by: Arun Kumar Neelakantam <aneela@codeaurora.org>
2017-06-07 11:34:08 +05:30
Jack Pham
71c2e3fc4f usb: pdphy: Prevent sending when message is just received
Prevent pd_phy_write() from sending a TX message if an RX
message IRQ is being handled, or if the RX_TOKEN is set
(indicating a message has just arrived) by returning -EBUSY
to let the upper layer gracefully abort. This helps in cases
(such as compliance testing) in which VDM messages are
received very quickly after one another and the protocol
layer needs to first handle the incoming message.

Change-Id: I3e26d7ff062ff7f51b6c66ab8d078b05749f808a
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2017-06-06 22:50:28 -07:00
Jack Pham
00adcfcbad usb: pd: Keep PROP_PR_SWAP set during ERROR_RECOVERY
Since ErrorRecovery handling requires a spoof disconnect, the
charger driver needs to avoid immediately reapplying the
terminations. Re-use the PROP_PR_SWAP property which ignores
the disconnect. After the 25ms delay, policy engine will
explicitly reset back to DRP.

Also remove the transition to ErrorRecovery from PE_SNK_DISCOVERY
as it is removed in V1.3 of the PD 2.0 specification.

Change-Id: I41f1da293208b6813dfb540a123ee84ac35b4a68
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2017-06-06 22:50:27 -07:00
Jack Pham
ed97270b78 usb: pd: Set PD_IN_HARD_RESET as soon as hard reset received
Move setting of PD_IN_HARD_RESET to the phy_sig_received()
callback in order to inform the charger to ignore the upcoming
VBUS toggle as soon as possible. This will help decrease the
possibility of racing to set the appropriate HW bits while
VBUS turns off and leads to the charger indicating disconnect.

Change-Id: I42cc2969defa48c9987fa4bea64780866861d868
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2017-06-06 22:50:26 -07:00
Linux Build Service Account
eb28d0da15 Merge "regulator: spm-regulator: Add support for FTS426 type regulators" 2017-06-06 21:33:16 -07:00
Linux Build Service Account
feb56ddbc1 Merge "ath10k: Update world regulatory rules" 2017-06-06 21:33:14 -07:00
Linux Build Service Account
ceffb12dba Merge "wil6210: stop TX queues when suspending" 2017-06-06 21:33:13 -07:00
Linux Build Service Account
e01e0ecf6a Merge "ARM: dts: msm: Defer regulator disable for SDM660 GPU SMMU" 2017-06-06 21:33:12 -07:00
Linux Build Service Account
61a82b2a3f Merge "msm: cec: Use CEC notifier framework in adapter driver" 2017-06-06 21:33:09 -07:00
Linux Build Service Account
fc6bb14548 Merge "fbdev: core: Initialise structure to prevent kernel information leak" 2017-06-06 21:33:08 -07:00
Linux Build Service Account
fb0ac8cd2b Merge "hrtimer: Don't drop the base lock when migration during isolation" 2017-06-06 21:33:06 -07:00
Linux Build Service Account
ccf240d7b7 Merge "msm: camera: isp: Disable SMMU stall upon VFE page fault" 2017-06-06 21:33:05 -07:00
Linux Build Service Account
c588e27b98 Merge "msm: camera: Prevent info leak in kernel driver." 2017-06-06 21:33:04 -07:00
Linux Build Service Account
412bca522f Merge "msm: camera: isp: Avoid information leak in ISPIF" 2017-06-06 21:33:04 -07:00
Linux Build Service Account
e5f02a0e83 Merge "ARM: dts: msm: Add cpp micro reset flag for SDM630" 2017-06-06 21:33:02 -07:00
Devi Sandeep Endluri V V
37342445e7 netfilter:Notify user space on creating sysfs file
uevent indication is required to notify the user space
on creation of sysfs file entry.
This helps in creating specific sysfs labeled entries
for newly created file which are module specific.

Change-Id: I576fa77158445ced6d5efb93b5d724d75f30b03f
CRs-Fixed: 2056628
Acked-by: Manoj Basapathi <manojbm@qti.qualcomm.com>
Signed-off-by: Tejaswi Tanikella <tejaswit@codeaurora.org>
2017-06-06 21:08:11 -07:00
Sujeev Dias
90bf661847 mhi: core: Add support for host triggered device ram dump
Add support for bus master to trigger PCIe device into ram dump
mode to collect device ram dump. RDDM capabilities are extended to
support under kernel panic as well.

CRs-Fixed: 2055981
Change-Id: I18f7d5784992df70aafc6e41d248ced3fac37181
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
2017-06-06 16:15:49 -07:00
Sujeev Dias
220c2f0aed mhi: core: Add support for PCIe linkdown abort
PCIe linkdown event can trigger anytime. During linkdown event
abort any work MHI host doing that require PCIE link.

CRs-Fixed: 2055975
Change-Id: Idba907c7977594dc08575e0020a7afa4868bc0e4
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
2017-06-06 16:15:04 -07:00
Abhijit Kulkarni
ea0f90a866 drm/msm/sde: add secure use case properties
This change adds custom PLANE(fb_translation_mode) and
CRTC(security_level) properties for supporting secure use case.
Plane property identifies the translation requirement for the
planes. CRTC property speicifies what planes could be attached
to this CRTC.

CRs-Fixed: 2053654
Change-Id: Iea59027d4bee536c8554e3955723982a6fc361dd
Signed-off-by: Abhijit Kulkarni <kabhijit@codeaurora.org>
2017-06-06 13:44:08 -07:00
Linux Build Service Account
ccde34ffb3 Merge "spcom: move SPCOM_MAX_CHANNELS define to uapi/linux/spcom.h" 2017-06-06 13:21:57 -07:00
Linux Build Service Account
f96ac4e094 Merge "mmc: debugfs: fix unclocked register access by force_error" 2017-06-06 13:21:57 -07:00
Linux Build Service Account
952a3f35ab Merge "ASoC: msm8998: fix clock refcount for MI2S/AUXPCM shutdown" 2017-06-06 13:21:54 -07:00
Linux Build Service Account
f7346af205 Merge "ASoC: msm: return the latest app type cfg data set when get is called" 2017-06-06 13:21:53 -07:00
Linux Build Service Account
9a3e66cffb Merge "Revert "ASoC: wcd9335: enable APC in Tx path"" 2017-06-06 13:21:51 -07:00
Linux Build Service Account
43f1e336c2 Merge "smb-lib: clear EXIT_SNK_BASED_ON_CC BIT after cable removal" 2017-06-06 13:21:50 -07:00
Linux Build Service Account
1d5844ba9d Merge "sched: hmp: Optimize cycle counter reads" 2017-06-06 13:21:50 -07:00