Commit graph

603261 commits

Author SHA1 Message Date
Linux Build Service Account
3a918f6a4e Merge "msm: vidc: do not set video state to DEINIT very early" 2018-11-16 11:07:37 -08:00
Linux Build Service Account
a606521723 Merge "msm: camera: initialize qos_request object" 2018-11-15 22:59:42 -08:00
Linux Build Service Account
45acec4542 Merge "msm: camera: isp: Fix drop frame due to reg update miss" 2018-11-15 22:59:36 -08:00
Linux Build Service Account
c535555586 Merge "msm: camera: isp: Handle frame drop due to delay " 2018-11-15 22:59:23 -08:00
Linux Build Service Account
1ba0161c4d Merge "af_key: unconditionally clone on broadcast" 2018-11-15 22:59:19 -08:00
Linux Build Service Account
f548507177 Merge "diag: Add new F3 mask and update event mask for diag logging" 2018-11-15 22:59:12 -08:00
Linux Build Service Account
337ccc42e2 Merge "arm64: msm: dts: enable sdhci in guest" 2018-11-15 22:59:10 -08:00
Linux Build Service Account
37b1261366 Merge "cnss2: cnss_bus_get_wake_irq should return int" 2018-11-15 22:59:07 -08:00
Linux Build Service Account
3fcf84534d Merge "drm: msm: sde: fix incorrect function pointer check" 2018-11-15 22:59:04 -08:00
Linux Build Service Account
3b3474037b Merge "usb: gadget: Don't override config->MaxPower if specified" 2018-11-15 22:59:03 -08:00
Linux Build Service Account
7ce352665f Merge "ARM: dts: msm: Add support for FHD+ video mode panel on sdm630" 2018-11-15 22:59:01 -08:00
Linux Build Service Account
8fae8eaa4f Merge "ais: cam_soc_api: Moved the Debug statement to the if-condition" 2018-11-15 22:58:59 -08:00
Meera Gande
0742151aca msm: camera: isp: Fix drop frame due to reg update miss
In few scenarios, where the register update ioctl is
missed, the handling of frame drop is not working
in such scenarios as the frame drop pattern is not
set correctly. Once the epoch handling is done,
we need to re-configure the buffer and pattern.

Change-Id: I87b2cecda7e7e1addc68511dad6a80498051f87a
Signed-off-by: Meera Gande <mgande@codeaurora.org>
2018-11-15 00:42:42 -08:00
Meera Gande
39e7df3355 msm: camera: isp: Handle frame drop due to delay
In few scenarios, the request frame may get
delayed and current and request frame id may
become same. To handle such scenarios, made
changes to inform user to delay a frame and
process the request.

Change-Id: I31fa04c386922c48a043c511a163c76316e21987
Signed-off-by: Meera Gande <mgande@codeaurora.org>
2018-11-15 00:32:16 -08:00
Manoj Prabhu B
a4947c78b5 diag: Add new F3 mask and update event mask for diag logging
Update the logging mask for both events and F3 masks to the latest
requests.

Change-Id: I9485f18eca2ee0f78b5086e0332359d997acf57a
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2018-11-14 14:08:03 +05:30
Rajasekaran Kalidoss
e268d7d64c cnss2: cnss_bus_get_wake_irq should return int
For error conditions,this api returns negative value.
currently the return type is unsigned int, this should
be changed to integer type.

Signed-off-by: Rajasekaran Kalidoss <rkalidos@codeaurora.org>
Change-Id: Ifaeea4d76f5d2c2e8f0f67eab97df50dae09462c
2018-11-13 22:53:35 -08:00
Srikanth Uyyala
abfb307324 msm: camera: initialize qos_request object
qos_request object is used between two drivers (msm, camera)
there can be a scenario qos_request being updated before
initialize.
fix: make sure initialize is called before update.

Change-Id: I5e7e1639577f30b671598663d3dd2f8e7f5c3f36
Signed-off-by: Srikanth Uyyala <suyyala@codeaurora.org>
2018-11-13 22:13:37 -08:00
Venkata Rao Kakani
21c6bba4aa arm64: msm: dts: enable sdhci in guest
Enable sdhci2 controller in guest to access sdcard from
guest.

