github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 23:52:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Add OP-TEE per cpu asynchronous notification

Browse Source 
Adds support for signalling from secure world with per-cpu interrupts in
 addition to edge-triggered peripheral interrupts.
 -----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCgA4FiEEFV+gSSXZJY9ZyuB5LinzTIcAHJcFAmQrwJYaHGplbnMud2lr
 bGFuZGVyQGxpbmFyby5vcmcACgkQLinzTIcAHJfyKw//TT/y0aSbxvg/9VY7ShAu
 ULhR4f50ariYtEqz5ulv3c+6T+ANP3uR788uF+5udDWQC0T1/siNWTAG5F0IxXt2
 UzGi7O0iVzbfA1PsQyjWQvZko5mQd1a8UV6rBodK/ACXxjj/8WVBnd/7AtOa31wm
 nRhpXCA3xGpqFdXfwuaksZFMOiCF1c4lR8KUxLkVvO7fElt+LVLB4cf54ZLKW4qC
 q8oAD7uo2An5gBgWkz3vCf7vSBpwnjCv13vxRbJZJtQR3OtjlivbfLpwlepDKk/B
 kcK88USc0AmrhG7hVYIANwey29setiDG+xwp1wVaJazGUjboUycnTLwQRx1JPEaS
 cTezfJG2DQsWEYpZB8uBHbi9ReZ278q2hAu/vYy7WsAgxZ7grN1718bKvA98IAb+
 erSR8TB5IHI31IQ5HISb6NORCaGWl+yPDbH0mKqi0UVSCUg2qvjTeFr9r6izN49K
 Mnw6BUakXtQTMyl5DsNc8uPik0L5LND/iQkyBcemGDjzrNwG6IUYjvz2VTs/0a6j
 eJb10MVJ0pXemX5/zHKjQawGxjvr5q9HklYfo9EjUSSNKSI6hKdHK3JPy/mPyBtN
 8WeFs+OkxF598QTdzCHtbfVXUkH2JuMdtV94RYYOqaa6nA6HyfA/I/RccRqUqQHY
 eOqTBrPwTpzrrqbDXxtfFV8=
 =yLJe
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmQsL5wACgkQmmx57+YA
 GNkeyxAAw1ocEuCE7d96UooEhkE2omLFzm6ogHX40Wi8FRF4ti8iWpLOsdze745E
 EOC8BaLtBHyuwQgrcKKmrzSbeuaDvwzVzAUAP76TTywjZDmfSWBAtrWn1AO+V0OM
 2EWN/VgUpcuQMZubS+4DpxJRencx3TBPR6mFocpn780JLxaU/Wb2/yHJc9Rez1S0
 Hv6aNTheqSVor8bq5xke3vA9x+PZp5DGjLoWyS+Ab0HpMjljkMjOc9rh7OTIxA8g
 ij1p1oEpY6lfTqz2o34uCmSsLoSMOussAbCwa9+kzmrZpnF/ed46t/Ap9lzowp02
 7r1k9K5UuZZkLh01wdFw7YoKPfbJQ4UmdUBb8jVqMcV+yWD1tZ2dSgS580lBxCBy
 rrb+ePA5yWl/yzVB5LaPWyA6iP0oZDi8iGkFt1g7OYPqrUp0NQEJ17q2BZdxqc54
 O8oj9sDav2Zup72e/jbYKdfUfnO116qpurTemgvLuQn8l6WeXIuuxnOVYZmO9O2u
 JXXbyPFmyGofh5NWkK4MhaG7j1NlOmJjxO2ag7DpTV5lm/2o/yMPo2vh8CkWXtyG
 F9SwQPaDVOp0NbEEkc5s1dVih1/amEjF6hMRiUS0Z7LFNkb+upmGmy3aBeWvajB8
 rVzlk62h/i7sQiQfXVmw+tT4XbFzrfHlXX4JBp5lbpLNlopzb0Q=
 =2bJ5
 -----END PGP SIGNATURE-----

