Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

qseecom: Add new IOCTL for QSEECom_send_modified_resp_64() function 

Add new IOCTL for QSEECom_send_modified_resp_64() function, which is
used to populate ION request buffer with SG list's 64bit phy addr
and sent to secure-UI listener service.

Change-Id: Id45d70315a868748a8bf2e2ba8bddefc75295331
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
This commit is contained in:
Zhen Kong 2015-06-15 11:39:06 -07:00 committed by Gerrit - the friendly Code Review server
parent e59c237bc1
commit 5b19402533
4 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/misc/compat_qseecom.c
View File

@ -537,6 +537,8 @@ static unsigned int convert_cmd(unsigned int cmd)
return QSEECOM_IOCTL_MDTP_CIPHER_DIP_REQ;
case COMPAT_QSEECOM_IOCTL_SEND_MODFD_CMD_64_REQ:
return QSEECOM_IOCTL_SEND_MODFD_CMD_64_REQ;
case COMPAT_QSEECOM_IOCTL_SEND_MODFD_RESP_64:
return QSEECOM_IOCTL_SEND_MODFD_RESP_64;
default:
return cmd;
@ -855,7 +857,8 @@ long compat_qseecom_ioctl(struct file *file,
(unsigned long)data);
}
break;
case COMPAT_QSEECOM_IOCTL_SEND_MODFD_RESP: {
case COMPAT_QSEECOM_IOCTL_SEND_MODFD_RESP:
case COMPAT_QSEECOM_IOCTL_SEND_MODFD_RESP_64: {
struct compat_qseecom_send_modfd_listener_resp __user *data32;
struct qseecom_send_modfd_listener_resp __user *data;
int err;

28
drivers/misc/qseecom.c
View File

@ -3609,8 +3609,8 @@ static int qseecom_send_resp(void)
}
static int qseecom_send_modfd_resp(struct qseecom_dev_handle *data,
void __user *argp)
static int __qseecom_send_modfd_resp(struct qseecom_dev_handle *data,
void __user *argp, bool is_64bit_addr)
{
struct qseecom_send_modfd_listener_resp resp;
int i;
@ -3647,12 +3647,26 @@ static int qseecom_send_modfd_resp(struct qseecom_dev_handle *data,
resp.resp_buf_ptr = this_lstnr->sb_virt +
(uintptr_t)(resp.resp_buf_ptr - this_lstnr->user_virt_sb_base);
__qseecom_update_cmd_buf(&resp, false, data);
if (!is_64bit_addr)
__qseecom_update_cmd_buf(&resp, false, data);
else
__qseecom_update_cmd_buf_64(&resp, false, data);
qseecom.send_resp_flag = 1;
wake_up_interruptible(&qseecom.send_resp_wq);
return 0;
}
static int qseecom_send_modfd_resp(struct qseecom_dev_handle *data,
void __user *argp)
{
return __qseecom_send_modfd_resp(data, argp, false);
}
static int qseecom_send_modfd_resp_64(struct qseecom_dev_handle *data,
void __user *argp)
{
return __qseecom_send_modfd_resp(data, argp, true);
}
static int qseecom_get_qseos_version(struct qseecom_dev_handle *data,
void __user *argp)
@ -6013,7 +6027,8 @@ long qseecom_ioctl(struct file *file, unsigned cmd, unsigned long arg)
mutex_unlock(&app_access_lock);
break;
}
case QSEECOM_IOCTL_SEND_MODFD_RESP: {
case QSEECOM_IOCTL_SEND_MODFD_RESP:
case QSEECOM_IOCTL_SEND_MODFD_RESP_64: {
if ((data->listener.id == 0) ||
(data->type != QSEECOM_LISTENER_SERVICE)) {
pr_err("receive req: invalid handle (%d), lid(%d)\n",
@ -6023,7 +6038,10 @@ long qseecom_ioctl(struct file *file, unsigned cmd, unsigned long arg)
}
/* Only one client allowed here at a time */
atomic_inc(&data->ioctl_count);
ret = qseecom_send_modfd_resp(data, argp);
if (cmd == QSEECOM_IOCTL_SEND_MODFD_RESP)
ret = qseecom_send_modfd_resp(data, argp);
else
ret = qseecom_send_modfd_resp_64(data, argp);
atomic_dec(&data->ioctl_count);
wake_up_all(&data->abort_wq);
if (ret)

3
include/uapi/linux/compat_qseecom.h
View File

@ -301,6 +301,9 @@ extern long compat_qseecom_ioctl(struct file *file,
#define COMPAT_QSEECOM_IOCTL_SEND_MODFD_CMD_64_REQ \
_IOWR(QSEECOM_IOC_MAGIC, 35, struct compat_qseecom_send_modfd_cmd_req)
#define COMPAT_QSEECOM_IOCTL_SEND_MODFD_RESP_64 \
_IOWR(QSEECOM_IOC_MAGIC, 36, \
struct compat_qseecom_send_modfd_listener_resp)
#endif
#endif /* _UAPI_COMPAT_QSEECOM_H_ */

3
include/uapi/linux/qseecom.h
View File

@ -331,4 +331,7 @@ extern long qseecom_ioctl(struct file *file,
#define QSEECOM_IOCTL_SEND_MODFD_CMD_64_REQ \
_IOWR(QSEECOM_IOC_MAGIC, 35, struct qseecom_send_modfd_cmd_req)
#define QSEECOM_IOCTL_SEND_MODFD_RESP_64 \
_IOWR(QSEECOM_IOC_MAGIC, 36, struct qseecom_send_modfd_listener_resp)
#endif /* _UAPI_QSEECOM_H_ */