Change-Id: I34f45987e2182616dff2d3a26d0c7d1d61de8822
Signed-off-by: Venkata Rao Kakani <vkakani@codeaurora.org>
2018-11-14 11:39:37 +05:30
Linux Build Service Account
23d37eecf8 Merge "ufs: qcom: set load before setting voltage in regulator" 2018-11-13 06:23:22 -08:00
Linux Build Service Account
c803ca5bd8 Merge "scsi: ufs: set load before setting voltage in regulators" 2018-11-13 06:23:22 -08:00
Linux Build Service Account
a2fad6d13e Merge "staging: android: ion: fix ION_IOC_IMPORT use-after-free" 2018-11-13 06:23:20 -08:00
Linux Build Service Account
04ff5c67d4 Merge "msm: ipa3: send usb-connect from rndis-ipa" 2018-11-12 23:17:08 -08:00
Darshan Kumsi Srinivasa
806f231247 msm: vidc: do not set video state to DEINIT very early
If video state set to DEINIT before processing all frame done
packets in the list may create video failures as explained below,
the client communication to video hardware will fail because of
DEINIT state and client will close the session upon failure which
will happen in parallel to response thread processing the response
packets in the list. It may happen that client already free'd the
buffer references and response thread might access the same buffer
reference and results in use-after-free memory fault. So In case
of sys error from video hardware, set video state to DEINIT after
processing all packets in the list to avoid use-after-free failure

Change-Id: I688c3ec3feb2b5621d75c4da93ee9870aa0e6dfe
Signed-off-by: Darshan Kumsi Srinivasa <darssr@codeaurora.org>
2018-11-12 22:57:38 -08:00
Guchun Chen
d586e3c6a9 drm: msm: sde: fix incorrect function pointer check
Original function pointer check is not correct, so use
the correct one.

Change-Id: I6e87eaef66339442b86e64ba0501eaca04b10d89
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-11-12 21:24:31 -08:00
Asutosh Das
4a64f949b7 ufs: qcom: set load before setting voltage in regulator
This sequence change is required to avoid dips in voltage
during boot-up.

Apparently, this dip is caused because in the original
sequence, the regulators are initialized in lpm mode.
And then when the load is set to high, and more current
is drawn, than is allowed in lpm, the dip is seen.

CRs-fixed: 2279027
Change-Id: Ie6cbc332cbee8227e16636219e375b18c796a12f
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
2018-11-12 20:34:28 -08:00
Asutosh Das
0fb9265a59 scsi: ufs: set load before setting voltage in regulators
This sequence change is required to avoid dips in voltage
during boot-up.

Apparently, this dip is caused because in the original
sequence, the regulators are initialized in lpm mode.
And then when the load is set to high, and more current
is drawn, than is allowed in lpm, the dip is seen.

CRs-fixed: 2279027
Change-Id: Ic531a1e6788d6288071f93d5002613855c2667f5
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
2018-11-12 20:33:47 -08:00
Skylar Chang
d93f79c344 msm: ipa3: send usb-connect from rndis-ipa
To resolve the timing issue between usb-driver
and android framework, made the change on rndis
ipa to send the usb-connect msg when usb-driver
connect the IPA pipes.

Change-Id: I51de37bc7610cb0a94659c64146f10ed322210b2
Acked-by: Pooja Kumari <kumarip@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2018-11-12 13:04:58 +05:30
Srinivasarao P
f2b44c5c18 staging: android: ion: fix ION_IOC_IMPORT use-after-free
The use-after-free issue can also occur with ION_IOC_IMPORT
just like in the commit 2c155709e4
("staging: android: ion: fix ION_IOC_{MAP,SHARE} use-after-free").
This is due to reacquiring client->lock in pass_to_user().

