Commit graph

589366 commits

Author SHA1 Message Date
Linux Build Service Account
34ca0e6f1d Merge "icnss: remove pre-alloc memory leak check in platform driver" 2017-05-02 09:07:40 -07:00
Linux Build Service Account
3939f41b22 Merge "Merge remote-tracking branch 'remotes/quic/dev/msm-4.4-8996au' into msm-4.4" 2017-05-02 09:07:39 -07:00
Linux Build Service Account
9edaf67e54 Merge "input: synaptics: fix for buggy code poined by SIL tool" 2017-05-02 09:07:38 -07:00
Linux Build Service Account
f7a2f37c6b Merge "usb: gadget: MIDI: Add support for SuperSpeed enumeration" 2017-05-02 09:07:37 -07:00
Linux Build Service Account
0a9ca6c6b2 Merge "diag: Open glink channels in workqueue context" 2017-05-02 09:07:36 -07:00
Linux Build Service Account
52f8817d78 Merge "clk: Add support to dump state of all clocks into ftrace" 2017-05-02 09:07:35 -07:00
Linux Build Service Account
49c218cafe Merge "SDM660: ADSPRPC: Align the size of IOVA to 128MB" 2017-05-02 09:07:34 -07:00
Linux Build Service Account
9b50e3d6ba Merge "esoc: mdm-4x: Separate out callback function for 9x45" 2017-05-02 09:07:32 -07:00
Linux Build Service Account
e9ee15387e Merge "ARM: dts: msm: Add support mdm9x45 external modem" 2017-05-02 09:07:31 -07:00
Linux Build Service Account
b899cb0b4c Merge "esoc: Add provision to handle shutdown request in userspace" 2017-05-02 09:07:31 -07:00
Linux Build Service Account
6ed87c4ef6 Merge "soc: qcom: ssr: Add option to relax on ssr failures" 2017-05-02 09:07:30 -07:00
Linux Build Service Account
02e860bddb Merge "msm/drm: Move msm_drm_config configuration into the GPUs" 2017-05-02 09:07:17 -07:00
Blagovest Kolenichev
95a027ead7 Merge branch 'android-4.4@e4528dd' into branch 'msm-4.4'
* refs/heads/tmp-e4528dd:
  Linux 4.4.65
  perf/core: Fix concurrent sys_perf_event_open() vs. 'move_group' race
  ping: implement proper locking
  staging/android/ion : fix a race condition in the ion driver
  vfio/pci: Fix integer overflows, bitmask check
  tipc: check minimum bearer MTU
  netfilter: nfnetlink: correctly validate length of batch messages
  xc2028: avoid use after free
  mnt: Add a per mount namespace limit on the number of mounts
  tipc: fix socket timer deadlock
  tipc: fix random link resets while adding a second bearer
  gfs2: avoid uninitialized variable warning
  hostap: avoid uninitialized variable use in hfa384x_get_rid
  tty: nozomi: avoid a harmless gcc warning
  tipc: correct error in node fsm
  tipc: re-enable compensation for socket receive buffer double counting
  tipc: make dist queue pernet
  tipc: make sure IPv6 header fits in skb headroom
  ANDROID: uid_sys_stats: fix access of task_uid(task)
  BACKPORT: f2fs: sanity check log_blocks_per_seg
  Linux 4.4.64
  tipc: fix crash during node removal
  block: fix del_gendisk() vs blkdev_ioctl crash
  x86, pmem: fix broken __copy_user_nocache cache-bypass assumptions
  hv: don't reset hv_context.tsc_page on crash
  Drivers: hv: balloon: account for gaps in hot add regions
  Drivers: hv: balloon: keep track of where ha_region starts
  Tools: hv: kvp: ensure kvp device fd is closed on exec
  kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd
  x86/mce/AMD: Give a name to MCA bank 3 when accessed with legacy MSRs
  powerpc/kprobe: Fix oops when kprobed on 'stdu' instruction
  ubi/upd: Always flush after prepared for an update
  mac80211: reject ToDS broadcast data frames
  mmc: sdhci-esdhc-imx: increase the pad I/O drive strength for DDR50 card
  ACPI / power: Avoid maybe-uninitialized warning
  Input: elantech - add Fujitsu Lifebook E547 to force crc_enabled
  VSOCK: Detach QP check should filter out non matching QPs.
  Drivers: hv: vmbus: Reduce the delay between retries in vmbus_post_msg()
  Drivers: hv: get rid of timeout in vmbus_open()
  Drivers: hv: don't leak memory in vmbus_establish_gpadl()
  s390/mm: fix CMMA vs KSM vs others
  CIFS: remove bad_network_name flag
  cifs: Do not send echoes before Negotiate is complete
  ring-buffer: Have ring_buffer_iter_empty() return true when empty
  tracing: Allocate the snapshot buffer before enabling probe
  KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyrings
  KEYS: Change the name of the dead type to ".dead" to prevent user access
  KEYS: Disallow keyrings beginning with '.' to be joined as session keyrings
  ANDROID: sdcardfs: Call lower fs's revalidate
  ANDROID: sdcardfs: Avoid setting GIDs outside of valid ranges
  ANDROID: sdcardfs: Copy meta-data from lower inode
  Revert "Revert "Android: sdcardfs: Don't do d_add for lower fs""
  ANDROID: sdcardfs: Use filesystem specific hash
  ANDROID: AVB error handler to invalidate vbmeta partition.
  ANDROID: Update init/do_mounts_dm.c to the latest ChromiumOS version.
  Revert "[RFC]cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions"

