Commit graph

530 commits

Author SHA1 Message Date
Jigarkumar Zala
5c24b7d2d6 msm: camera: common: Correct compilation flag for TFE hw
TFE hardware compilation needs to be enable with correct flag.
Correct tfe compilation flag along with necessary base Makefile
change. Also, remove unnecessary makefiles from tfe hw module.

CRs-Fixed: 2675526
Change-Id: Ibd8b8f5acc4f843bf373e14a9c8e3bc41cb58839
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-05-28 18:31:43 -07:00
Camera Software Integration
f458d8e16a Merge "msm: camera: sync: Increase number of fences in sync" into camera-kernel.lnx.4.0 2020-05-26 13:14:29 -07:00
Camera Software Integration
07a53e7a01 Merge "msm: camera: cci: Correct the check and return code" into camera-kernel.lnx.4.0 2020-05-26 13:14:11 -07:00
Camera Software Integration
f947043b90 Merge "msm: camera: reqmgr: Add subdev node at the time of register" into camera-kernel.lnx.4.0 2020-05-26 13:14:02 -07:00
Camera Software Integration
efaf7facfb Merge "msm: camera: sync: Add SYNC_CANCEL support in sync driver" into camera-kernel.lnx.4.0 2020-05-26 13:13:46 -07:00
Camera Software Integration
6990de7ea5 Merge "msm: camera: ife: Change log level" into camera-kernel.lnx.4.0 2020-05-22 13:09:57 -07:00
Camera Software Integration
7cc1ee3b13 Merge "msm: camera: uapi: Support for UAPI_HEADER_TEST config" into camera-kernel.lnx.4.0 2020-05-22 13:09:48 -07:00
Camera Software Integration
c1c4a0651a Merge "msm: camera: cpas: Add mandatory bw option for axi ports clocks" into camera-kernel.lnx.4.0 2020-05-22 13:09:33 -07:00
Camera Software Integration
46c7b6bf79 Merge "msm: camera: util: Correct the return code" into camera-kernel.lnx.4.0 2020-05-22 13:09:22 -07:00
Karthik Jayakumar
c6096c4e35 msm: camera: uapi: Support for UAPI_HEADER_TEST config
Aligns the uapi header types and includes to be in-line with upstream
kernel formatting. The errors are given by enabling the UAPI_HEADER_TEST
config, which is now enabled in GKI builds.

CRs-Fixed: 2679250
Change-Id: I195fb2aab9251043fc63d79dd31f2db53b1228f5
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2020-05-21 21:35:50 -07:00
Mukund Madhusudan Atre
f54a60cc9e msm: camera: reqmgr: Add subdev node at the time of register
Some driver probes do not have a real dependency on other
driver probes. Still, they are blocked from creating subdev
nodes if that driver's probe comes after all nodes were created
in master component bind. Add subdev node at the time of subdev
register itself, to lift this requirement.

CRs-Fixed: 2686729
Change-Id: I3505071a79296dd7d5665b13d533a9a022aa1a85
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-05-21 18:52:56 -07:00
Jigarkumar Zala
a1f635192b msm: camera: cci: Correct the check and return code
Update the master status data type, as it expects the negative value
and do the operation accordingly. Also, correct the return code and
update the validation check.

CRs-Fixed: 2686717
Change-Id: I8ecae74de2995a08e532a7f0ef078d48d45a928e
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-05-21 13:35:04 -07:00
Pavan Kumar Chilamkurthi
74410fea6b msm: camera: sync: Add SYNC_CANCEL support in sync driver
Add SYNC_CANCEL definition and signal CANCEL instead of
ERROR in flush cases.

CRs-Fixed: 2673810
Change-Id: I1bd83e382f9b38f5f020a5af3b883083e211e3d2
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2020-05-20 12:48:36 -07:00
Alok Chauhan
0ec65e7c74 msm: camera: cpas: Add mandatory bw option for axi ports clocks
Bw voting is mandatory to enable rt_axi and nrt_axi
clocks. Adding support for the same.