Change-Id: Ib5f3297504763c341b3ce343ef18538ce2c9c7d5
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-11-12 12:12:49 +05:30
puneet
6e5c601011 drivers: iio: imu: enabled regulator for bmi160 sensor
BMI160 will not power on if regulator does not enabled from
probe

Change-Id: I134687a7923416dd87c8753e980337f68f6862c4
Signed-off-by: puneet <puneet@codeaurora.org>
2018-11-11 01:20:47 -08:00
Linux Build Service Account
f1587d8660 Merge "dwc3: gadget: Remove soft reset as part of gadget run_stop" 2018-11-09 16:15:27 -08:00
Sean Tranchetti
c4c5a31862 af_key: unconditionally clone on broadcast
Attempting to avoid cloning the skb when broadcasting by inflating
the refcount with sock_hold/sock_put while under RCU lock is dangerous
and violates RCU principles. It leads to subtle race conditions when
attempting to free the SKB, as we may reference sockets that have
already been freed by the stack.

Unable to handle kernel paging request at virtual address 6b6b6b6b6b6c4b
[006b6b6b6b6b6c4b] address between user and kernel address ranges
Internal error: Oops: 96000004 [#1] PREEMPT SMP
task: fffffff78f65b380 task.stack: ffffff8049a88000
pc : sock_rfree+0x38/0x6c
lr : skb_release_head_state+0x6c/0xcc
Process repro (pid: 7117, stack limit = 0xffffff8049a88000)
Call trace:
	sock_rfree+0x38/0x6c
	skb_release_head_state+0x6c/0xcc
	skb_release_all+0x1c/0x38
	__kfree_skb+0x1c/0x30
	kfree_skb+0xd0/0xf4
	pfkey_broadcast+0x14c/0x18c
	pfkey_sendmsg+0x1d8/0x408
	sock_sendmsg+0x44/0x60
	___sys_sendmsg+0x1d0/0x2a8
	__sys_sendmsg+0x64/0xb4
	SyS_sendmsg+0x34/0x4c
	el0_svc_naked+0x34/0x38
Kernel panic - not syncing: Fatal exception

CRs-Fixed: 2251019
Change-Id: Ib3b01f941a34a7df61fe9445f746b7df33f4656a
Signed-off-by: Sean Tranchetti <stranche@codeaurora.org>
2018-11-09 12:01:45 -08:00
Linux Build Service Account
ac7b931cf8 Merge "msm: kgsl: Correct the state transitions in suspend function" 2018-11-09 06:19:12 -08:00
Linux Build Service Account
06ff6ccf78 Merge "msm: kgsl: Don't halt dispatcher if device is not in SUSPEND state" 2018-11-09 06:19:10 -08:00
Sriharsha Allenki
8aa1802d6a dwc3: gadget: Remove soft reset as part of gadget run_stop
Soft reset of the core before setting the run stop
bit of the core is not suggested.
So, remove the soft reset of the core as part of
the run_stop operation.

Change-Id: Ib87176d8036a27cc7e0a5790b293ee79811e4734
Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
2018-11-09 02:17:13 -08:00
Manu Gautam
de2b9b1330 usb: gadget: Don't override config->MaxPower if specified
For various reasons, user may want to specify lower bMaxPower
using following sysfs attribute for a configuration:
"configs/c.1/MaxPower"

Driver currently ignores that and selects 500mA or 900mA based
on the connection speed. Fix this by no overriding bMaxPower
if config->MaxPower is non-zero.

Change-Id: I10b499b327d5c4e332df2ce435211144637c48d0
Signed-off-by: Manu Gautam <mgautam@codeaurora.org>
2018-11-09 15:02:43 +05:30
Linux Build Service Account
91c4a617f5 Merge "ARM: dts: msm: Enabled dt entry for bmi160 and iam20680" 2018-11-08 20:29:06 -08:00
Linux Build Service Account
70be7025dc Merge "timekeeping: Cap adjustments so they don't exceed the maxadj value" 2018-11-08 20:29:04 -08:00
Linux Build Service Account
b49958c0c6 Merge "defconfig: msm: Enable MSM_TIMER_LEAP for msm8996-auto" 2018-11-08 20:29:04 -08:00
Linux Build Service Account
a7ad7d6251 Merge "soc: qcom: hab: benchmark cross VM schdule latency" 2018-11-08 20:29:02 -08:00
puneet
a2ac9c46d5 ARM: dts: msm: Enabled dt entry for bmi160 and iam20680
GPS QDR feature has dependency on BMI160 and IAM20680
sensor driver which is enabled through GPIO 10 and 11 pins.

Change-Id: Ib9c257fc385233c733c24fa0f7175f739ce75a19
Signed-off-by: puneet <puneet@codeaurora.org>
2018-11-07 22:05:16 -08:00
John Stultz
1b6457b89d timekeeping: Cap adjustments so they don't exceed the maxadj value
Thus its been occasionally noted that users have seen
confusing warnings like:

    Adjusting tsc more than 11% (5941981 vs 7759439)

We try to limit the maximum total adjustment to 11% (10% tick
adjustment + 0.5% frequency adjustment). But this is done by
bounding the requested adjustment values, and the internal
steering that is done by tracking the error from what was
requested and what was applied, does not have any such limits.

This is usually not problematic, but in some cases has a risk
that an adjustment could cause the clocksource mult value to
overflow, so its an indication things are outside of what is
expected.

It ends up most of the reports of this 11% warning are on systems
using chrony, which utilizes the adjtimex() ADJ_TICK interface
(which allows a +-10% adjustment). The original rational for
ADJ_TICK unclear to me but my assumption it was originally added
to allow broken systems to get a big constant correction at boot
(see adjtimex userspace package for an example) which would allow
the system to work w/ ntpd's 0.5% adjustment limit.

Chrony uses ADJ_TICK to make very aggressive short term corrections
(usually right at startup). Which push us close enough to the max
bound that a few late ticks can cause the internal steering to push
past the max adjust value (tripping the warning).

Thus this patch adds some extra logic to enforce the max adjustment
cap in the internal steering.

Note: This has the potential to slow corrections when the ADJ_TICK
value is furthest away from the default value. So it would be good to
get some testing from folks using chrony, to make sure we don't
cause any troubles there.

Change-Id: I31f2966d5134af18e3902cb0f1d9805f204a3e14
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Andy Lutomirski <luto@kernel.org>
Tested-by: Miroslav Lichvar <mlichvar@redhat.com>
Reported-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Git-commit: ec02b076ceab63f99e5b3d80fd223d777266c236
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2018-11-06 22:39:34 -08:00
Linux Build Service Account
e2a4721cfa Merge "ARM: dts: msm: Add pcie-ep device for msm8996" 2018-11-06 22:09:07 -08:00
Linux Build Service Account
cbb5bff2a0 Merge "cnss2: call remove driver_ops in cnss_wlan_unregister" 2018-11-06 22:09:05 -08:00
Linux Build Service Account
3e15f887cf Merge "ARM: dts: msm: Add support for APQ8096A" 2018-11-06 09:07:19 -08:00
Linux Build Service Account
38b693f401 Merge "soc: qcom: glink_smem_native_xprt: init in_ssr before IRQ eanbled." 2018-11-06 02:05:32 -08:00
Linux Build Service Account
8952000791 Merge "soc: qcom: hab: refine hab virtual channel's resource free" 2018-11-06 02:05:30 -08:00
Linux Build Service Account
e8e7047a8a Merge "soc: qcom: socinfo: Add support for APQ8096A" 2018-11-06 02:05:29 -08:00
Linux Build Service Account
0ac5501f23 Merge "ASoC: change mask in snd_soc_get/put_volsw_sx to unsigned int" 2018-11-06 02:05:28 -08:00
Linux Build Service Account
462513774f Merge "pps: DR_SYNC pulse needs to be connected to Linux PPS driver" 2018-11-06 02:05:21 -08:00
Linux Build Service Account
cbdfa9f566 Merge "ARCH: arm: defconfig: BMI160 and IAM20680 sensor enablement" 2018-11-06 02:05:19 -08:00