Conflicts:
	drivers/md/Makefile

Change-Id: I8f5ed53cb8b6cc66914f10c6ac820003b87b8759
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-05-02 06:40:36 -07:00
Neeraj Upadhyay
beaa060bcc tty: serial: msm: fix potential race b/w startup and irq handling
There is a potential race for tx/rx dma requests between
msm_startup() and irq handling, for cases where dmas are not
available. This results in irq path trying to do dma mapping,
resulting in data abort. For example, consider below scenario
where rx handler reads the intermediate value of dma->chan,
set in msm_request_rx_dma(), and tries to do dma mapping,
which results in data abort.

uart_port_startup()
  msm_startup()
   request_irq()
   ...
   msm_request_rx_dma()
    ...
    dma->chan = dma_request_slave_channel_reason(dev, "rx");
    <UART RX IRQ>
     msm_uart_irq()
      msm_handle_rx_dm()
       msm_start_rx_dma()
        dma->desc = dma_map_single()
         <data abort>

Change-Id: Icf5d48f2718c3c6a855ffd3d10988a93f8281d78
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
2017-05-02 16:41:48 +05:30
Neeraj Soni
fb40987526 fs: ecryptfs: Cache to be cleared after file write
This ensures that caches are maintained and no stale
data is present.

Change-Id: Ie8e92197a5a4179d422a523d3d6dad48bdf0b5d2
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2017-05-02 15:32:48 +05:30
Andrew Chant
d60fed08b9 input: synaptics: fix for buggy code poined by SIL tool
Place file offset validity checks under mutex for
synaptics_dsx_rmi_dev.c touch driver.

Git-repo: https://android.googlesource.com/kernel/msm
Git-commit: e1fb1600fc222337989e3084d68df929882deae5
Change-Id: I2c32babbccb483547204cb2843973abf97e988a5
Signed-off-by: Andrew Chant <achant@google.com>
[srkupp@codeaurora.org: This change is a fix for buggy
code pointed by sil after merging the above commit.}
Signed-off-by: Srinivasa Rao Kuppala <srkupp@codeaurora.org>
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
2017-05-02 01:18:11 -07:00
Linux Build Service Account
82fffc58bf Merge "drm/msm: Add PLL_DELTA property to HDMI connector" 2017-05-01 23:57:09 -07:00
Linux Build Service Account
7eacb7e8a2 Merge "ARM: dts: msm: Set 1.848V as the minimum voltage for LDO24 on msm8998" 2017-05-01 23:57:08 -07:00
Linux Build Service Account
91371a5fd8 Merge "power_supply: Add REAL_TYPE power_supply_property" 2017-05-01 23:57:05 -07:00
Linux Build Service Account
edd6b4da0a Merge "qpnp-smb2: make qnovo vote for current and voltage" 2017-05-01 23:57:04 -07:00
Linux Build Service Account
83d523c6dc Merge "qcom: qpnp-smb2: fix cleanup path" 2017-05-01 23:57:03 -07:00
Linux Build Service Account
4082e377a6 Merge "qcom: battery: Fix using stale votable pointers" 2017-05-01 23:57:03 -07:00
Linux Build Service Account
a7e6a8242c Merge "ARM: dts: msm: Add iommu coherent test device for msm8998" 2017-05-01 23:57:02 -07:00
Linux Build Service Account
5c0c850420 Merge "msm: ipa3: fix channel stop retry logic" 2017-05-01 23:57:01 -07:00
Linux Build Service Account
740fee5938 Merge "ARM: boot: Silence 'zimage-dtb is ready' message" 2017-05-01 23:57:00 -07:00
Linux Build Service Account
a2c574ad5b Merge "esoc: mdm-4x: Add support for mdm9x45 and apq8096" 2017-05-01 23:56:58 -07:00
Linux Build Service Account
abb8574839 Merge "defconfig: disable slub debug on sdm660" 2017-05-01 23:56:57 -07:00
Linux Build Service Account
cf05282438 Merge "mmc: cmdq_hci: Avoid releasing clock twice during DCMD error" 2017-05-01 23:56:55 -07:00
Linux Build Service Account
71e7e17ea1 Merge "cfg80211: Add macros to indicate backport support for FILS" 2017-05-01 23:56:53 -07:00
Linux Build Service Account
8d3c81087c Merge "ASoC: msm: q6dspv2: fix APR deregistration logic in ASM during ADSP SSR" 2017-05-01 23:56:51 -07:00
Linux Build Service Account
25790febf2 Merge "defconfig: msm: add dcc config for perf on sdm660" 2017-05-01 23:56:50 -07:00
Linux Build Service Account
e575b75923 Merge "msm: pcie: switch GPIO to sleep state before asserting PERST" 2017-05-01 23:56:48 -07:00
Linux Build Service Account
1886bd0e4b Merge "msm: sde: Avoid use of uninitialized variable" 2017-05-01 23:56:47 -07:00
Ajay Agarwal
0d7e0c0f76 usb: gadget: MIDI: Add support for SuperSpeed enumeration
Currently MIDI function supports only upto HighSpeed
enumeration. Add descriptors for SuperSpeed mode
and bind them to enable SuperSpeed enumeration of
USB MIDI function.

