diff options
| author | Ajay Dudani <adudani@codeaurora.org> | 2013-04-22 15:10:32 -0700 |
|---|---|---|
| committer | Vineeta Srivastava <vsrivastava@google.com> | 2013-04-22 16:27:36 -0700 |
| commit | 0cd599c7c0494533f59aaa5fcf7475b36e30534d (patch) | |
| tree | 7fca92449fd2cb7565011bc09e3cd0d8b3d76b62 | |
| parent | fb5cdde80ba39d571e3281f3619717a3a5361cf0 (diff) | |
| download | android_hardware_qcom_keymaster-0cd599c7c0494533f59aaa5fcf7475b36e30534d.tar.gz android_hardware_qcom_keymaster-0cd599c7c0494533f59aaa5fcf7475b36e30534d.tar.bz2 android_hardware_qcom_keymaster-0cd599c7c0494533f59aaa5fcf7475b36e30534d.zip | |
keymaster: Fixup ion allocation request to match kernel ion api
Bug: 8155492
Change-Id: Iebd6a18d5b86a88502ba697494b7d41b447a70b3
| -rw-r--r-- | keymaster_qcom.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/keymaster_qcom.cpp b/keymaster_qcom.cpp index 4f64c8e..0c388c7 100644 --- a/keymaster_qcom.cpp +++ b/keymaster_qcom.cpp @@ -62,8 +62,8 @@ struct qcom_km_ion_info_t { struct qcom_keymaster_handle { struct QSEECom_handle *qseecom; void *libhandle; - int (*QSEECom_start_app)(struct QSEECom_handle ** handle, const char* path, - const char* appname, uint32_t size); + int (*QSEECom_start_app)(struct QSEECom_handle ** handle, char* path, + char* appname, uint32_t size); int (*QSEECom_shutdown_app)(struct QSEECom_handle **handle); int (*QSEECom_send_cmd)(struct QSEECom_handle* handle, void *cbuf, uint32_t clen, void *rbuf, uint32_t rlen); @@ -222,10 +222,10 @@ static int32_t qcom_km_ION_memalloc(struct qcom_km_ion_info_t *handle, ion_alloc_data.align = 4096; /* memory is allocated from EBI heap */ - ion_alloc_data.heap_mask = ION_HEAP_CARVEOUT_MASK; + ion_alloc_data.heap_mask= ION_HEAP(ION_QSECOM_HEAP_ID); /* Set the memory to be uncached */ - ion_alloc_data.flags = ION_HEAP(ION_QSECOM_HEAP_ID); + ion_alloc_data.flags = 0; /* IOCTL call to ION for memory request */ rc = ioctl(ion_fd, ION_IOC_ALLOC, &ion_alloc_data); |