Commit graph

594866 commits

Author SHA1 Message Date
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
Linux Build Service Account
d88953de59 Merge "rtc: Disable alarm irq if alarm time is in the past" 2017-10-27 08:52:15 -07:00
Linux Build Service Account
f15c96401c Merge "drm/msm: add SRM support for HDCP 2.2" 2017-10-27 08:52:14 -07:00
Mao Jinlong
ecbfe59d65 rtc: Disable alarm irq if alarm time is in the past
If device is boot up by rtc alarm, the alarm irq will still be
enabled and the alarm time is smaller than current rtc time before
any alarm is set or canceled. If device is powered off now, it will
boot up automatically as the alarm irq is enabled.

So disable alarm irq if alarm is enabled and alarm time is in the
past.

CRs-Fixed: 2109666
Change-Id: Ie60bd1222a400cd45a6c5a385faa70190fbe7e3c
Signed-off-by: Mao Jinlong <jinlmao@codeaurora.org>
2017-10-27 00:02:38 -07:00
Zhiqiang Tu
8353608a98 ARM: dts: msm: Refactor device tree of msm8996 virtual platform
Refactor device tree to support multiple targets on virtual platform.

Change-Id: Id4a3519afd63b77510d824979fc71309ff6ac481
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-10-26 17:31:46 -07:00
Linux Build Service Account
4bea3d2624 Merge "uapi: Export msm_ipc.h" 2017-10-26 14:47:35 -07:00
Linux Build Service Account
cf4751b009 Merge "defconfig: arm64: fsm: Add configs for FSM platforms" 2017-10-26 14:47:34 -07:00
Linux Build Service Account
f5caf269cd Merge "soc: qcom: glink: Add downvote of transport during SSR" 2017-10-26 14:47:33 -07:00
Linux Build Service Account
2db878d52e Merge "Merge android-4.4@d6fbbe5 (v4.4.93) into msm-4.4" 2017-10-26 07:35:30 -07:00
Linux Build Service Account
dd2d19cd96 Merge "ath10k: Add radar detect width for wcn3990 interface combination" 2017-10-26 07:35:29 -07:00
Linux Build Service Account
3b637f746d Merge "drm/msm: clear deep color bits in the HDMI controller" 2017-10-26 07:35:28 -07:00
Linux Build Service Account
40530e7b4e Merge "drm/msm: reset sink hdr capabilities during bridge disable" 2017-10-26 07:35:27 -07:00
Linux Build Service Account
b6171c845c Merge "usb: gadget: Add check gadget function bind or not" 2017-10-26 07:35:26 -07:00
Dhoat Harpal
9ed4818826 soc: qcom: glink: Add downvote of transport during SSR
During SSR, down vote transport of xprt is not called.
This leads to transport not being able to go to idle state.

Downvote of transport is called in SSR path.

CRs-Fixed: 2131780
Change-Id: Ic374073187aab95b700aa3f795787819f34d3c3c
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
2017-10-26 19:21:44 +05:30
Hugh Guan
d0cfe54645 SoC: msm: Support SEC_MI2S_RX
Support SEC_MI2S_RX dai link and export kcontrols to update
Bit Format configuration.

CRs-fixed: 2112037
Change-Id: Ic70b501d900a3f0dab2608fda0f1573cb59c7d35
Signed-off-by: Hugh Guan <hhguan@codeaurora.org>
2017-10-25 19:59:47 -07:00
Linux Build Service Account
4c5c6905e4 Merge "defconfig: msm: Enable USB video class support on msm-4.4 kernel" 2017-10-25 15:58:59 -07:00
Linux Build Service Account
5177652ad0 Merge "Merge android-4.4@73a2b70 (v4.4.92) into msm-4.4" 2017-10-25 15:58:58 -07:00
Linux Build Service Account
b3161dca6c Merge "ARM: dts: msm: modify interrupt flag for wled device on PMI8994" 2017-10-25 15:58:57 -07:00
vpalvai
f7ac82b8a0 defconfig: msm: Enable USB video class support on msm-4.4 kernel
Enable USB video class for USB camera support on
msm8996-auto devices