Change-Id: I0451dabf91e88503ab588dadbfbe6a2b76e2351b
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2017-05-02 11:42:18 +05:30
Tharun Kumar Merugu
0f776b9069 SDM660: ADSPRPC: Align the size of IOVA to 128MB
Align the size of the IOVA that is being passed
in the arm_iommu_create_mapping() to 128MB.

Change-Id: Ia554c2157d6c46b2f3848f993a7e61ff7f029547
Acked-by: Chenna Kesava Raju <chennak@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-05-01 22:52:17 -07:00
Hardik Kantilal Patel
98dc1b4795 icnss: remove pre-alloc memory leak check in platform driver
The WLAN host driver is allocating the memory from pre-alloc pool
during insmod/wlan start up before WLAN driver register and
release the pre-alloc memory after driver unregister/remove.
The Pre-alloc memory leak check and reset in Icnss platform driver
on probe failure and after remove will leads to invalid memory
leak stat and dangling pointer for wlan host driver allocated memory
from the pre-alloc memory pool.

To fix the above issue remove the pre-allaoc memory leak
check and pre-alloc memory pool reset from the icnss platform
driver and export symbol for the pre-alloc memory leak check
and pre-alloc memory pool reset.

CRs-Fixed: 2039483
Change-Id: Id9f01c9d2b5184fbb58935eaf11fd21b50b47908
Signed-off-by: Hardik Kantilal Patel <hkpatel@codeaurora.org>
2017-05-02 11:09:35 +05:30
Arun KS
383f0f89d0 esoc: mdm-4x: Separate out callback function for 9x45
Reset and power off timing is different. Hence need a
separate callback function.

Change-Id: I9714a4449b1fbeab84017da4be17f5ca2cb6cab6
Signed-off-by: Arun KS <arunks@codeaurora.org>
2017-05-02 10:10:38 +05:30
Arun KS
6e878faf2b ARM: dts: msm: Add support mdm9x45 external modem
This change defines upto 3 instances of external mdm9x45 modems in
device-tree which would need to be controlled by esoc (external esoc)
driver. The device-tree nodes allows the configuration of the external
modems (like the GPIO pins used to communicate status of modem) to be
specified.

Change-Id: I7e609f7549a02cd3322db76b00dc30137ed68953
Signed-off-by: Arun KS <arunks@codeaurora.org>
2017-05-02 10:10:38 +05:30
Arun KS
e704eb5275 esoc: Add provision to handle shutdown request in userspace
In certain scenarios, modem shutdown requests are handled in
userspace. Enhance request engine of esoc driver to send
shutdown requests to userspace.

Also, during a shutdown, avoid setting status to 0, if line is
not a power source. There can be multiple mdms monitoring status
line. This can otherwise be misinterpreted as an unexpected reset
by other mdms.

Change-Id: I9c20a86e76f892cc61dbfb814202b26e5cce3e96
Signed-off-by: Arun KS <arunks@codeaurora.org>
Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
2017-05-02 10:10:37 +05:30
Arun KS
b1da6f2225 esoc: Update SSR driver with crash status
During an unexpected reset or error fatal, update the
crash status to SSR. This is important for the drivers
listening at SSR related kernel notifier calls, where
crash status is also passed as a data payload.