Merge tag 'optee-per-cpu-irq-for-v6.4' of https://git.linaro.org/people/jens.wiklander/linux-tee into soc/drivers

Add OP-TEE per cpu asynchronous notification

Adds support for signalling from secure world with per-cpu interrupts in
addition to edge-triggered peripheral interrupts.

* tag 'optee-per-cpu-irq-for-v6.4' of https://git.linaro.org/people/jens.wiklander/linux-tee:
  optee: add per cpu asynchronous notification
  dt-bindings: optee driver interrupt can be a per-cpu interrupt

Link: https://lore.kernel.org/r/20230404062727.GA2765560@rayden
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-04-04 16:09:31 +02:00
commit 0d3becec77
3 changed files with 144 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.yaml
View File

@ -28,7 +28,8 @@ properties:
maxItems: 1
description: |
This interrupt which is used to signal an event by the secure world
software is expected to be edge-triggered.
software is expected to be either a per-cpu interrupt or an
edge-triggered peripheral interrupt.
method:
enum: [smc, hvc]

24
drivers/tee/optee/optee_private.h
View File

@ -94,11 +94,35 @@ struct optee_supp {
struct completion reqs_c;
};
/*
* struct optee_pcpu - per cpu notif private struct passed to work functions
* @optee optee device reference
*/
struct optee_pcpu {
struct optee *optee;
};
/*
* struct optee_smc - optee smc communication struct
* @invoke_fn handler function to invoke secure monitor
* @memremaped_shm virtual address of memory in shared memory pool
* @sec_caps: secure world capabilities defined by
* OPTEE_SMC_SEC_CAP_* in optee_smc.h
* @notif_irq interrupt used as async notification by OP-TEE or 0
* @optee_pcpu per_cpu optee instance for per cpu work or NULL
* @notif_pcpu_wq workqueue for per cpu asynchronous notification or NULL
* @notif_pcpu_work work for per cpu asynchronous notification
* @notif_cpuhp_state CPU hotplug state assigned for pcpu interrupt management
*/
struct optee_smc {
optee_invoke_fn *invoke_fn;
void *memremaped_shm;
u32 sec_caps;
unsigned int notif_irq;
struct optee_pcpu __percpu *optee_pcpu;
struct workqueue_struct *notif_pcpu_wq;
struct work_struct notif_pcpu_work;
unsigned int notif_cpuhp_state;
};
/**

122
drivers/tee/optee/smc_abi.c
View File

@ -52,6 +52,23 @@
*/
#define OPTEE_MIN_STATIC_POOL_ALIGN 9 /* 512 bytes aligned */
/* SMC ABI considers at most a single TEE firmware */
static unsigned int pcpu_irq_num;
static int optee_cpuhp_enable_pcpu_irq(unsigned int cpu)
{
enable_percpu_irq(pcpu_irq_num, IRQ_TYPE_NONE);
return 0;
}
static int optee_cpuhp_disable_pcpu_irq(unsigned int cpu)
{
disable_percpu_irq(pcpu_irq_num);
return 0;
}
/*
* 1. Convert between struct tee_param and struct optee_msg_param
*
@ -991,9 +1008,8 @@ static u32 get_async_notif_value(optee_invoke_fn *invoke_fn, bool *value_valid,
return res.a1;
}
static irqreturn_t notif_irq_handler(int irq, void *dev_id)
static irqreturn_t irq_handler(struct optee *optee)
{
struct optee *optee = dev_id;
bool do_bottom_half = false;
bool value_valid;
bool value_pending;
@ -1016,6 +1032,13 @@ static irqreturn_t notif_irq_handler(int irq, void *dev_id)
return IRQ_HANDLED;
}
static irqreturn_t notif_irq_handler(int irq, void *dev_id)
{
struct optee *optee = dev_id;
return irq_handler(optee);
}
static irqreturn_t notif_irq_thread_fn(int irq, void *dev_id)
{
struct optee *optee = dev_id;
@ -1025,7 +1048,7 @@ static irqreturn_t notif_irq_thread_fn(int irq, void *dev_id)
return IRQ_HANDLED;
}
static int optee_smc_notif_init_irq(struct optee *optee, u_int irq)
static int init_irq(struct optee *optee, u_int irq)
{
int rc;
@ -1040,12 +1063,103 @@ static int optee_smc_notif_init_irq(struct optee *optee, u_int irq)
return 0;
}
static irqreturn_t notif_pcpu_irq_handler(int irq, void *dev_id)
{
struct optee_pcpu *pcpu = dev_id;
struct optee *optee = pcpu->optee;
if (irq_handler(optee) == IRQ_WAKE_THREAD)
queue_work(optee->smc.notif_pcpu_wq,
&optee->smc.notif_pcpu_work);
return IRQ_HANDLED;
}
static void notif_pcpu_irq_work_fn(struct work_struct *work)
{
struct optee_smc *optee_smc = container_of(work, struct optee_smc,
notif_pcpu_work);
struct optee *optee = container_of(optee_smc, struct optee, smc);
optee_smc_do_bottom_half(optee->ctx);
}
static int init_pcpu_irq(struct optee *optee, u_int irq)
{
struct optee_pcpu __percpu *optee_pcpu;
int cpu, rc;
optee_pcpu = alloc_percpu(struct optee_pcpu);
if (!optee_pcpu)
return -ENOMEM;
for_each_present_cpu(cpu)
per_cpu_ptr(optee_pcpu, cpu)->optee = optee;
rc = request_percpu_irq(irq, notif_pcpu_irq_handler,
"optee_pcpu_notification", optee_pcpu);
if (rc)
goto err_free_pcpu;
INIT_WORK(&optee->smc.notif_pcpu_work, notif_pcpu_irq_work_fn);
optee->smc.notif_pcpu_wq = create_workqueue("optee_pcpu_notification");
if (!optee->smc.notif_pcpu_wq) {
rc = -EINVAL;
goto err_free_pcpu_irq;
}
optee->smc.optee_pcpu = optee_pcpu;
optee->smc.notif_irq = irq;
pcpu_irq_num = irq;
rc = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "optee/pcpu-notif:starting",
optee_cpuhp_enable_pcpu_irq,
optee_cpuhp_disable_pcpu_irq);
if (!rc)
rc = -EINVAL;
if (rc < 0)
goto err_free_pcpu_irq;
optee->smc.notif_cpuhp_state = rc;
return 0;
err_free_pcpu_irq:
free_percpu_irq(irq, optee_pcpu);
err_free_pcpu:
free_percpu(optee_pcpu);
return rc;
}
static int optee_smc_notif_init_irq(struct optee *optee, u_int irq)
{
if (irq_is_percpu_devid(irq))
return init_pcpu_irq(optee, irq);
else
return init_irq(optee, irq);
}
static void uninit_pcpu_irq(struct optee *optee)
{
cpuhp_remove_state(optee->smc.notif_cpuhp_state);
destroy_workqueue(optee->smc.notif_pcpu_wq);
free_percpu_irq(optee->smc.notif_irq, optee->smc.optee_pcpu);
free_percpu(optee->smc.optee_pcpu);
}
static void optee_smc_notif_uninit_irq(struct optee *optee)
{
if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_ASYNC_NOTIF) {
optee_smc_stop_async_notif(optee->ctx);
if (optee->smc.notif_irq) {
free_irq(optee->smc.notif_irq, optee);
if (irq_is_percpu_devid(optee->smc.notif_irq))
uninit_pcpu_irq(optee);
else
free_irq(optee->smc.notif_irq, optee);
irq_dispose_mapping(optee->smc.notif_irq);
}
}