Commit graph

591158 commits

Author SHA1 Message Date
Linux Build Service Account
fb2390c8b1 Merge "msm: kgsl: convert some workqueues to use kthreads." 2017-06-22 07:40:34 -07:00
Linux Build Service Account
e26d095a21 Merge "power: smb-lib: Rearrange BOOST_BACK voting logic" 2017-06-22 07:40:33 -07:00
Linux Build Service Account
4f317411a4 Merge "msm: vidc: Recompute extradata address of buffers with ref 2" 2017-06-22 07:40:31 -07:00
Linux Build Service Account
d9cc5d555c Merge "msm: vidc: Renaming the AU-Delimiter params/extens" 2017-06-22 07:40:30 -07:00
Linux Build Service Account
c515c98cc0 Merge "msm: camera: validate num_streams in stream_cfg_cmd before using it" 2017-06-22 07:40:29 -07:00
Linux Build Service Account
86d96e09c2 Merge "ARM: dts: msm: Update sensor device node for SDM660 QRD" 2017-06-22 07:40:28 -07:00
Linux Build Service Account
4bdee99442 Merge "ath10k: Increase peer delete response wait to 500msec" 2017-06-22 07:40:27 -07:00
Linux Build Service Account
0ae9c77a8c Merge "msm📷 correct stats query out of boundary" 2017-06-22 07:40:26 -07:00
Linux Build Service Account
d519bfb9c1 Merge "clk: qcom: osm: Initialize ACD when the cluster is online" 2017-06-22 07:40:25 -07:00
Linux Build Service Account
f8499f2b5e Merge "ais: refine some code style issues" 2017-06-22 07:40:24 -07:00
Linux Build Service Account
3b2de2e798 Merge "ARM: dts: msm: override initial pwrlevel for MSM8996ProAU" 2017-06-22 07:40:23 -07:00
Linux Build Service Account
4dcf7a50c5 Merge "Merge branch 'android-4.4@6fc0573' into branch 'msm-4.4'" 2017-06-22 07:40:22 -07:00
Linux Build Service Account
a367cb43e4 Merge "wil6210: protect against invalid length of tx management frame" 2017-06-22 07:40:21 -07:00
Linux Build Service Account
b944e8d1e6 Merge "msm: camera: Add error check for cmd in IOCTL." 2017-06-22 07:40:20 -07:00
Linux Build Service Account
7c14b62c88 Merge "drivers: soc: qcom: rpm_stats: Add mutex lock for shared data" 2017-06-22 07:40:19 -07:00
Linux Build Service Account
77a019931a Merge "msm: camera: fix untrusted pointer for power down setting" 2017-06-22 07:40:18 -07:00
Linux Build Service Account
46e4ca524d Merge "msm: ipa3: fix compatibility with ipa_nat driver" 2017-06-22 07:40:17 -07:00
Linux Build Service Account
1184e3d0c4 Merge "msm: sps: Fix race condition in SPS debugfs APIs" 2017-06-22 07:40:16 -07:00
Linux Build Service Account
dcb27d45f0 Merge "msm: camera: fix untrusted pointer for power down setting" 2017-06-22 07:40:15 -07:00
Linux Build Service Account
870d3e21b3 Merge "msm: camera: Use mutex lock to avoid race condition" 2017-06-22 07:40:15 -07:00
Tim Murray
7412403004 msm: kgsl: convert some workqueues to use kthreads.
adreno_dispatch_work and _kgsl_event_worker are both low-latency
low-runtime functions that are in the critical path of GPU
rendering. Moving them out of workqueues and into a dedicated FIFO
kthread avoids significant jitter.

bug 30342017

Git-commit: 1a7a93bd33f48a369de29f6f2b56251127bf6ab4
Git-repo: https://android.googlesource.com/kernel/msm

Change-Id: I83562f488c34c2ab001c8ea79e7f09b633c658bd
Signed-off-by: Tim Murray <timmurray@google.com>
Signed-off-by: Abhilash Kumar <krabhi@codeaurora.org>
2017-06-21 22:56:18 -07:00
Anirudh Ghayal
f11fd649ff power: smb-lib: Rearrange BOOST_BACK voting logic
The BOOST_BACK USB-ICL voter needs to be removed in the
following conditions -

1. VBUS falling path during PD hard-reset
2. typeC removal
3. False boost-back detected

