Commit graph

594859 commits

Author SHA1 Message Date
Linux Build Service Account
982c01bee6 Merge "defconfig: msmcortex: Enable sdcardfs" 2017-11-05 22:32:58 -08:00
Linux Build Service Account
0d6ccec7eb Merge "spi: core: Extract of_spi_parse_dt()" 2017-11-05 22:32:57 -08:00
Linux Build Service Account
da82750992 Merge "ARM: dts: msm: Add base register property for lpass and turing for sdm660" 2017-11-05 22:32:55 -08:00
Linux Build Service Account
e6754b0406 Merge "msm: kgsl: Print Vulkan memory types as well" 2017-11-05 22:32:54 -08:00
Linux Build Service Account
b147b4588b Merge "defconfig: msm: enable DRM driver for msm8996" 2017-11-05 22:32:53 -08:00
Linux Build Service Account
328319f28a Merge "icnss: Check for FW_READY state before sending uevent in PD notifier" 2017-11-05 22:32:52 -08:00
Linux Build Service Account
2dedf76547 Merge "ath: Disable non-20 mhz 2G world regulatory channels" 2017-11-05 22:32:51 -08:00
Linux Build Service Account
99b30615eb Merge "diag: Handle data ready notification properly" 2017-11-05 22:32:50 -08:00
Linux Build Service Account
b6f12218b5 Merge "power: qpnp-fg-gen3: Fine tune the monotonic SOC calculation" 2017-11-05 22:32:49 -08:00
Linux Build Service Account
697888e330 Merge "defconfig: Enable DFS support for ath10k" 2017-11-05 22:32:48 -08:00
Linux Build Service Account
aa00b1c16d Merge "clk: qcom: Add support for 430MHz for gpu clock on sdm660" 2017-11-05 22:32:47 -08:00
Linux Build Service Account
efa374d7b2 Merge "SoC: msm: Support SEC_MI2S_RX" 2017-11-05 22:32:45 -08:00
Linux Build Service Account
0a9e5f9137 Merge "leds: qpnp-wled: Fix configuration for AMOLED mode" 2017-11-05 22:32:43 -08:00
Linux Build Service Account
67dcc348d7 Merge "leds: qpnp-wled: Disable module permanently when OVP fault persists" 2017-11-05 22:32:43 -08:00
Linux Build Service Account
c6846de733 Merge "leds: qpnp-wled: Configure WLED1_CTRL_SWITCHING_FREQUENCY selectively" 2017-11-05 22:32:42 -08:00
Linux Build Service Account
7777cc93db Merge "power: qpnp-fg-gen3: Skip the status_change work if suspended" 2017-11-03 21:45:05 -07:00
Linux Build Service Account
96bbdb7e76 Merge "memblock: Fix memblock_overlaps_memory()" 2017-11-03 21:45:03 -07:00
Linux Build Service Account
fc86e52281 Merge "Merge android-4.4@89074de (v4.4.94) into msm-4.4" 2017-11-03 07:04:47 -07:00
Linux Build Service Account
3c586a777b Merge "serial: msm_serial_hs: Do not accept Rx Data till the Rx pipe connect" 2017-11-03 07:04:46 -07:00
Ritesh Harjani
ea65e36e9d defconfig: msmcortex: Enable sdcardfs
This patch enables sdcardfs for msmcortex.

Change-Id: Icf3105c0080a35c2ead663decf4340647ac64b67
Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
2017-11-03 04:11:26 -07:00
Anirudh Ghayal
fa88f5e4cb power: qpnp-fg-gen3: Skip the status_change work if suspended
There is a scenario where the status change work can hold
a mutex lock for ~1.5 seconds which can race with the FG resume
callback. Avoid this condition by adding a state variable
to track the suspend/resume state and skip executing the
status change work while suspended.

CRs-Fixed: 2101514
Change-Id: Ib5300a5dfce30c4c6bcc8d8428b664c184a83fb4
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-11-03 08:28:01 +05:30
Rahul Sharma
960078448f defconfig: msm: enable DRM driver for msm8996
This change disables FB driver and enable DRM display driver
on msm8996 auto defconfig.

Change-Id: Ic214b70dd47379464220e4f801c2ab38753c9a10
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-11-02 14:11:13 +05:30
Anurag Chouhan
fd554860f0 icnss: Check for FW_READY state before sending uevent in PD notifier
The existing state check will create a corner case that when FW
crashed during driver probe, platform driver won't send early
uevent notification to host driver, which create a small window where
host can communicate with FW when FW is crashed. This case can be
covered by checking FW_READY state instead.

