From patchwork Mon Jul 17 10:38:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 107896 Delivered-To: patches@linaro.org Received: by 10.140.101.44 with SMTP id t41csp4343909qge; Mon, 17 Jul 2017 03:39:06 -0700 (PDT) X-Received: by 10.25.207.204 with SMTP id f195mr7385828lfg.40.1500287946628; Mon, 17 Jul 2017 03:39:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500287946; cv=none; d=google.com; s=arc-20160816; b=xIIRE19KQFe+YiP0C4fXtpd7WN6vEP9PtQt0WhQ/CNXkLfnLwkJ2B9W+yhtCi1lYrs pv/JmriLM6t5YZtLvAXdDFKXgNvRqxf5SfrCo8w7DXreum9H44qjjnZC2PgVihniIWp4 3jGHT0FyqNsEwgtY/c9rxzdUvJUtV2uR4KZzbKcyC6+2CXUzgh+c4JNjcE1ZlBvbHR1B ijpBuXSSjT3vf1GLSpdbI1bSvrGQlnMJKx0Y3y0CxMCipsn3hP4p5boElPDLhSKWGCTi 5nMwgTjwriD5PFNGnD7PKCreLyci+1gSEG+ELJQGX5CBE/yxxxnQHuBJ0ZaBJimAy0S9 sqWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=X9mc8LnnGJoBokzpBZYtH5wE+1VOf4DhPyR9xn+rW1c=; b=Jhhtwv60ZQpFavsRZ/nfr1Ou6nrr3bbiHgbFmbEcDoROvBYoxOznHa8DZF752H2/m+ qL4xzqS9WPeMCzpOh+Gn/Qg+he5lfJhMfQpPvxQpkrV4SnOt6FFk54Y7OMWPiCaKCrGl JSdf56T+enxV2BMaq3sVmy183yKCSSZIqJpDmymnc1vWksDj7RtCWmATYSXybYJC2jhq AjSruZ3R/brxZ5m4XtvvnLKJ5O9NJw95x7yf5rnnuqCmg9jrxBkd8129nSk38x2T9fEZ KniMJPJzXpUX/8TiY5xiJ1S8NcBp2ySGZpWZvBNy0SO2v0FoGbSBlsd9vz79Odt7Id7w cO7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=KXlVBBzb; spf=pass (google.com: domain of jens.wiklander@linaro.org designates 2a00:1450:4010:c07::22e as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-lf0-x22e.google.com (mail-lf0-x22e.google.com. [2a00:1450:4010:c07::22e]) by mx.google.com with ESMTPS id g26si7472711ljd.237.2017.07.17.03.39.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 03:39:06 -0700 (PDT) Received-SPF: pass (google.com: domain of jens.wiklander@linaro.org designates 2a00:1450:4010:c07::22e as permitted sender) client-ip=2a00:1450:4010:c07::22e; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=KXlVBBzb; spf=pass (google.com: domain of jens.wiklander@linaro.org designates 2a00:1450:4010:c07::22e as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x22e.google.com with SMTP id t72so83061069lff.1 for ; Mon, 17 Jul 2017 03:39:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=X9mc8LnnGJoBokzpBZYtH5wE+1VOf4DhPyR9xn+rW1c=; b=KXlVBBzbIvA+RXxtkRdJjBsLCPi/OpOkjjBLqD2a7m3oMsDdmOX+FdmpckSDnXlntT 5zx+vViVk6krHWsf08NP4OuLrtEVYv8tMpsdsr9f6zOWvCT+tNqqeRMMXB9HsSeXzF/r J/dHCGe6BZDqtCBN9ebMxUwyBUyPR+dfQTXTE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=X9mc8LnnGJoBokzpBZYtH5wE+1VOf4DhPyR9xn+rW1c=; b=sWdtmUysFD2h7oXbGk2R6A9dtp+oZp5piUnxfoOCV3lTQM+GyqCH5IqVAAegvZgrNZ N8j6qMfvNTEVFwUU0iozeNDA67OGXeLR7CboPq/AtQfJtgsQ1zCkQUB6Q/btGj6trxZf 7OibpquEbLBEmoKAGHTY/724f4I7llAsERV95FTgmXtMa+lie8buZkekcHh4mkKkdg3i nl1QcqYvZnSzCy4COBn6U7VhxJ44+P70Fi2WOj1e0HhjLpVREY5xaDfY9xtA2JirG1VS Fyz2cRGkzOve9u0dKuOScaK/zfELDu5nH99AWtl1z4/yduWZdSGvV8Nrg5WwHwjOIRsS ZGNg== X-Gm-Message-State: AIVw1112wbwq+t0WSkAO+WR5L+1N/sco2+PLc2n4xq+jDsaTBQQKSPwZ SIa1QvW+XAdEI1xXg44= X-Received: by 10.46.14.10 with SMTP id 10mr4825622ljo.75.1500287946252; Mon, 17 Jul 2017 03:39:06 -0700 (PDT) Return-Path: Received: from jax.urgonet (h-84-45.A175.priv.bahnhof.se. [79.136.84.45]) by smtp.gmail.com with ESMTPSA id h203sm92208lfe.7.2017.07.17.03.39.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Jul 2017 03:39:05 -0700 (PDT) From: Jens Wiklander To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, tee-dev@lists.linaro.org Cc: David Wang , Jerome Forissier , Jens Wiklander Subject: [PATCH] tee: optee: sync with new naming of interrupts Date: Mon, 17 Jul 2017 12:38:57 +0200 Message-Id: <1500287937-30504-1-git-send-email-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.7.4 From: David Wang In the latest changes of optee_os, the interrupts' names are changed to "native" and "foreign" interrupts. Signed-off-by: David Wang Signed-off-by: Jerome Forissier Signed-off-by: Jens Wiklander --- drivers/tee/optee/optee_smc.h | 12 ++++++------ drivers/tee/optee/rpc.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) -- 2.7.4 diff --git a/drivers/tee/optee/optee_smc.h b/drivers/tee/optee/optee_smc.h index 13b7c98cdf25..069c8e1429de 100644 --- a/drivers/tee/optee/optee_smc.h +++ b/drivers/tee/optee/optee_smc.h @@ -298,7 +298,7 @@ struct optee_smc_disable_shm_cache_result { OPTEE_SMC_FAST_CALL_VAL(OPTEE_SMC_FUNCID_ENABLE_SHM_CACHE) /* - * Resume from RPC (for example after processing an IRQ) + * Resume from RPC (for example after processing a foreign interrupt) * * Call register usage: * a0 SMC Function ID, OPTEE_SMC_CALL_RETURN_FROM_RPC @@ -383,19 +383,19 @@ struct optee_smc_disable_shm_cache_result { OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_FREE) /* - * Deliver an IRQ in normal world. + * Deliver foreign interrupt to normal world. * * "Call" register usage: - * a0 OPTEE_SMC_RETURN_RPC_IRQ + * a0 OPTEE_SMC_RETURN_RPC_FOREIGN_INTR * a1-7 Resume information, must be preserved * * "Return" register usage: * a0 SMC Function ID, OPTEE_SMC_CALL_RETURN_FROM_RPC. * a1-7 Preserved */ -#define OPTEE_SMC_RPC_FUNC_IRQ 4 -#define OPTEE_SMC_RETURN_RPC_IRQ \ - OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_IRQ) +#define OPTEE_SMC_RPC_FUNC_FOREIGN_INTR 4 +#define OPTEE_SMC_RETURN_RPC_FOREIGN_INTR \ + OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_FOREIGN_INTR) /* * Do an RPC request. The supplied struct optee_msg_arg tells which diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c index 9488ed1541bc..cef417f4f4d2 100644 --- a/drivers/tee/optee/rpc.c +++ b/drivers/tee/optee/rpc.c @@ -371,11 +371,11 @@ void optee_handle_rpc(struct tee_context *ctx, struct optee_rpc_param *param) shm = reg_pair_to_ptr(param->a1, param->a2); tee_shm_free(shm); break; - case OPTEE_SMC_RPC_FUNC_IRQ: + case OPTEE_SMC_RPC_FUNC_FOREIGN_INTR: /* - * An IRQ was raised while secure world was executing, - * since all IRQs are handled in Linux a dummy RPC is - * performed to let Linux take the IRQ through the normal + * A foreign interrupt was raised while secure world was + * executing, since they are handled in Linux a dummy RPC is + * performed to let Linux take the interrupt through the normal * vector. */ break;