Change-Id: Ide0634d0139a84b5988fa87e709877f3028029ef
Signed-off-by: Arun KS <arunks@codeaurora.org>
2017-05-02 10:10:36 +05:30
Arun KS
6ad851b920 soc: qcom: ssr: Add option to relax on ssr failures
SSR failures are considered fatal and results in system panic.
In certain scenarios system can continue to work even with a
failed subsystem.

Add an option in subsystem descriptor to relax on ssr failures.

Change-Id: I86dcaa615d6443937077880d9a91070d9c22ea1f
Signed-off-by: Arun KS <arunks@codeaurora.org>
[satyap@codeaurora.org: trivial merge conflict resolution]
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
2017-05-02 10:10:21 +05:30
Amit Nischal
0f70c6b867 clk: Add support to dump state of all clocks into ftrace
Add clk_state event to record the state of all the clocks
into ftrace. The clock event could be triggered by using
the "trace_clocks" debugfs entry and it would dump the
current state of all clocks in ftrace logs.

Change-Id: I28b6574fe1d96472833a93e7b251dbba6c6eae49
Signed-off-by: Amit Nischal <anischal@codeaurora.org>
2017-05-02 09:21:47 +05:30
Fenglin Wu
2fc978c8b7 power_supply: Add REAL_TYPE power_supply_property
Add REAL_TYPE power_supply property to record the real time charger
type.

Change-Id: I5fb2e3e3e782bcac0f8dd6071a830bcf370ebbd4
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
2017-05-01 19:37:08 -07:00
Abhijeet Dharmapurikar
38d7ef50d6 qpnp-smb2: make qnovo vote for current and voltage
Currently the code simply enforces Qnovo's current and voltage bypassing
other voters. This is not desired. Make Qnovo vote via the FCC and FV
votables. The only other vote it should skip is the votes coming from
battery profile.

Change-Id: I5c794ea209a8ea2a61d834e2f619d7ccfd02fed9
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-01 19:37:07 -07:00
Ashay Jaiswal
1317ba7da7 qcom: qpnp-smb2: fix cleanup path
Fix the cleanup path of probe failure to make sure
all the resources get released in proper order.

Change-Id: Ie482c9856569ea708a8fa186049ab778a8e5be12
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-01 19:37:07 -07:00
Harry Yang
3ecadbc42f qcom: battery: Fix using stale votable pointers
The code flow between battery.c and smblib.c could end up with
stale references in smblib. This is when if pl_init fails for
some reason after creating the votables, while smblib obtains
references to them, those references become invalid.

Fix this by calling pl_init early in smb2 driver's probe such that if
it fails smb2 driver exits early.

Also change the name of pl_(de)init() functions to more appropriate
name - qcom_batt_(de)init().

Change-Id: I58f79d26e6cc8524e792a23185ff6fc8cfdffa75
Signed-off-by: Harry Yang <harryy@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-01 19:36:44 -07:00
Zhiqiang Tu
b15484bc06 Merge remote-tracking branch 'remotes/quic/dev/msm-4.4-8996au' into msm-4.4
Conflicts:
	arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
	drivers/gpu/drm/msm/Makefile

Change-Id: Ief80c28ff1422fd71a0c3d2041531e2ab078ee7a
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-05-02 08:59:16 +08:00
Sudarshan Rajagopalan
edeb290f5d ARM: dts: msm: Add iommu coherent test device for msm8998
Added a new iommu test device which is dma-coherent. This
test device will be used for validating buffer coherency.

Change-Id: Iea1c57fd2cd5d71de2f26932d21cae8102fb918e
Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>
2017-05-01 17:14:20 -07:00
Tony Truong
4501fe2b46 msm: pcie: switch GPIO to sleep state before asserting PERST
Before asserting PERST, PCIe bus driver should switch GPIO to
sleep state. This will prevent host from missing any events after
the link is off.

Change-Id: Ie57d339da02dde6cbb3c41d2be52ee0602227193
Signed-off-by: Tony Truong <truong@codeaurora.org>
2017-05-01 17:14:09 -07:00
Abhijeet Dharmapurikar
0f0e36134d smb138x: use chg src bit to disable parallel charger
smb1355 doesn't have any facility to suspend input. One has to
disable charging using the chg_en command bit.

So, when parallel charging needs to be disabled, configure
the charger to ignore the chg_en input pin and instead use the
command register. The command register is always programmed to
disable charging.

When parallel charging needs to be enabled, configure it to
follow the chg_en input pin.

This will work for both smb1355 and smb1381 parallel chargers.

Change-Id: I50294f40927641c2e0a7c7e4e7d263592086d3a9
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-01 14:43:19 -07:00