Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3473b71e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tee-misc-for-v5.1' of... 

Merge tag 'tee-misc-for-v5.1' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers

OP-TEE driver
- dual license for optee_msg.h and optee_smc.h
Generic
- add cancellation support to client interface

* tag 'tee-misc-for-v5.1' of https://git.linaro.org/people/jens.wiklander/linux-tee

:
  tee: optee: update optee_msg.h and optee_smc.h to dual license
  tee: add cancellation support to client interface

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4f640201 32356d30

drivers/tee/optee/optee_msg.h

+2 −24
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) */

/*

 * Copyright (c) 2015-2016, Linaro Limited

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

 *

 * 1. Redistributions of source code must retain the above copyright notice,

 * this list of conditions and the following disclaimer.

 *

 * 2. Redistributions in binary form must reproduce the above copyright notice,

 * this list of conditions and the following disclaimer in the documentation

 * and/or other materials provided with the distribution.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

 * POSSIBILITY OF SUCH DAMAGE.

 * Copyright (c) 2015-2019, Linaro Limited

 */

#ifndef _OPTEE_MSG_H

#define _OPTEE_MSG_H

drivers/tee/optee/optee_smc.h

+2 −24
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) */

/*

 * Copyright (c) 2015-2016, Linaro Limited

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

 *

 * 1. Redistributions of source code must retain the above copyright notice,

 * this list of conditions and the following disclaimer.

 *

 * 2. Redistributions in binary form must reproduce the above copyright notice,

 * this list of conditions and the following disclaimer in the documentation

 * and/or other materials provided with the distribution.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

 * POSSIBILITY OF SUCH DAMAGE.

 * Copyright (c) 2015-2019, Linaro Limited

 */

#ifndef OPTEE_SMC_H

#define OPTEE_SMC_H

drivers/tee/tee_core.c

+9 −0
Original line number Diff line number Diff line
@@ -1041,6 +1041,15 @@ int tee_client_invoke_func(struct tee_context *ctx, 
}

EXPORT_SYMBOL_GPL(tee_client_invoke_func);



int tee_client_cancel_req(struct tee_context *ctx,

			  struct tee_ioctl_cancel_arg *arg)

{

	if (!ctx->teedev->desc->ops->cancel_req)

		return -EINVAL;

	return ctx->teedev->desc->ops->cancel_req(ctx, arg->cancel_id,

						  arg->session);

}



static int tee_client_device_match(struct device *dev,

				   struct device_driver *drv)

{

include/linux/tee_drv.h

+12 −0
Original line number Diff line number Diff line
@@ -535,6 +535,18 @@ int tee_client_invoke_func(struct tee_context *ctx, 
			   struct tee_ioctl_invoke_arg *arg,

			   struct tee_param *param);



/**

 * tee_client_cancel_req() - Request cancellation of the previous open-session

 * or invoke-command operations in a Trusted Application

 * @ctx:       TEE Context

 * @arg:       Cancellation arguments, see description of

 *             struct tee_ioctl_cancel_arg

 *

 * Returns < 0 on error else 0 if the cancellation was successfully requested.

 */

int tee_client_cancel_req(struct tee_context *ctx,

			  struct tee_ioctl_cancel_arg *arg);



static inline bool tee_param_is_memref(struct tee_param *param)

{

	switch (param->attr & TEE_IOCTL_PARAM_ATTR_TYPE_MASK) {