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;
From:   meenakshi.aggarwal@nxp.com
To:     horia.geanta@nxp.com, V.sethi@nxp.com, pankaj.gupta@nxp.com,
        gaurav.jain@nxp.com, herbert@gondor.apana.org.au,
        davem@davemloft.net, linux-crypto@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Subject: [PATCH v2 2/2] crypto: caam - OP-TEE firmware support
Date:   Wed, 22 Mar 2023 07:17:16 +0100
Message-Id: <20230322061716.3195841-3-meenakshi.aggarwal@nxp.com>
In-Reply-To: <20230322061716.3195841-1-meenakshi.aggarwal@nxp.com>
References: <20230302062055.1564514-3-meenakshi.aggarwal@nxp.com>
 <20230322061716.3195841-1-meenakshi.aggarwal@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aQxd6U+WUoWqeB1AVwMjYs4H0QijfeOwrBeEYzpfaO2iaALnwgo1j4Ku8vSO?=
 =?us-ascii?Q?g4mXd4gyO71MKlEpny3+INhbYu4t2oIjWkGejyCyS1H43/819JP0o6FfZayr?=
 =?us-ascii?Q?yRnyj2m0pusu5e073D/nFPh5yQpM5fTzCexl0OEW7j+0ubwM6dvjNB+FBgy0?=
 =?us-ascii?Q?pJseN8wFnhWZ8vm3ZQFNUH0F1hFfn9944SNpCkzTAwdSTt9/gdo2C3ZdIGOp?=
 =?us-ascii?Q?OrGL/Q3A5pgI+dKS2d+IywmpsUC1HJR1qjq3nBmhI3VTlW2oTDb/3F86qv+T?=
 =?us-ascii?Q?SEW+9nPey0/JgfZTCtPQNTDfZtvXcvRVzdm/SqiEgWSM7OX7e1hfvfQThS13?=
 =?us-ascii?Q?E2JbWIYI0uVLNzk6ZJBAQDGevVofvH2l2EsBFmyjVLDCm/R3kCi+fE2588rQ?=
 =?us-ascii?Q?hajJbq4dgOBFix26DYqDL4ElQTwzRsL5lYgWrBIsIyLuPNVQreCmcjZH/6P+?=
 =?us-ascii?Q?GOL87HREaKV1o/DJBpWOHLe8TqM905KLdf8gndHR1prVlLOo5qB+k0O8L50M?=
 =?us-ascii?Q?83sL52+pXnFg+LAAUUxXoSRWlscWuZIgptkmy7kxRuzfty8nImY/EfLHGSqn?=
 =?us-ascii?Q?ohVNPeaus6WZ1iIsqFDxOmnfkmd/MLMKtXBxwKlV/W0ezpLXoAqxQi6KiQTT?=
 =?us-ascii?Q?sL8HT2yJOPlUSCoaSXv8TzNRm8leAgWlk+pWUiHFlsnauG6LMV/wl+o9TJCE?=
 =?us-ascii?Q?4TJGMmpffufmRaTmEWUzPZVzHTc9xRE6U3kR1tsIpkCxsGCbgwCy5BTWcmu0?=
 =?us-ascii?Q?m2rBpSehWtO6M7MPaOK/rgnCDbZJlGiPV9f9KaLbyqEhlwpLqADAbUVs9/r+?=
 =?us-ascii?Q?5FiAefs9XGhujxGGGDWdUIgXzVYQqdijM0RC+5mbcHe2YbJIh2y/PVOkzvVN?=
 =?us-ascii?Q?uRTMHXooURMSOOh6vCI5TBAeXRAkbIMkPyc4V7fOYJxT7drorme3jbfPPGMP?=
 =?us-ascii?Q?xa8iHoz2MPwH9pTWb2B+7DJ9fi1KXkduDjtLrw+xJLjCXGXtqvu2wrgsiCzu?=
 =?us-ascii?Q?nYiwzRVTep0aNSqgtWQMiqSmXqByKDLUOPq8WXWnG2Mjr44xiqNxvx1F97Fq?=
 =?us-ascii?Q?9s/6YVJ+8az3JV6b1Y82ENRT1ys0W+7FXc+/S9IjE8EICN69g8aLkIMoxqiF?=
 =?us-ascii?Q?UW//++79COApvR7s6gfDFnQxtlUmYJBEhzR3HEsshF7qpjJ4utE0/KPboUZB?=
 =?us-ascii?Q?P2itWH+Z2ZltwZd9BXyJyAMArW8axZgSA7tdJalSUrLBG85y+CPDn8iPUp8o?=
 =?us-ascii?Q?SUsN3hhVR1CIDnUXPD8Axgce5WjplmChfPbCguZoHSAR45HOZZgKNvl5dadQ?=
 =?us-ascii?Q?dNnC9Ta7i1sKOIjk1/jBgkf5os/lLoHmR5kkbPbY6mF+xS7xAG3tF8p0uv9l?=
 =?us-ascii?Q?v7jG68OAKf936vucf3QpopXRvViGb2bQiQfxcn5HoZ/4fYXRwMZMoJo1HGAp?=
 =?us-ascii?Q?FGhgbkec7/9d9Y9m3WNA0ggSc9fZlSm9wZ2m47RmUXVYrIEqYMpqvZCwiUSK?=
 =?us-ascii?Q?r64VdAEZMlZhD/6rInXmtg+InqbI/uZY//yBlniS/hxpLri4wySTJ71eWyTp?=
 =?us-ascii?Q?kqs6+dk12Pf0DkAGuZ4yzhDWXrSzJJu8SAQ8vrvWuLtqZynBbq2ZkWSEB4X+?=
 =?us-ascii?Q?fQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 341aa3d6-10b3-4c54-35a9-08db2a9d2abc
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9563.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2023 06:17:52.1078
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: LT9d2zTkCXtjKBKf+gMFskFepjlPWfXx8AVXyDk/rHNiE81r8d6oyM5mij7LJglxF5F5OP2+I6Z0dwqvuTL2vKnBf7aLC+G9Hwc8P7sWZ+w=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB7020
X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=unavailable
        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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Horia GeantA <horia.geanta@nxp.com>

