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: 9844551 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 09EA760386 for ; Mon, 17 Jul 2017 10:39:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF7CA23B34 for ; Mon, 17 Jul 2017 10:39:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E41C327FB7; Mon, 17 Jul 2017 10:39:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8EDAC23B34 for ; Mon, 17 Jul 2017 10:39:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=QcV29ygLtAgMzkXLJAyq266tEqtDppMrslWImAHaxKE=; b=IUB AGv0yCns8UAD2nvwvxMUvBWdxO6pyPhqbc1csUjgGeEaIXUFXqKi1+aZg+/ygACG0IvvvyLMf8XgM vhFUkulxtI0XAfusXD0hum367feJ6dGj0Krx+IBHTnc87htpQJFBQdfzzAO4HnfF/AmUIuWYJkvlr qdH3xz7bLJadIafWeRGeuAbgPhcAXsonS33uug/W8MatHCeelxWvo5GkA6ZDzFE6djftODraGhTFv LzOKSFtC65UK9wKn2SXcZSpC4v9cyaoal3WFWUVc9b3M/BXPSrjBOTjaw375zjiy7w9vmoTwDDs0K Gg9yxqHnp1xabamwooFUylfX0Zjb+bA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dX3R5-00066A-T7; Mon, 17 Jul 2017 10:39:31 +0000 Received: from mail-lf0-x236.google.com ([2a00:1450:4010:c07::236]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dX3R2-000659-GH for linux-arm-kernel@lists.infradead.org; Mon, 17 Jul 2017 10:39:30 +0000 Received: by mail-lf0-x236.google.com with SMTP id w198so15341825lff.2 for ; Mon, 17 Jul 2017 03:39:07 -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=LGHNjf+rYqtbdPdD8WauXmtaPoJd24ckkmn2qRbGiXO0ztEFoQwM9OZ4ZxlyoJqsDq KNezHXHbbFI21gJ12VbaPSqa/uyL8bbCR9QSiQUc6s4lFIEycXFPcqQ4lvQMVL7YjT+r Nh904N7Qr4NcWQ+Wkxfcbjdw4PK4PT9T42rYDIKb7Mve2pe7Dh/+VMJjoqdgKRNV2gWr bz/ppywKtWjsxISCHGz1uZh9qgW64kBCf9MKecHkVZtSbdiLildi5eJuvUh2VpH7SvQi KmmLr3sMtq95VlHy0VLWoqq2eWOvK1sDPe4JetoGeDtjsu0zgVHTNaTPjAgW3KnT3Goj 2v0g== X-Gm-Message-State: AIVw111TBXe4L5L3FC8JTWyKwfUyvfeLpN5evqxb0L+uqU05Y2VmRas/ beRMKCMIAGK1gIh76Ri3uw== X-Received: by 10.46.14.10 with SMTP id 10mr4825622ljo.75.1500287946252; Mon, 17 Jul 2017 03:39:06 -0700 (PDT) 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170717_033928_764102_545E1D91 X-CRM114-Status: GOOD ( 10.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Wang , Jens Wiklander , Jerome Forissier MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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;