Commit graph

331 commits

Author SHA1 Message Date
Camera Software Integration
77b739919d Merge "msm: camera: isp: Change data type for error handling" into camera-kernel.lnx.4.0 2020-02-04 15:17:06 -08:00
Camera Software Integration
5f52e784c4 Merge "msm: camera: isp: Update unlink handling to avoid race" into camera-kernel.lnx.4.0 2020-02-04 15:14:58 -08:00
Camera Software Integration
139893ac96 Merge "msm: camera: sensor: Fix an operator error" into camera-kernel.lnx.4.0 2020-02-04 15:09:59 -08:00
Camera Software Integration
7212c1deb0 Merge "msm: camera: custom: Disable overflow recovery" into camera-kernel.lnx.4.0 2020-02-04 15:09:43 -08:00
Camera Software Integration
8d141684b8 Merge "msm: camera: ife: Stop hardware in error" into camera-kernel.lnx.4.0 2020-02-04 15:09:03 -08:00
Camera Software Integration
db3bae58bc Merge "msm: camera: req_mgr: Reduce maximum attempts to apply request" into camera-kernel.lnx.4.0 2020-02-04 15:08:50 -08:00
Camera Software Integration
4690565ab4 Merge "msm: camera: req_mgr: Increase watchdog timeout" into camera-kernel.lnx.4.0 2020-02-04 15:08:32 -08:00
Camera Software Integration
c80a4ac519 Merge "msm: camera: cpas: Add cpas support for camera v170_200 platform" into camera-kernel.lnx.4.0 2020-02-04 15:08:11 -08:00
Camera Software Integration
1598b6d0e8 Merge "msm: camera: icp: Dump patching info in case of page faults" into camera-kernel.lnx.4.0 2020-02-04 15:07:59 -08:00
Camera Software Integration
d96c25f265 Merge "msm: camera: icp: Enable hang dump on failure" into camera-kernel.lnx.4.0 2020-02-04 15:07:49 -08:00
Camera Software Integration
8b7546e512 Merge "msm: camera: custom: Add support for immediate stop" into camera-kernel.lnx.4.0 2020-02-04 15:07:26 -08:00
Camera Software Integration
d9c3665f6b Merge "msm: camera: reqmgr: Reduce delay by one frame during bubble recovery" into camera-kernel.lnx.4.0 2020-02-03 14:10:09 -08:00
Camera Software Integration
bcb623611e Merge "msm: camera: ife: Disable clock gating at top" into camera-kernel.lnx.4.0 2020-02-03 14:09:53 -08:00
Camera Software Integration
2eb43777e9 Merge "msm: camera: icp: Mapping fw error numbers with error names" into camera-kernel.lnx.4.0 2020-02-03 14:09:36 -08:00
Camera Software Integration
01c08edcd4 Merge "msm: camera: icp: Enqueue the abort cmd in workq" into camera-kernel.lnx.4.0 2020-02-03 14:09:20 -08:00
Camera Software Integration
346b97be0d Merge "msm: camera: icp: Increase the wait time for abort ACK" into camera-kernel.lnx.4.0 2020-02-03 14:09:06 -08:00
Camera Software Integration
6218118e61 Merge "msm: camera: reqmgr: reset the slot on buf_done" into camera-kernel.lnx.4.0 2020-02-03 14:08:56 -08:00
Camera Software Integration
56a3afaca6 Merge "msm: camera: csiphy: Update common sequence for csiphy v1.2" into camera-kernel.lnx.4.0 2020-02-03 14:08:33 -08:00
Camera Software Integration
4bc14156bb Merge "msm: camera: req_mgr: Link state check before process trigger workq" into camera-kernel.lnx.4.0 2020-02-03 14:07:52 -08:00
Camera Software Integration
b7d2028ac7 Merge "msm: camera: isp: prioritize RUP over EPOCH in bottom half" into camera-kernel.lnx.4.0 2020-02-03 14:04:40 -08:00
Camera Software Integration
cb3b398b2b Merge "msm: camera: cpas: Reorder sequence of cleanup in cpas probe failure" into camera-kernel.lnx.4.0 2020-02-03 14:03:50 -08:00
Camera Software Integration
6d220294b9 Merge "msm: camera: jpeg: Increase number of jpeg contexts" into camera-kernel.lnx.4.0 2020-02-03 14:03:23 -08:00
Chandan Kumar Jha
e03b67bb2f msm: camera: cpas: Add cpas support for camera v170_200 platform
Add register information. Initial QoS settings info to program
camera static settings for chipsets having camera v170_200.
Also change the logic to get the camera and cpas versions.
Added the map table corresponding to camera and cpas versions.
For any new CPAS version support, just need to add the entries to
the map. This removes the complexity of if-else cases while
fetching the cpas hw information.