CRs-Fixed: 2585073, 2685467
Change-Id: I236b3940faea3925e668e0e5ddbf61e8e569b2f7
Signed-off-by: Rishabh Jain <risjai@codeaurora.org>
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-05-15 20:30:22 -07:00
Karthik Anantha Ram
26ef750076 msm: camera: isp: Update last reported request ID correctly
The last reported request ID indicates the request ID for which
the shutter was sent last. Only update this field for requests
that have not bubbled in a given IFE ctx.

CRs-Fixed: 2680502
Change-Id: I9ee4b479fe95800efa40ea1ff8d840fc79ef6528
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-05-15 12:50:29 -07:00
Jigarkumar Zala
0bede4b524 msm: camera: util: Correct the return code
For secure mode, csiphy driver ask for secure stream. Currently
this call always return success. This change return the appropriate
result of failure/success.

CRs-Fixed: 2673418
Change-Id: Ib425ad77e6481888acefdaf843256602aa759cf3
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-05-12 17:30:41 -07:00
Mukund Madhusudan Atre
bfdaaba4eb msm: camera: sync: Increase number of fences in sync
Some mfhdr usecases require more than 1024 fences because of
delayed request processing and bypass. Increase maximum number
of fences or sync objects to 2048.

CRs-Fixed: 2598592
Change-Id: If11fa2986fce0cd97c14370d29a117230134d6f5
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-05-11 14:26:17 -07:00
Camera Software Integration
beb3ea37bb Merge "msm: camera: common: Remove extra CAM_INFO logs" into camera-kernel.lnx.4.0 2020-05-07 20:31:15 -07:00
Camera Software Integration
1d8c2c33ae Merge "msm: camera: isp: Fix checking for valid bw vote" into camera-kernel.lnx.4.0 2020-05-07 20:30:59 -07:00
Camera Software Integration
15f0a07e50 Merge "msm: camera: sync: Fix kbuild config checks for synx driver" into camera-kernel.lnx.4.0 2020-05-07 20:30:46 -07:00
Camera Software Integration
da7a91d4f7 Merge "msm: camera: cpas: Fix bw voting units for interconnect" into camera-kernel.lnx.4.0 2020-05-07 20:30:37 -07:00
Camera Software Integration
078fae7918 Merge "msm: camera: sensor: Turn off the flash while flushing" into camera-kernel.lnx.4.0 2020-05-07 20:30:16 -07:00
Camera Software Integration
c056e39f34 Merge "msm: camera: smmu: Add map and unmap monitor" into camera-kernel.lnx.4.0 2020-05-04 14:06:05 -07:00
Camera Software Integration
c072d0eaab Merge "msm: camera: smmu: Use iommu best match algo for camera" into camera-kernel.lnx.4.0 2020-05-04 14:05:57 -07:00
Camera Software Integration
7b2841a726 Merge "msm: camera: smmu: Add support for non-contiguous mermory region" into camera-kernel.lnx.4.0 2020-05-04 14:05:48 -07:00
Anil Kumar Kanakanti
538accf58e msm: camera: sensor: Turn off the flash while flushing
Turn off the flash while flushing if the flushed request is
flash off and removed flush request ID validation in flush_all
scenario.

CRs-Fixed: 2667472
Change-Id: Iaf123f2f56117d7b7d1ef6d2291b0cde8c232d44
Signed-off-by: Anil Kumar Kanakanti <akanakan@codeaurora.org>
2020-05-04 09:56:10 -07:00
Mukund Madhusudan Atre
7429211dfc msm: camera: isp: Fix checking for valid bw vote
The BW config coming from user space functions based on
usage type as single or dual. Checking the validity of bw
vote based on hw index caused bw updates to be ignored from
isp side. Fix checking for valid bw vote by falling back to
walking through all indices.

CRs-Fixed: 2669422
Change-Id: I5762fb06c8b69ade286d890146e91844fbde5ce7
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-05-04 09:49:34 -07:00
Mukund Madhusudan Atre
bac9cf4a20 msm: camera: cpas: Fix bw voting units for interconnect
In bw voting for ahb and axi, interconnect API requires
bw values in KBps. Add conversion to icc compatible units
before voting to interconnect framework.