CRs-Fixed: 2122702
Change-Id: I0bde9cb5a526ccd9fe81cd38bd4c27cf2e95042b
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
Signed-off-by: Anurag Chouhan <achouhan@codeaurora.org>
2017-11-01 23:50:26 -07:00
Avaneesh Kumar Dwivedi
48d5f82d0e ARM: dts: msm: Add base register property for lpass and turing for sdm660
Add base register property in respective pil nodes to iomap them
during probe of the subsystem pil driver.

Change-Id: I961ab80f1caf84ab63d649c3a1545b89fed56c0b
Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>
2017-11-02 11:40:33 +05:30
Avaneesh Kumar Dwivedi
d438970a05 soc: qcom: pil: Log the TZ NMI caused subsystem crash on err fatal
Check NMI STATUS register and dump the log if the err fatal caused
on subsystem is due to TZ NMI.

Change-Id: I8ac4190aca60aeedcd41fd06e2f7dd053edd0f30
Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>
2017-11-02 11:39:55 +05:30
Linux Build Service Account
11734d0451 Merge "drm/msm/sde: add mutex to the sde resource manager" 2017-11-01 20:34:04 -07:00
Linux Build Service Account
e8c140a99b Merge "ARM: dts: msm: enable one adv7533 instance on apq8096 lite board" 2017-11-01 20:34:03 -07:00
Young Hwan Kwak
70e0fba783 msm: kgsl: Print Vulkan memory types as well
Vulkan memory types are added into UMD.
Print Vulkan memory type as an int value.

CRs-Fixed: 2119633
Change-Id: Idf5d58a6a02dbef6ef8cf6663e7819d221bf3e11
Signed-off-by: Young Hwan Kwak <ykwak@codeaurora.org>
2017-11-02 09:44:10 +08:00
Rajeev Kumar Sirasanagandla
b85f32555a ath: Disable non-20 mhz 2G world regulatory channels
The minimum bandwidth supported is 5 MHZ. Kernel API
wiphy_apply_custom_regulatory can enable channels 12/13
with BW 5/10 even for reg rule 2402-2472. Circumvent the issue
by doing a check in the driver.

CRs-Fixed: 2136273
Change-Id: I296e45d142c38a83c90deb743e992eb1a7743feb
Signed-off-by: Rajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>
2017-11-01 16:24:42 +05:30
Linux Build Service Account
aedf62a2ba Merge "block: Fix oops in locked_inode_to_wb_and_lock_list()" 2017-10-31 16:54:18 -07:00
Linux Build Service Account
5954c32915 Merge "block: Fix bdi assignment to bdev inode when racing with disk delete" 2017-10-31 16:54:18 -07:00
Linux Build Service Account
d4cc718065 Merge "diag: Remove AXI prefetch related padding" 2017-10-31 16:54:17 -07:00
Linux Build Service Account
df3eaf90e3 Merge "ARM: 8701/1: fix sparse flags for build on 64bit machines" 2017-10-31 16:54:16 -07:00
Linux Build Service Account
5327b0ab71 Merge "msm: mdss: add support for dma scheduling for dsi v2.1" 2017-10-31 16:54:14 -07:00
Ashish Garg
0d030ecce2 msm: mdss: add support for dma scheduling for dsi v2.1
Dsi controller v2.1 and above supports scheduling of dma
commands. Schedule dsi cmds at the starting of blanking
region to avoid sending of commands in active region
resulting in dsi overflow errors.

Change-Id: I658b7d7008eb9071148820c0ea949ae9ba593ed9
Signed-off-by: Ashish Garg <ashigarg@codeaurora.org>
2017-10-31 10:32:59 -07:00
Sameer Thalappil
9fccd743a2 icnss: Do not assert if reboot requested during PDR
When icnss driver sees a PD down, and if the recovery is already in
progress, it forces an assert in debug builds. That is to detect any
Modem failures during PDR or to catch any instance of recursive PDRs.
When system goes thru a reboot or shutdown, and if the recovery is in
progress then avoid calling this assert.