CRs-Fixed: 2571273
Change-Id: I7d54b8bc038aa90ecb39f5048e7809ac10c4476f
Signed-off-by: Gaurav Jindal <gjindal@codeeaurora.org>
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-02-02 21:24:40 -08:00
Venkat Chinta
0f1162d099 msm: camera: ife: Stop hardware in error
This change adds logic to stop IFE hardware in case of
hardware errors.

CRs-Fixed: 2590331
Change-Id: I86773cc44ce890cea47f19f0482761e686b0cd00
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-01-30 13:54:38 -08:00
Venkat Chinta
0fb8f447c1 msm: camera: req_mgr: Reduce maximum attempts to apply request
This change reduces the maximum attempts to apply a particular
request from three to two. After two failed attempts to apply
to ISP device, IRQs for ISP device will be overlapped from
two requests. Thereafter apply request at every alternate
frame will fail without a chance of recovery. Therefore we
must notify userspace to trigger recover on the link.

CRs-Fixed: 2606911
Change-Id: I526bb837a496fe1e67786b854c5afb062dddb918
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-01-30 13:52:07 -08:00
Venkat Chinta
5fec859ec6 msm: camera: ife: Disable clock gating at top
Clock gating must be disabled at top level initialize
hardware routine as VFE is reset after resource level
initialize hardware routine.

CRs-Fixed: 2590331
Change-Id: I5c51c402a3a6076f056368493b774daa199228aa
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-01-30 13:50:18 -08:00
Venkat Chinta
f010528566 msm: camera: req_mgr: Increase watchdog timeout
This change increases the watchdog timeout value from one second
to five.

CRs-Fixed: 2606911
Change-Id: I353f78369c31a513dfd94dd1988bc42c2f75b167
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-01-30 13:48:41 -08:00
Depeng Shao
9303d3ae02 msm: camera: sensor: Fix an operator error
- Fix an operator error in cam_sensor_flush_request

CRs-Fixed: 2591694
Change-Id: I39a8b29f83db55d2a930dd5ccd2b765517e2c1d6
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
2020-01-30 13:32:10 -08:00
Vikram Sharma
7d3a0f3abb msm: camera: isp: Update unlink handling to avoid race
Expire timer after destroying workqueues so that we
do not refer to watchdog timer while the link is
getting unlinked from session handle.

CRs-Fixed: 2585098
Change-Id: Ife2450ae66bd52ec704ac7d593b2daaeb20ba54d
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2020-01-30 13:16:02 -08:00
Karthik Anantha Ram
fbfa512811 msm: camera: reqmgr: Reduce delay by one frame during bubble recovery
The EPOCH at which bubble is detected no setting is applied
to any device. This change will trigger applying the bubbled
setting to the device with highest pipeline delay.

CRs-Fixed: 2564669
Change-Id: I180b4a1d2d29267f330546b8860a099baf1688e9
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-01-30 10:53:46 -08:00
Karthik Anantha Ram
118b93f5dd msm: camera: custom: Add support for immediate stop
Add support for immediate stop and reset during flush
for custom HW.

CRs-Fixed: 2585745
Change-Id: I542ac02f8d99c194efa498bc07dffae7879a6c8a
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-01-30 10:53:31 -08:00
Karthik Anantha Ram
287b7b22d7 msm: camera: isp: Change data type for error handling
Use unsigned long to capture the return value of
wait_for_completion APIs as part of CSID path reset.

CRs-Fixed: 2600604
Change-Id: Ic21ddf283180a177b2c2d9e9a33fec4ec68bdd98
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-01-30 10:53:18 -08:00
Karthik Anantha Ram
42e7f5c6d8 msm: camera: custom: Disable overflow recovery
This change disables overflow recovery/detection for
custom CSID. Currently for QCOM CSID we enable overflow
detection and freeze on overflow. But for custom HW the
CSID needs to be free running, custom HW will take care
of handling any backpressure from IFE pipeline/DDR.
There is no need to backpressure to CSID in case of custom
HW.