For (1) and (2) - remove the boost_back vote in the usbin_handler
and typec_removal path. For (3) add a worker which removes the
boost_back vote after the boost-back condition is detected. The
delay is sufficient to recover from both a valid and an incorrectly
detected boost-back condition.

CRs-Fixed: 2051908
Change-Id: I9d1d04f392bb6040b0565510ff7d1032bb036de2
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-06-21 18:36:11 +05:30
Terence Ho
e53f2adc3f msm: camera: validate num_streams in stream_cfg_cmd before using it
stream_cfg_cmd->num_streams is from userspace,
need to check it against MSM_ISP_STATS_MAX before using it.

CRs-Fixed: 2029867
Change-Id: I02a71b983947981806470454654d712bcc732077
Signed-off-by: Terence Ho <terenceh@codeaurora.org>
2017-06-21 17:12:27 +08:00
Rakesh Pillai
2f74c5032f ath10k: Increase peer delete response wait to 500msec
Peer creation in firmware fails if last peer deletion is still
in progress. Need to wait for peer delete response from firmware
after deleting peer from host driver.

Increase the peer delete response wait time to 500msec.

CRs-Fixed: 2063832
Change-Id: I1c1c2500ae7f8ff1448f6b726d30dbbe3334957c
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
2017-06-21 01:39:28 -07:00
Depeng Shao
3dc4455f64 ARM: dts: msm: Update sensor device node for SDM660 QRD
Update main and aux camera sensor dvdd configuration
to enable the vreg and ldo together.

Change-Id: Iacc79799d1c06a3385a8cfd9ef80d707f8fa8d69
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2017-06-21 00:14:06 -07:00
Fei Zhang
b38f9aca3c msm📷 correct stats query out of boundary
Fix a potential out of boundary query of stats info.

CRs-Fixed: 2041066
Change-Id: I76d4aa8c8ddd523fde007bfb6fa387a17930c2ba
Signed-off-by: Fei Zhang <feizhang@codeaurora.org>
2017-06-20 23:10:52 -07:00
Andy Sun
182ec0b2bc ais: refine some code style issues
1. function/variable static declare;
2. dereference of noderef expression;
3. cast removes address space of expression;
4. using plain integer as NULL pointer;

Change-Id: If11a29aca93380de68a323880d55597bf320470f
Signed-off-by: Andy Sun <bins@codeaurora.org>
2017-06-21 09:43:11 +08:00
Terence Ho
206a79a7fa msm: camera: Add error check for cmd in IOCTL.
Return EINVAL if cmd is not v4l2 PRIVATE_IOCTL_CMD.

CRs-Fixed: 2016416
Change-Id: I6758bc9d6b159b2e2e4eba5a9d9a3882de320041
Signed-off-by: Terence Ho <terenceh@codeaurora.org>
2017-06-20 09:33:42 -07:00
Hamad Kadmany
7041944896 wil6210: protect against invalid length of tx management frame
Validate buffer length has the minimum needed size
when sending management frame to protect against
possible buffer overrun.

Change-Id: Ib5aed79694100597d7f71a9e8d4e8dba91be538a
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
2017-06-20 13:55:07 +03:00
Kasin Li
af803bcd66 ARM: dts: msm: override initial pwrlevel for MSM8996ProAU
Current DRM driver set GPU clock rate with initial pwrlevel and use it
all the time. This value is too low and couldn't cover many computing
tasks. Change to a higher value for automotive system.

Change-Id: I348f187bfb8c0c2a3936a132bc0142fd5553226c
Signed-off-by: Kasin Li <donglil@codeaurora.org>
2017-06-20 18:38:37 +08:00
Linux Build Service Account
560a996da5 Merge "soc: qcom: rpm-smd-debug: initialize variables and check for return value" 2017-06-20 03:20:41 -07:00
Linux Build Service Account
2305f01fc2 Merge "msm: vidc: Addition of VIDIOC_QUERY_EXT_CTRL ioctl" 2017-06-20 03:20:40 -07:00
Linux Build Service Account
3f302a6640 Merge "qpnp-fg-gen3: Move getting battery id and profile to profile_load_work" 2017-06-20 03:20:39 -07:00
Linux Build Service Account
5f0a789229 Merge "drm/msm: use 13-bit mask for h_total and v_total" 2017-06-20 03:20:31 -07:00
Linux Build Service Account
d00b4e6e09 Merge "drm/msm: start secure domain va from non-zero address" 2017-06-20 03:20:30 -07:00
Linux Build Service Account
296e2f3d7e Merge "drm/msm: Remove superfluous hang check message" 2017-06-20 03:20:28 -07:00
Linux Build Service Account
c9e6118965 Merge "drm/msm: Add a submit queue flag to disable the QoS timer" 2017-06-20 03:20:27 -07:00
Linux Build Service Account
73a0e7ea49 Merge "drm/msm: Add submit queue queries" 2017-06-20 03:20:26 -07:00
Siva Kumar Akkireddi
be32f1d527 msm: sps: Fix race condition in SPS debugfs APIs
SPS debugfs APIs can be called concurrently which can result
in dangling pointer access. This change synchronizes access
to the SPS debugfs buffer.

