From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A67C31519AA; Wed, 5 Feb 2025 14:04:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738764296; cv=none; b=HCZK7V3bGWnqRuum/Ihe6YOMVps4rLj7U0kg9Ho8nC7pwHSFddc40EKmnpiznTXjUt2WL2Xx3PR18ubn6+Ok9Axnk15SC4Mg5I/pH2Oa5OGeJpqoQJXFU9mvcYV45AaO3djmdVzCUH2zDhSFAOrwEbFzLV8eZjPv5NNexiQj7yw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738764296; c=relaxed/simple; bh=EmbwjCoyNcCg/y1Lib8pzzXH2bPt4G8qTYksHBSF/54=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kCwW7Rii9dYvZimpu0Rt3TwrY5tCAaL/kNVqCwg2DVhcmH7fqTdqn74vuk6qf/xigoGbQshxPb7pN2dAtrNWusyjv7V85NoffMG7911rM4Xzu9MvQdUmXTdMxXv4qQUYpsFW+JYZi5DhfGovXOhZpn5mjyl3Ql2igoJne1tvCCI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Od5GTBjd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Od5GTBjd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4D1CC4CED1; Wed, 5 Feb 2025 14:04:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738764296; bh=EmbwjCoyNcCg/y1Lib8pzzXH2bPt4G8qTYksHBSF/54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Od5GTBjdpQtgdHuvcize0krtFDToqxQJ0hre509mnQ8jpxdVQmK4ljbGDy/An2D7R vdMZjWf6ZXOJHuEnyVZo7JX2VBOBy8XYiPGTX+Y00cylGeAQh5e8Sh2rErlR0p/dWt yW6cBB2S4kMgdwgA8VhJlRQ5OYoBA34y9ONnuRbE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Gaurav Jain , Ahmad Fatoum , =?UTF-8?q?Horia=20Geant=C4=83?= , Herbert Xu , Sasha Levin Subject: [PATCH 6.6 159/393] crypto: caam - use JobRs space to access page 0 regs Date: Wed, 5 Feb 2025 14:41:18 +0100 Message-ID: <20250205134426.384785499@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134420.279368572@linuxfoundation.org> References: <20250205134420.279368572@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Gaurav Jain [ Upstream commit 73a7496c218b7ca19ba276f54758e7f0adf269c5 ] On iMX8DXL/QM/QXP(SECO) & iMX8ULP(ELE) SoCs, access to controller region(CAAM page 0) is not permitted from non secure world. use JobR's register space to access page 0 registers. Fixes: 6a83830f649a ("crypto: caam - warn if blob_gen key is insecure") Signed-off-by: Gaurav Jain Reviewed-by: Ahmad Fatoum Reviewed-by: Horia Geantă Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/caam/blob_gen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/caam/blob_gen.c b/drivers/crypto/caam/blob_gen.c index 87781c1534ee5..079a22cc9f02b 100644 --- a/drivers/crypto/caam/blob_gen.c +++ b/drivers/crypto/caam/blob_gen.c @@ -2,6 +2,7 @@ /* * Copyright (C) 2015 Pengutronix, Steffen Trumtrar * Copyright (C) 2021 Pengutronix, Ahmad Fatoum + * Copyright 2024 NXP */ #define pr_fmt(fmt) "caam blob_gen: " fmt @@ -104,7 +105,7 @@ int caam_process_blob(struct caam_blob_priv *priv, } ctrlpriv = dev_get_drvdata(jrdev->parent); - moo = FIELD_GET(CSTA_MOO, rd_reg32(&ctrlpriv->ctrl->perfmon.status)); + moo = FIELD_GET(CSTA_MOO, rd_reg32(&ctrlpriv->jr[0]->perfmon.status)); if (moo != CSTA_MOO_SECURE && moo != CSTA_MOO_TRUSTED) dev_warn(jrdev, "using insecure test key, enable HAB to use unique device key!\n"); -- 2.39.5