CRs-Fixed: 2135071
Change-Id: I28f5c79a4cd8b83f60a62111535b11c2fba6000b
Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>
2017-10-31 10:19:55 -07:00
Luc Van Oostenryck II
38aaac21e6 ARM: 8701/1: fix sparse flags for build on 64bit machines
By default sparse uses the characteristics of the build
machine to infer things like the wordsize.
This is fine when doing native builds but for ARM it's,
I suspect, very rarely the case and if the build are done
on a 64bit machine we get a bunch of warnings like:
  'cast truncates bits from constant value (... becomes ...)'

Fix this by adding the -m32 flags for sparse.

Change-Id: I9045e5b77578d03e328a4a6af297e84356c02cf8
Reported-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Git-commit: 6042b8c7c08cad7a8bdc0456c619ae941962b40a
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-30 16:11:46 -07:00
Linux Build Service Account
9c23726ad4 Merge "leds: qpnp-flash: Fix Use-after-free(UAF) for debugfs" 2017-10-30 15:13:50 -07:00
Linux Build Service Account
bb3bb010ec Merge "ASoC: wcd9xxx: restrict debugfs permission" 2017-10-30 05:26:21 -07:00
Linux Build Service Account
4dd3043f35 Merge "ASoC: sdm660_cdc: Fix pop noise issue at DMIC" 2017-10-30 05:26:20 -07:00
Lloyd Atkinson
0852d989e4 drm/msm/sde: add mutex to the sde resource manager
Fix serialization of access to the SDE resource manager by
adding mutex protection to its external APIs.

Change-Id: I469a1c7b37d4a2f115443bdc308d0236d786fc68
Signed-off-by: Lloyd Atkinson <latkinso@codeaurora.org>
Signed-off-by: Lihui Wen <lwen@codeaurora.org>
2017-10-30 05:23:16 -07:00
Surabhi Vishnoi
f465647dfb defconfig: Enable DFS support for ath10k
DFS support is disabled for ath10k driver.

Enable the DFS support for ath10k in the defconfig and perf defconfig.

CRs-Fixed: 2124757
Change-Id: Iccecd2226fd13034b12a8978b68f9535178ed430
Signed-off-by: Surabhi Vishnoi <svishnoi@codeaurora.org>
2017-10-30 13:46:10 +05:30
Odelu Kukatla
08d84b18b1 clk: qcom: Add support for 430MHz for gpu clock on sdm660
GPU clock requires to support 430MHz, so add the support
for the same on sdm660.

Change-Id: Ief238fbe521a10f8096ac44844f5abe013649f81
Signed-off-by: Odelu Kukatla <okukatla@codeaurora.org>
2017-10-30 11:06:37 +05:30
Guchun Chen
4ae9ad2434 ARM: dts: msm: enable one adv7533 instance on apq8096 lite board
Apq8096 lite board has one DSI-HDMI display through adv7533 bridge chip,
so enable this bridge chip node.

Change-Id: I3539889b70b5a14d6acd09d13e387bdce11d59b1
CRs-Fixed: 2113147
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2017-10-30 13:15:46 +08:00
Linux Build Service Account
d2c583756f Merge "security: Extend SELinux to support CAN sockets" 2017-10-29 20:59:53 -07:00
Ankit Sharma
d851b06217 leds: qpnp-flash: Fix Use-after-free(UAF) for debugfs
Fix UAF where two threads can open and close the same file. Second
open will cause the private data for the first file to be overwritten.
When the first file is closed and the private data is freed, this makes
the now-shared private data OOB for the second thread.

CRs-Fixed: 1109763
Change-Id: I1c4618d5be99e140abf0f3ea0d7f485897db5ab2
Signed-off-by: Ankit Sharma <ansharma@codeaurora.org>
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-10-28 14:29:50 +05:30
Subbaraman Narayanamurthy
9445c88458 power: qpnp-fg-gen3: Fine tune the monotonic SOC calculation
Currently, all the values of raw monotonic SOC (0-255) gets
rounded off to 0-100. This can show up monotonic SOC hitting 0%
earlier when the SOC hadn't really hit zero yet. Improve the
SOC round off calculation so that 0 and 100 % can be shown when
it reaches the exact point.