CRs-Fixed: 2664087
Change-Id: If64c2bcbd20a3e2ad9f738e18955d5a8256d715c
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-05-04 09:49:29 -07:00
Camera Software Integration
4cccdd446e Merge "msm: camera: csiphy: Fixed CSID overflow errors" into camera-kernel.lnx.4.0 2020-05-01 16:47:13 -07:00
Camera Software Integration
865fed29b3 Merge "msm: camera: isp: Remove request ID in bubble sof notification" into camera-kernel.lnx.4.0 2020-04-30 11:48:00 -07:00
Camera Software Integration
4ca6ec945a Merge "msm: camera: csiphy: Remove unnecessary delay from reset sequence" into camera-kernel.lnx.4.0 2020-04-30 11:47:53 -07:00
Camera Software Integration
9e312575d7 Merge "msm: camera: csiphy: Update bringUp sequence" into camera-kernel.lnx.4.0 2020-04-30 11:47:37 -07:00
Camera Software Integration
a2e62547bd Merge "msm: camera: isp: Fix per req reg dump for Single IFE usecase" into camera-kernel.lnx.4.0 2020-04-30 11:47:18 -07:00
Camera Software Integration
09bbae85ac Merge "msm: camera: smmu: Profile time taken for map, unmap" into camera-kernel.lnx.4.0 2020-04-30 11:47:09 -07:00
Camera Software Integration
aa71c1c0b7 Merge "msm: camera: ife: IFE debug enhancement for overflow debugging" into camera-kernel.lnx.4.0 2020-04-30 11:46:59 -07:00
Karthik Jayakumar
655736ee0b msm: camera: common: Remove extra CAM_INFO logs
Changes extraneous CAM_INFO logs into CAM_DBG logs in order to help
de-clutter serial boot logs.

CRs-Fixed: 2669269
Change-Id: I7589bd64363aa122c46e1193c68bbf49d78a4a9a
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
2020-04-30 09:37:40 -07:00
ANIL KUMAR KANAKANTI
a5c3abfd09 msm: camera: csiphy: Fixed CSID overflow errors
Fix: Updated PHY settings as per latest PHY HPG to
avoid possible CSID overflow errors.

CRs-Fixed: 2567045
Change-Id: I7a508cb8ef31b642b2afbeb1adb1508b1d8ee205
Signed-off-by: ANIL KUMAR KANAKANTI <akanakan@codeaurora.org>
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-04-30 10:30:10 +05:30
Camera Software Integration
1e20d6f687 Merge "msm: camera: isp: Ignore other csid irq errors during csid top reset" into camera-kernel.lnx.4.0 2020-04-29 16:52:22 -07:00
Camera Software Integration
6d5b2a796c Merge "msm: camera: common: Add sysfs support for bw override" into camera-kernel.lnx.4.0 2020-04-29 16:52:03 -07:00
Jigarkumar Zala
49dfccf260 msm: camera: csiphy: Remove unnecessary delay from reset sequence
Lane enable register reset is not required any delay to reflect the
change. This change removes the unnecesaary delay from lane_enable
register. Also, adding 1us of delay between back to back write in
SW reset register along with condition based refelction of delay.

CRs-Fixed: 2671221
Change-Id: I010570045a97fc1489a84d22ebd39df6f6f14f0a
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-04-28 13:22:16 -07:00
Jigarkumar Zala
43e3ea9bf3 msm: camera: csiphy: Update bringUp sequence
Update 2phase and 3phase bring up sequence for different
data rate to reflect latest hpg change.

CRs-Fixed: 2671221
Change-Id: Idd7445a523486a5fb4ec5d43bcf8987c54c089b0
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
2020-04-28 13:20:03 -07:00
Pavan Kumar Chilamkurthi
122039844c msm: camera: smmu: Add map and unmap monitor
Add map and unmap events in monitor array for each
context bank and dump the last set of events whenever
some smmu related issue happens.

CRs-Fixed: 2538876
Change-Id: I18941e9a64ebd6828419e13471938bb32438122c
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2020-04-27 14:00:47 -07:00
Pavan Kumar Chilamkurthi
5b396d1411 msm: camera: smmu: Use iommu best match algo for camera
Use best fit match algo for smmu map instead of first match
algo to avoid fragmentation in smmu virtual space.

CRs-Fixed: 2580128
Change-Id: I434e6e4396bc713e6e12e3da7ae4b78cc2da6a42
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2020-04-27 14:00:37 -07:00
Pavan Kumar Chilamkurthi
efc0528e8a msm: camera: smmu: Add support for non-contiguous mermory region
Add support to discard a memory region inside the full dma map
virtual address space region.

