summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-07Merge android13-gs-pixel-5.10-24Q2 into android14-gs-pixel-5.15-24Q2 am: ↵android-15-beta-1_r0.8android-15-beta-1_r0.7android-gs-shusky-5.15-android15-dpPixelBot AutoMerger
cd2de84d08 Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/aoc/+/2753745 Change-Id: I04bb67a473cbc40afc90b7cf807b1293af9c1ee5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07Merge android13-gs-pixel-5.10-24Q2 into android14-gs-pixel-5.15-24Q2android-u-qpr3-beta-2.1_r0.8android-gs-shusky-5.15-android14-qpr3-betaPixelBot AutoMerger
SBMerger: 610748217 Change-Id: Iff0a6178689bd6198e910bf6f1017f936f7eb8e7 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2024-03-05aoc: remove mutex print am: e384b612d6Alex Iacobucci
Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/aoc/+/2759073 Change-Id: Ib0fdc35edc5f6bd17e9a00e21647b22a31f6ba77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05aoc: remove mutex printAlex Iacobucci
Bug: 327792895 Test: triggered multiple SSRs on device Change-Id: Ie7bd7c72979920628c4edad0211b3c48496587d5 Signed-off-by: Alex Iacobucci <alexiacobucci@google.com>
2024-03-03Merge android14-gs-pixel-5.15-24Q2 into android14-gs-pixel-5.15PixelBot AutoMerger
SBMerger: 610748217 Change-Id: I6c11f814a56563d50600ba254336d967996dabef Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2024-02-27aoc: improve handling of SSR requestsAlex Iacobucci
Prevents concurrent execution of SSR. Uses trylock and no_sync to avoid b/322826918 Bug: 304888713 Test: triggered many SSRs Signed-off-by: Alex Iacobucci <alexiacobucci@google.com> Change-Id: I501c20ce79a9aaea52f1308218db46e34d8eb462 (cherry picked from commit 4079d32cb9ef977e77eb1d92f6789f5cacdc2dbd)
2024-02-27aoc: add new a state to indicate aoc ssrGuan-Yu Lin
Add a new state to indicate AoC is under SSR. This prevents other drivers access aoc services during AoC SSR. Bug: 298015705 Test: Local AoC SSR multiple times. Change-Id: I615adf38f7ae3f64ee076d11d4b5e59d6cb3d8e9 Signed-off-by: Guan-Yu Lin <guanyulin@google.com> (cherry picked from commit 3b2398053ecdd6f4c74a3d0bdd55decc36063ba8)
2024-02-25Merge android14-gs-pixel-5.15-24Q2 into android14-gs-pixel-5.15PixelBot AutoMerger
SBMerger: 605678113 Change-Id: I372d9d4d932bf9aaba70339db27fca838d1635e1 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2024-02-21aoc: add driver for unit testsAlex Iacobucci
Bug: 324244159 Test: tested on device Change-Id: I639f047fbde33fb23a7a3b978ad6c2f9932d345d Signed-off-by: Alex Iacobucci <alexiacobucci@google.com>
2024-02-11Merge android14-gs-pixel-5.15-24Q2 into android14-gs-pixel-5.15PixelBot AutoMerger
SBMerger: 605678113 Change-Id: I3af677e05c2182365b3480d00531bf9832f701d1 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2024-02-11Merge android14-gs-pixel-5.15-24Q1 into android14-gs-pixel-5.15-24Q2android-15-dp-2_r0.7PixelBot AutoMerger
SBMerger: 605678113 Change-Id: I54399d3210344ac587f697dca084bf5003eb45ab Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2024-02-05Merge android13-gs-pixel-5.10-24Q1 into android14-gs-pixel-5.15-24Q1android-14.0.0_r0.77android-14.0.0_r0.67android-gs-shusky-5.15-android14-qpr2PixelBot AutoMerger
Conflict files: ion_physical_heap.h SBMerger: 603054162 Change-Id: I13b4dd2b4336af7ce7dc7b337b87600ada97feac Signed-off-by: benmcgee <benmcgee@google.com>
2024-01-21Merge android14-gs-pixel-5.15-24Q2 into android14-gs-pixel-5.15PixelBot AutoMerger
SBMerger: 571992243 Change-Id: I8895a0132282b9684b8152b082bdd63cf38479ff Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2024-01-18Increase channel and period bytes max for 5.1chandroid-u-qpr3-beta-2_r0.8Jasmine Cha
- increase period_bytes_max to 11520 - support max channel from 4 to 6 Bug: 295174236 Test: manual test Change-Id: I3c722b077118da38f322846dff6c24275349044f Signed-off-by: Jasmine Cha <chajasmine@google.com>
2024-01-15Merge "Merge android14-gs-pixel-5.15-udc-d2 into ↵android-u-qpr3-beta-1_r0.8android-15-dp-1_r0.8Robin Peng
android14-gs-pixel-5.15-24Q2" into android14-gs-pixel-5.15-24Q2
2024-01-15Merge android14-gs-pixel-5.15-udc-d2 into android14-gs-pixel-5.15-24Q2PixelBot AutoMerger
SBMerger: 571992243 Change-Id: I807c71bdeabfa8679835773c7abb7f87d126fe9f
2024-01-14Merge android14-gs-pixel-5.15-24Q2 into android14-gs-pixel-5.15PixelBot AutoMerger
SBMerger: 571992243 Change-Id: Iea16aefef72322ea50ebef52a35183d8cd26ae4d Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2024-01-14Merge android14-gs-pixel-5.15-24Q1 into android14-gs-pixel-5.15-24Q2PixelBot AutoMerger
SBMerger: 571992243 Change-Id: I61a6f0076441b9c001687166e2a6663ec2a239a6 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2024-01-14Merge android13-gs-pixel-5.10-24Q1 into android13-gs-pixel-5.10-24Q2android-u-qpr3-beta-2_r0.7android-u-qpr3-beta-2_r0.6android-u-qpr3-beta-2_r0.5android-u-qpr3-beta-2_r0.4android-u-qpr3-beta-2_r0.3android-u-qpr3-beta-2_r0.2android-u-qpr3-beta-2.1_r0.7android-u-qpr3-beta-2.1_r0.5android-u-qpr3-beta-2.1_r0.4android-u-qpr3-beta-2.1_r0.3android-u-qpr3-beta-2.1_r0.2android-u-qpr3-beta-2.1_r0.1android-15-dp-2_r0.6android-15-dp-2_r0.5android-15-dp-2_r0.4android-15-dp-2_r0.3android-15-dp-2_r0.2android-15-dp-2_r0.1android-15-beta-1_r0.6android-15-beta-1_r0.4android-15-beta-1_r0.2android-15-beta-1_r0.1android-gs-tangorpro-5.10-android15-dpandroid-gs-tangorpro-5.10-android14-qpr3-betaandroid-gs-raviole-5.10-android14-qpr3-betaandroid-gs-pantah-5.10-android15-dpandroid-gs-pantah-5.10-android14-qpr3-betaandroid-gs-lynx-5.10-android14-qpr3-betaandroid-gs-felix-5.10-android15-dpandroid-gs-felix-5.10-android14-qpr3-betaandroid-gs-bluejay-5.10-android15-dpandroid-gs-bluejay-5.10-android14-qpr3-betaPixelBot AutoMerger
SBMerger: 571992243 Change-Id: I9b8f253b1c06a0525124e2325a13af4669c9f1fb Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2024-01-10Fix type confusion of dmabuf in aoc driverandroid-u-qpr2-beta-3.1_r0.7android-u-qpr2-beta-3.1_r0.5android-u-qpr2-beta-3.1_r0.4android-u-qpr2-beta-3.1_r0.3android-u-qpr2-beta-3.1_r0.2android-u-qpr2-beta-3.1_r0.1android-14.0.0_r0.76android-14.0.0_r0.75android-14.0.0_r0.74android-14.0.0_r0.73android-14.0.0_r0.72android-14.0.0_r0.71android-14.0.0_r0.66android-14.0.0_r0.65android-14.0.0_r0.64android-14.0.0_r0.63android-14.0.0_r0.62android-14.0.0_r0.61android-14.0.0_r0.56android-14.0.0_r0.55android-14.0.0_r0.54android-14.0.0_r0.53android-14.0.0_r0.52android-14.0.0_r0.51android-gs-tangorpro-5.10-android14-qpr2-betaandroid-gs-tangorpro-5.10-android14-qpr2android-gs-raviole-5.10-android14-qpr2-betaandroid-gs-raviole-5.10-android14-qpr2android-gs-pantah-5.10-android14-qpr2-betaandroid-gs-pantah-5.10-android14-qpr2android-gs-lynx-5.10-android14-qpr2-betaandroid-gs-lynx-5.10-android14-qpr2android-gs-felix-5.10-android14-qpr2-betaandroid-gs-felix-5.10-android14-qpr2android-gs-bluejay-5.10-android14-qpr2-betaandroid-gs-bluejay-5.10-android14-qpr2Ismael Castro
This change ensures that the struct dma_heap that is passed in the file descriptor via ioctl is created/maintained by aoc. Bug: 313424730 Test: researcher's PoC doesn't print handle Change-Id: I408872a66964bd4d03d3b09794b2eb626028b60b Signed-off-by: Ismael Castro <iicastro@google.com> (cherry picked from commit 7672a4aaa5bb92bc69337942e5fa047e4964ae62)
2024-01-10Fix type confusion of dmabuf in aoc driverandroid-u-qpr2-beta-3.1_r0.8android-14.0.0_r0.57android-gs-shusky-5.15-android14-qpr2-betaIsmael Castro
This change ensures that the struct dma_heap that is passed in the file descriptor via ioctl is created/maintained by aoc. Bug: 313424730 Test: researcher's PoC doesn't print handle Change-Id: I408872a66964bd4d03d3b09794b2eb626028b60b Signed-off-by: Ismael Castro <iicastro@google.com> (cherry picked from commit 7672a4aaa5bb92bc69337942e5fa047e4964ae62)
2023-12-17Merge android14-gs-pixel-5.15-24Q2 into android14-gs-pixel-5.15PixelBot AutoMerger
SBMerger: 571992243 Change-Id: Idadd0a93d21ed6ba7b6035073d7b04336d15a295 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-12-17Merge android14-gs-pixel-5.15-24Q1 into android14-gs-pixel-5.15-24Q2PixelBot AutoMerger
SBMerger: 571992243 Change-Id: I3000a135a3af980b0f01262d3241c85055b6517a Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-12-14Revert "Set up OWNERS"Cyan Hsieh
Revert submission 2521855-285981567 Reason for revert: open for 5.15 in-market kernel development Reverted changes: /q/submissionid:2521855-285981567 Bug: 313355593 Bug: 309749142 Change-Id: Icb407a628d0a7c13bcbf79de580176d1e24ff0a8
2023-12-13aoc: add bootarg to force mif off on volte callsandroid-u-qpr2-beta-3_r0.8Alex Iacobucci
Test: on device Bug: 207711097 Change-Id: I69ce237be000ffb351b61ed33a846f6252971303 Signed-off-by: Alex Iacobucci <alexiacobucci@google.com>
2023-12-12Merge android13-gs-pixel-5.10-24Q1 into android14-gs-pixel-5.15-24Q1PixelBot AutoMerger
Conflict files: alsa/aoc_alsa.h SBMerger: 571992243 Change-Id: Ie9d3c086b902757e1b57dab966cc99f1c4e4dd4b Signed-off-by: benmcgee <benmcgee@google.com>
2023-12-08aoc: gracefully handle coredump corrupt caseandroid-14.0.0_r0.81android-14.0.0_r0.80android-gs-akita-5.15-android14-d2Alex Iacobucci
Test: on device Bug: 307383094 Change-Id: Id474c099fa8392e3379b7a2a8861bf508951352a Signed-off-by: Alex Iacobucci <alexiacobucci@google.com> (cherry picked from commit d16319dd4b25e5a9f01c823da63c7165ba4c0c0f)
2023-12-03Merge android14-gs-pixel-5.15-24Q1 into android14-gs-pixel-5.15PixelBot AutoMerger
SBMerger: 571992243 Change-Id: I804d9afbd8116435975217cd84f19711ed2c823b Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-12-03Merge android13-gs-pixel-5.10-24Q1 into android13-gs-pixel-5.10android-u-qpr3-beta-1_r0.7android-u-qpr3-beta-1_r0.5android-u-qpr3-beta-1_r0.4android-u-qpr3-beta-1_r0.3android-u-qpr3-beta-1_r0.2android-u-qpr3-beta-1_r0.1android-15-dp-1_r0.7android-15-dp-1_r0.5android-15-dp-1_r0.4android-15-dp-1_r0.3android-15-dp-1_r0.2android-15-dp-1_r0.1PixelBot AutoMerger
SBMerger: 571992243 Change-Id: Iac42b53b23a42f55678602fad8c999f8761f3e6c Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-11-30alsa: add support for microphone mask updateandroid-u-qpr2-beta-3_r0.7android-u-qpr2-beta-3_r0.6android-u-qpr2-beta-3_r0.5android-u-qpr2-beta-3_r0.4android-u-qpr2-beta-3_r0.3android-u-qpr2-beta-3_r0.2yixuanjiang
Support dynamic change PDM mask for normal recording and voice uplink. In AoC with differnt projects. PDM and microphone may not map with same order, so it need to adjust mask order. Add control to adjust it. Bug: 299035199 Change-Id: I6c425126f9151b7433034718abe231e084ecd555 Signed-off-by: yixuanjiang <yixuanjiang@google.com>
2023-11-28Merge "Merge android13-gs-pixel-5.10-24Q1 into android14-gs-pixel-5.15-24Q1" ↵Ismael Pérez Álvarez
into android14-gs-pixel-5.15-24Q1
2023-11-26Merge android13-gs-pixel-5.10-24Q1 into android14-gs-pixel-5.15-24Q1PixelBot AutoMerger
SBMerger: 571992243 Change-Id: I0a1bd23a196efab73a6f3f42238c240e8c812591 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-11-21aoc: notify aocd when aoc_request_on times outAlex Iacobucci
Test: on device Bug: 309950738 Change-Id: I60c14d8d89847c0681ff285b1f4d26d37858be18 Signed-off-by: Alex Iacobucci <alexiacobucci@google.com>
2023-11-19Merge android14-gs-pixel-5.15-24Q1 into android14-gs-pixel-5.15PixelBot AutoMerger
SBMerger: 571992243 Change-Id: Ic5731e32f78d47d1b3f9b096c100c887f139171d Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-11-19Merge android13-gs-pixel-5.10-24Q1 into android14-gs-pixel-5.15-24Q1PixelBot AutoMerger
SBMerger: 571992243 Change-Id: Id9aa6ac74b81d23ecd84a14be171b8e13ecce224 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-11-18Fix the reason string when triggered from ALSACraig Dooley
The NULL termination was wrong when triggered from ALSA, due to trigger_watchdog passing strlen (without NULL) as the count. The explicit NULL termination here would overwrite the last character, but strscpy is supposed to use the full size of the destination buffer and handle NULL termination itself. Bug: 309902598 Change-Id: I9cf91660a5fd85fdcc2589dafa5f3c8af4e0fdb8 Signed-off-by: Craig Dooley <dooleyc@google.com>
2023-11-17Add entries fore new BT channel in aoc_chan.Luis Delgado de Mendoza
This CL adds the necessary entries in the aoc_chan driver to handle the new channel that will be used by BT. Bug: 308452948 Test: Validated locally. Change-Id: I4227029dbdbaa56858d6a45b1970dc65e9599db6 Signed-off-by: Luis Delgado de Mendoza <luisddmg@google.com>
2023-11-17aoc: remove spatial capture control during stream open/closeyixuanjiang
move spatial eanble control to mixer control from HAL Bug: 278650628 Change-Id: Ic8b186235ce7ffe884b82a958faddd013fba7930 Signed-off-by: yixuanjiang <yixuanjiang@google.com>
2023-11-13aoc: gracefully handle coredump corrupt caseandroid-u-qpr2-beta-2_r0.7android-u-qpr2-beta-2_r0.5android-u-qpr2-beta-2_r0.4android-u-qpr2-beta-2_r0.3android-u-qpr2-beta-2_r0.2android-u-qpr2-beta-2_r0.1Alex Iacobucci
Test: on device Bug: 307383094 Change-Id: Id474c099fa8392e3379b7a2a8861bf508951352a Signed-off-by: Alex Iacobucci <alexiacobucci@google.com>
2023-11-12Merge android14-gs-pixel-5.15-24Q1 into android14-gs-pixel-5.15PixelBot AutoMerger
SBMerger: 571992243 Change-Id: I7216a6dccd7d8efe674ec257ef3a1cbb178a5cdc Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-11-12Merge android13-gs-pixel-5.10-24Q1 into android14-gs-pixel-5.15-24Q1android-u-qpr2-beta-2_r0.8PixelBot AutoMerger
SBMerger: 571992243 Change-Id: Ic9f339f81dd56440ad8e1cb834aca4aa2088607e Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-11-10Merge "Merge android13-gs-pixel-5.10-24Q1 into android14-gs-pixel-5.15-24Q1" ↵Ismael Pérez Álvarez
into android14-gs-pixel-5.15-24Q1
2023-11-09alsa: fix build warningRobert Lee
add build dependency for disaplay port audio, and fix buildifiler error Glob pattern "Kbuild" has no wildcard ('*'). Constant patterns can be error-prone, move the file outside the glob. http://go/buildifier-warnings#constant-glob Bug: 309871378 Test: build and no warning is output Change-Id: Iee8dff7b7e0d38eb1e299186a7d599e570705c68 Signed-off-by: Robert Lee <lerobert@google.com>
2023-11-07aoc: clean aoc_platform_device if probe failyixuanjiang
It cause next probe fail after DEFER Bug: 303681990 Change-Id: I40bc1808f3ad3ed5367af24747ead6a6ee851f0c Signed-off-by: yixuanjiang <yixuanjiang@google.com>
2023-11-05Merge android14-gs-pixel-5.15-24Q1 into android14-gs-pixel-5.15PixelBot AutoMerger
SBMerger: 571992243 Change-Id: I7dc19f753db112fcc02e08a5fed86fa4e7461dce Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-11-05Merge android14-gs-pixel-5.15-udc-d2 into android14-gs-pixel-5.15-24Q1PixelBot AutoMerger
SBMerger: 571992243 Change-Id: I518a30f4090c8398f1f29564423173b15d854e2a Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-11-05Merge android13-gs-pixel-5.10-24Q1 into android14-gs-pixel-5.15-24Q1PixelBot AutoMerger
SBMerger: 571992243 Change-Id: Ib7ad360a9e953f586b6d2993f653f3272d8c7d07 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-11-02aoc: add quirk flags to default skip implicit FBvincenttew
Bug: 294495501 Change-Id: Ie1929a75017cad29b7a09ba5ee0afb391fc885a2 Signed-off-by: vincenttew <vincenttew@google.com>
2023-10-30aoc: get crash info string on coredump corruptAlex Iacobucci
Test: on device Bug: 307383094 Change-Id: I9a1949810a1cf8352d6708a1759053e36e1fb921 Signed-off-by: Alex Iacobucci <alexiacobucci@google.com>
2023-10-29Merge android14-gs-pixel-5.15-24Q1 into android14-gs-pixel-5.15PixelBot AutoMerger
SBMerger: 571992243 Change-Id: I4d842d42fdf4fe67d5d7f0bccfe347f344690541 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 09:09:25 +0000