CRs-Fixed: 2524308
Change-Id: I5de62eea0e87674d7ac24bb5ad2f11ff2a5a6b7c
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-01-30 10:51:57 -08:00
Karthik Anantha Ram
b2e69c4df0 msm: camera: icp: Dump patching info in case of page faults
Currently as part of the page fault handler we only dump the
io_bufs. This change dumps all the patched addresses for
this request as well.

CRs-Fixed: 2579908
Change-Id: If5deec0ad3a8aec82824ef55366084c31a037515
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-01-30 10:49:50 -08:00
Karthik Anantha Ram
080bb2339a msm: camera: icp: Enable hang dump on failure
In case user does not set any dump lvl, KMD will set
to dump on failure as default.

CRs-Fixed: 2579908
Change-Id: I036e91f5daceedf575815e7569c0e90c04f8de52
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-01-30 10:49:11 -08:00
Shravan Nevatia
9fdce6ca87 msm: camera: sensor: Add null check for read buffer
Add proper null checks for function arguments,
including read buffer, before dereferencing them.

CRs-Fixed: 2581538
Change-Id: I8c49bbc419e2ac5579341c7dc789da0ed1c4d123
Signed-off-by: Shravan Nevatia <snevatia@codeaurora.org>
2020-01-30 04:57:29 -08:00
Gaurav Jindal
a29622aedc msm: camera: jpeg: Add mutex lock to protect jpeg list corruption
Due to race conditions, situation can arise where the process_irq
and flush for jpeg are being handled in parallel. This will cause
the jpeg list corruption.
This commit protects the code of adding back to free list
in process_irq with the mutex.

CRs-Fixed: 2578247
Change-Id: I28ee48bc0d5cfcf3ae4a936b2eb2976226ad88d5
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2020-01-30 04:55:55 -08:00
Prakasha Nayak
4f8e2cdeff msm: camera: icp: Mapping fw error numbers with error names
This change will print ICP error names based on error type.

CRs-Fixed: 2456658
Change-Id: I975598a7404f7520912d7b3211b6baa249e7f238
Signed-off-by: Prakasha Nayak <pnayak@codeaurora.org>
2020-01-30 04:07:39 -08:00
Karthik Anantha Ram
5edf8f04dc msm: camera: icp: Enqueue the abort cmd in workq
The request frame cmds are submitted to the FW in workq context.
The abort cmd as part of flush is triggered in user thread context.
This change will enqueue the abort as part of flush to FW in workq,
thereby ensuring that if there are any pending frames they are
submitted prior to the abort cmd.

CRs-Fixed: 2588575
Change-Id: I5034ca500cf39dfa0e553c49917fedb8bd084b0b
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-01-30 04:04:48 -08:00
Karthik Anantha Ram
f7943f0f07 msm: camera: icp: Increase the wait time for abort ACK
This change attempts to retry waiting atleast 1 time for
a duration of 1 second for the abort ACK from FW. Also
adds some debug messages during flush and removes mutex
usage during page fault dump.

CRs-Fixed: 2588575
Change-Id: I2f273baa3d56ab2dc0368d882470360a3702c53c
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-01-30 03:57:33 -08:00
Alok Pandey
5f5a2f2028 msm: camera: cpas: Reorder sequence of cleanup in cpas probe failure
if cpas probe fails during initialization of soc resources
soc data is being accessed after freeing the memory.
This change handling the sequence on failure.

CRs-Fixed: 2585085
Change-Id: Ia89b02bce9cfb6512b33f8e7366a552635317ccd
Signed-off-by: Alok Pandey <akumarpa@codeaurora.org>
2020-01-30 03:50:52 -08:00
Suraj Dongre
2e181b7f9c msm: camera: jpeg: Increase number of jpeg contexts
Fixed out of memory issue in triple camera usecase by increasing
number of logical jpeg contexts.

CRs-Fixed: 2587592
Change-Id: I25c99c0be8d3986bc11fbc2894a0dbf27c645d4e
Signed-off-by: Suraj Dongre <sdongre@codeaurora.org>
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-01-30 03:37:52 -08:00
Tejas Prajapati
96390653c5 msm: camera: reqmgr: reset the slot on buf_done
Reset the slot with the valid request on receiving
the buf_done which is reported on next EPOCH.
In case of back to back irqs slot is marked as skip idx
it will apply the request and try to reset a slot based
on MAX_PD + 1 calculation which might have the request
for which we have got a bubble. To make sure this does not
happen, reset a slot only on the buf_done for valid request.

