summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-05-25Silence noisy log messageandroid-wear-13.0.0_r0.8android-wear-13.0.0_r0.6android-wear-13.0.0_r0.4android-wear-13.0.0_r0.3android-wear-13.0.0_r0.12android-wear-13.0.0_r0.10android-msm-eos-5.15-tm-wear-kr3-dr-eosDaniel Price
The "Trying to unmap vaddr" message doesn't appear to be an actual error, so don't log it at that level. Bug: 284220550 Change-Id: Iac6af686fbc478369faf90bb3ac15f1c6dde7f9b Signed-off-by: Daniel Price <danielprice@google.com>
2023-05-02Merge AU_LINUX_ANDROID_LW.UM.2.1.R1.11.00.00.200.040Daniel Price
This updates our sources to CodeLinaro release AU_LINUX_ANDROID_LW.UM.2.1.R1.11.00.00.200.040 (LW.UM.2.1.r1-04000-SW5100.0), which corresponds to ChipCode LW 2.0 r00078.3a. Bug: 280095980 Change-Id: If590b7f07a00b43ddf2c655afc514b72edad976e Signed-off-by: Daniel Price <danielprice@google.com>
2023-04-28Fix compile error from android13-5.15-2023-04_r1 mergeBen Fennema
Bug: 280120653 Change-Id: I2acc06eda8eea8783400d86dc9f1bf775737a7a3 Signed-off-by: Ben Fennema <fennema@google.com>
2023-04-21Merge "Qcedev: To make qcedev compatible with 32 bit targets." into ↵Linux Build Service Account
sec-kernel.lnx.13.1.r9-rel
2023-04-20Qcedev: To make qcedev compatible with 32 bit targets.Shivangi Kesharwani
1) As per new design change to support 32bit targets, Qcedev driver will work on buffer allocated using kmalloc instead of user buffer, so using "memcpy" instead of "get_user" and "put_user". 2) Replaced "copy_from_user" and "copy_to_user" API with "memmove" in case of 32bit target, as buffer allocated with kmalloc is not compatible with these API. Tests: Validated all qcedev test in 32bit target and 64bit target 1)./qcedev_test -n (Nominal) 2)./qcedev_test -a (Adversarial) 3)./qcedev_test -r (Repeatabilty) 4)./qcedev_test -s (Stress) 5)./qcedev_test -p (Performance) Change-Id: Ia9f9e55afcaca944cd376e4c1eb204da8d1d23cc Signed-off-by: Shivangi Kesharwani <quic_skesharw@quicinc.com>
2023-04-19qseecom: Add flush_work based on flagShivangi Kesharwani
As INIT_WORK during suspend resume path is only supported with bus scaling support hence use the same check for flush_work and delete timer Change-Id: I466d3f9fb7cfadf9db52703956ae83d3fd7409d8 Signed-off-by: Shivangi Kesharwani <quic_skesharw@quicinc.com>
2023-04-19Set up OWNERSAndrew Evans
Point to kernel/private/msm-google:OWNERS_pixelwatchbsp Bug: 247160135 Change-Id: Id945e540026886182ac757324ed55c5e3389e5eb Signed-off-by: Andrew Evans <andrewevans@google.com>
2023-04-17Merge commit 'f7f3c7e45eed6badd77f8e427545805b3cf60307' into ↵rthavti
sec-kernel.lnx.13.1.r9-rel Change-Id: I29c909a00b0f403862ad0f7d02eb1cbd639032e9
2023-04-03Merge AU_LINUX_ANDROID_LW.UM.2.1.R1.11.00.00.200.031Daniel Price
This updates our sources to CodeLinaro release AU_LINUX_ANDROID_LW.UM.2.1.R1.11.00.00.200.031 (LW.UM.2.1.r1-03100-SW5100.0), which corresponds to ChipCode LW 2.0 r00062.1a. Bug: 276757489 Change-Id: Ie404e8a395fd1fc596b1d6d64dd19293e78aee32 Signed-off-by: Daniel Price <danielprice@google.com>
2023-03-22Merge "Qseecom: Add qseecom_32bit_impl driver to make qseecom compatible ↵Linux Build Service Account
with 32 bit target." into sec-kernel.lnx.13.1.r9-rel
2023-03-21Qcedev: To make qcedev compatible with 32 bit targets.Shivangi Kesharwani
1) Replaced "get_user" and "put_user" API with "memcpy" in case of 32bit target, as buffer allocated with kmalloc is not compatible with these API. 2) Replaced "copy_from_user" and "copy_to_user" API with "memmove" in case of 32bit target, as buffer allocated with kmalloc is not compatible with these API. Tests: Validated all qcedev test in 32bit target and 64bit target 1)./qcedev_test -n (Nominal) 2)./qcedev_test -a (Adversarial) 3)./qcedev_test -r (Repeatabilty) 4)./qcedev_test -s (Stress) 5)./qcedev_test -p (Performance) Change-Id: Ie2ac33f95afbb63652dfed0d1b37417a32dae02b Signed-off-by: Shivangi Kesharwani <quic_skesharw@quicinc.com>
2023-03-21Qseecom: Add qseecom_32bit_impl driver to make qseecom compatible with 32 ↵Shivangi Kesharwani
bit target. 1) Add qseecom_32bit_impl driver, replaced API "compat_alloc_user_space" with "kmalloc" as it got deprecated in kernel.5.15. 2) Replaced "copy_from_user" and "copy_to_user" API with "memmove" in case of 32bit target, as buffer allocated with kmalloc is not compatible with these API. Test: Validated all qseecom sample app commands on below target configurations 1) Target where all applications are 32bit 2) Target where all applications are 64bit 3) Target which have both 32bit and 64bit application Change-Id: Id66f05bc82a06a3c92eee23521065e3a3b25b8cc Signed-off-by: Shivangi Kesharwani <quic_skesharw@quicinc.com>
2023-03-16Qseecom: Add qseecom_32bit_impl driver to make qseecom compatible with 32 ↵Shivangi Kesharwani
bit target. 1) Add qseecom_32bit_impl driver, replaced API "compat_alloc_user_space" with "kmalloc" as it got deprecated in kernel.5.15. 2) Replaced "copy_from_user" and "copy_to_user" API with "memmove" in case of 32bit target, as buffer allocated with kmalloc is not compatible with these API. Test: Validated all qseecom sample app commands on below target configurations 1) Target where all applications are 32bit 2) Target where all applications are 64bit 3) Target which have both 32bit and 64bit application Change-Id: Id66f05bc82a06a3c92eee23521065e3a3b25b8cc Signed-off-by: Shivangi Kesharwani <quic_skesharw@quicinc.com>
2023-03-13Merge ce6acb59fc57aa5a9902f4975f07036f285b2693 on remote branchLinux Build Service Account
Change-Id: Id870ab4a173078a694c0d16f84670767a81d2ebd
2023-03-06qseecom: bw_scale_down_timer not setup when support_bus_scaling falseBen Fennema
Only modify qseecom.bw_scale_down_timer and qseecom.timer_running when qseecom.support_bus_scaling is true, since it is only initially setup in qseecom_init_bus when it is true. Bug: 271711990 Change-Id: I8fb3c8b6e5ca1a97b5beed22b8da4966a66667c0 Signed-off-by: Ben Fennema <fennema@google.com>
2023-03-06qseecom: Add flush_work based on flagMonika Singh
As INIT_WORK during suspend resume path is only supported with bus scaling support hence use the same check for flush_work. Change-Id: I5172d574a2bc33a1cdba1fead7e6c4208648448c Signed-off-by: Monika Singh <monising@codeaurora.org>
2023-02-28tz_log: Make creation of directories dependent on whether hypervisor is enabled.Amanpreet Kaur
Disable creation of hyp_general, hyp_log and rm_log directories if hypervisor is disabled. Change-Id: I5a7b73dd9dbda9c438d99b1e644a201367eb124f
2023-02-28Merge "sec-kernel: Enable ICE FDE"qctecmdr
2023-02-26securemsm-kernel: smcinvoke: Call object release sync once before adding to ↵Nitin LNU
queue call release tz object in sync manner only in case of EBUSY add object in to post process list, so that we can retry and process it later in a seprate kthread. Change-Id: I2158b3faa5c41d2f10ed532c50c9c6b113961c57
2023-02-23smcinvoke: Handle suspend and resume issues in smcinvoke driverPawan Rai
This change makes changes to smcinvoke driver to handle suspend and resume scenarios. If the accept thread gets interrupted, do not set the server state as defunct if the thread is in freezing state, i.e. if the thread is going in suspend. In such cases, increase timeout of that server so that invoke thread waits indefinitely for response from userspace until the system resumes back. Also in case the accept thread has invalid cbtxn, start waitingfor new requests instead of going to userspace and then coming back. Change-Id: Id92aa9f46e38e075f658fc4f6f842296c8721ba4
2023-02-22sec-kernel: Enable ICE FDEjianshu
Add API qseecom_create_key_in_slot that is only for FDE. And enable kernel call to qseecom module. Change-Id: I219c30457da0f23b59e1f3405962cd390735ee3b Signed-off-by: jianshu <quic_jianshu@quicinc.com>
2023-02-22smcinvoke: ADCI methods call on rootEnvPawan Rai
Change adci methods call on rootEnv from clientEnv as per QTEE implementation. Change-Id: Ib1ca4312844f6f3dedbfb639e5b83f71d97ecc68
2023-02-14Revert "Qseecom: Add qseecom_32bit_impl driver to make qseecom compatible ↵Shivangi Kesharwani
with 32 bit target." This reverts commit b5f2395e174c0780793d625794f682b2e1fe6c7a. Change-Id: I17f4c4b61eed46b5ed759eeabb6fabf44e588a4f Signed-off-by: Shivangi Kesharwani <quic_skesharw@quicinc.com>
2023-02-08smcinvoke: remove global lock around the call to QTEEPawan Rai
Change-Id: Ib1e2054bfe7f0eb0ecc7b8b343a8a173df02dfeb Signed-off-by: Pawan Rai <quic_pawarai@quicinc.com>
2023-02-07Merge AU_LINUX_ANDROID_LW.UM.2.1.R1.11.00.00.200.024Andrei Ciubotariu
This updates our sources to CodeLinaro release AU_LINUX_ANDROID_LW.UM.2.1.R1.11.00.00.200.024 (LW.UM.2.1.r1-02400-SW5100.0), which corresponds to ChipCode LW 2.0 r00040.3. Bug: 268128919 Change-Id: I33b534cb3081b6ba9d560ca380ea5306a65e8126 Signed-off-by: Andrei Ciubotariu <aciubotariu@google.com>
2023-02-02qcedev: conditionally compile compat_qcedev.cPranav Lavhate
compile compat_qcedev.c when CONFIG_COMPAT is enabled Tests: Build compilation successful Change-Id: I4e286d56ea2fd4f27eb6fdc3ad9ca6add407f088 Signed-off-by: Pranav Lavhate <quic_plavhate@quicinc.com>
2023-01-27Merge commit '0e92ea4387f8c0a4d295b10dfa07f7155455ab84' into ↵rthavti
sec-kernel.lnx.13.1.r9-rel Change-Id: I8ff4752aab38ed594dabb1539bbe250653d0ce7a
2023-01-25Update securemsm Makefile to install uapi headersBen Fennema
Move uapi header files to include/uapi Bug: 263990905 Change-Id: Iab6db2d95ab52348042e245fd71bdd1f4dd4358b Signed-off-by: Ben Fennema <fennema@google.com>
2023-01-19Merge "smcinvoke: adci inerface adaptation as per QTEE"qctecmdr
2023-01-19smcinvoke: adci inerface adaptation as per QTEEPawan Rai
Adapted the latest IClientEnv adci and other interface methods from QTEE. Change-Id: I05730e56d656977fbc53a2d3dedb04426474be1c
2023-01-10msm-google-modules: securemsm: Fix module compilationBen Fennema
Currently the default make target causes the mm modules to be compiled, which is all that is needed. However, the target is written such that it will cause the kernel's makefile to be invoked with the "all" target, which unnecessarily recompiles the devicetree. Fix this by ensuring that the default rule only compiles the kernel modules. Bug: 264944277 Change-Id: I631481b585e8d1f9c864fcba99ae0a066e1e68ad Signed-off-by: Ben Fennema <fennema@google.com>
2023-01-09qcedev: ensure sequential req_done on errorGaurav Kashyap
req_done is usually scheduled on success scenarios as it needs to wakeup the sleep thread. However, in the scenario where sleep has timed out, there is nothing to wake up, and req_done can be called sequentially instead of scheduling it (which might cause use after free). Change-Id: I296076fcb43d91d16b00f08819dca45bd9049198 Signed-off-by: Gaurav Kashyap <quic_gaurkash@quicinc.com>
2023-01-05qcedev: check error bits instead of symptom bitsGaurav Kashyap
Currently, timer and pause error is determined by checking the symptom bits (TIMER_EXPIRED and PAUSE_DET). This causes a contention when both of these are set, but a pause error occurs, as timer expiry is prioritized. Instead, check the actual error bits (TIMER_ERROR and PAUSE_ERROR) which is a more accurate representation of the decrypt error. Change-Id: Ie7c67554256c19c52ae719c09e7ceb0a57eff109 Signed-off-by: Gaurav Kashyap <quic_gaurkash@quicinc.com>
2023-01-04Merge "qcedev: better error handling for crypto requests"qctecmdr
2023-01-03Merge "smcinvoke: ADCI changes for SMCInvoke Driver"qctecmdr
2023-01-02securemsm-kernel: Added qrng and qseecom in first stage modulesJayasri Bhattacharyya
1. Adding qrng in first stage module saved ~900ms in boringssl test for Divar chipset on kernel-5.15 2. Adding qseecom in first stage module saved ~800ms in qseecom daemon start during bootup for Divar chipset on kernel-5.15 Change-Id: Ideda4f13165a0043b12936b7507e297190a4d04e
2023-01-02qcedev: better error handling for crypto requestsGaurav Kashyap
Handle crypto errors and timeouts better leaving room for lesser sync issues (especially during timeouts). Also, support the crypto status changes in the v5.8 CE engine. Also resolved merge conflicts. Tests: compilation and qcedev tests passed. Change-Id: I78f0c6596c235f702c19b21f076c018cad423658 Signed-off-by: Gaurav Kashyap <quic_gaurkash@quicinc.com> Signed-off-by: Pranav Lavhate <quic_plavhate@quicinc.com>
2022-12-29smcinvoke: ADCI changes for SMCInvoke DriverPawan Rai
Change consists creation of ADCI thread at SMCInvoke driver initialization Change consists creation of ADCI thread at SMCInvoke driver initialization Following scenario have been tested for this change (1) ADCI thread creation and QTEE invocation during driver initialization (2) Backward Compatibility - IF ADCI feature is not supported (OBJECT_ERROR_INVALID) then exit the ADCI thread gracefully after cleaning up all the resources (3) Leak Test: All the resources held by ADCI thread should be released if ADCI feature is not supported by QTEE (i) adci task_struct state and exit state: state = TASK_RUNNING , exit_state = 0 (While ADCI thread execution) state = TASK_DEAD , exit_state = EXIT_DEAD (During ADCI thread termination) (ii) adci task_struct = NULL (fetched based on adci thread_id) which make sure task_struct has been deallocated (4) SMCInvoke related Test: All the internal(suuported),memobj and cbo testing has been performed. Change-Id: I2916ce260fae293b88fbc8b9d24baccdee1ea89f Signed-off-by: Pawan Rai <quic_pawarai@quicinc.com>
2022-12-26qseecom: changed entry type from unit32_t to int32_tDisha Galve
Return value of function is int32_t and storing return value in uint32_t will lead to integer underflow issue. Change variable from uint32_t to int32_t to handle negative integer values. Change-Id: I6d8525e9ee4a138c96933674f5f828e19794258b Signed-off-by: Disha Galve <quic_dgalve@quicinc.com>
2022-12-22Qseecom: Add qseecom_32bit_impl driver to make qseecom compatible with 32 ↵Shivangi Kesharwani
bit target. 1) Add qseecom_32bit_impl driver, replaced API "compat_alloc_user_space" with "kmalloc" as it got deprecated in kernel.5.15. 2) Replaced "copy_from_user" and "copy_to_user" API with "memmove" in case of 32bit target, as buffer allocated with kmalloc is not compatible with these API. Change-Id: Ia2170ffd8997804df3ac4f3db9bd07c419663b7d Signed-off-by: Shivangi Kesharwani <quic_skesharw@quicinc.com>
2022-12-21Merge "Lemans: Enable qseecom."qctecmdr
2022-12-20Lemans: Enable qseecom.jianshu
Enable qseecom kernel module for lemans board. Change-Id: Iebb0e9cd657ef92c18c4e5cb974ab0f5844e4efa Signed-off-by: jianshu <quic_jianshu@quicinc.com>
2022-12-16smcinvoke: Flush cache contents before invalidatingAshish Pratap Singh Bhadoria
during smcinvoke callback response handling. Add Cache flush before invalidating out_buf during cb response handling in smcinvoke driver. Change-Id: I68b70c078675f1841690c93048cbba3589a388f3
2022-12-11qseecom: use legacy command for slateappShivangi Kesharwani
Use the legacy command for sending any data to trusted application if the app name is slateapp. As trusted application is not expecting sglistinfo in case of slate app load command. Test: 1) Loaded Slateapp ->Reboot->Run Slateapp load command. echo start > /sys/class/remoteproc/remoteproc0/state 2) Check Slateapp status cat /sys/class/remoteproc/remoteproc0/state --> running 3) Validated HLOS and Qseelogs Change-Id: Iecbe75c45b253ef87de3306b89b50c39008550fe Signed-off-by: Shivangi Kesharwani <quic_skesharw@quicinc.com>
2022-12-02Merge fd4c96da805bdc2788a99bdf22a7e6417787013c on remote branchLinux Build Service Account
Change-Id: Ied92d1cb0a057f6f9b69786bc6b8b87aff78c487
2022-11-28securemsm-kernel: Add support for commonlib loaded from hostvenkata sateesh
Add support for qcom,commonlib-loaded-by-hostvm to use commonlib loaded by host VM. Change-Id: I3a9f08bb53dde7545f518247ae885411ae8eef64 Signed-off-by: venkata sateesh <quic_vencher@quicinc.com> Signed-off-by: Nishant Raj <quic_nishraj@quicinc.com>
2022-11-17securemsm-kernel: Removed hardcoded pathAshok Lachanolla
Change-Id: Ia4d16a90d181bf3eb791daa88142aeb6e9242025
2022-11-16Qseecom: Add compat qseecom driver to make qseecom compatible with 32 bit targetShivangi Kesharwani
1) Add compat qseecom driver, replaced API "compat_alloc_user_space" with "kmalloc" as it got deprecated in kernel.5.15. 2) Replaced "copy_from_user" and "copy_to_user" API with "memcpy" as buffer allocated with kmalloc is not compatible with these API. Change-Id: Ia2170ffd8997804df3ac4f3db9bd07c419663b7d Signed-off-by: Shivangi Kesharwani <quic_skesharw@quicinc.com>
2022-11-16sec-kernel:Removed name from log message.Indranil Pradhan
Removed name from log message Test:Compiled and boot up tested. Change-Id: Ia5c21710a63bb2e461259cf07951c579c3c95bee Signed-off-by: Indranil Pradhan <quic_ipradhan@quicinc.com>
2022-11-14Merge 5aeaf9b9a619e529c813233a37395c0e721b8f3b on remote branchLinux Build Service Account
Change-Id: I93d4baa2850978540806fc2cbf31e6f096294afb
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 12:29:18 +0000