Change-Id: I5bd9ebc8667a5beed9e1e97ff492aa1350f4d0f7
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-27 20:02:54 -07:00
Blagovest Kolenichev
dbad9b8f72 Merge android-4.4@89074de (v4.4.94) into msm-4.4
* refs/heads/tmp-89074de
  Linux 4.4.94
  Revert "tty: goldfish: Fix a parameter of a call to free_irq"
  cpufreq: CPPC: add ACPI_PROCESSOR dependency
  nfsd/callback: Cleanup callback cred on shutdown
  target/iscsi: Fix unsolicited data seq_end_offset calculation
  uapi: fix linux/mroute6.h userspace compilation errors
  uapi: fix linux/rds.h userspace compilation errors
  ceph: clean up unsafe d_parent accesses in build_dentry_path
  i2c: at91: ensure state is restored after suspending
  net: mvpp2: release reference to txq_cpu[] entry after unmapping
  scsi: scsi_dh_emc: return success in clariion_std_inquiry()
  slub: do not merge cache if slub_debug contains a never-merge flag
  ocfs2/dlmglue: prepare tracking logic to avoid recursive cluster lock
  crypto: xts - Add ECB dependency
  net/mlx4_core: Fix VF overwrite of module param which disables DMFS on new probed PFs
  sparc64: Migrate hvcons irq to panicked cpu
  md/linear: shutup lockdep warnning
  f2fs: do not wait for writeback in write_begin
  Btrfs: send, fix failure to rename top level inode due to name collision
  iio: adc: xilinx: Fix error handling
  netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value.
  net/mlx4_en: fix overflow in mlx4_en_init_timestamp()
  mac80211: fix power saving clients handling in iwlwifi
  mac80211_hwsim: check HWSIM_ATTR_RADIO_NAME length
  irqchip/crossbar: Fix incorrect type of local variables
  watchdog: kempld: fix gcc-4.3 build
  locking/lockdep: Add nest_lock integrity test
  Revert "bsg-lib: don't free job in bsg_prepare_job"
  tipc: use only positive error codes in messages
  net: Set sk_prot_creator when cloning sockets to the right proto
  packet: only test po->has_vnet_hdr once in packet_snd
  packet: in packet_do_bind, test fanout with bind_lock held
  tun: bail out from tun_get_user() if the skb is empty
  l2tp: fix race condition in l2tp_tunnel_delete
  l2tp: Avoid schedule while atomic in exit_net
  vti: fix use after free in vti_tunnel_xmit/vti6_tnl_xmit
  isdn/i4l: fetch the ppp_write buffer in one shot
  bpf: one perf event close won't free bpf program attached by another perf event
  packet: hold bind lock when rebinding to fanout hook
  net: emac: Fix napi poll list corruption
  ip6_gre: skb_push ipv6hdr before packing the header in ip6gre_header
  udpv6: Fix the checksum computation when HW checksum does not apply
  bpf/verifier: reject BPF_ALU64|BPF_END
  sctp: potential read out of bounds in sctp_ulpevent_type_enabled()
  MIPS: Fix minimum alignment requirement of IRQ stack
  drm/dp/mst: save vcpi with payloads
  percpu: make this_cpu_generic_read() atomic w.r.t. interrupts
  trace: sched: Fix util_avg_walt in sched_load_avg_cpu trace
  sched/fair: remove erroneous RCU_LOCKDEP_WARN from start_cpu()
  sched: EAS/WALT: finish accounting prior to task_tick
  cpufreq: sched: update capacity request upon tick always
  sched/fair: prevent meaningless active migration
  sched: walt: Leverage existing helper APIs to apply invariance

Conflicts:
	kernel/sched/core.c
	kernel/sched/fair.c
	kernel/sched/sched.h

Change-Id: I0effac90fb6a4db559479bfa2fefa31c41200ce9
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-10-27 10:56:12 -07:00
Blagovest Kolenichev
7ed4cfd83b sched: restore discarded ifdef CONFIG_SCHED_WALT code
Code closed in ifdef CONFIG_SCHED_WALT blocks is not used in
msm-4.4 builds, hence in order to be as much as closer to
upstream and subsequently to have less merge conflicts in the
future, let's restore this code.

Restore below CONFIG_SCHED_WALT changes in file [1]:

  3c5c4e9 trace/sched: add rq utilization signal for WALT
  3a29814 sched: fix wrong truncation of walt_avg
  efb86bd sched: Introduce Window Assisted Load Tracking (WALT)

[1] include/trace/events/sched.h

The above changes were discarded during android-4.4 merging
into msm-4.4 starting from change 1758716.

Change-Id: I1dfe59689ee5f1207e0951a8362a497a8c67c6a7
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-10-27 08:58:59 -07:00
Linux Build Service Account
31c9729a25 Merge "ARM: dts: msm: Refactor device tree of msm8996 virtual platform" 2017-10-27 08:52:16 -07:00