From patchwork Sun Jan 24 09:23:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1430884 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=foundries.io header.i=@foundries.io header.a=rsa-sha256 header.s=google header.b=Jgxt8IZh; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DNncC4mdYz9sVS for ; Sun, 24 Jan 2021 20:23:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 99219826CD; Sun, 24 Jan 2021 10:23:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=foundries.io Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=foundries.io header.i=@foundries.io header.b="Jgxt8IZh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 34693826F3; Sun, 24 Jan 2021 10:23:16 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B16F0826C8 for ; Sun, 24 Jan 2021 10:23:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=foundries.io Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@foundries.io Received: by mail-lf1-x131.google.com with SMTP id f1so3754739lfu.3 for ; Sun, 24 Jan 2021 01:23:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundries.io; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RQ4swMdElhMkK3XU8fLBOfY3P1MqR0GD22u3GZ9mXhM=; b=Jgxt8IZhNu6FldRazrD4A8/n+APZHqKsG51AH/A1bix1kv7dyeWjHTcI8+7+YUdggV hVVup7lPfTTA6Oq7xWmVFDpRI6RSfd30iGfSsENSYMVVP89YV60YuJ9t93zlKIyLG/VV 0//SAkUIf6dIj6VzSgJqyM//eTe0zY1+vFHg72oSJ+/SN+qY6Lp0LIwkJj4gSm6PRVqq 3UXSQ5fJHqxgJ0Es3+SMzSnRIbxGBdTLEBe3HNFrFHrW/gJV2JS5Cj0IfOHyWl8OlUYj fj+9EO7PKG03ghzIfejU0OFH3br5eDZbQmg3SG2o+9sPdlGgOvBGA/jMFh4gWCKEGX9D rBug== 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:mime-version :content-transfer-encoding; bh=RQ4swMdElhMkK3XU8fLBOfY3P1MqR0GD22u3GZ9mXhM=; b=fmoaQ8GIa7Hub282Jt6g6ZtKHsyMe4tUe93MOItoxYMPjQ19z60vK2qpSaHZsdLiUO y2QAw2VU1rU7A0q8SbtOooPOogSoS2eI4xYmy+muj6xT1rgKvjQW1LR1IdiE+oxawQ5Z hNxXDJ2lEoIzSy+Z7TdVF0j+7RulI+ysAweYWPGPKa1ftNixeGx8/mdcpGuiEW/C10o1 N2qoaGgjJh5WhLRmtVAdNgynMqcYmFgEV9ogFYTGPfzwTBez9LyVNWhWpg/lolnY+mZh VhR4ttOEcOAujVm3GDwOcrGy6AHa9NbQDYW32NgSXD19CXKeXDf5GtNd9/r4gpZbWq0t yjzg== X-Gm-Message-State: AOAM530j5JkFX8iDG5hPiVvMOygyWQKbeZyo0omwJ9fLIhWJVjqJ6gAW 0M0FBoFVNynzDAoR+ar3ScSmvlVfhUKaGmHF X-Google-Smtp-Source: ABdhPJzYxp2ctlUYx91k3SavLxF6PXKQ2hkifeBUO1//N3BkzUIGXfeG3aIox/YfbMhaCffufaKMOw== X-Received: by 2002:a19:ad42:: with SMTP id s2mr787313lfd.448.1611480191561; Sun, 24 Jan 2021 01:23:11 -0800 (PST) Received: from localhost ([109.108.76.111]) by smtp.gmail.com with ESMTPSA id d28sm514523lfn.15.2021.01.24.01.23.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 01:23:10 -0800 (PST) From: Igor Opaniuk X-Google-Original-From: Igor Opaniuk To: u-boot@lists.denx.de Cc: jorge@foundries.io, mike@foundries.io, ricardo@foundries.io, etienne.carriere@linaro.org, jens.wiklander@linaro.org, Igor Opaniuk , Anatolij Gustschin , Patrick Delaunay , Sean Anderson , Simon Glass Subject: [RFC PATCH v1 1/2] optee: obtain emmc rpmb info from dt Date: Sun, 24 Jan 2021 11:23:03 +0200 Message-Id: <20210124092304.51462-1-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk Add support for rpmb-dev property in optee node. Prioritize that eMMC info from DT for RPMB operations instead of the one provided by OP-TEE OS core in RPC calls. Signed-off-by: Igor Opaniuk --- drivers/tee/optee/core.c | 33 +++++++++++++++++ drivers/tee/optee/optee_private.h | 2 +- drivers/tee/optee/rpmb.c | 60 ++++++++++++++++++------------- 3 files changed, 70 insertions(+), 25 deletions(-) diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index b898c32edc..1d85486dcb 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "optee_smc.h" #include "optee_msg.h" @@ -607,14 +608,46 @@ static optee_invoke_fn *get_invoke_func(struct udevice *dev) return ERR_PTR(-EINVAL); } +static struct mmc *get_rpmb_dev(struct udevice *dev) +{ + struct udevice *mmc_dev; + const fdt32_t *phandle_p; + u32 phandle; + int ret = 0; + + debug("optee: looking for rpmb device in DT.\n"); + + phandle_p = ofnode_get_property(dev_ofnode(dev), + "rpmb-dev", NULL); + if (!phandle_p) { + debug("optee: missing \"rpmb-dev\" property\n"); + return ERR_PTR(-ENXIO); + } + + phandle = fdt32_to_cpu(*phandle_p); + + ret = uclass_get_device_by_phandle_id(UCLASS_MMC, phandle, &mmc_dev); + if (ret) { + printf("optee: invalid phandle value in \"rpmb-dev\".\n"); + return ERR_PTR(-ENXIO); + } + + debug("optee: using phandle %d from \"rpmd-dev\" property.\n", + phandle); + return mmc_get_mmc_dev(mmc_dev); +} + static int optee_of_to_plat(struct udevice *dev) { struct optee_pdata *pdata = dev_get_plat(dev); + struct optee_private *priv = dev_get_priv(dev); pdata->invoke_fn = get_invoke_func(dev); if (IS_ERR(pdata->invoke_fn)) return PTR_ERR(pdata->invoke_fn); + priv->rpmb_mmc = get_rpmb_dev(dev); + return 0; } diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h index 1f07a27ee4..8e5a280622 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -19,8 +19,8 @@ */ struct optee_private { struct mmc *rpmb_mmc; - int rpmb_dev_id; int rpmb_original_part; + bool rpmb_inited; }; struct optee_msg_arg; diff --git a/drivers/tee/optee/rpmb.c b/drivers/tee/optee/rpmb.c index 0804fc963c..0137c44be1 100644 --- a/drivers/tee/optee/rpmb.c +++ b/drivers/tee/optee/rpmb.c @@ -45,55 +45,67 @@ static void release_mmc(struct optee_private *priv) { int rc; - if (!priv->rpmb_mmc) + if (!priv->rpmb_mmc || !priv->rpmb_inited) return; - rc = blk_select_hwpart_devnum(IF_TYPE_MMC, priv->rpmb_dev_id, - priv->rpmb_original_part); + rc = mmc_switch_part(priv->rpmb_mmc, priv->rpmb_original_part); if (rc) debug("%s: blk_select_hwpart_devnum() failed: %d\n", __func__, rc); - priv->rpmb_mmc = NULL; + priv->rpmb_inited = false; +} + +static int check_mmc(struct mmc *mmc) +{ + if (!mmc) { + debug("Cannot find RPMB device\n"); + return -ENODEV; + } + if (!(mmc->version & MMC_VERSION_MMC)) { + debug("Device id is not an eMMC device\n"); + return -ENODEV; + } + if (mmc->version < MMC_VERSION_4_41) { + debug("RPMB is not supported before version 4.41\n"); + return -ENODEV; + } + + return 0; } static struct mmc *get_mmc(struct optee_private *priv, int dev_id) { - struct mmc *mmc; int rc; - if (priv->rpmb_mmc && priv->rpmb_dev_id == dev_id) + if (priv->rpmb_mmc && priv->rpmb_inited) return priv->rpmb_mmc; release_mmc(priv); - mmc = find_mmc_device(dev_id); - if (!mmc) { - debug("Cannot find RPMB device\n"); - return NULL; - } - if (!(mmc->version & MMC_VERSION_MMC)) { - debug("Device id %d is not an eMMC device\n", dev_id); - return NULL; - } - if (mmc->version < MMC_VERSION_4_41) { - debug("Device id %d: RPMB not supported before version 4.41\n", - dev_id); + /* + * Check if priv->rpmb_mmc was already set from DT node, + * otherwise use dev_id provided by OP-TEE OS + * and find mmc device by its dev_id + */ + if (!priv->rpmb_mmc) + priv->rpmb_mmc = find_mmc_device(dev_id); + + rc = check_mmc(priv->rpmb_mmc); + if (rc) return NULL; - } - priv->rpmb_original_part = mmc_get_blk_desc(mmc)->hwpart; + priv->rpmb_original_part = mmc_get_blk_desc(priv->rpmb_mmc)->hwpart; - rc = blk_select_hwpart_devnum(IF_TYPE_MMC, dev_id, MMC_PART_RPMB); + rc = mmc_switch_part(priv->rpmb_mmc, MMC_PART_RPMB); if (rc) { debug("Device id %d: cannot select RPMB partition: %d\n", dev_id, rc); return NULL; } - priv->rpmb_mmc = mmc; - priv->rpmb_dev_id = dev_id; - return mmc; + priv->rpmb_inited = true; + return priv->rpmb_mmc; } static u32 rpmb_get_dev_info(u16 dev_id, struct rpmb_dev_info *info)