From patchwork Mon Feb 6 10:27:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 53171 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2159386wrn; Mon, 6 Feb 2023 02:35:57 -0800 (PST) X-Google-Smtp-Source: AK7set/0uTa/Pv5iY8d9HID+iEULC+YQRZgWBkP/zAgtRY+dECgGMprvsbTRVZ3fMWxpoUtfM0Bh X-Received: by 2002:a50:99dd:0:b0:4aa:b5e7:9e77 with SMTP id n29-20020a5099dd000000b004aab5e79e77mr1564811edb.11.1675679757073; Mon, 06 Feb 2023 02:35:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675679757; cv=none; d=google.com; s=arc-20160816; b=g6EWVc3yszd0Lv0Pb05EU2qb0bOrlHcQoiBIqwaS1B6ZCCfNnsYSDWKS4ZC2j1ujzc uBucVJLiiuBX0KNeBF6p3Nq3tqNTyG/ugDTjOwdh4QV24/okgIw4uvjIbaxGF6y36+2x Fg6m40cgSwzP3H+A1Mn8rqtUrOOcPLvEt/nGQxqHlCMXg4Qd/ReLNm35OpOX1vp79yZ6 MkJthZhKcQ6452nMV9OwpjvuvJ/R3HbEmg8rNPFL0QO9BsuHWSbaSLLq4BCGe0A331gQ ksMGf0iuLGxAjzgUqgvY6sS/BL/uTyTMYHsftfC44nIAFvBWOBSeZb+J7Aa+lYnL+0uo +shg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PgSSD3uLqDr7SGSKLQ1i7dmWi7XiSm1LY65hwRVkN5w=; b=Z6vZBkfJjgMkoile3wWsUsoRAybig7PelWjMTeT/8G+nH5cY1wtH4GNQoz5ujXdGTX TIBMB07AoDcJ3EGCh1rGYEpvx5OvycC0pma/sqPtbYbWvX622jAi7P2uHt8cofsBCHZ4 HyZiHV5Vyec41MVcaHyQvBu14t7nz+MM3oWBiJgOsh67qFZfwthIY/TycKg4W1O+UKJQ TkBEr8gMqlILwT9fbaidpK0epEVmX4sXojvNFlVE//EmvvtQM+s0N7ro6a76BwWlEYhu cZdiyYvYxK4Rhn6aMxGZ7kUHgygZfmH+2s9zA5yvISVj6Jfu6UnGU7KMF2BK+rU9D97R gQRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fFENw3ke; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j8-20020aa7ca48000000b004aa96c529f6si8359749edt.371.2023.02.06.02.35.33; Mon, 06 Feb 2023 02:35:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fFENw3ke; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230466AbjBFKag (ORCPT + 99 others); Mon, 6 Feb 2023 05:30:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231222AbjBFK3o (ORCPT ); Mon, 6 Feb 2023 05:29:44 -0500 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 405A219697 for ; Mon, 6 Feb 2023 02:28:56 -0800 (PST) Received: by mail-wm1-x32f.google.com with SMTP id u10so5232924wmj.3 for ; Mon, 06 Feb 2023 02:28:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PgSSD3uLqDr7SGSKLQ1i7dmWi7XiSm1LY65hwRVkN5w=; b=fFENw3keV/o+jIwwd3UnUip+TBBpP/Uvya7LKSwgGbZ/aMCNUrnpXpNUa3IBBDiWfv laTJt5bZq6c8dM9p+mDa61bGdZXvNfOJFExjhF8VtOjFlx9w6wV4GabbmAIxFn2fPy/V PucfwQbiBp9m+K/BSXP0ReqDANrP+aZXenxa6ipKNaxwY5ZzNSv7cLu2rkRpoY4aWEqs RdNRJtD6qc8AyFM76h1LapIn2XZZsfCFNrgK/m3l5XVXfaaHZ4IY/DpJ3/+CHzRsoGh7 zUR2dFwBQHEeKPajJeKreCuAkZb3+nqUC4JhEZlOoJ5W2WsuoQ44OCoftklG5e47yKlI 617g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PgSSD3uLqDr7SGSKLQ1i7dmWi7XiSm1LY65hwRVkN5w=; b=VoH6vbRGbF1RIEov7rLkg5iOaehsUff8ypK55K2sFHh6n8OKzjy5mhMw5Uo3vlN1CC BLuWHKX9cuAWRohsOU56NZmKdn+yjp/XyWgJmC1JWiEMeBMsXDKhm2xrpsbqrVaXSzID UyAi8bB9RON5dQrvSDuMXtLKVbjYpoaOGYjgu2P1u8AR5epmM/st1UFrlHdZHK9hDu1a a2RZlricHR9l+thRrbFsnAlKX8SpsGgnYF11b1NRcCxc88XuewsjhTAVBiA5ERwU/VBx nKZ5Pr1LtVkFpXL48tiuw2zHLZMy481jKtv389oIV6sS8lQGZXK5MaiZ+qNK0Gnv0yHa Yksg== X-Gm-Message-State: AO0yUKWcifnv5cUYlSsMjej80i6U8NXHZEx6YtM+3i6DB4iZRiy0VAKp qkfCDTshwkZP8PR8rhuWjRReKA== X-Received: by 2002:a05:600c:348a:b0:3d1:caf1:3f56 with SMTP id a10-20020a05600c348a00b003d1caf13f56mr10574113wmq.9.1675679333828; Mon, 06 Feb 2023 02:28:53 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id g10-20020a05600c310a00b003de77597f16sm11002446wmo.21.2023.02.06.02.28.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Feb 2023 02:28:53 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Patrick Delaunay , Etienne Carriere , Srinivas Kandagatla Subject: [RESEND PATCH 32/37] nvmem: stm32: detect bsec pta presence for STM32MP15x Date: Mon, 6 Feb 2023 10:27:54 +0000 Message-Id: <20230206102759.669838-33-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230206102759.669838-1-srinivas.kandagatla@linaro.org> References: <20230206102759.669838-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757077576782539816?= X-GMAIL-MSGID: =?utf-8?q?1757077576782539816?= From: Patrick Delaunay On STM32MP15x SoC, the SMC backend is optional when OP-TEE is used; the PTA BSEC should be used as it is done on STM32MP13x platform, but the BSEC SMC can be also used: it is a legacy mode in OP-TEE, not recommended but used in previous OP-TEE firmware. The presence of OP-TEE is dynamically detected in STM32MP15x device tree and the supported NVMEM backend is dynamically detected: - PTA with stm32_bsec_pta_find - SMC with stm32_bsec_check With OP-TEE but without PTA and SMC detection, the probe is deferred for STM32MP15x devices. On STM32MP13x platform, only the PTA is supported with cfg->ta = true and this detection is skipped. Signed-off-by: Patrick Delaunay Reviewed-by: Etienne Carriere Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/stm32-romem.c | 38 +++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/drivers/nvmem/stm32-romem.c b/drivers/nvmem/stm32-romem.c index 978a63edf297..ba779e26937a 100644 --- a/drivers/nvmem/stm32-romem.c +++ b/drivers/nvmem/stm32-romem.c @@ -159,6 +159,31 @@ static int stm32_bsec_pta_write(void *context, unsigned int offset, void *buf, return stm32_bsec_optee_ta_write(priv->ctx, priv->lower, offset, buf, bytes); } +static bool stm32_bsec_smc_check(void) +{ + u32 val; + int ret; + + /* check that the OP-TEE support the BSEC SMC (legacy mode) */ + ret = stm32_bsec_smc(STM32_SMC_READ_SHADOW, 0, 0, &val); + + return !ret; +} + +static bool optee_presence_check(void) +{ + struct device_node *np; + bool tee_detected = false; + + /* check that the OP-TEE node is present and available. */ + np = of_find_compatible_node(NULL, NULL, "linaro,optee-tz"); + if (np && of_device_is_available(np)) + tee_detected = true; + of_node_put(np); + + return tee_detected; +} + static int stm32_romem_probe(struct platform_device *pdev) { const struct stm32_romem_cfg *cfg; @@ -195,11 +220,16 @@ static int stm32_romem_probe(struct platform_device *pdev) } else { priv->cfg.size = cfg->size; priv->lower = cfg->lower; - if (cfg->ta) { + if (cfg->ta || optee_presence_check()) { rc = stm32_bsec_optee_ta_open(&priv->ctx); - /* wait for OP-TEE client driver to be up and ready */ - if (rc) - return rc; + if (rc) { + /* wait for OP-TEE client driver to be up and ready */ + if (rc == -EPROBE_DEFER) + return -EPROBE_DEFER; + /* BSEC PTA is required or SMC not supported */ + if (cfg->ta || !stm32_bsec_smc_check()) + return rc; + } } if (priv->ctx) { rc = devm_add_action_or_reset(dev, stm32_bsec_optee_ta_close, priv->ctx);