summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-16Merge android-msm-barbet-4.19-sc-v2 into android-msm-barbet-4.19-sc-qpr3android-s-qpr3-beta-3_r0.4android-s-qpr3-beta-2_r0.4android-s-qpr3-beta-1_r0.4android-12.1.0_r0.34android-12.1.0_r0.27android-msm-barbet-4.19-s-qpr3-beta-3android-msm-barbet-4.19-s-qpr3-beta-2android-msm-barbet-4.19-android12-qpr3PixelBot AutoMerger
SBMerger: 410055097 Change-Id: I6652548d397f3ece7171c9818b74a787f8d7adf1 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-01-16Merge android-msm-barbet-4.19-sc-qpr1 into android-msm-barbet-4.19-sc-v2android-12.1.0_r0.21android-12.1.0_r0.15android-msm-barbet-4.19-android12LPixelBot AutoMerger
SBMerger: 410055097 Change-Id: I5391cae04af7410dcc81eacfe0af07db013db78e Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2021-11-24Merge branch 'android-msm-barbet-4.19-sc-security' into ↵android-12.0.0_r0.41android-12.0.0_r0.35android-msm-barbet-4.19-android12-qpr1Eva Huang
android-msm-barbet-4.19-sc-qpr1 Jan 2022.1 Bug: 204278602 Change-Id: If0896ff2c81f88271be9ac79679b62e13fac3fd9
2021-11-24Asoc: check for invalid voice session idBubble Fang
Add check to return if session id is invalid. From 28a5f166422bf0b8b91dc348d02e62212ee0b261 Mon Sep 17 00:00:00 2001 From: Lakshman Chaluvaraju <lchalu@codeaurora.org> Date: Tue, 8 Jun 2021 10:43:20 +0530 Bug: 190503256 Signed-off-by: Bubble Fang <bubblefang@google.com> Change-Id: I2833f375e7c971d2006de3d0c3d0a05ccf535111 (cherry picked from commit 43667cf179dda119cb8e6224fff04511c4c0045d)
2021-06-22Merge android-msm-pixel-4.19 into android-msm-barbet-4.19android-s-v2-beta-3_r0.5android-s-v2-beta-2_r0.5android-s-v2-beta-1_r0.5android-s-beta-5_r0.6android-12.1.0_r0.5android-12.0.0_r0.7android-12.0.0_r0.25android-12.0.0_r0.15android-msm-barbet-4.19-s-v2-beta-3android-msm-barbet-4.19-s-v2-beta-1android-msm-barbet-4.19-s-beta-5android-msm-barbet-4.19-android12-v2-beta-2android-msm-barbet-4.19-android12Lucas Wei
Bug: 187909050 Signed-off-by: Lucas Wei <lucaswei@google.com> Change-Id: I5355253bce3b7c945ea75f94f24d22ec601dacf5
2021-06-22Merge LA.UM.9.12.C10.11.00.00.840.010 via branch ↵android-s-v2-beta-2_r0.4android-s-v2-beta-1_r0.4android-s-beta-5_r0.5android-s-beta-4_r0.5android-12.0.0_r0.6android-12.0.0_r0.24android-12.0.0_r0.14android-msm-redbull-4.19-s-beta-5android-msm-redbull-4.19-s-beta-4android-msm-redbull-4.19-android12-v2-beta-2android-msm-redbull-4.19-android12android-msm-redbull--s-v2-beta-1Lucas Wei
'qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3' into android-msm-pixel-4.19 Conflicts: dsp/q6adm.c dsp/rtac.c include/dsp/q6adm-v2.h Bug: 187909050 Signed-off-by: Lucas Wei <lucaswei@google.com> Change-Id: I9261f1c48a33410da347a0ed29da4b93d4ec0ec9
2021-06-21soc: add check condition before enabling irqJason Hsu
Enable interrupt request only when the interrupt is in disabled state. Bug: 187655844 Signed-off-by: Jason Hsu <jasonchhsu@google.com> Change-Id: I18d32113be7b81d5ea120bd7fd696474efd5229d
2021-06-17asoc: codec: Playback Amp power up/down time optimization.vijeth.po
In-order reduce the power down and hence to improve audio-server restart time following time optimization is done. 1. Add common delay after both Amp is powered down. a. Use 16ms instead of 20ms 2. Remove extra delay added in tas256x_set_power_shutdown() 3. Use usleep_range() instead of msleep for less than 20ms in power up/down related functions. Bug: 171941028 Signed-off-by: vincenttew <vincenttew@google.com> Change-Id: I9d169b73f140c0b6b65d4f035193e3f687624aaa
2021-06-16Merge branch 'android-msm-barbet-4.19-rvc' into android-msm-barbet-4.19Lucas Wei
Change-Id: Ia2fddd6b1983f7a496fdb494397016638e661623 Signed-off-by: Lucas Wei <lucaswei@google.com>
2021-06-07Merge remote-tracking branch 'android-msm-barbet-4.19-rvc-security' into ↵android-11.0.0_r0.116android-11.0.0_r0.106android-msm-barbet-4.19-android11-d2achigoliu
android-msm-barbet-4.19-rvc Aug 2021.1 Bug: 189715888 Bug: 189715042 Change-Id: I3798f624b84783365dddcbeb89dc9cdafc267736
2021-06-07Merge remote-tracking branch 'android-msm-pixel-4.19-rvc-security' into ↵achigoliu
android-msm-barbet-4.19-rvc-security Bug: 189715042 Change-Id: I48ea48ce48b6bcfd40dfb89545a64bcc5443d88c
2021-06-07Merge branch 'android-msm-pixel-4.19-rvc-qpr3' into android-msm-pixel-4.19android-s-beta-3_r0.5android-msm-redbull-4.19-s-beta-3Lucas Wei
Change-Id: I5c2d11ab5e5fd04cb4a6cef1cfe18b2877c99ff6 Signed-off-by: Lucas Wei <lucaswei@google.com>
2021-06-03Merge branch 'android-msm-pixel-4.19-rvc-security' into ↵android-11.0.0_r0.115android-11.0.0_r0.105android-11.0.0_r0.100android-msm-redbull-4.19-android11-qpr3Eva Huang
android-msm-pixel-4.19-rvc-qpr3 Aug 2021.1 Bug: 189715888 Change-Id: Ic5e1225a3932b92943fe5fbaea2d363efd776725
2021-05-03Merge branch android-msm-pixel-4.19 into android-msm-barbet-4.19JohnnLee
Conflicts: asoc/codecs/Kbuild dsp/q6afe.c Bug: 184813985 Change-Id: I1ac7afebff5a637726ed6770cf4e4e3fc0fa59ac
2021-04-21Merge branch 'LA.UM.9.12.R1.11.00.00.597.108' via branch ↵JohnnLee
'qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3' into android-msm-pixel-4.19 Conflicts: asoc/kona.c Bug: 182748782 Change-Id: I3a9dffa6dd350b5a6b240e50c7e94eebb8b31243
2021-04-16audio: sound trigger new PCM for zero-latency recordingandroid-s-beta-2_r0.5android-msm-redbull-4.19-s-beta-2yixuanjiang
Create new PCM to capture hotword buffer for zeroy latency Bug: 184006297 Signed-off-by: yixuanjiang <yixuanjiang@google.com> Change-Id: I3101302d980ebeab69f7040c7dcd17126b582041
2021-04-15audio: sound trigger new PCM for zero-latency recordingyixuanjiang
Create new PCM to capture hotword buffer for zeroy latency Bug: 184006297 Signed-off-by: yixuanjiang <yixuanjiang@google.com> Change-Id: I3101302d980ebeab69f7040c7dcd17126b582041
2021-04-13Merge "ASoC: dsp: Synchronise adm commands"qctecmdr
2021-04-04Merge android-msm-barbet-4.19-rvc into android-msm-barbet-4.19PixelBot AutoMerger
SBMerger: 351186807 Change-Id: If80ee87e5ce4556d86e1cbbba963a35711715b85 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2021-03-26asoc: codecs: fix race condition of core vote and reg accessVangala, Amarnath
Auto suspend timer for core vote is triggering before read write complete. Move the auto suspend of core vote to post read write operation. Change-Id: Ib0f6b026fe0e7fd3fbe052691db492915e436a78 Signed-off-by: Vangala, Amarnath <avangala@codeaurora.org>
2021-03-22ASoC: dsp: Synchronise adm and rtac commandsandroid-s-beta-1_r0.5android-msm-redbull-4.19-s-beta-1android-msm-redbull--s-beta-1Soumya Managoli
Race condition observed while processing the set_pp_params command responses sent back to back by adsp for commands sent from adm and rtac. Handle this by synchronising the get/set pp_params command in both the drivers. QCT CR-2771103 Bug: 181819518 Change-Id: Id89d98217dc5cad3703e5d545ddee21cb145c874 Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
2021-03-22ASoC: dsp: Synchronise adm and rtac commandsandroid-11.0.0_r0.110Soumya Managoli
Race condition observed while processing the set_pp_params command responses sent back to back by adsp for commands sent from adm and rtac. Handle this by synchronising the get/set pp_params command in both the drivers. QCT CR-2771103 Bug: 181819518 Change-Id: Id89d98217dc5cad3703e5d545ddee21cb145c874 Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
2021-03-22ASoC: dsp: Synchronise adm commandsSoumya Managoli
Race condition observed while processing the get/set_pp_params and adm_close command. Synchronise adm open, close and get/set_pp_params by sending the apr cmd pkt using the same lock. Change-Id: I9a1ebcedc91f78f3940846688f8569ec9088e1e7 Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
2021-03-21Merge "dsp: update size check for get VI param function"qctecmdr
2021-03-19Merge branch LA.UM.9.12.R1.11.00.00.597.108 into ↵Wilson Sung
qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3 Change-Id: I0cef4ccfb5e280c4c21009fa9d1ea7f2ad7d2637
2021-03-17dsp: adm: add to check output/input channelShashi Kant Maurya
To avoid out of bound value of output/input channel add the check. Change-Id: I25b7616d6fc08c2d0bb530dfb1457471dc25861c Signed-off-by: Shashi Kant Maurya <smaury@codeaurora.org> Signed-off-by: Lakshman Chaluvaraju <lchalu@codeaurora.org>
2021-03-17dsp: update size check for get VI param functionKunlei Zhang
In afe_get_cal_sp_th_vi_param functions, data size should check with size of cal_type_header. The check is not present which might lead to out of bounds access. Update condition to ensure data_size is greater than or equal to size of cal_type_header. Change-Id: Ib2904f53243f4fb858131511812fd90de32b4656 Signed-off-by: Kunlei Zhang <kunleiz@codeaurora.org>
2021-03-10Merge "asoc: bolero: Add core_vote before gfmux access"qctecmdr
2021-03-10ASoC: dsp: Synchronise adm and rtac commandsSoumya Managoli
Race condition observed while processing the set_pp_params command responses sent back to back by adsp for commands sent from adm and rtac. Handle this by synchronising the get/set pp_params command in both the drivers. QCT CR-2771103 Bug: 181819518 Change-Id: Id89d98217dc5cad3703e5d545ddee21cb145c874 Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
2021-03-08asoc: codecs: add child devices after completing initializationVangala, Amarnath
In bolero-cdc and tx, va, wsa and rx macros, move schedule_work call to add the child devices to the point later to where the parent initialization gets completed. Change-Id: Iaa07329a25020dde21d9249c3848bb7fcf7d816a Signed-off-by: Vangala, Amarnath <avangala@codeaurora.org>
2021-03-08asoc: bolero: Add core_vote before gfmux accessLaxminath Kasam
GFMUX access happen during RX macro usecase. Update rx macro to do core_vote before clock request. Change-Id: I1afd38ae13066dcfbda307308afce7c4291142d9 Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2021-02-26dsp: add change to enable preemption atJason Hsu
cal_utils_dealloc_cal. Add change to enable preemption at cal_utils_dealloc_cal. Bug: 179039763 Signed-off-by: Jason Hsu <jasonchhsu@google.com> Change-Id: Ib8ec71cf50e30ae9d32e97b22ddbb57acbcba946
2021-02-26dsp: add change to handle use-after-free in cal_utils_is_cal_staleJason Hsu
Add change to address the race condition between pointer dereference and memory deallocation.1 Bug: 179039763 Signed-off-by: Jason Hsu <jasonchhsu@google.com> Change-Id: I8a9adf67abd3d336749ba465e7273ecbd3e62832
2021-02-26asoc: fix voice two way no soundandroid-s-preview-3_r0.5android-msm-redbull-4.19-s-preview-3vincenttew
add voice call TX routing path to fix no backend DAI issue Bug: 178767850 Signed-off-by: vincenttew <vincenttew@google.com> Change-Id: I46da86b2bbc3d7ab51f26ed21b3c077e74414877
2021-02-26Merge LA.UM.9.12.R2.10.00.00.685.039 via branch 'qcom-msm-4.19-7250' into ↵Lucas Wei
android-msm-pixel-4.19 Conflicts: Makefile asoc/kona.c asoc/msm-pcm-routing-v2.c Bug: 172988823 Signed-off-by: lucaswei <lucaswei@google.com> Change-Id: I7f325c91d3f13c62a046dd150bef827a25cb34ad
2021-02-23ASoC: dsp: Synchronise adm and rtac commandsSoumya Managoli
Race condition observed while processing the set_pp_params command responses sent back to back by adsp for commands sent from adm and rtac. Handle this by synchronising the get/set pp_params command in both the drivers. Change-Id: Id89d98217dc5cad3703e5d545ddee21cb145c874 Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
2021-02-21Merge 227a982a2cfae41cc9595f220fd7de234f2253ce on remote branchLinux Build Service Account
Change-Id: I9bef57b6645f4c8a820510a345c0f446539ad939
2021-02-05soc: swr-mstr: Check if fifo available before bulk writeVatsal Bucha
Check for fifo availability before writing slave registers during swrm master bulk write so as to prevent swr overflow, underflow errors. Change-Id: I97a914cac289b3f1215ccf5c1abec88b959a9f21 Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2021-02-01audio: change log level for warning messageandroid-s-preview-2_r0.5android-msm-redbull-4.19-s-preview-2Jason Hsu
kernel_debug_memory built will treate dbg_warn as KP. Bug: 171357371 Test: local built pass Signed-off-by: Jason Hsu <jasonchhsu@google.com> Change-Id: I325606ca18a6d973c8419679648e3e986ddeb090
2021-01-30asoc: Add check to handle negative value passed for num_app_cfg_typeHarshal Ahire
Long int negative value passed as part of ucontrol structure is assigned to int num_app_cfg_type making it positive and leading to overflow while populating maximum supported lsm_app_type_cfg structures. Change-Id: I81e3c75eea82265c8e8e1b3f8f95d9e334c895c4 Signed-off-by: Harshal Ahire <hahire@codeaurora.org>
2021-01-29asoc: Update copy_to_user to requested buffer sizeLaxminath Kasam
Avoid copy to user more than requested buffer size to avoid memory corruption. Change-Id: Ibf1607f777a358ebd16fd8b8728809afda34eba7 Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2021-01-24Merge 27e8e9bf68f7d2cc23f7d42407a213a03e3faaa5 on remote branchLinux Build Service Account
Change-Id: I8101b43f160023c599aa522fb3a106946031d061
2021-01-13Merge branch 'android-msm-pixel-4.19-rvc-qpr2' into android-msm-barbet-4.19Lucas Wei
Merge kernel from build ab/7056683 Bug: 177377122 Signed-off-by: Lucas Wei <lucaswei@google.com> Change-Id: I29071305c8dddd9c69cad52917e92732e19137fa
2021-01-11soc: swr-mstr: Fix headset detect issue during clk stop wakeupVatsal Bucha
When ext clk stop wakeup and slave_pending_irq come together then interrupt at swrslave is cleared due to calling enable_slave_irq. Do not clear interrupts for enable_slave_irq when its called from clk stop wakeup. Change-Id: Ia710030ab80306d6750bea7264f0d4c07053d701 Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2021-01-06audio: reduce log for TAS amp in kernelvincenttew
reduce unnecessary log: 1. change to debug level log for register read/write 2. change adsp module log to debug level Bug: 170955458 Test: build pass, check kernel log Signed-off-by: vincenttew <vincenttew@google.com> Change-Id: I58d5d9c5a4f3f5ce0f7d48cee81428de022cfe3c
2020-12-29Merge 8b699bc1775f1df3eeed557c6aaf5fa2d647d6f6 on remote branchLinux Build Service Account
Change-Id: Ic5e520311db758d8faa930d7f6a2e02ee58e7971
2020-12-13asoc: wsa881x: Fix crash while capturing swr_slv codec dumpShashi Kant Maurya
Swr-slv address is overwritten during wsa881x_swr_probe, hence soundwire getting incorrect slave address. While accessing swr master from swr slave due to incorrect address device crashed To avoid the issue align the debugfs similar to wsa883x codec. Change-Id: Ic8aaa0728a43936cd4c6e1ed590e01ba8f0fbf5b Signed-off-by: Shashi Kant Maurya <smaury@codeaurora.org>
2020-12-13ASoC: wsa883x: Handle PA_ERR interrupt on WSA speakerSudheer Papothi
PA_ERR can happen during speaker path setup. Log the error status in the interrupt handler and clear the error status for next audio playback to resume properly on the speaker. Change-Id: I5800d9505a3036127097745aaa880b73b3e87f30 Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
2020-12-10asoc: wsa881x: Fix crash while capturing swr_slv codec dumpShashi Kant Maurya
Swr-slv address is overwritten during wsa881x_swr_probe, hence soundwire getting incorrect slave address. While accessing swr master from swr slave due to incorrect address device crashed To avoid the issue align the debugfs similar to wsa883x codec. Change-Id: Ic8aaa0728a43936cd4c6e1ed590e01ba8f0fbf5b Signed-off-by: Shashi Kant Maurya <smaury@codeaurora.org>
2020-12-10asoc: codecs: performance improvement for suezvincenttew
not using floting or double division caculation in kernel it may cause performance issue Bug: 175092754 Test: stress GCA with touch sound enable Signed-off-by: vincenttew <vincenttew@google.com> Change-Id: I96a123758954afd4a5723306f09013c1a38314ab