security: tlk_driver: remove legacy ss support

Remove support for legacy secure storage protocol now that the rest of TLK
is using new protocol.

Bug 1397251

Change-Id: Idbc99e46a58d77934d6c6dce41d1dcf0d175b8cc
Signed-off-by: Scott Long <scottl@nvidia.com>
Reviewed-on: http://git-master/r/369107
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Chris Johnson <cwj@nvidia.com>
Tested-by: Chris Johnson <cwj@nvidia.com>

3 files changed, 0 insertions, 238 deletions

diff --git a/security/tlk_driver/ote_device.c b/security/tlk_driver/ote_device.c
index 214e511d20a2..bfc59d3cb94c 100644
--- a/security/tlk_driver/ote_device.c
+++ b/security/tlk_driver/ote_device.c
@@ -712,12 +712,6 @@ static long tlk_device_ioctl(struct file *file, unsigned int ioctl_num,
 		mutex_unlock(&smc_lock);
 		break;
 
-	case TE_IOCTL_FILE_NEW_REQ:
-	case TE_IOCTL_FILE_FILL_BUF:
-	case TE_IOCTL_FILE_REQ_COMPLETE:
-		err = te_handle_fs_ioctl(file, ioctl_num, ioctl_param);
-		break;
-
 	case TE_IOCTL_SS_NEW_REQ:
 	case TE_IOCTL_SS_REQ_COMPLETE:
 		err = te_handle_ss_ioctl(file, ioctl_num, ioctl_param);
diff --git a/security/tlk_driver/ote_fs.c b/security/tlk_driver/ote_fs.c
index d305247f429a..e3d427ae9a2f 100644
--- a/security/tlk_driver/ote_fs.c
+++ b/security/tlk_driver/ote_fs.c
@@ -27,188 +27,17 @@
 
 #include "ote_protocol.h"
 
-#define TE_SHMEM_FNAME_SZ	SZ_64
-#define TE_SHMEM_DATA_SZ	SZ_128K
-
-struct te_file_req_shmem {
-	char	file_name[TE_SHMEM_FNAME_SZ];
-	char	file_data[TE_SHMEM_DATA_SZ];
-};
-
-struct te_file_req_node {
-	struct list_head node;
-	struct te_file_req *req;
-};
-
-static struct list_head req_list;
 static DECLARE_COMPLETION(req_ready);
 static DECLARE_COMPLETION(req_complete);
-static unsigned long secure_error;
 
 static struct te_ss_op *ss_op_shmem;
 static uint32_t ss_op_size;
 
-static void indicate_complete(unsigned long ret)
-{
-	tlk_generic_smc(TE_SMC_FS_OP_DONE, ret, 0);
-}
-
 static void indicate_ss_op_complete(void)
 {
 	tlk_generic_smc(TE_SMC_SS_REQ_COMPLETE, 0, 0);
 }
 
-int te_handle_fs_ioctl(struct file *file, unsigned int ioctl_num,
-	unsigned long ioctl_param)
-{
-	struct te_file_req new_req, *ptr_user_req = NULL;
-	struct te_file_req_node *req_node;
-
-	switch (ioctl_num) {
-	case TE_IOCTL_FILE_NEW_REQ: /* new request */
-
-		ptr_user_req = (struct te_file_req *)ioctl_param;
-
-		/* wait for a new request */
-		if (wait_for_completion_interruptible(&req_ready)) {
-			return -ENODATA;
-		}
-
-		/* dequeue new request from the secure world */
-		req_node = list_first_entry(&req_list, struct te_file_req_node,
-				node);
-
-		/* populate request for the non-secure client */
-		if (req_node) {
-			if (copy_to_user(ptr_user_req, req_node->req,
-				sizeof(struct te_file_req))) {
-				pr_err("copy_to_user failed for new request\n");
-				return -EFAULT;
-			}
-
-			list_del(&req_node->node);
-			kfree(req_node);
-		} else {
-			pr_err("no request available\n");
-			return -ENOMEM;
-		}
-
-		break;
-
-	case TE_IOCTL_FILE_FILL_BUF: /* pass data to be written to the file */
-
-		if (copy_from_user(&new_req, (void __user *)ioctl_param,
-			sizeof(struct te_file_req))) {
-			pr_err("copy_from_user failed for request\n");
-			return -EFAULT;
-		}
-
-		if (new_req.type != OTE_FILE_REQ_WRITE)
-			return -EINVAL;
-
-		if (!new_req.kern_data_buf || !new_req.user_data_buf)
-			return -EINVAL;
-
-		if (copy_to_user(new_req.user_data_buf, new_req.kern_data_buf,
-			new_req.data_len)) {
-			pr_err("copy_to_user failed for fill buffer\n");
-			return -EFAULT;
-		}
-		break;
-
-	case TE_IOCTL_FILE_REQ_COMPLETE: /* request complete */
-
-		if (copy_from_user(&new_req, (void __user *)ioctl_param,
-			sizeof(struct te_file_req))) {
-			pr_err("copy_from_user failed for request\n");
-			return -EFAULT;
-		}
-
-		if (new_req.type == OTE_FILE_REQ_READ && !new_req.error) {
-			if (copy_from_user(new_req.kern_data_buf,
-				(void __user *)new_req.user_data_buf,
-				new_req.data_len)) {
-				pr_err("copy_from_user failed for request\n");
-				return -EFAULT;
-			}
-		}
-
-		/* get error code */
-		secure_error = (new_req.error) ? OTE_ERROR_NO_DATA
-					       : new_req.result;
-
-		/* signal the producer */
-		complete(&req_complete);
-		break;
-
-	default:
-		pr_err("copy_from_user failed for request\n");
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-static void _te_fs_file_operation(const char *name, void *buf, int len,
-		enum te_file_req_type type)
-{
-	struct te_file_req *new_req;
-	struct te_file_req_node *req_node;
-
-	BUG_ON(!name);
-
-	if (type == OTE_FILE_REQ_READ || type == OTE_FILE_REQ_WRITE)
-		BUG_ON(!buf);
-
-	/* allocate te_file_req structure */
-	new_req = kzalloc(sizeof(struct te_file_req), GFP_KERNEL);
-	BUG_ON(!new_req);
-
-	/* prepare a new request */
-	strncpy(new_req->name, name, strlen(name));
-	new_req->type = type;
-	new_req->data_len = len;
-	new_req->result = 0;
-	new_req->kern_data_buf = buf;
-	new_req->error = 0;
-
-	req_node = kzalloc(sizeof(struct te_file_req_node), GFP_KERNEL);
-	BUG_ON(!req_node);
-
-	req_node->req = new_req;
-	INIT_LIST_HEAD(&req_node->node);
-
-	/* add it to the pending queue and signal the consumer */
-	list_add_tail(&req_list, &req_node->node);
-	complete(&req_ready);
-
-	/* wait for the consumer's signal */
-	wait_for_completion(&req_complete);
-
-	kfree(new_req);
-
-	/* signal completion to the secure world */
-	indicate_complete(secure_error);
-}
-
-void tlk_fread(const char *name, void *buf, int len)
-{
-	if (!buf)
-		_te_fs_file_operation(name, buf, len, OTE_FILE_REQ_SIZE);
-	else
-		_te_fs_file_operation(name, buf, len, OTE_FILE_REQ_READ);
-}
-
-void tlk_fwrite(const char *name, void *buf, int len)
-{
-	_te_fs_file_operation(name, buf, len, OTE_FILE_REQ_WRITE);
-}
-
-void tlk_fdelete(const char *name)
-{
-	_te_fs_file_operation(name, NULL, 0, OTE_FILE_REQ_DELETE);
-}
-
 int te_handle_ss_ioctl(struct file *file, unsigned int ioctl_num,
 	unsigned long ioctl_param)
 {
@@ -256,44 +85,10 @@ void tlk_ss_op(uint32_t size)
 	indicate_ss_op_complete();
 }
 
-static int tlk_fs_register_handlers(void)
-{
-	struct te_file_req_shmem *shmem_ptr;
-	uintptr_t smc_args[MAX_EXT_SMC_ARGS];
-	dma_addr_t shmem_dma;
-
-	shmem_ptr = dma_alloc_coherent(NULL, sizeof(struct te_file_req_shmem),
-			&shmem_dma, GFP_KERNEL);
-	if (!shmem_ptr) {
-		pr_err("%s: no memory available for fs operations\n", __func__);
-		return -ENOMEM;
-	}
-
-	memset(shmem_ptr, 0, sizeof(struct te_file_req_shmem));
-
-	INIT_LIST_HEAD(&req_list);
-	init_completion(&req_ready);
-	init_completion(&req_complete);
-
-	smc_args[0] = TE_SMC_REGISTER_FS_HANDLERS;
-	smc_args[1] = (uintptr_t)tlk_fread;
-	smc_args[2] = (uintptr_t)tlk_fwrite;
-	smc_args[3] = (uintptr_t)tlk_fdelete;
-	smc_args[4] = (uintptr_t)shmem_ptr->file_name;
-	smc_args[5] = (uintptr_t)shmem_ptr->file_data;
-
-	tlk_extended_smc(smc_args);
-
-	return 0;
-}
-
 static int __init tlk_ss_init(void)
 {
 	dma_addr_t ss_op_shmem_dma;
 
-	/* register legacy support */
-	tlk_fs_register_handlers();
-
 	/* allocate shared memory buffer */
 	ss_op_shmem = dma_alloc_coherent(NULL, sizeof(struct te_ss_op),
 			&ss_op_shmem_dma, GFP_KERNEL);
diff --git a/security/tlk_driver/ote_protocol.h b/security/tlk_driver/ote_protocol.h
index fd18183ad657..7e10feed5233 100644
--- a/security/tlk_driver/ote_protocol.h
+++ b/security/tlk_driver/ote_protocol.h
@@ -37,12 +37,6 @@
 #define TE_IOCTL_LAUNCH_OPERATION_COMPAT \
 	_IOWR(TE_IOCTL_MAGIC_NUMBER, 0x14, union te_cmd_compat)
 
-#define TE_IOCTL_FILE_NEW_REQ \
-	_IOR(TE_IOCTL_MAGIC_NUMBER,  0x16, struct te_file_req)
-#define TE_IOCTL_FILE_FILL_BUF \
-	_IOR(TE_IOCTL_MAGIC_NUMBER,  0x17, struct te_file_req)
-#define TE_IOCTL_FILE_REQ_COMPLETE \
-	_IOWR(TE_IOCTL_MAGIC_NUMBER, 0x18, struct te_file_req)
 #define TE_IOCTL_SS_NEW_REQ \
 	_IOR(TE_IOCTL_MAGIC_NUMBER,  0x20, struct te_ss_op)
 #define TE_IOCTL_SS_REQ_COMPLETE \
@@ -117,12 +111,10 @@ enum {
 	TE_SMC_LAUNCH_OPERATION		= 0x30000003,
 
 	/* Trusted OS calls */
-	TE_SMC_REGISTER_FS_HANDLERS	= 0x32000001,
 	TE_SMC_REGISTER_REQ_BUF		= 0x32000002,
 	TE_SMC_PROGRAM_VPR		= 0x32000003,
 	TE_SMC_REGISTER_IRQ_HANDLER	= 0x32000004,
 	TE_SMC_NS_IRQ_DONE		= 0x32000005,
-	TE_SMC_FS_OP_DONE		= 0x32000006,
 	TE_SMC_INIT_LOGGER		= 0x32000007,
 	TE_SMC_SS_REGISTER_HANDLER	= 0x32000008,
 	TE_SMC_SS_REQ_COMPLETE		= 0x32000009,
@@ -312,25 +304,6 @@ void te_launch_operation_compat(struct te_launchop_compat *cmd,
 	struct te_request_compat *request,
 	struct tlk_context *context);
 
-#define TE_MAX_FILE_NAME_LEN	64
-
-enum te_file_req_type {
-	OTE_FILE_REQ_READ	= 0,
-	OTE_FILE_REQ_WRITE	= 1,
-	OTE_FILE_REQ_DELETE	= 2,
-	OTE_FILE_REQ_SIZE	= 3,
-};
-
-struct te_file_req {
-	char name[TE_MAX_FILE_NAME_LEN];
-	enum te_file_req_type type;
-	void *user_data_buf;
-	void *kern_data_buf;
-	unsigned long data_len;
-	unsigned long result;
-	int error;
-};
-
 #define SS_OP_MAX_DATA_SIZE	0x1000
 struct te_ss_op {
 	uint8_t		data[SS_OP_MAX_DATA_SIZE];