Change-Id: I409b3f0618f760cb67eba47b43c81d166cdae4aa
Signed-off-by: Siva Kumar Akkireddi <sivaa@codeaurora.org>
2017-06-19 23:19:19 -07:00
Amir Levy
a9517ddfbe msm: ipa3: fix compatibility with ipa_nat driver
Add several defines and structs to allow IPA nat driver compile.
Change IPA_HW_MAX to be a define instead of enum so user space
can check its existence with ifdef.

Change-Id: I33df449d18b678dca44475f04eb72318179dda11
Signed-off-by: Amir Levy <alevy@codeaurora.org>
2017-06-19 23:06:27 -07:00
Taniya Das
f530d78e83 clk: qcom: osm: Initialize ACD when the cluster is online
The OSM clock driver currently enables ACD for the silver and
gold clusters regardless of whether they've been brought up or
not. ACD requires the cluster PLLs to be running for initialization,
a requirement which would not be met if the cluster hasn't been
brought online.
Tie the ACD initialization sequence with enabling OSM for that
cluster.

Change-Id: I4a7e7176e30b26d096645dd9ce508b7af8ae6df2
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2017-06-20 10:26:46 +05:30
Ray Zhang
49e5049a72 drm/msm: use 13-bit mask for h_total and v_total
HDMI TX controller can output 13-bit h_total and v_total
compare to 12-bit width of previous generation chipsets.
So use 13-bit mask for these HSYNC and VSYNC settings.