CRs-Fixed: 2580128
Change-Id: I76cc778f2437a01a4efabec836ce92c47d983d61
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2020-04-27 14:00:17 -07:00
Pavan Kumar Chilamkurthi
1b644126dd msm: camera: smmu: Profile time taken for map, unmap
Add debugging capability to profile ion alloc,
smmu map and unmap calls. Enable below debugfs settings
to get the traces with corresponding latencies.
Alloc      : echo 1 > /sys/kernel/debug/camera_memmgr/alloc_profile_enable
Map, Unmap : echo 1 > /sys/kernel/debug/camera_smmu/map_profile_enable
Capture the profiling numbers in traces.

CRs-Fixed: 2538876
Change-Id: I92dc58416a9febc77a7836b8f7b1523b547c128f
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>
2020-04-27 13:23:55 -07:00
Mukund Madhusudan Atre
2e6a2419b4 msm: camera: common: Add sysfs support for bw override
To simulate bus overflow recovery in camera, cpas needs sysfs
to take input from shell and vote the final value as given,
instead of consolidated values from cpas clients. Add initial
support for sysfs to add nodes for all drivers. Add sysfs
based debug node to maintain and update all settings. Add cpas
settings to override final bw voted to camnoc and mnoc ports.

Usage:
adb shell "echo <driver_name>#<setting_name>=<value>
> /sys/devices/platform/soc/soc:qcom,cam-req-mgr/debug_node"

Example:i
adb shell "echo cpas#camnoc_bw=100
> /sys/devices/platform/soc/soc:qcom,cam-req-mgr/debug_node"

Input format for updating settings is strict.

CRs-Fixed: 2646825
Change-Id: I8d6063240f9685474bf4b2899e8dfb3f74cbdb75
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
2020-04-25 19:24:45 -07:00
Chandan Kumar Jha
e990f99276 msm: camera: isp: Ignore other csid irq errors during csid top reset
During global reset, csi rx irq bits are set since sensor/phy was not
reset properly in last closure and sending some data. This can lead
to csid fatal or non-fatal errors.
To avoid this condition, ignore other csid irq errors during csid top
reset and during csid stop sequence.

CRs-Fixed: 2585726
Change-Id: I5e09caf3b374407ece8ff1b871c2cf7e0f1837ac
Signed-off-by: Chandan Kumar Jha <cjha@codeaurora.org>
Signed-off-by: Depeng Shao <depengs@codeaurora.org>
Signed-off-by: Vishalsingh Hajeri <vhajeri@codeaurora.org>
2020-04-24 10:33:04 -07:00
Karthik Anantha Ram
85ac759b1e msm: camera: cpas: Set AHB clock rate only if a client is streamed on
Currently the ahb clock rate is set as part of cpas_start for a
given client. In order to set this rate, any camera gdsc needs to
be enabled. This change adds a check to allow setting the clk rate
only if the gdsc regulator has been enabled to avoid NoC timeouts.

CRs-Fixed: 2671048
Change-Id: I6551c8c648ae298dca97f0e35ba7c9ca83b5a2cd
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
2020-04-24 10:04:43 -07:00
Venkat Chinta
758e751074 msm: camera: isp: Remove request ID in bubble sof notification
This change removes valid request ID from sof notification
when bubble is detected. The sof notification for this request
will be sent after the state machine moves out of bubble applied
state. This is to avoid duplication of timestamps in case of
bubble due to IRQ delays.

CRs-Fixed: 2671273
Change-Id: I5334fab41ae5bce8a42e421747b35f9bfd32aff3
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-04-23 15:45:53 -07:00
Venkat Chinta
df4da1d8dd msm: camera: ife: Change log level
To acquire a CSID path we loop through all available
CSIDs. Therefore the log that indicates that a specific
CSID does not have a path available is not a error by
itself. This commit changes that log level to debug.

CRs-Fixed: 2671273
Change-Id: I52750975a739faa5a4015d20cebb5f7f0442fb58
Signed-off-by: Venkat Chinta <vchinta@codeaurora.org>
2020-04-23 15:44:24 -07:00