summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-01-08Revert "asoc: added panic in afe_send_packet for error EBUSY"android-s-preview-3_r0.4android-s-preview-3_r0.3android-s-preview-2_r0.4android-s-preview-2_r0.3android-s-beta-2_r0.4android-s-beta-2_r0.3android-s-beta-1_r0.4android-s-beta-1_r0.3android-msm-sunfish-4.14-s-preview-3android-msm-sunfish-4.14-s-preview-2android-msm-sunfish-4.14-s-beta-2android-msm-sunfish-4.14-s-beta-1android-msm-coral-4.14-s-preview-3android-msm-coral-4.14-s-preview-2android-msm-coral-4.14-s-beta-2android-msm-coral-4.14-s-beta-1JJ Lee
This reverts commit 861f2812e0259737f7abadaa247f0e9719e03c5b. Bug: 168847556 Change-Id: I115d2480137a673c71939c6538f95b05cc98bf84
2020-12-11Merge android-msm-pixel-4.14-rvc-qpr2 into android-msm-pixel-4.14android-s-preview-1_r0.4android-s-preview-1_r0.3android-msm-sunfish-4.14-s-preview-1android-msm-coral-4.14-s-preview-1PixelBot AutoMerger
SBMerger: 325904710 Change-Id: Ibd397d51eeefa5d072d9a364a5a2f41606992239 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2020-12-11Merge android-msm-pixel-4.14-rvc-qpr1 into android-msm-pixel-4.14-rvc-qpr2android-11.0.0_r0.94android-11.0.0_r0.85android-11.0.0_r0.80android-11.0.0_r0.75android-11.0.0_r0.64android-msm-sunfish-4.14-android11-qpr2PixelBot AutoMerger
SBMerger: 325904710 Change-Id: Ifc93f9804bca21e44fea806997619987afa1effa Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2020-12-02ASoC: msm-routing: Add lock in lsm_app_type_cfg_control callbacksandroid-11.0.0_r0.55android-msm-sunfish-4.14-android11-qpr1Sivasri Kumar Vanka
Add routing_lock mutex to protect global variables in _get() & _put() callback of Listen App Type Config mixer control. Bug: 172348954 Change-Id: Id17ee80fce83bdbc6a7371de2aaf3c92fe587caa Signed-off-by: Sivasri Kumar Vanka <sivasri@codeaurora.org> (cherry picked from commit d77f8a2decc4626cd0b9e21c0ffe9802954a6b9e)
2020-11-20ASoC: wcd-mbhc: Remove max impedance limit for lineout detectionVatsal Bucha
Max limit of 60k ohms was set for cable to be detected as lineout to fix headset detected as lineout issue on legacy targets. This was because of large impedance detected for headset. This is not applicable for adc based targets as headset is detected based on mic adc voltage. Remove max impedance limit for lineout detection. Bug: 171289750 Change-Id: If73bbe2cd78d04d1fcb359a3e5ed5cd69f3ab9f0 Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org> Signed-off-by: vincenttew <vincenttew@google.com>
2020-09-18asoc: added panic in afe_send_packet for error EBUSYJJ Lee
We observed that ADSP keeps returning EBUSY for all APR requests. Yet ADSP does not look busy when checking the existing ramdump. Adding panic in afe_send_packet to get the ramdump as soon as EBUSY is first returned. Bug: 163101967 Change-Id: I33b85a4e91e6a45e55e88f165471d7727d229feb Signed-off-by: JJ Lee <leejj@google.com>
2020-09-17dsp: trigger ADSP SSR for asm open write timeoutJJ Lee
ADSP timed out in __q6asm_open_write() and returned ADSP_EALREADY for all the following open write. Added the ADSP SSR to recover and to collect ADSP ramdump for further analysis. Bug: 167581124 Test: basic audio functions Change-Id: Icafe17257a13f7e725de2dc58aa633d02e01a221
2020-06-16Merge android-msm-sunfish-4.14 into android-msm-pixel-4.14Wilson Sung
Bug: 149536833 Change-Id: I763bb18a965b17141ff9bd2e1099f18a88d402d4 Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-06-16Merge android-msm-floral-4.14 into android-msm-pixel-4.14Wilson Sung
Bug: 149536833 Change-Id: I106366dcc7a77197807409318eb55402104679dc Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-06-11asoc: add SEC_TDM_RX to SLIM_7_TX for HFPandroid-r-beta-3_r0.6android-11.0.0_r0.5android-11.0.0_r0.45android-11.0.0_r0.31android-11.0.0_r0.25android-11.0.0_r0.14android-msm-sunfish-4.14-r-beta-3android-msm-sunfish-4.14-android11Jasmine Cha
Bug: 151908253 Test: HFP BTSCO Signed-off-by: Jasmine Cha <chajasmine@google.com> Change-Id: I1c40bffba4c755cf99a0bde77489636384e416e1
2020-05-30asoc: add new path for in call recordingZhou Song
Add path for routing in call uplink and downlink to MultiMedia9. Bug: 153327094 Change-Id: Id43519ca3cd31aafc0f88a1c2428b3ddc7cc1f93 Signed-off-by: Zhou Song <zhous@codeaurora.org>
2020-05-26Merge branch 'LA.UM.9.1.R1.10.00.00.604.038' via branch 'qcom-msm-4.14' into ↵Wilson Sung
android-msm-pixel-4.14 Conflicts: Makefile Signed-off-by: Wilson Sung <wilsonsung@google.com> Change-Id: I1ebec53e8d290e02e11f2dd9d7e1eecfe7f242b5
2020-05-20dsp: fix set_adm_pp_params command timeoutRobert Lee
Because Waves effect use send_adm_apr() in rtac.c to set adm pp params when starting or seeking music, but there is sync issue with set_adm_pp_params() in q6adm.c. Patch is provided from case#04514971. It adds new api adm_apr_send_pkt() which is used to send adm set pp params command in q6adm.c and rtac.c, and it also add mutex this_adm.adm_apr_lock to protect it to make sure sending next adm pp params command after previous response is received. Original problem: q6adm send pp param(thread1) -> rtac send adm pp param(thread2) -> adm_callback send response to rtac but this one should send to q6adm -> adm_callback send response to q6adm but this one should send to rtac After applying the patch: q6adm send pp param(thread1) -> rtac send adm pp param(thread2 blocked) -> adm_callback to q6adm -> rtac send adm pp param -> adm_callback to rtac Bug: 147327901 Test: verified seeking with visualizer enabled Change-Id: I6c1a46b5b9bde8a45680b517239ee70cc929def8 Signed-off-by: Robert Lee <lerobert@google.com> (cherry picked from commit 5763f0a1b2fa2ae2a2102e8bda94c985e90d9dc7)
2020-05-19Merge branch 'LA.UM.9.1.R1.10.00.00.604.038' via branch 'qcom-msm-4.14' into ↵android-r-beta-3_r0.4android-r-beta-2_r0.4android-11.0.0_r0.93android-11.0.0_r0.84android-11.0.0_r0.79android-11.0.0_r0.74android-11.0.0_r0.62android-11.0.0_r0.54android-11.0.0_r0.44android-11.0.0_r0.4android-11.0.0_r0.30android-11.0.0_r0.24android-11.0.0_r0.12android-msm-coral-4.14-r-beta-3android-msm-coral-4.14-r-beta-2android-msm-coral-4.14-android11-qpr2android-msm-coral-4.14-android11-qpr1android-msm-coral-4.14-android11Wilson Sung
android-msm-floral-4.14 Bug: 155859424 Change-Id: Ie0b4844432f2dfa3d8f310ca1eca8c8a5d3e2f7f Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-05-19dsp: fix set_adm_pp_params command timeoutandroid-r-beta-1_r0.4android-msm-coral-4.14-r-beta-1Robert Lee
Because Waves effect use send_adm_apr() in rtac.c to set adm pp params when starting or seeking music, but there is sync issue with set_adm_pp_params() in q6adm.c. Patch is provided from case#04514971. It adds new api adm_apr_send_pkt() which is used to send adm set pp params command in q6adm.c and rtac.c, and it also add mutex this_adm.adm_apr_lock to protect it to make sure sending next adm pp params command after previous response is received. Original problem: q6adm send pp param(thread1) -> rtac send adm pp param(thread2) -> adm_callback send response to rtac but this one should send to q6adm -> adm_callback send response to q6adm but this one should send to rtac After applying the patch: q6adm send pp param(thread1) -> rtac send adm pp param(thread2 blocked) -> adm_callback to q6adm -> rtac send adm pp param -> adm_callback to rtac Bug: 147327901 Test: verified seeking with visualizer enabled Change-Id: I6c1a46b5b9bde8a45680b517239ee70cc929def8 Signed-off-by: Robert Lee <lerobert@google.com>
2020-05-12asoc: add new path for in call recordingZhou Song
Add path for routing in call uplink and downlink to MultiMedia9. Bug: 153327094 Change-Id: Id43519ca3cd31aafc0f88a1c2428b3ddc7cc1f93 Signed-off-by: Zhou Song <zhous@codeaurora.org>
2020-05-12asoc: sm8150: add proxy ports for call screening in machine driverSujin Panicker
add machine driver changes for proxy port changes. Bug: 140384450 Change-Id: I04146717ee68f7c2dac719d5e4b2bbefea1797b8 Signed-off-by: Sujin Panicker <spanic@codeaurora.org>
2020-05-12asoc: add code change for pseudo playback and capture BE DAIs.Sujin Panicker
Pseudo AFE port based BE DAIs can be used for various use cases, including but not limited to voice call. Add support for BE DAI link based on pseudo port. Bug: 140384450 Change-Id: I00384de1104399853743e709f53f969842ef69a1 Signed-off-by: Sujin Panicker <spanic@codeaurora.org>
2020-04-21Merge branch 'LA.UM.9.1.R1.10.00.00.604.035' via branch 'qcom-msm-4.14' into ↵Wilson Sung
android-msm-floral-4.14 Conflicts: Makefile Bug: 152368391 Change-Id: I88f078ea5a50e1c0641c2b01daf8b1850f253860 Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-04-14asoc: add TERT_TDM_RX to SLIM_7_TX for HFPJasmine Cha
Bug: 152820847 Test: manual test Signed-off-by: Jasmine Cha <chajasmine@google.com> Change-Id: I2284a92b4d6f859ca4ca03c53b0adc1ef9ae7909
2020-04-10asoc: add TERT_TDM_RX to SLIM_7_TX for HFPJasmine Cha
Bug: 152820847 Test: manual test Signed-off-by: Jasmine Cha <chajasmine@google.com> Change-Id: I2284a92b4d6f859ca4ca03c53b0adc1ef9ae7909
2020-04-08Merge 4213bccd992c2911dbcd1470599e99be15df29da on remote branchLinux Build Service Account
Change-Id: If633b1ef35eedd2065868e09fc6557fd3446c173
2020-03-24Merge "audio-kernel: Synchronize hw vote and unvote requests"qctecmdr
2020-03-24Merge "asoc: sm8150: add proxy ports for call screening in machine driver"qctecmdr
2020-03-24Merge android-msm-sunfish-4.14 into android-msm-pixel-4.14Wilson Sung
Bug: 149536833 Signed-off-by: Wilson Sung <wilsonsung@google.com> Change-Id: I2b1ea89dc513fd1e7a898f8203a18f1e6d9496a5
2020-03-24Merge android-msm-floral-4.14 into android-msm-pixel-4.14Wilson Sung
Bug: 149536833 Change-Id: I08a58cb15fed67b2a41d51fdee7f3b20ed541dd4 Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-03-20Merge android-msm-floral-4.14-qt-qpr3 into android-msm-floral-4.14android-r-preview-4_r0.7android-msm-coral-4.14-r-preview-4SecurityBot AutoMerger
SBMerger: 284775313 Change-Id: I431c28b10a50298bda4dd48dcd2fa9c6c5d967fa Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2020-03-20audio-kernel: Synchronize hw vote and unvote requestsAditya Bavanari
HW vote and unvote is currently called from multiple clients leading to synchronization issues during SSR/PDR scenarios. Synchronize all the requests by using a vote resource manager. Change-Id: I7e63f69ab5d761a3bb4c7ce70bbef2e8bfd76cfb Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2020-03-20asoc: sm8150: add proxy ports for call screening in machine driverSujin Panicker
add machine driver changes for proxy port changes. Change-Id: I04146717ee68f7c2dac719d5e4b2bbefea1797b8 Signed-off-by: Sujin Panicker <spanic@codeaurora.org>
2020-03-19Merge b51434354d9c6d47fd5cfa04eb71353cbd9aac0b on remote branchLinux Build Service Account
Change-Id: Iee7de7e9ab5fa01478b68a82bb2d77b22e3f21dc
2020-03-19asoc: add SEC_TDM_RX to SLIM_7_TX for HFPJasmine Cha
Bug: 151908253 Test: HFP BTSCO Signed-off-by: Jasmine Cha <chajasmine@google.com> Change-Id: I1c40bffba4c755cf99a0bde77489636384e416e1
2020-03-18asoc: add code change for pseudo playback and capture BE DAIs.Sujin Panicker
Pseudo AFE port based BE DAIs can be used for various use cases, including but not limited to voice call. Add support for BE DAI link based on pseudo port. Change-Id: I00384de1104399853743e709f53f969842ef69a1 Signed-off-by: Sujin Panicker <spanic@codeaurora.org>
2020-03-13dsp: avtimer: validate payload size before memory copyandroid-10.0.0_r0.81android-10.0.0_r0.74android-10.0.0_r0.67android-msm-coral-4.14-android10-qpr3android-msm-coral-4.14-android10Ajit Pandey
Check payload size to avoid out-of-boundary memory access before attemptimg memory read. Bug: 145550580 Change-Id: I94723b526449aacfe7b2fe30990fb77cdd15c5da Signed-off-by: Ajit Pandey <ajitp@codeaurora.org>
2020-03-13Merge "asoc: codecs: Support for TX HPF cut off frequency snd ctrl"qctecmdr
2020-03-13Merge "audio-kernel: Pull in latest code changes from 4.0 branch"qctecmdr
2020-03-11Merge c3e6450573ff9503c76dce9e6272c12ab63a21f6 on remote branchLinux Build Service Account
Change-Id: I52fd526ccb002fa369c1d9a6374042c5a1622ec3
2020-03-11dsp: lsm: adjust mutex_lock to avoid deadlockMeng Wang
When dispatch_event in apr and q6lsm_client_free in q6lsm are running concurrently, there may be deadlock between session_lock in lsm and svc->m_lock in apr. Adjust session_lock in q6lsm_client_free to avoid deadlock. Change-Id: I26eb788d4c17af78272dd1f717717e865dfbd0ac Signed-off-by: Meng Wang <mengw@codeaurora.org>
2020-03-10asoc: codecs: Support for TX HPF cut off frequency snd ctrlShalini Manjunatha
Adding changes for Bolero codec snd controls structure to support TX HPF cut off frequency setting Change-Id: Ia601d7b4bc6d80ff584b5bf6df47663080b2aa6f Signed-off-by: Shalini Manjunatha <shalma@codeaurora.org>
2020-03-09audio-kernel: Pull in latest code changes from 4.0 branchFaiz Nabi Kuchay
Pull in latest code changes from 4.0 branch into 3.0 for atoll target. Change-Id: Icca21f9a4e5b2619b4a606fff1a241b2c4241027 Signed-off-by: Faiz Nabi Kuchay <fkuchay@codeaurora.org>
2020-03-03asoc: support SEC_TDM_RX as echo referenceandroid-10.0.0_r0.87android-10.0.0_r0.85android-10.0.0_r0.83android-msm-sunfish-4.14-android10-d4Jasmine Cha
Port of speaker TX would not be enabled in handset mode, so echo reference should be assigned from speaker RX. Bug: 149605543 Test: Phone/Hangout/Skype on handset/handsfree mode Signed-off-by: Jasmine Cha <chajasmine@google.com> Change-Id: I565cf3152fc7b1137ca4ef75fcba625ada2b9be0
2020-02-28Merge "asoc: msm-pcm: Fix deadlock with error case in latency_ctl_get()"qctecmdr
2020-02-28Merge "ASoC: sm8150 fix for i2s"qctecmdr
2020-02-25Merge "audio-kernel: changes in domain number check"qctecmdr
2020-02-25asoc: increase insert debounce timevincenttew
increase headset insertion debounce time from 96ms to 384ms. Bug: 149818985 Change-Id: I5dc8391a81c039461ad8213f072c3e00662853e5 Signed-off-by: vincenttew <vincenttew@google.com>
2020-02-24ASoC: sm8150 fix for i2sAsish Bhattacharya
Changes in audio-kernel to extend support for hanasdx55 target. Change-Id: If575528e763e9dccbb60c4a2054b767582d3701a Signed-off-by: Pallavi Mishra <pallavim@codeaurora.org>
2020-02-23asoc: msm-pcm: Fix deadlock with error case in latency_ctl_get()Ajit Pandey
Mutex lock happened two times without unlock,which created deadlock. Change mutex_lock() to mutex_unlock() to fix it. Change-Id: I3731bdb202a664c3dbaea74f90dbea487350c804 Signed-off-by: Ajit Pandey <ajitp@codeaurora.org>
2020-02-21Merge "ASoC: sdm660: Fix compilation issue of sdm660 drivers"qctecmdr
2020-02-19Merge 08e7e3dc5d26f994004a70e5d2561998ddb9b33a on remote branchLinux Build Service Account
Change-Id: I7f82226de81773729c961bda3f30407646cc5f15
2020-02-19asoc: add SCO_SLIM7_DL_HL to support LDACJasmine Cha
- MIXER_ABR_TX_FEEDBACK_PATH is A2DP_SLIM7_UL_HL Switch - MIXER_ABR_RX_FEEDBACK_PATH is SCO_SLIM7_DL_HL Switch Bug: 149732712 Test: connect bt headset with LDAC/ATPX/SBC encoder and check log during playback Change-Id: Ie6d1f0bc321e6fabd794f5cafc96d05cd5502931 Signed-off-by: Jasmine Cha <chajasmine@google.com>
2020-02-17Merge branch 'LA.UM.9.1.R1.10.00.00.604.021' via branch 'qcom-msm-4.14' into ↵Wilson Sung
android-msm-floral-4.14 Bug: 149660093 Change-Id: I2f7f7fdd0eec6ee8c12163bb600b70fb5aa8179e Signed-off-by: Wilson Sung <wilsonsung@google.com>