If STOP ioctl is called from UMD for ISP, it will flush all
the lists. But this is not notified to CRM which might have
a stale entry of the half applied request, so on STOP ioctl
clear all the slots.

In case of SAT mode if one of the link has generated bubble,
while the sync_link has the sync_request slot reset sync_link
will not let the link recover of the bubble. To make sure the
recovery sync_mode is set to 0 for two consecutive slots of
the link.

CRs-Fixed: 2551701
Change-Id: If4b6f8a4a831ffddcef2cae6292d066778c18b04
Signed-off-by: Tejas Prajapati <tpraja@codeaurora.org>
2020-01-30 03:34:07 -08:00
Shravan Nevatia
bf16c8a8e5 msm: camera: csiphy: Update common sequence for csiphy v1.2
Add a high-to-low transition in the CTRL0 register
during the common power-up sequence.

CRs-Fixed: 2580437
Change-Id: I66541d3d787fa2f161e5d8e647fb11c8075a1947
Signed-off-by: Shravan Nevatia <snevatia@codeaurora.org>
2020-01-30 03:32:39 -08:00
Gaurav Jindal
65f749c831 msm: camera: req_mgr: Link state check before process trigger workq
Due to scheduling delays, process trigger workq can be delayed.
In the meantime, link state can be reset to IDLE. This can cause
abnormal behaviour resulting in stability issues. Also, at the
time of apply  fail for flash, failed_dev is not updated.
This causes crash while notifying the error on link.
This commit prevents the execution of workq process trigger if
the link has been reset to IDLE state.
Also, failed_dev is updated if the apply for flash fails.

CRs-Fixed: 2572511
Change-Id: Iaea1e0a7a24afc9e408a1530a5875f6b6c41a45b
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
2020-01-30 03:30:48 -08:00
Vikram Sharma
6b1a0dfc66 msm: camera: isp: prioritize RUP over EPOCH in bottom half
When epoch comes along with RUP we report bubble as per current state
machine. This was because in camif_bottom_half handler we are handling
EPOCH before RUP. This change prioritize RUP over EPOCH  and EOF over
SOF to handle race.

CRs-Fixed: 2567120
Change-Id: I236bcc44b609f8ef7f963f19d33d46a3d95ba0d2
Signed-off-by: Vikram Sharma <vikramsa@codeaurora.org>
2020-01-30 02:49:33 -08:00
Camera Software Integration
b08e2b4099 Merge "msm: camera: sync: Enable driver registration with dtsi match" into camera-kernel.lnx.4.0 2020-01-17 13:21:56 -08:00
Suresh Vankadara
f1f6915ed4 msm: camera: ope: Fix OPE AHB voting issue
Initialize AHB voting variable in OPE acquire
to fix AHB voting issue for OPE.

CRs-Fixed: 2594541
Change-Id: I5bf8c0b1315a351abd80341100bdaf42333c4c24
Signed-off-by: Suresh Vankadara <svankada@codeaurora.org>
2020-01-16 17:45:48 +05:30
Ravikishore Pampana
12548365df msm: camera: common: secure camera fixes
Isp bus port secure mode not coming properly. Added proper
logic to get the bus port secure mode correctly.
Use secure iommu handle to get secure buffer for ope.
Add spin lock for tfe irq handler.
Use proper bw structure to copy the user send blob
data.

CRs-Fixed: 2594541
Change-Id: Icb8ecf869681c370efa084991505036f90a35065
Signed-off-by: Ravikishore Pampana <rpampana@codeaurora.org>
2020-01-16 17:45:47 +05:30
Tony Lijo Jose
832ac63b18 msm: camera: cci: Correct the queue size for cci version 1.2
Correct the queue size for cci version 1.2 as below,

1. Queue 0 size = 64.
2. Queue 1 size = 16.

CRs-Fixed: 2594541
Change-Id: Ifc9407427fe2bf0996c77dc00c5dfe7e5ba22140
Signed-off-by: Tony Lijo Jose <tjose@codeaurora.org>
2020-01-16 17:45:47 +05:30