Commit graph

593516 commits

Author SHA1 Message Date
Linux Build Service Account
90c1f488e7 Merge "ath10k: Enable sta idle powersave" 2017-09-03 11:43:31 -07:00
Linux Build Service Account
4d530fd9b7 Merge "wil6210: move vring_idle_trsh definition to wil6210_priv" 2017-09-03 04:06:41 -07:00
Linux Build Service Account
4a8c1aa57f Merge "wil6210: store FW RF calibration result" 2017-09-03 04:06:41 -07:00
Amir Samuelov
b5b4f0eb8d spcom: avoid implicit casting from size_t to uint32 for file ops
spcom expose "pseudo file" char-device to user space.
The file operation callback function definition is using size_t for user
buffer size.
The spcom API uses uint32 as the spcom communication buffers are about
300 bytes, and the user space file operation read()/write() are limited to
PAGE_SIZE which is about 4KB.
Use explicit casting rather than implicit casting when fops callbacks
calls spcom internal functions.

CRs-Fixed: 2025174
Change-Id: I5d6bf71ab77f97ea350178bb8b3473fd4cefddfd
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
2017-09-03 03:12:59 -07:00
Linux Build Service Account
9b6345d034 Merge "msm: kgsl: Return supported page size based on available memory pools" 2017-09-02 00:32:38 -07:00
Linux Build Service Account
0b7201d95b Merge "ARM: dts: msm: Update HS PHY parameters for QRD SDM660/630" 2017-09-02 00:32:37 -07:00
Dennis Cagle
9124589f5c f2fs: Revert duplicate F2FS_MAX_SEGMENT
This reverts commit e4f6002702 ("f2fs: sanity check segment
count"). This change was already present and the new commit
added a redundant declaration for F2FS_MAX_SEGMENT.

Change-Id: Ie9a1d2b255fb20fcf2d4237e661430a39d8626ef
Signed-off-by: Dennis Cagle <dcagle@codeaurora.org>
2017-09-01 17:39:05 -07:00
Linux Build Service Account
328b726671 Merge "soc: qcom: smp2p: spinlock_test: Initialize work item" 2017-09-01 15:32:56 -07:00
Linux Build Service Account
9ecbc587d6 Merge "power_supply: add POWER_SUPPLY_PROP_{COLD,HOT}_TEMP properties" 2017-09-01 15:32:54 -07:00
Blagovest Kolenichev
901bf6ddcc Merge android-4.4@4b8fc9f (v4.4.82) into msm-4.4
* refs/heads/tmp-4b8fc9f
  UPSTREAM: locking: avoid passing around 'thread_info' in mutex debugging code
  ANDROID: arm64: fix undeclared 'init_thread_info' error
  UPSTREAM: kdb: use task_cpu() instead of task_thread_info()->cpu
  Linux 4.4.82
  net: account for current skb length when deciding about UFO
  ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output
  mm/mempool: avoid KASAN marking mempool poison checks as use-after-free
  KVM: arm/arm64: Handle hva aging while destroying the vm
  sparc64: Prevent perf from running during super critical sections
  udp: consistently apply ufo or fragmentation
  revert "ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output"
  revert "net: account for current skb length when deciding about UFO"
  packet: fix tp_reserve race in packet_set_ring
  net: avoid skb_warn_bad_offload false positives on UFO
  tcp: fastopen: tcp_connect() must refresh the route
  net: sched: set xt_tgchk_param par.nft_compat as 0 in ipt_init_target
  bpf, s390: fix jit branch offset related to ldimm64
  net: fix keepalive code vs TCP_FASTOPEN_CONNECT
  tcp: avoid setting cwnd to invalid ssthresh after cwnd reduction states
  ANDROID: keychord: Fix for a memory leak in keychord.
  ANDROID: keychord: Fix races in keychord_write.
  Use %zu to print resid (size_t).
  ANDROID: keychord: Fix a slab out-of-bounds read.
  Linux 4.4.81
  workqueue: implicit ordered attribute should be overridable
  net: account for current skb length when deciding about UFO
  ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output
  mm: don't dereference struct page fields of invalid pages
  signal: protect SIGNAL_UNKILLABLE from unintentional clearing.
  lib/Kconfig.debug: fix frv build failure
  mm, slab: make sure that KMALLOC_MAX_SIZE will fit into MAX_ORDER
  ARM: 8632/1: ftrace: fix syscall name matching
  virtio_blk: fix panic in initialization error path
  drm/virtio: fix framebuffer sparse warning
  scsi: qla2xxx: Get mutex lock before checking optrom_state
  phy state machine: failsafe leave invalid RUNNING state
  x86/boot: Add missing declaration of string functions
  tg3: Fix race condition in tg3_get_stats64().
  net: phy: dp83867: fix irq generation
  sh_eth: R8A7740 supports packet shecksumming
  wext: handle NULL extra data in iwe_stream_add_point better
  sparc64: Measure receiver forward progress to avoid send mondo timeout
  xen-netback: correctly schedule rate-limited queues
  net: phy: Fix PHY unbind crash
  net: phy: Correctly process PHY_HALTED in phy_stop_machine()
  net/mlx5: Fix command bad flow on command entry allocation failure
  sctp: fix the check for _sctp_walk_params and _sctp_walk_errors
  sctp: don't dereference ptr before leaving _sctp_walk_{params, errors}()
  dccp: fix a memleak for dccp_feat_init err process
  dccp: fix a memleak that dccp_ipv4 doesn't put reqsk properly
  dccp: fix a memleak that dccp_ipv6 doesn't put reqsk properly
  net: ethernet: nb8800: Handle all 4 RGMII modes identically
  ipv6: Don't increase IPSTATS_MIB_FRAGFAILS twice in ip6_fragment()
  packet: fix use-after-free in prb_retire_rx_blk_timer_expired()
  openvswitch: fix potential out of bound access in parse_ct
  mcs7780: Fix initialization when CONFIG_VMAP_STACK is enabled
  rtnetlink: allocate more memory for dev_set_mac_address()
  ipv4: initialize fib_trie prior to register_netdev_notifier call.
  ipv6: avoid overflow of offset in ip6_find_1stfragopt
  net: Zero terminate ifr_name in dev_ifname().
  ipv4: ipv6: initialize treq->txhash in cookie_v[46]_check()
  saa7164: fix double fetch PCIe access condition
  drm: rcar-du: fix backport bug
  f2fs: sanity check checkpoint segno and blkoff
  media: lirc: LIRC_GET_REC_RESOLUTION should return microseconds
  mm, mprotect: flush TLB if potentially racing with a parallel reclaim leaving stale TLB entries
  iser-target: Avoid isert_conn->cm_id dereference in isert_login_recv_done
  iscsi-target: Fix delayed logout processing greater than SECONDS_FOR_LOGOUT_COMP
  iscsi-target: Fix initial login PDU asynchronous socket close OOPs
  iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race
  iscsi-target: Always wait for kthread_should_stop() before kthread exit
  target: Avoid mappedlun symlink creation during lun shutdown
  media: platform: davinci: return -EINVAL for VPFE_CMD_S_CCDC_RAW_PARAMS ioctl
  ARM: dts: armada-38x: Fix irq type for pca955
  ext4: fix overflow caused by missing cast in ext4_resize_fs()
  ext4: fix SEEK_HOLE/SEEK_DATA for blocksize < pagesize
  mm/page_alloc: Remove kernel address exposure in free_reserved_area()
  KVM: async_pf: make rcu irq exit if not triggered from idle task
  ASoC: do not close shared backend dailink
  ALSA: hda - Fix speaker output from VAIO VPCL14M1R
  workqueue: restore WQ_UNBOUND/max_active==1 to be ordered
  libata: array underflow in ata_find_dev()
  ANDROID: binder: don't queue async transactions to thread.
  ANDROID: binder: don't enqueue death notifications to thread todo.
  ANDROID: binder: call poll_wait() unconditionally.
  android: configs: move quota-related configs to recommended
  BACKPORT: arm64: split thread_info from task stack
  UPSTREAM: arm64: assembler: introduce ldr_this_cpu
  UPSTREAM: arm64: make cpu number a percpu variable
  UPSTREAM: arm64: smp: prepare for smp_processor_id() rework
  BACKPORT: arm64: move sp_el0 and tpidr_el1 into cpu_suspend_ctx
  UPSTREAM: arm64: prep stack walkers for THREAD_INFO_IN_TASK
  UPSTREAM: arm64: unexport walk_stackframe
  UPSTREAM: arm64: traps: simplify die() and __die()
  UPSTREAM: arm64: factor out current_stack_pointer
  BACKPORT: arm64: asm-offsets: remove unused definitions
  UPSTREAM: arm64: thread_info remove stale items
  UPSTREAM: thread_info: include <current.h> for THREAD_INFO_IN_TASK
  UPSTREAM: thread_info: factor out restart_block
  UPSTREAM: kthread: Pin the stack via try_get_task_stack()/put_task_stack() in to_live_kthread() function
  UPSTREAM: sched/core: Add try_get_task_stack() and put_task_stack()
  UPSTREAM: sched/core: Allow putting thread_info into task_struct
  UPSTREAM: printk: when dumping regs, show the stack, not thread_info
  UPSTREAM: fix up initial thread stack pointer vs thread_info confusion
  UPSTREAM: Clarify naming of thread info/stack allocators
  ANDROID: sdcardfs: override credential for ioctl to lower fs

Conflicts:
	android/configs/android-base.cfg
	arch/arm64/Kconfig
	arch/arm64/include/asm/suspend.h
	arch/arm64/kernel/head.S
	arch/arm64/kernel/smp.c
	arch/arm64/kernel/suspend.c
	arch/arm64/kernel/traps.c
	arch/arm64/mm/proc.S
	kernel/fork.c
	sound/soc/soc-pcm.c

Change-Id: I273e216c94899a838bbd208391c6cbe20b2bf683
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-09-01 11:47:49 -07:00
Chris Lew
3be5a5a839 soc: qcom: smp2p: spinlock_test: Initialize work item
Initialize the has_locked member before running SSR
spinlock test to ensure consistent results.

CRs-Fixed: 2091946
Change-Id: Ifad37541a94668b496aa9204dc80920b9a7ff244
Signed-off-by: Chris Lew <clew@codeaurora.org>
2017-09-01 11:10:55 -07:00
Deepak Kumar
a68123258a msm: kgsl: Return supported page size based on available memory pools
In case memory pools are supported return the page size as
supported only if corresponding memory pool is available.
This will increase the usage of memory pool and will reduce the
overall allocation time.

Change-Id: Iea84a4259b38fe9cb546419dfcbaf0a9666e7ca9
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
2017-09-01 06:00:48 -07:00
Linux Build Service Account
7683c6a144 Merge "f2fs: sanity check segment count" 2017-09-01 03:10:27 -07:00
Linux Build Service Account
d62c95453b Merge "ARM: dts: msm: fix size-cells for smb138x" 2017-09-01 03:10:26 -07:00
Linux Build Service Account
81730ec4ba Merge "ARM: dts: msm: update the battery profile for ascent 3450mAh battery" 2017-09-01 03:10:25 -07:00
Lingutla Chandrasekhar
af5a88a343 soc: qcom: dump current task stack and task_struct for minidump
Register the current stack and task_struct of all cpus to
the minidump table on panic.

Change-Id: I6906721f8c734dbf8142dc49e80dc730530f028c
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
2017-09-01 02:51:08 -07:00
Zhiqiang Tu
c140ef0eee Merge branch 'dev/msm-4.4-8996au' into msm-4.4
Change-Id: I9736089c23ce5dca4e4341406671269f19b7515f
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-09-01 10:30:44 +08:00
Terence Ho
36463959af msm: ais: Register and listen to bridge-chip interrupts
Changes that help facilitate sending the FPD-III to CSI bridge chip's
input signal status to the user-mode components.

Change-Id: I5e39c75b61f05edc8a1dc77677b9cad85fc563eb
Signed-off-by: Terence Ho <terenceh@codeaurora.org>
Signed-off-by: Andy Sun <bins@codeaurora.org>
2017-09-01 10:27:55 +08:00
Subbaraman Narayanamurthy
b1c9e9171d power: qpnp-fg-gen3: apply SOC linearization based on user input
Currently, SOC linearization is done when SOC masking feature is
enabled to spread out the drop in SOC across a wider range and
for better user experience. Make this configurable through a DT
property "qcom,linearize-soc" so that the user can enable it as
and when required.

Change-Id: Ic9f5f04f4e872d7804152c17206a8b204de3a9c1
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-08-31 19:25:34 -07:00
Subbaraman Narayanamurthy
2f60027ca7 power: qpnp-smb2: smb138x: change the vbus/vconn regulator_ops to static
Change the regulator_ops of vbus/vconn regulators in smb2 and
smb138x drivers to static. While at it, change the interrupt
handler smb138x_handle_slave_chg_state_change to static.

Change-Id: Iacd6b84adc6db1819b4a337aac9f6ccc52989dcd
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-08-31 19:25:33 -07:00
Subbaraman Narayanamurthy
2f006f97f5 power: qpnp-fg-gen3: support JEITA thresholds configurable runtime
Currently, JEITA thresholds are configured through the device
tree properties. Allow them to be configured runtime through
power supply properties.

Change-Id: Ie93c7e447a4f8ac793e6e324f7a0269dbc14c7e5
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-08-31 19:25:33 -07:00
Subbaraman Narayanamurthy
063d7870ec power_supply: add POWER_SUPPLY_PROP_{COLD,HOT}_TEMP properties
Add POWER_SUPPLY_PROP_COLD_TEMP and POWER_SUPPLY_PROP_HOT_TEMP
properties to represent Cold and Hot JEITA thresholds of the
battery.

Change-Id: Id5e16a4f7b20bb05d997277d20db05fc08db9f33
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-08-31 19:25:32 -07:00
Subbaraman Narayanamurthy
90d88df47e power: qpnp-fg-gen3: make CHARGE_FULL property writable by user
CHARGE_FULL property indicates the learnt capacity of the battery
from the last capacity learning cycle. However, in some rare
cases, if the learnt capacity is having an unexpected value, it
requires a reset to a good value which is not possible for an
user who cannot reinsert a battery or do an explicit write to FG
SRAM. Allowing CHARGE_FULL to be writable helps this.

Change-Id: I05aa8392f103685f8fc1ba5a3780122150be0ee6
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-08-31 19:25:31 -07:00
Subbaraman Narayanamurthy
887e3c2097 ARM: dts: msm: fix size-cells for smb138x
Fix the bad cell count warning coming from smb138x device by
setting size-cells correctly.

Change-Id: I050471d676c8a11737d9034bd25d3e9229591752
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-08-31 18:30:14 -07:00
Subbaraman Narayanamurthy
03c22f1938 ARM: dts: msm: update the battery profile for ascent 3450mAh battery
Update the battery profile for ascent 3450mAh battery based on
the latest characterization data.

Change-Id: I44e08b66d1f4dd424efc1595e3b4f3bbb2176a48
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-08-31 18:30:14 -07:00
Vidyakumar Athota
ff6c6abc1b soc: qcom: initialize glink link state
Initialize glink link state to GLINK_LINK_STATE_DOWN to
return error if userspace sends glink command packet
before glink link is up.

Change-Id: I79b5e4eb5a743dd0b118ba1b28523bfea24044d7
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
2017-08-31 16:34:52 -07:00
Govind Singh
b5bc317b2a ath10k: Enable interrupt for pktlog CE11
WCN3990 uses CE11 for pktlog. Enable CE interrupts
for pktlog pipe for WCN3990 target.

Change-Id: I5af4e47bc31fe0d94cacae0305a90f698e2d5a51
Signed-off-by: Govind Singh <govinds@codeaurora.org>
2017-08-31 07:34:33 -07:00
Linux Build Service Account
285229fa97 Merge "msm: vidc: Avoid setting internal scratch buffers if not required" 2017-08-31 05:08:57 -07:00
Linux Build Service Account
9edfa7b95a Merge "msm: vidc: use %pK instead of %p which respects kptr_restrict sysctl" 2017-08-31 05:08:55 -07:00
Linux Build Service Account
8e9a6e742b Merge "defconfig: Enable few configs for SDM660" 2017-08-31 05:08:55 -07:00
Govind Singh
49295d71cc ath10k: Enable sta idle powersave
Enable STA idle powersave for WCN3990.

Change-Id: I3dea0727464eda255fee50d21eee84919ab19205
Signed-off-by: Govind Singh <govinds@codeaurora.org>
2017-08-31 03:30:49 -07:00
Mohammed Khajapasha
092475d1bf defconfig: msm: Disable DEVPORT config for sdm660
Disable CONFIG_DEVPORT config for sdm660.
As selinux policy requires this node to be not
accessible to userspace.

Change-Id: I163b5bc0ad1d97590f20ffc2392c36e03be3cbf2
Signed-off-by: Mohammed Khajapasha <mkhaja@codeaurora.org>
2017-08-31 15:17:24 +05:30
Liangliang Lu
3e24701fda ARM: dts: msm: Update HS PHY parameters for QRD SDM660/630
Update HS Phy parameters which has better eye diagram.

Change-Id: I2774dc4c5512ba156dacb23e454d3f65691d5a06
Signed-off-by: Liangliang Lu <luliang@codeaurora.org>
2017-08-31 17:12:25 +08:00
Manoj Prabhu B
47fe494283 diag: Proper feature mask update to Glink supported peripherals
The patch re-enables updating APPS feature mask to GLINK
supported peripheral after peripheral's feature mask has been
processed and the proper transport has been updated. The patch
also corrects code indentation in buffers initialization.

CRs-Fixed: 2092758
Change-Id: Iaff5346dae833d6dbb576ca3a4a9dbdcf789a3c4
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2017-08-31 11:12:44 +05:30
Linux Build Service Account
09a04dabb6 Merge "ARM: dts: msm: update mincpu BW vote when Big CPU runs at Max freq" 2017-08-30 19:30:06 -07:00
Linux Build Service Account
fc9558666f Merge "drm/msm/sde: count null character for blob length" 2017-08-30 19:30:05 -07:00
Linux Build Service Account
b01b33489f Merge "msm: sde: fix deadlock issue in concurrency test" 2017-08-30 19:30:04 -07:00
Linux Build Service Account
c762445edd Merge "soc: qcom: glink: Initialize dummy xprt with dummy functions" 2017-08-30 19:30:03 -07:00
Linux Build Service Account
a13a87ba3a Merge "msm: ipa: Fix to use after free issue" 2017-08-30 19:30:02 -07:00
Linux Build Service Account
349cc845af Merge "msm: thermal: check LMH DCVS devicetree to enable reboot/suspend mitigation" 2017-08-30 19:30:00 -07:00
Lingutla Chandrasekhar
d67e8e7dfa defconfig: msm: enable Minidump support on SDM660
Enable Minidump support for SDM660 target.

Change-Id: Ic3792b9ff28ea006adf64180ae441886a426426d
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
2017-08-30 19:26:42 +05:30
Linux Build Service Account
c9acad7278 Merge "msm: ipa3: Vote to IPA clocks when destroying MHI channels" 2017-08-30 06:26:19 -07:00
Linux Build Service Account
04e0dd59ce Merge "ARM: dts: msm: Add speed-bin 3 for sdm660" 2017-08-30 06:26:17 -07:00
Linux Build Service Account
8207427ffb Merge "ARM: dts: msm: Add minidump dt support for MSS subsystem on sdm660" 2017-08-30 06:26:16 -07:00
Linux Build Service Account
7392248e79 Merge "soc: qcom: Add SSR minidump provision for subsystem ramdump" 2017-08-30 06:26:15 -07:00
Linux Build Service Account
ed52938fc3 Merge "wil6210: fix interface-up check" 2017-08-30 06:26:11 -07:00
Mohammed Khajapasha
13657230ea defconfig: Enable few configs for SDM660
This change enables below list of configs to
address the VTS KernelConfig and KernelProcFileApiTest
test case failures for SDM660.

Enable configs:
CONFIG_QUOTA
CONFIG_QUOTA_NETLINK_INTERFACE
CONFIG_QFMT_V2
CONFIG_SECURITY_PERF_EVENTS_RESTRICT
CONFIG_TASKSTATS
CONFIG_TASK_XACCT
CONFIG_TASK_IO_ACCOUNTING
CONFIG_UID_SYS_STATS

Change-Id: I5aa724988c21fa02cdc88c89d9663d2939198943
Signed-off-by: Mohammed Khajapasha <mkhaja@codeaurora.org>
2017-08-30 16:58:34 +05:30
Linux Build Service Account
adb3863289 Merge "ARM: dts: msm: Add virtual platform specific pinctrl dtsi" into dev/msm-4.4-8996au 2017-08-30 02:27:59 -07:00
Ghanim Fodi
1afd570abc msm: ipa3: Vote to IPA clocks when destroying MHI channels
Due to the missing vote, un-clocked access to GSI registers
occurred when destroying MHI channels. Fix it by voting
to the clocks.

CRs-Fixed: 2097296
Change-Id: Ib4fe41ff87ecb9746617b1ed3e32cae740de0c7e
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
2017-08-30 01:27:48 -07:00
Sravan Kumar Ambapuram
57cff14555 ARM: dts: msm: update mincpu BW vote when Big CPU runs at Max freq
Increase mincpu BW vote mapping for Big CPU Max frequency
to DDR Max frequency. This will help to reduce RAM access
latencies when CPU is running at max frequency.

Change-Id: I5f12ff09d5b2b94b1f02394219a3dcb4e56589e8
Signed-off-by: Sravan Kumar Ambapuram <asravan@codeaurora.org>
2017-08-30 13:53:43 +05:30