Change-Id: I2a385cf4c935d5bc2a4c1171f185baf30322ed1d
Signed-off-by: vpalvai <vpalvai@codeaurora.org>
2017-10-25 10:01:06 -07:00
Linux Build Service Account
f0ae27b1af Merge "ath10k: increase the allowed num of tx pending pkts" 2017-10-25 07:26:51 -07:00
Linux Build Service Account
2a42942814 Merge "leds: qpnp-wled: Improve auto calibration algorithm" 2017-10-25 07:26:50 -07:00
Linux Build Service Account
77383f7a13 Merge "regulator: qpnp-labibb: Allow 0 ms for IBB PWRUP_DLY1 and PWRDN_DLY2" 2017-10-25 07:26:48 -07:00
Linux Build Service Account
06c1491488 Merge "regulator: qpnp-labibb: Fix LAB PS_CTL configuration for pmi8998" 2017-10-25 07:26:47 -07:00
Linux Build Service Account
d9ec6c6960 Merge "ARM: dts: msm: enable camera on SDM636 CDP" 2017-10-25 07:26:46 -07:00
Tirupathi Reddy
473edcfeb6 ARM: dts: msm: modify interrupt flag for wled device on PMI8994
The wled driver is not statically handling interrupt flags.
Pass proper flag such as IRQ_TYPE_EDGE_RISING for wled
"sc-irq" interrupt through device node.

Change-Id: I90974bd7995949a97bb7070e86c469cde646096a
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-10-25 14:08:33 +05:30
Alex Yakavenka
f5ada1fa7a security: Extend SELinux to support CAN sockets
CAN socket SELinux support is required to be able
to distinguish between generic socket and can_socket

Change-Id: I9ec2099fc4c08ab6406e33ff9ad821ef18261763
Signed-off-by: Alex Yakavenka <ayakav@codeaurora.org>
2017-10-24 22:08:44 -07:00
Linux Build Service Account
59099c712f Merge "leds: qpnp-wled: Fix parameters passed to of_get_address_byname()" 2017-10-24 20:02:57 -07:00
Linux Build Service Account
9765263bbe Merge "soc: qcom: ipc_router_glink_xprt: Change wake source name" 2017-10-24 20:02:56 -07:00
Linux Build Service Account
25d590e3f8 Merge "net: restore upstream changes which break routing in tunnel scenarios" 2017-10-24 20:02:53 -07:00
Linux Build Service Account
b3ede85de2 Merge "ARM: dts: msm: add support for QBT1000 on SDM630" 2017-10-24 20:02:52 -07:00
Linux Build Service Account
13b2fc0bc3 Merge "drm: msm: fix list corruption problem" 2017-10-24 20:02:51 -07:00
Linux Build Service Account
4021b93ec3 Merge "msm: vidc: Fix the type of frame size" 2017-10-24 20:02:50 -07:00
Linux Build Service Account
458c7d15b5 Merge "ARM: dts: msm: Use system time timestamp for PPS on msm8996 CV2X" 2017-10-24 20:02:48 -07:00
Linux Build Service Account
682b7f4ae8 Merge "pps-gpio: Add new property to use system time timestamp for PPS GPIO" 2017-10-24 20:02:47 -07:00
Linux Build Service Account
0fd0ad8913 Merge "defconfig: msm: Disable USELIB and INET_LRO" 2017-10-24 20:02:46 -07:00
Linux Build Service Account
b895f07a61 Merge "scsi: ufs: Fix stack overflow read in ufs debugfs driver" 2017-10-24 20:02:45 -07:00
Abhinav Kumar
a005a1e954 drm/msm: reset sink hdr capabilities during bridge disable
Reset the HDR capabilities during the bridge disable.
The capabilities are re-programmed the next time
the userspace issues the call to populate the modes.