caam driver needs to be aware of OP-TEE f/w presence, since some things
are done differently:

1. there is no access to controller's register page (note however that
some registers are aliased in job rings' register pages)

2 Due to this, MCFGR[PS] cannot be read and driver assumes
MCFGR[PS] = b'0 - engine using 32-bit address pointers.

This is in sync with the fact that:
-all i.MX SoCs currently use MCFGR[PS] = b'0
-only i.MX OP-TEE use cases don't allow access to controller register page

Signed-off-by: Horia GeantA <horia.geanta@nxp.com>
Signed-off-by: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
---
 drivers/crypto/caam/ctrl.c    | 23 ++++++++++++++++++++++-
 drivers/crypto/caam/debugfs.c |  3 +++
 drivers/crypto/caam/intern.h  |  1 +
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index ae07c1e5fd38..d96c81540957 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -633,6 +633,7 @@ static int caam_probe(struct platform_device *pdev)
 	int pg_size;
 	int BLOCK_OFFSET = 0;
 	bool pr_support = false;
+	bool reg_access = true;
 
 	ctrlpriv = devm_kzalloc(&pdev->dev, sizeof(*ctrlpriv), GFP_KERNEL);
 	if (!ctrlpriv)
@@ -646,6 +647,17 @@ static int caam_probe(struct platform_device *pdev)
 	caam_imx = (bool)imx_soc_match;
 
 	if (imx_soc_match) {
+		/*
+		 * Until Layerscape and i.MX OP-TEE get in sync,
+		 * only i.MX OP-TEE use cases disallow access to
+		 * caam page 0 (controller) registers.
+		 */
+		np = of_find_compatible_node(NULL, NULL, "linaro,optee-tz");
+		ctrlpriv->optee_en = !!np;
+		of_node_put(np);
+
+		reg_access = ctrlpriv->optee_en;
+
 		if (!imx_soc_match->data) {
 			dev_err(dev, "No clock data provided for i.MX SoC");
 			return -EINVAL;
@@ -696,7 +708,8 @@ static int caam_probe(struct platform_device *pdev)
 	caam_little_end = !(bool)(rd_reg32(&perfmon->status) &
 				  (CSTA_PLEND | CSTA_ALT_PLEND));
 	comp_params = rd_reg32(&perfmon->comp_parms_ms);
-	if (comp_params & CTPR_MS_PS && rd_reg32(&ctrl->mcr) & MCFGR_LONG_PTR)
+	if (reg_access && comp_params & CTPR_MS_PS &&
+	    rd_reg32(&ctrl->mcr) & MCFGR_LONG_PTR)
 		caam_ptr_sz = sizeof(u64);
 	else
 		caam_ptr_sz = sizeof(u32);
@@ -761,6 +774,9 @@ static int caam_probe(struct platform_device *pdev)
 	}
 #endif
 
+	if (!reg_access)
+		goto set_dma_mask;
+
 	/*
 	 * Enable DECO watchdogs and, if this is a PHYS_ADDR_T_64BIT kernel,
 	 * long pointers in master configuration register.
@@ -800,6 +816,7 @@ static int caam_probe(struct platform_device *pdev)
 			      JRSTART_JR1_START | JRSTART_JR2_START |
 			      JRSTART_JR3_START);
 
+set_dma_mask:
 	ret = dma_set_mask_and_coherent(dev, caam_get_dma_mask(dev));
 	if (ret) {
 		dev_err(dev, "dma_set_mask_and_coherent failed (%d)\n", ret);
@@ -842,6 +859,9 @@ static int caam_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	}
 
+	if (!reg_access)
+		goto report_live;
+
 	comp_params = rd_reg32(&perfmon->comp_parms_ls);
 	ctrlpriv->blob_present = !!(comp_params & CTPR_LS_BLOB);
 
@@ -943,6 +963,7 @@ static int caam_probe(struct platform_device *pdev)
 		clrsetbits_32(&ctrl->scfgr, 0, SCFGR_RDBENABLE);
 	}
 
+report_live:
 	/* NOTE: RTIC detection ought to go here, around Si time */
 
 	caam_id = (u64)rd_reg32(&perfmon->caam_id_ms) << 32 |
diff --git a/drivers/crypto/caam/debugfs.c b/drivers/crypto/caam/debugfs.c
index 798ba989a8a0..cec93498836d 100644
--- a/drivers/crypto/caam/debugfs.c
+++ b/drivers/crypto/caam/debugfs.c
@@ -77,6 +77,9 @@ void caam_debugfs_init(struct caam_drv_private *ctrlpriv,
 	debugfs_create_file("fault_status", 0444, ctrlpriv->ctl,
 			    &perfmon->status, &caam_fops_u32_ro);
 
+	if (ctrlpriv->optee_en)
+		return;
+
 	/* Internal covering keys (useful in non-secure mode only) */
 	ctrlpriv->ctl_kek_wrap.data = (__force void *)&ctrlpriv->ctrl->kek[0];
 	ctrlpriv->ctl_kek_wrap.size = KEK_KEY_SIZE * sizeof(u32);
diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h
index 572cf66c887a..86ed1b91c22d 100644
--- a/drivers/crypto/caam/intern.h
+++ b/drivers/crypto/caam/intern.h
@@ -94,6 +94,7 @@ struct caam_drv_private {
 	u8 qi_present;		/* Nonzero if QI present in device */
 	u8 blob_present;	/* Nonzero if BLOB support present in device */
 	u8 mc_en;		/* Nonzero if MC f/w is active */
+	u8 optee_en;		/* Nonzero if OP-TEE f/w is active */
 	int secvio_irq;		/* Security violation interrupt number */
 	int virt_en;		/* Virtualization enabled in CAAM */
 	int era;		/* CAAM Era (internal HW revision) */
-- 
2.25.1