From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from BN8PR05CU002.outbound.protection.outlook.com (mail-eastus2azon11011046.outbound.protection.outlook.com [52.101.57.46]) (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 63A493D891D for ; Tue, 7 Jul 2026 09:56:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.57.46 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783418195; cv=fail; b=MC3JBiAJDiWTytWkvDd+Myy74Zk+QliLVp7u18RJi+spOvj5yTnMGPqcmKZZxkHo4wP2p42q0NJmmQ9OfRmyppyuzhTC307Uo2SMGp3UYnWOUdfTBmy09eJB8z5yC2MAK4swsboWaYsHrsiaXKb1o0G9XCx8oBlmekc+MvQRWmk= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783418195; c=relaxed/simple; bh=NFOYvMzr1ao6NgO3hSXOWdIX1XEOfXUXHMx76czfnLA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=d7iI5NLkh0ZdgHnfiPx100X3UMpqH7DidJ0i30lbvPUhiJvll/4ggLj09kkvopKfQRS6LKrZNXh3cqtkouQKwbMivLOVBkeXdODVeC34Nk0YqqCn7zv4pjAGQ7iV9OuLcXG/Jh+EPBpnJs90Uhm51BDseK+4mDkkqgtMFXL1kNQ= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=Zre1n3F0; arc=fail smtp.client-ip=52.101.57.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="Zre1n3F0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nS8BfiJBV8QCzPXTcf/uNjduNN1GANUmR4nKfgVpIVePTJrlnoI4XViJ8uHP7mDbgJms1DY/mGl1Lu1ptP7/gEYkIa3JUHzTntagm+YwCb4/4DksiWoNEPDAF6I45jnrgzuhdyiRqsbqqhUdfBIFJonDGt2wa34lsoqb21yxowkxHrMqk6XxKHWIg2iKRpdvCJAmm7MPifk+E0bHrOeTiBcfN7dEmrYcX9EsUqGAzW6SL6jUC8CJemh9+b0G/c73ZfsfTZrl262seBxJIlUtxauiqRr4sW+G1qDSb37uEIsLEsknutxMwZKR9kxEMMmTt1qXyHaEnEZgLO1+HSCCbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vWDy4zoy1Y3g53ddHi9n5IpQaUydyxFxkdX2gbGmTvs=; b=H6JvbH3U7h66/abk3wJbnO/UmhWln92xmid7098Z1kZSNqfMW2tlJszgn/m+splKTGp+ydT6ndWex+oqag2NQuPspuxBegtz+QsRtN00hCKIrtAnXP3ubpXBd8YZymEm04noYUt7XBrTY58OYbGL8xvjoGrzz/MedJ4+5X6puf5to5/TuyVeT9Tw+hbFzDetFdKpxLvSYwg6d0McuJUf/StRfHpSzH+ERbfPpOL8jL574huiQFU0ZmOkjc9TYjj2whPOkw/mcI71SaMOMAe0v750ZIbCjKljYqDRW7/pWvPhmJS+iddIJFuim4mUqkII3Ze2LSepn7UZPfblSQ8d4Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=arndb.de smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vWDy4zoy1Y3g53ddHi9n5IpQaUydyxFxkdX2gbGmTvs=; b=Zre1n3F0bbGJN6S0fdJJ0MbGeMzMb9431G9qPRDJeTvone/dAFbIJpJ47CSvbZsrH1voVktYHe2f4U0vJNeS3/IIjm5YKXQC15ZSaYuMxTDTzfownl8c3sDTFFESHgcTnQ40y40unttSPoBKqzX91ikUNqtCBVZWf7293LuXr70= Received: from SA0PR11CA0202.namprd11.prod.outlook.com (2603:10b6:806:1bc::27) by DM4PR12MB6639.namprd12.prod.outlook.com (2603:10b6:8:be::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.181.10; Tue, 7 Jul 2026 09:56:29 +0000 Received: from SA2PEPF00001506.namprd04.prod.outlook.com (2603:10b6:806:1bc:cafe::6) by SA0PR11CA0202.outlook.office365.com (2603:10b6:806:1bc::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.181.13 via Frontend Transport; Tue, 7 Jul 2026 09:56:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by SA2PEPF00001506.mail.protection.outlook.com (10.167.242.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.181.6 via Frontend Transport; Tue, 7 Jul 2026 09:56:28 +0000 Received: from satlexmb07.amd.com (10.181.42.216) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Tue, 7 Jul 2026 04:56:28 -0500 Received: from xhdharshj40.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.41 via Frontend Transport; Tue, 7 Jul 2026 04:56:25 -0500 From: Harsh Jain To: , , , , , CC: Harsh Jain Subject: [PATCH 1/2] firmware: xilinx: Add Versal PUF PM API support Date: Tue, 7 Jul 2026 15:26:19 +0530 Message-ID: <20260707095620.2795456-2-h.jain@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260707095620.2795456-1-h.jain@amd.com> References: <20260707095620.2795456-1-h.jain@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00001506:EE_|DM4PR12MB6639:EE_ X-MS-Office365-Filtering-Correlation-Id: df9ee430-4ec9-4618-b107-08dedc0e03f7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700016|376014|1800799024|23010399003|22082099003|3023799007|56012099006|18002099003|5023799004|11063799006|6133799003; X-Microsoft-Antispam-Message-Info: rR/6LXGTQVsVVwDEiZDRJ6nPYZrHSkl4wApVtZNqATd5hvRC8rMqlm7ZbYeuR31B5YEmRNT65UWV3ydDjrpwlaULygfSYRPm+v8GIyTwBLQE+uOZC+sTzyBhJeYLlD0sDsPfgGa7Fs0VhXVhljVsfu5dZZ4rzT+1hzhqsA8J6YJRvQExmlxS/WX8ny7HWOslTdKNrYWIzUbNaF2QbdlJjJvNNqb5c71NkkF9zktaPWj9FFe+Vl7/e02/pcd30mDSiOdx9hjROltEGrO7CFGxxDaIKg2tY/Y/Z6Evz2Ch4ncrUZO94usdiyJ4mTtcjn9JKun0/zGnKdfjtW34Az5oK1dFuX9nTwnNnM7Dd8oCrn5WOw+6t2M8Z06qhUILmDeZCD5jctm6Q0yM/bNpnrBwxqBZnivWXTUR3efAewvveRufB95JVIchU1EOIPKX/m5llp/Gz7kHMcrmCvkPtBNAkGOjY+ieR61wsFLmUA7xJBK4InN0av+hYWaOv7Lyn6PJLikaEAgYfm+rYP2oXY+VePbZIFgi1xodTG1eZR6LT1YDo/QDC7Gnb0lqquEIUqVvcaYodvrtLijvx3rWpiMw8R6vnbXQPpEVSj3Buu39TwSLHDfVTLHz2IP1swK/yDLpVQR8wWPBSJ4MyTYfY+mUaUyEkngul3NwOFfpP36/Axy3OYIBwCTAaXue698E0psKj6w6/tp5mM64N9oLBSiaEQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb08.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(36860700016)(376014)(1800799024)(23010399003)(22082099003)(3023799007)(56012099006)(18002099003)(5023799004)(11063799006)(6133799003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lU51HyvYscxfnNZDpwpS92zeI8yHL39eMbeKksQTcnThoiNO/fgg6a1JD0hEN3xv0D+BwZAq9SXqIYv/WpO5tpAMOa4b2Y2YD8BUFxQUak6R6m8zFjCrs2JmX/pGlhiqP0v7Ls1ZEM+4QNFe68L/pHkVlGXIhNRcZtdFMpx86vq8ZRpukNyzkBADeJ9/mTVnUclNBBAOMM2U7Qe9Uj34fYXqEWVoNTKfzGnd0UFmWhghv5r9pojeAvQC5e5uAJVgF3tuxhe/5rv7h8AZkLHSk10eTi9VHi9eoiMJTxo0yGCM/Xya1E15LVfTjnRCxeUBExixMMQJzzBGRLjM4ltUg7ZWRHs1ydGGL5Qb9U2hjBeG+td8wDPwhV0RH4u5Z4zAiO1b/RBVK10d1fCIzbJC2BSFMDisFRH1VvzeHlyQ1fUn9uf8wUgiIzuGPz273hhD X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jul 2026 09:56:28.6842 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: df9ee430-4ec9-4618-b107-08dedc0e03f7 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00001506.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6639 Add XPUF command IDs and versal_pm_puf_registration(), versal_pm_puf_regeneration(), and versal_pm_puf_clear_id() wrappers for invoking PUF operations via platform management firmware. Also add versal_pm_puf_key_zero() so the misc driver can clear the PUF-derived AES key via the existing XilSecure PM API. Signed-off-by: Harsh Jain --- drivers/firmware/xilinx/zynqmp-crypto.c | 51 +++++++++++++++++++++ include/linux/firmware/xlnx-zynqmp-crypto.h | 30 ++++++++++++ 2 files changed, 81 insertions(+) diff --git a/drivers/firmware/xilinx/zynqmp-crypto.c b/drivers/firmware/xilinx/zynqmp-crypto.c index f06f1e2f67b8..4a4e0b79d126 100644 --- a/drivers/firmware/xilinx/zynqmp-crypto.c +++ b/drivers/firmware/xilinx/zynqmp-crypto.c @@ -236,3 +236,54 @@ int versal_pm_aes_init(void) return zynqmp_pm_invoke_fn(XSECURE_API_AES_INIT, NULL, 0); } EXPORT_SYMBOL_GPL(versal_pm_aes_init); + +/** + * versal_pm_puf_registration - Invoke PUF registration through platform firmware + * @in_addr: Physical address of the PUF parameter block + * + * Return: Returns status from the firmware, or an error code. + */ +int versal_pm_puf_registration(const u64 in_addr) +{ + return zynqmp_pm_invoke_fn(XPUF_API_PUF_REGISTRATION, NULL, 2, + lower_32_bits(in_addr), + upper_32_bits(in_addr)); +} +EXPORT_SYMBOL_GPL(versal_pm_puf_registration); + +/** + * versal_pm_puf_regeneration - Invoke PUF regeneration through platform firmware + * @in_addr: Physical address of the PUF parameter block + * + * Return: Returns status from the firmware, or an error code. + */ +int versal_pm_puf_regeneration(const u64 in_addr) +{ + return zynqmp_pm_invoke_fn(XPUF_API_PUF_REGENERATION, NULL, 2, + lower_32_bits(in_addr), + upper_32_bits(in_addr)); +} +EXPORT_SYMBOL_GPL(versal_pm_puf_regeneration); + +/** + * versal_pm_puf_clear_id - Clear PUF ID via platform firmware + * + * Return: Returns status from the firmware, or an error code. + */ +int versal_pm_puf_clear_id(void) +{ + return zynqmp_pm_invoke_fn(XPUF_API_PUF_CLEAR_PUF_ID, NULL, 0); +} +EXPORT_SYMBOL_GPL(versal_pm_puf_clear_id); + +/** + * versal_pm_puf_key_zero - Zero the PUF-derived KEK in the AES engine + * + * Return: Returns status from the firmware, or an error code. + */ +int versal_pm_puf_key_zero(void) +{ + return zynqmp_pm_invoke_fn(XSECURE_API_AES_KEY_ZERO, NULL, 1, + XSECURE_AES_PUF_KEY_SRC); +} +EXPORT_SYMBOL_GPL(versal_pm_puf_key_zero); diff --git a/include/linux/firmware/xlnx-zynqmp-crypto.h b/include/linux/firmware/xlnx-zynqmp-crypto.h index 56595ab37c43..710e40403663 100644 --- a/include/linux/firmware/xlnx-zynqmp-crypto.h +++ b/include/linux/firmware/xlnx-zynqmp-crypto.h @@ -32,6 +32,12 @@ struct xlnx_feature { #define XSECURE_API_AES_DECRYPT_FINAL 0x50f #define XSECURE_API_AES_KEY_ZERO 0x510 #define XSECURE_API_AES_WRITE_KEY 0x511 +#define XSECURE_AES_PUF_KEY_SRC 0xb + +/* XilPuf API commands module id + api id */ +#define XPUF_API_PUF_REGISTRATION 0xc01 +#define XPUF_API_PUF_REGENERATION 0xc02 +#define XPUF_API_PUF_CLEAR_PUF_ID 0xc03 #if IS_REACHABLE(CONFIG_ZYNQMP_FIRMWARE) int zynqmp_pm_aes_engine(const u64 address, u32 *out); @@ -47,6 +53,10 @@ int versal_pm_aes_dec_update(const u64 in_params, const u64 in_addr); int versal_pm_aes_dec_final(const u64 gcm_addr); int versal_pm_aes_enc_final(const u64 gcm_addr); int versal_pm_aes_init(void); +int versal_pm_puf_registration(const u64 in_addr); +int versal_pm_puf_regeneration(const u64 in_addr); +int versal_pm_puf_clear_id(void); +int versal_pm_puf_key_zero(void); #else static inline int zynqmp_pm_aes_engine(const u64 address, u32 *out) @@ -114,6 +124,26 @@ static inline int versal_pm_aes_init(void) return -ENODEV; } +static inline int versal_pm_puf_registration(const u64 in_addr) +{ + return -ENODEV; +} + +static inline int versal_pm_puf_regeneration(const u64 in_addr) +{ + return -ENODEV; +} + +static inline int versal_pm_puf_clear_id(void) +{ + return -ENODEV; +} + +static inline int versal_pm_puf_key_zero(void) +{ + return -ENODEV; +} + #endif #endif /* __FIRMWARE_XLNX_ZYNQMP_CRYPTO_H__ */ -- 2.34.1