Change-Id: I04dbaa99c291de13b81e12cb9742cc97d9b02593
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-10-24 18:45:29 -07:00
Subbaraman Narayanamurthy
1b9a30ef0e regulator: qpnp-labibb: Allow 0 ms for IBB PWRUP_DLY1 and PWRDN_DLY2
Currently, IBB PWRUP_DLY1 and PWRDN_DLY2 settings are configured
only for values greater than 0. However, 0 ms (no delay) can be
allowed by disabling EN_PWRUP_DLY1 or EN_PWRDN_DLY2 bits. Add
support to allow this configuration.

CRs-Fixed: 2125062
Change-Id: I8ef3b5522b8d4db6befb3fb1c2e58ea24c0f5ea0
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-24 17:37:50 -07:00
Subbaraman Narayanamurthy
ce1d2a8266 regulator: qpnp-labibb: Fix LAB PS_CTL configuration for pmi8998
PMI8998 LAB pulse skip configuration is different from PMI8996
and earlier PMICs. Fix it by using the right configuration API
to configure LAB PS_CTL along with supporting PM660A properly.
Since the existing LAB PS configuration threshold for pmi8998 is
incorrect in device tree, update it along with this change.

Change-Id: I2686733867ec3e2909d0c071a5881d3d824c713e
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-24 17:35:58 -07:00
Subbaraman Narayanamurthy
49043e1584 leds: qpnp-wled: Fix configuration for AMOLED mode
Some registers are configured incorrectly for AMOLED mode in WLED
peripheral. Fix them based on the hardware documentation.

Change-Id: If021423653b94f1bcc97cdb50b7067af24bcef61
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-24 16:41:45 -07:00
Subbaraman Narayanamurthy
703b54ebc4 leds: qpnp-wled: Disable module permanently when OVP fault persists
Currently, auto calibration will be invoked if an OVP fault is
triggered because of an incorrect sink configuration. However,
there are certain hardware platforms where the display panel is
not used. It is hard to differentiate such platforms as they
will be using the same device tree configuration or parameters
related to display panel passed through the bootloader.

Disable the module permanently and also keep the OVP fault
interrupt disabled when a valid sink configuration is not found
by auto calibration.

Change-Id: I302322020e8d6d4f92901dac468602c357967e18
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-24 16:40:22 -07:00
Subbaraman Narayanamurthy
f24199bb12 leds: qpnp-wled: Configure WLED1_CTRL_SWITCHING_FREQUENCY selectively
As per the hardware documentation, WLED1_CTRL_SWITCHING_FREQUENCY
register is in logic_rb instead of in periph_rb. With overwrite
bit (bit 7) set, this can change the switching frequency from
1.6 MHz to 800 KHz for AMOLED whenever the module is disabled and
enabled. Fix this by not setting the overwrite bit for AMOLED
panel so that the frequency can be selected internally by the
hardware based on EN_AMOLED configuration.

Change-Id: I1594af40b53f762fa97884c019ad70f24ea78257
CRs-Fixed: 2106094
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-24 16:38:52 -07:00
Subbaraman Narayanamurthy
7d1d130a1b leds: qpnp-wled: Improve auto calibration algorithm
If CABC is enabled and auto calibration is attempted, then OVP
fault can be seen even with a valid sink configuration and a
brightness level greater than or equal to 0.4 % dimming. This is
because of the modulation done through CABC pin which if low
enough can cause the brightness level to still go further down.

Fix this by disabling CABC on all sinks before running auto
calibration and re-enable it if the feature is enabled. Also,
modify the auto calibration brightness level to 200 so that the
load increase on WLED_VOUT can bring the voltage below OVP
threshold quick enough on a valid sink configuration.

Finally, disable WLED module before switching the sink
configuration and enable it after configuring sinks.

CRs-Fixed: 2125217
Change-Id: I570dc9eba540cd96328afd7c68f4643a112c4962
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-24 16:36:59 -07:00
Subbaraman Narayanamurthy
df035333ce leds: qpnp-wled: Fix parameters passed to of_get_address_byname()
Pass NULL pointer to of_get_address_byname() for size and flags
parameters instead of an integer value 0.

Change-Id: I53984141bb8f1164c27b6a9a5d90853b4d077ee1
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-24 16:35:46 -07:00