CRs-Fixed: 2052655
Change-Id: I2421a4e0a7646d10ba9e8f427807daa6a1bc1a21
Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2017-06-20 08:57:51 +08:00
Blagovest Kolenichev
c5f247dd6d Merge branch 'android-4.4@6fc0573' into branch 'msm-4.4'
* refs/heads/tmp-6fc0573:
  Linux 4.4.71
  xfs: only return -errno or success from attr ->put_listent
  xfs: in _attrlist_by_handle, copy the cursor back to userspace
  xfs: fix unaligned access in xfs_btree_visit_blocks
  xfs: bad assertion for delalloc an extent that start at i_size
  xfs: fix indlen accounting error on partial delalloc conversion
  xfs: wait on new inodes during quotaoff dquot release
  xfs: update ag iterator to support wait on new inodes
  xfs: support ability to wait on new inodes
  xfs: fix up quotacheck buffer list error handling
  xfs: prevent multi-fsb dir readahead from reading random blocks
  xfs: handle array index overrun in xfs_dir2_leaf_readbuf()
  xfs: fix over-copying of getbmap parameters from userspace
  xfs: fix off-by-one on max nr_pages in xfs_find_get_desired_pgoff()
  xfs: Fix missed holes in SEEK_HOLE implementation
  mlock: fix mlock count can not decrease in race condition
  mm/migrate: fix refcount handling when !hugepage_migration_supported()
  drm/gma500/psb: Actually use VBT mode when it is found
  slub/memcg: cure the brainless abuse of sysfs attributes
  ALSA: hda - apply STAC_9200_DELL_M22 quirk for Dell Latitude D430
  pcmcia: remove left-over %Z format
  drm/radeon: Unbreak HPD handling for r600+
  drm/radeon/ci: disable mclk switching for high refresh rates (v2)
  scsi: mpt3sas: Force request partial completion alignment
  HID: wacom: Have wacom_tpc_irq guard against possible NULL dereference
  mmc: sdhci-iproc: suppress spurious interrupt with Multiblock read
  i2c: i2c-tiny-usb: fix buffer not being DMA capable
  vlan: Fix tcp checksum offloads in Q-in-Q vlans
  net: phy: marvell: Limit errata to 88m1101
  netem: fix skb_orphan_partial()
  ipv4: add reference counting to metrics
  sctp: fix ICMP processing if skb is non-linear
  tcp: avoid fastopen API to be used on AF_UNSPEC
  virtio-net: enable TSO/checksum offloads for Q-in-Q vlans
  be2net: Fix offload features for Q-in-Q packets
  ipv6: fix out of bound writes in __ip6_append_data()
  bridge: start hello_timer when enabling KERNEL_STP in br_stp_start
  qmi_wwan: add another Lenovo EM74xx device ID
  bridge: netlink: check vlan_default_pvid range
  ipv6: Check ip6_find_1stfragopt() return value properly.
  ipv6: Prevent overrun when parsing v6 header options
  net: Improve handling of failures on link and route dumps
  tcp: eliminate negative reordering in tcp_clean_rtx_queue
  sctp: do not inherit ipv6_{mc|ac|fl}_list from parent
  sctp: fix src address selection if using secondary addresses for ipv6
  tcp: avoid fragmenting peculiar skbs in SACK
  s390/qeth: avoid null pointer dereference on OSN
  s390/qeth: unbreak OSM and OSN support
  s390/qeth: handle sysfs error during initialization
  ipv6/dccp: do not inherit ipv6_mc_list from parent
  dccp/tcp: do not inherit mc_list from parent
  sparc: Fix -Wstringop-overflow warning
  android: base-cfg: disable CONFIG_NFS_FS and CONFIG_NFSD
  schedstats/eas: guard properly to avoid breaking non-smp schedstats users
  BACKPORT: f2fs: sanity check size of nat and sit cache
  FROMLIST: f2fs: sanity check checkpoint segno and blkoff
  sched/tune: don't use schedtune before it is ready
  sched/fair: use SCHED_CAPACITY_SCALE for energy normalization
  sched/{fair,tune}: use reciprocal_value to compute boost margin
  sched/tune: Initialize raw_spin_lock in boosted_groups
  sched/tune: report when SchedTune has not been initialized
  sched/tune: fix sched_energy_diff tracepoint
  sched/tune: increase group count to 5
  cpufreq/schedutil: use boosted_cpu_util for PELT to match WALT
  sched/fair: Fix sched_group_energy() to support per-cpu capacity states
  sched/fair: discount task contribution to find CPU with lowest utilization
  sched/fair: ensure utilization signals are synchronized before use
  sched/fair: remove task util from own cpu when placing waking task
  trace:sched: Make util_avg in load_avg trace reflect PELT/WALT as used
  sched/fair: Add eas (& cas) specific rq, sd and task stats
  sched/core: Fix PELT jump to max OPP upon util increase
  sched: EAS & 'single cpu per cluster'/cpu hotplug interoperability
  UPSTREAM: sched/core: Fix group_entity's share update
  UPSTREAM: sched/fair: Fix calc_cfs_shares() fixed point arithmetics width confusion
  UPSTREAM: sched/fair: Fix incorrect task group ->load_avg
  UPSTREAM: sched/fair: Fix effective_load() to consistently use smoothed load
  UPSTREAM: sched/fair: Propagate asynchrous detach
  UPSTREAM: sched/fair: Propagate load during synchronous attach/detach
  UPSTREAM: sched/fair: Fix hierarchical order in rq->leaf_cfs_rq_list
  BACKPORT: sched/fair: Factorize PELT update
  UPSTREAM: sched/fair: Factorize attach/detach entity
  UPSTREAM: sched/fair: Improve PELT stuff some more
  UPSTREAM: sched/fair: Apply more PELT fixes
  UPSTREAM: sched/fair: Fix post_init_entity_util_avg() serialization
  BACKPORT: sched/fair: Initiate a new task's util avg to a bounded value
  sched/fair: Simplify idle_idx handling in select_idle_sibling()
  sched/fair: refactor find_best_target() for simplicity
  sched/fair: Change cpu iteration order in find_best_target()
  sched/core: Add first cpu w/ max/min orig capacity to root domain
  sched/core: Remove remnants of commit fd5c98da1a42
  sched: Remove sysctl_sched_is_big_little
  sched/fair: Code !is_big_little path into select_energy_cpu_brute()
  EAS: sched/fair: Re-integrate 'honor sync wakeups' into wakeup path
  Fixup!: sched/fair.c: Set SchedTune specific struct energy_env.task
  sched/fair: Energy-aware wake-up task placement
  sched/fair: Add energy_diff dead-zone margin
  sched/fair: Decommission energy_aware_wake_cpu()
  sched/fair: Do not force want_affine eq. true if EAS is enabled
  arm64: Set SD_ASYM_CPUCAPACITY sched_domain flag on DIE level
  UPSTREAM: sched/fair: Fix incorrect comment for capacity_margin
  UPSTREAM: sched/fair: Avoid pulling tasks from non-overloaded higher capacity groups
  UPSTREAM: sched/fair: Add per-CPU min capacity to sched_group_capacity
  UPSTREAM: sched/fair: Consider spare capacity in find_idlest_group()
  UPSTREAM: sched/fair: Compute task/cpu utilization at wake-up correctly
  UPSTREAM: sched/fair: Let asymmetric CPU configurations balance at wake-up
  UPSTREAM: sched/core: Enable SD_BALANCE_WAKE for asymmetric capacity systems
  UPSTREAM: sched/core: Pass child domain into sd_init()
  UPSTREAM: sched/core: Introduce SD_ASYM_CPUCAPACITY sched_domain topology flag
  UPSTREAM: sched/core: Remove unnecessary NULL-pointer check
  UPSTREAM: sched/fair: Optimize find_idlest_cpu() when there is no choice
  BACKPORT: sched/fair: Make the use of prev_cpu consistent in the wakeup path
  UPSTREAM: sched/core: Fix power to capacity renaming in comment
  Partial Revert: "WIP: sched: Add cpu capacity awareness to wakeup balancing"
  Revert "WIP: sched: Consider spare cpu capacity at task wake-up"
  FROM-LIST: cpufreq: schedutil: Redefine the rate_limit_us tunable
  cpufreq: schedutil: add up/down frequency transition rate limits
  trace/sched: add rq utilization signal for WALT
  sched/cpufreq: make schedutil use WALT signal
  sched: cpufreq: use rt_avg as estimate of required RT CPU capacity
  cpufreq: schedutil: move slow path from workqueue to SCHED_FIFO task
  BACKPORT: kthread: allow to cancel kthread work
  sched/cpufreq: fix tunables for schedfreq governor
  BACKPORT: cpufreq: schedutil: New governor based on scheduler utilization data
  sched: backport cpufreq hooks from 4.9-rc4
  ANDROID: Kconfig: add depends for UID_SYS_STATS
  ANDROID: hid: uhid: implement refcount for open and close
  Revert "ext4: require encryption feature for EXT4_IOC_SET_ENCRYPTION_POLICY"
  ANDROID: mnt: Fix next_descendent

