Message ID | 20210325093036.3270101-23-peng.fan@oss.nxp.com |
---|---|
State | Accepted |
Commit | 81d5605a8654ae735e751b59f3f2d7b09fe29471 |
Delegated to: | Stefano Babic |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=DwiD87bI; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F5g386M8xz9s1l for <incoming@patchwork.ozlabs.org>; Thu, 25 Mar 2021 20:36:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D108E82935; Thu, 25 Mar 2021 10:33:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="DwiD87bI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DC06F828F4; Thu, 25 Mar 2021 10:32:54 +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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20605.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::605]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 23F67828E6 for <u-boot@lists.denx.de>; Thu, 25 Mar 2021 10:32:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WkCLqHuEHxpn94ZLJBvvpMdYupuljPB1/rzLSxZK2gd2tBYR1lJM6ZVnT5XHZRjzbfiS4xDnLWz5YNA7lxaPXE0yf3lEoJMckp2qF0t781IPX0W5kAbhIK4CJLaHaDA2R3kj3Heso4PnY+RmEFjNRPDRyZVtF+hOem1TvOg68j+v5J+p9lCy4HieDm5mSHjXI9YQP6hGOuyCf5oV0MSDnGHLuWkqnPwuqdwU8u3rtCQVZ4LodPlhQLTTaBFMgWThX4H+WCERn4qlJIscb9Ia0LPVv04BiwjWcONkXMQT6i4ofJLchHd31667K72/yN8Sb9RJCm/2s+B2//d2C8byGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=U9+NbnN0YVpMi8tbDSK47HIPOvT6ORdrvIAIKPxZ3tk=; b=mryVlIX0vgpBpfhMK8/hKAN+CKfioIcCJcyBa5iXsEkyr3G4YcZId/O2vN/EQoQBMZ9k3ZOWpbea49M5yuB8upRHgH2HW2QjbKHN5TeVa413uVVwTThSZp41GC3Cl3yiLDP2ETLiWLDzyt9TGdpDTWI2nH67t9y2ByxHXvJLlz9K90418LVF11/El3Swx5jm8yVhNFpO2BbSDx+SlLoQjn+nykfzjOIoOz69IBcG6frPAGiMsXl9iMB4jYAG5Dgyug9bUSCbwZCjPUYFYhv072jkJU8YTXiF8Y9bwbu5BdD0Hu0aPuuuwYBj2wuZOM0zr7MnDQHnn7pLr2dX7DHqMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=U9+NbnN0YVpMi8tbDSK47HIPOvT6ORdrvIAIKPxZ3tk=; b=DwiD87bIeO5qzDQvUCeMvs60713XRN2VuvlcMFt6Js00BXrixgOOv8/g/3fHqVqFI3oc3ylCv6cSMTt/WDOsLhA4FEaImJnUw7qDyA8ODTQ+UkcmHLTWI7Da8AuUj42em/wXdG1UKF0fN7Gke01BjStA3nVIcg5caR38010Q8k4= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB7PR04MB5243.eurprd04.prod.outlook.com (2603:10a6:10:17::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.25; Thu, 25 Mar 2021 09:32:48 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d58c:d479:d094:43d0]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d58c:d479:d094:43d0%9]) with mapi id 15.20.3955.025; Thu, 25 Mar 2021 09:32:48 +0000 From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com> To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Breno Lima <breno.lima@nxp.com>, Ye Li <ye.li@nxp.com>, Peng Fan <peng.fan@nxp.com> Subject: [PATCH 22/37] cmd: blob: Instantiate RNG before running CMD_BLOB Date: Thu, 25 Mar 2021 17:30:21 +0800 Message-Id: <20210325093036.3270101-23-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210325093036.3270101-1-peng.fan@oss.nxp.com> References: <20210325093036.3270101-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: HK2PR0302CA0021.apcprd03.prod.outlook.com (2603:1096:202::31) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by HK2PR0302CA0021.apcprd03.prod.outlook.com (2603:1096:202::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.16 via Frontend Transport; Thu, 25 Mar 2021 09:32:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2b4fcbc3-00d7-4a14-2323-08d8ef70f427 X-MS-TrafficTypeDiagnostic: DB7PR04MB5243: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: <DB7PR04MB5243A63333DA0D5640292710C9629@DB7PR04MB5243.eurprd04.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sV8ve03hyrLFekOibtHtqLA7RsCY1TRYk9AXJRJmJ7G8U8AcRm2RF9V8WKk9X9GyYdIL7WWA+Fauh9nMl+dxZJ00TaKNmdO4LMjrPbNTtjW89A2pRQSARfZl2XM7VOrzYEH0zyveQkNXjjfocu+bN0DVEX/Y9eWgvmw1GiAWw5ZJPbR2lbKK6QbCIQD9YPhIp4ZsXFfh6I1wU16zEgje2GJ+btkVzce3a69kxzRQaADgX0/zsayoQpaj8Z87BSamr8VYrep/rAMaXyYLFRjdD00ZyRf8JVFRf+yExB9wmJ/m/QWbJ7eVdigKbSiuObxvR926aWpEqHqc3RGz80tbTaix2aP8VRqbKKrrz5x+y5eFnnJltdfbtm/a6ZD/6K1p5sp5orL/5jCgVs8ihUg2riV8XjUirjTxPBSYuT11xNTC2dXwXSuSzrcuqDcxCX7RULX2ZqxvVLuwPxXHgD+/8YcQhGoprSNZFFLW3eZKzIUv4+BpYJstMRgLIVUh/1agE/UwSxsNXLw0w+wWCZNsbSsoo6bS/96Wav1Ud/28iCI4eIVbq6JZdUOYmjOS105MIyPeLVasJ5w3r3qrVYCA1yKOgyOOQmIMw/oXIaP3Ll8a1jso47UfNLhooXfghqDQqeV3543QY7Q640bGz0D3QrNRFPRWig5nSKR/IWB3thSg7uemStFWsKUMHk/b8z0s X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0402MB2760.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(396003)(346002)(39860400002)(376002)(83380400001)(38100700001)(956004)(316002)(2616005)(5660300002)(66946007)(6666004)(66476007)(1076003)(66556008)(86362001)(69590400012)(6512007)(2906002)(8936002)(6486002)(4326008)(8676002)(26005)(186003)(16526019)(52116002)(6506007)(54906003)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: HD0R11peGWZbPvLt+njBfZfqJjMdL35zcBNVDPsPc7si+FsYzXURC6Dp6+OaaVJ/rUtqQkGsGZbSCjnIGIQoogIjwzOlprM5+z9FAN1Leq5SnYZEs0ZhAUSf+xUsIlqVpZVaxxexugGT3uWbbXSNn3kVZGFnEb7XTLKlxrZUXHfNVJuz5XL9OLUct34iCYXKHxmXMOufpVJSnueJZbs8sHDlH4X9hn5aclHgY3m052EoMP+4F3uhpXLF1opP53xRiylHumC+mDg1GH/OvCzVevuvAntJ9NL9umHe6iQL/hsYSn7KAbW8oMq6rQI3JMojJtwYOMN7/phiTdbz2q+lXLrxmH17Rtn4ykfvn1nHw7GR5nTLCPuw6X3WnkV5PqYKr2jc9pwp0jaS06hyx6nqxAUJEeAwZVEp7YaHuioBRc1JT6dqaPpWDTBtyJwlwVl+bcr+cdO+HzOdF9FSoINMFhB3AwKeN7h3E8ffB1fqbJMDgGRaLNsADCErBK6ZwLHf2Sk/qDMc/PRmSIOnKayWphR/f8oNjOocmwS+vx1OwxZTwAhjAjhfQd3xDjWkCfHKnCTLBGsz88Q2sI5R32EArJKAmrwy2hJ3INY60/XH8WLvCrft/SRPOyCQIfSL4pNsvFMjRuyw1UpQG23cWZ5sLVvXPYx0g7EPyG8exv3nxzt4h2gsHjRP3AA2GI9iTPLAlWbGzohKUqBmy6rziyoI60DHTUJVC8Rk3sVu1xLDUqOHf4LR05b+IJuKcv/FWApFwfXJ2+n7mfMnJJM5JMSsdiCoW/Itzmy/85/d16HLbbhLLeBFg+IYUeWLIyRhquto6c9cSFzmND/HjPAtJo1GbN/lA2+UKhr7B7sS9dS0CiHi9deSfIncNnJ9HFof2khtYb33xXVjw+qdjFDQBPpuwoPpZGocJx8jd1QYd0tZlVXobfEeEg29Pl8Go1lH5wSRoj3O9Ar6f0vNIVQYevkh393MsnV7gTK0N4i8KVE73x9nHLjmg7/dCPXwxYqAiWmQNJTjnHSphmUPtUeYVbqayii18rNx5f8TtQr7Z8ijkx5HolxMaKYO1xZvp+1chrlwMyq5r/VkFm+hyn8O13SC4oOXnvW6QJXkF4IqzWH7h6zwiCz0wD/z/5mljgpY3ZL3vY6qkOEZvYKG/aK+pwY9omzLWmG4nygVKXlRiemwDsmc/V6uFzOCDJwm0pxX42t1D1GrvucLdqE+YUxCK8VW9IYZYGgvcLiUj89KC9jvHXxC6JZSfWRG12G2VOoFxGLZYdTozFCRNkxPz4jR/cFBBLyj3cMk2ddOz/IUy/xj+q2CjId4MaaHfFe+6wia3QALemVtqnvOjGeewvD1FBlFew== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b4fcbc3-00d7-4a14-2323-08d8ef70f427 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2021 09:32:48.6455 (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: hsxUl3QVglvH4lhv2IN5bsx1xiRYKH8eWXaYFskEJL2+vedt59boWcTMMLLFA/XdQjT57JpBImDSvHunMTJAcA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5243 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean |
Series |
imx: hab/caam new feature and update
|
expand
|
diff --git a/cmd/blob.c b/cmd/blob.c index c80e6977b4..359c8940fb 100644 --- a/cmd/blob.c +++ b/cmd/blob.c @@ -9,6 +9,10 @@ #include <malloc.h> #include <asm/byteorder.h> #include <linux/compiler.h> +#if defined(CONFIG_ARCH_MX6) || defined(CONFIG_ARCH_MX7) +#include <fsl_sec.h> +#include <asm/arch/clock.h> +#endif /** * blob_decap() - Decapsulate the data as a blob @@ -74,6 +78,16 @@ static int do_blob(struct cmd_tbl *cmdtp, int flag, int argc, src_ptr = (uint8_t *)(uintptr_t)src_addr; dst_ptr = (uint8_t *)(uintptr_t)dst_addr; +#if defined(CONFIG_ARCH_MX6) || defined(CONFIG_ARCH_MX7) + + hab_caam_clock_enable(1); + + u32 out_jr_size = sec_in32(CONFIG_SYS_FSL_JR0_ADDR + + FSL_CAAM_ORSR_JRa_OFFSET); + if (out_jr_size != FSL_CAAM_MAX_JR_SIZE) + sec_init(); +#endif + if (enc) ret = blob_encap(km_ptr, src_ptr, dst_ptr, len); else diff --git a/include/fsl_sec.h b/include/fsl_sec.h index 40f1c5b10d..c661bd6ead 100644 --- a/include/fsl_sec.h +++ b/include/fsl_sec.h @@ -344,6 +344,9 @@ struct sg_entry { #define FSL_CAAM_MP_PRVK_BYTES 32 #define FSL_CAAM_MP_MES_DGST_BYTES 32 +#define FSL_CAAM_ORSR_JRa_OFFSET 0x102c +#define FSL_CAAM_MAX_JR_SIZE 4 + /* blob_dek: * Encapsulates the src in a secure blob and stores it dst * @src: reference to the plaintext