Conflicts:
	include/trace/events/sched.h
	kernel/sched/Makefile
	kernel/sched/core.c
	kernel/sched/fair.c
	kernel/sched/sched.h

Change-Id: I55318828f2c858e192ac7015bcf2bf0ec5c5b2c5
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-06-19 16:59:55 -07:00
Linux Build Service Account
0045ec6f11 Merge "drm/msm : add hdcp debugfs nodes for DRM HDMI driver" 2017-06-19 16:42:05 -07:00
Linux Build Service Account
25e509561f Merge "f_gsi: Use kernel buffer instead of user space provided buffer" 2017-06-19 16:42:05 -07:00
Linux Build Service Account
3e0ab6ba33 Merge "soc: qcom: glink: Move ctx initialization of xprt ptr" 2017-06-19 16:42:04 -07:00
Linux Build Service Account
2dc794c527 Merge "soc: qcom: glink_ssr: Remove subsystem_restart call" 2017-06-19 16:42:03 -07:00
Linux Build Service Account
61155a521f Merge "i2c-msm-v2: Print error logs in process context" 2017-06-19 16:42:01 -07:00
Linux Build Service Account
69c6a42d14 Merge "ARM: dts: msm: Enable use of 64K page pool for SDM630" 2017-06-19 16:42:00 -07:00
Linux Build Service Account
a34722136d Merge "qpnp-smb2: Fix QC_PULSE_COUNT reading logic" 2017-06-19 16:41:59 -07:00