From nobody Fri Jul 24 05:21:39 2026 Received: from SN4PR2101CU001.outbound.protection.outlook.com (mail-southcentralusazon11012070.outbound.protection.outlook.com [40.93.195.70]) (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 C6DDF1AC45D for ; Thu, 23 Jul 2026 12:50:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.195.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784811033; cv=fail; b=BWeX4Cl0TG1qUeqWvLRz7kgvKzHtTCxsJvFot8OQH3gK0uqHhnlLNtDxzTyrxNEJgkPTCYG/xw8RvXdE6gE7A0JcjxKEjohUBjx9vcut5rfBZ5apwZAz9GQutcDyl7AmSw1WXdkz9Bm09kSylbkU4MaCA5gM3tWndYKKARs5kqc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784811033; c=relaxed/simple; bh=k/LiHr9NOth1NaDU7VOCwHVY35GYm2VdJl6lUQsQ0uU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CcFso4r+kGq++Mh/+zBDzoa7SHW8bBnHoE5lv0YaJJ5B7RPZtaD3FQjZqxCc4CXEP0y7fLdIhMvbGr6vxwTnP/FqbnXw2sY4G9b/2ybOzowXJXAJOSTqzzCzDBGcurpqf/552GR4bbB5wSRcJVHpAW+NOxZA93zg6q7yAivAUfo= 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=KO6kkFSl; arc=fail smtp.client-ip=40.93.195.70 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="KO6kkFSl" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=T1KqM0xhhR/FJm88HbuUl/8Ji9ebfIZhgNQsqPCenILNZbX7bzUAaXHrktd8Ow3TnuwKy2pX7KjV31caRAiPMTGK/B+Jx5i2uw8jLe8arW4C+FwTIY5CcdR/aQD6Zops58doz1YJSNFr+s33IziJF+Qg9ccH9g6bARkGYo8BhzPaa2LU43QOT8CdAgweecYW+Zj8Lm96KiVH7X6zkVKI8M8sIFDeVGe9yHnWevm7fzb0tBMjU6g3Xl3Tk5GM+/rjeB5qZcAhbWEBxKzdgxNLNgULtsEbpWUX+TRScePEcymtRX+xmuti0/ISDMimlRbGBL97kCPGAtIGSCCXNvVLNg== 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=8Y9wyG40A6X3o7u59yCn+i4uUB/drIoRNt9cZ2dDX84=; b=AaCsq5UTAs+HOP/lHfLEhSqF8DO884CBj4F23ZbTuluMoyc0uPPZkhWCea9yhBTOrCjIE7LuBVAmWZn2zj+F3+vC8SZx7NDqytZzuizaa0NVXAXGCAlziLDiNsMjcj9TRxQmkB16e0zDSB6vIjp7o3/cQ/M6D5lkI9SCfO9tZ5IfB6fI5UBC3m1DioKAUFaBJXwU/20h/B4ynbpAuhosTTAOf6tQyjKgkyGRP0vHSSZkCYrWnjC9KoYl2VvpG78UfI1v8U8Tn6JLAZ1aCHTDjCFW7opMPUWsp9C4XcaUhw4U8V/hg4Skqbi1ErO+3kliPoE5HybMjvhTpV3eyeOG0A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.infradead.org 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=8Y9wyG40A6X3o7u59yCn+i4uUB/drIoRNt9cZ2dDX84=; b=KO6kkFSlGSYyRQG1y/3uw99dAF+d1U38F/AVLh/cmmXE6x1MN/EJwXY7m32NNRbs94EV/gbYdf5x90mtKOOwEGh8DCeMeqdMJ8wtYTRGahrAW6aQCpmW1WkonVPH7WfpGWsFe6ldk+ZOGybhvbsjg3Lf1dtAIPgZ6EOdxD0UPEk= Received: from SJ0PR05CA0117.namprd05.prod.outlook.com (2603:10b6:a03:334::32) by BL1PR12MB5803.namprd12.prod.outlook.com (2603:10b6:208:393::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.11; Thu, 23 Jul 2026 12:50:25 +0000 Received: from SJ1PEPF000023D2.namprd02.prod.outlook.com (2603:10b6:a03:334:cafe::2a) by SJ0PR05CA0117.outlook.office365.com (2603:10b6:a03:334::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.270.4 via Frontend Transport; Thu, 23 Jul 2026 12:50:24 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by SJ1PEPF000023D2.mail.protection.outlook.com (10.167.244.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.270.5 via Frontend Transport; Thu, 23 Jul 2026 12:50:24 +0000 Received: from xsjarunbala50.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Thu, 23 Jul 2026 07:50:13 -0500 From: Jay Buddhabhatti To: , CC: , , Jay Buddhabhatti Subject: [PATCH 1/4] firmware: xilinx: Add support to clear TF-A PM state Date: Thu, 23 Jul 2026 05:48:38 -0700 Message-ID: <20260723124841.2567827-2-jay.buddhabhatti@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260723124841.2567827-1-jay.buddhabhatti@amd.com> References: <20260723124841.2567827-1-jay.buddhabhatti@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: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000023D2:EE_|BL1PR12MB5803:EE_ X-MS-Office365-Filtering-Correlation-Id: 67a64faa-67c8-4ccf-e041-08dee8b8f69c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|36860700016|376014|1800799024|82310400026|10067099003|5023799004|11063799006|3023799007|6133799003|18002099003|22082099003|56012099006; X-Microsoft-Antispam-Message-Info: YzT7rE1yu6gz5TtFXCA7Sau7k9BW+DNbB8T5s1uJlQGSPWNdbA8cKUkldoGFryLYSQZK5bjSWC5e33EmNnt1ofUkt3a1Z7wS7AuSfmLy9nPsI3SQtv0Iz1Gft57CK4P3JvfqsUeKAvURF5gF4zhBB0dpScomVIdJ/74SR4gl8+ZA3P5NzRTHw6X/Ec+tF+vbpnfV7esCjWec3JlFLGyAnXPez8ifAiIH0ydCJ4d+5vYU79Lx8lQvLeaDYaSVrVXO/Mqg2SSKByQuhbfD/WR1VgD+VLuVGOVAQo5SrO+veULh8ISSL6okWzSo5wmAMr8iZy4JdXJ3quEe6TFKKv1vjIqEakHNw7nEk0cCD/8KWpo48/zBQCqqX13ZZBeSC9c63T9dqHoKZwoOD3vqEzN6fT5KEqpFbi/G+unWcrZ28WrciE/osARg2tlzwYLRHY6Zptn65zeuI2WodbJZWJZw1yguAFwxUjHVi2OkS5suhZG/2PWPmnFDZrCHkzXNIiKI8GRZJmULf6/t50hgeqzHaduF6YeuvzMaKmdSdv5BmHmvrLH0+HlC3Cu9YIRTfUuLYaHXUc1t9/lzps6BUrd870U7rFmf0/uMJBCjvgxli5B0AW4AX956nK7cjsOzrrUoprhp8hgj7iu1LLVZLaEkr6TgctDBuG9z1JWsWpnpcw7kfLEhvWXbsCtWlL21QhNjsOLHLs+e8gwPFIO6nTZbrw== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(23010399003)(36860700016)(376014)(1800799024)(82310400026)(10067099003)(5023799004)(11063799006)(3023799007)(6133799003)(18002099003)(22082099003)(56012099006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dQbIJUmxPYPWzGxgOxuYXUEQUSYJp9mLV8vAtCPes0Au1f0I5z97V3JJypY6fiVGnvGLhSLt1KCFicucCmv5cCz3pzTNuXZ8bfWo2NgMa5Qp1JOJWtDXw+RrShdKjr75BZqDYpLygO8mIcgyX10Qeek6t9JkP0wvBMDVZSRU6PzztuDMgbb6bIeSIpDa1tXfq2VS/AzAmG638cHOvnuTOfSKddW99Xu3i2L9Rfufn6krR/gr3aLNjSRTYKsDJFylO7U+t7ALP4kS/pNXPu1Iseo8DY/I9fiaUzs6XNU6pZhpJKUCAd6Bq4cB3nulf+N/7vZe8SyunaWE16gAGKvdg8ydJLzJTuxuW0dUBGfqSiMrDVvD4z1l4pn02x1l4Yl0Uq4WsixWtexLygelf2txQvQeoB1qpGpq96Le+tEQraOB/JV5LdLVm4ijIhhminlz X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2026 12:50:24.1024 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 67a64faa-67c8-4ccf-e041-08dee8b8f69c 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000023D2.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5803 Content-Type: text/plain; charset="utf-8" Currently, during a kexec restart, only the kernel is reloaded, while the TF-A specific data remain unchanged. This leads to a mismatch between the kernel state and the TF-A firmware state like SGI number and shutdown scope variable. For example, the kernel registers an SGI number with TF-A so that TF-A can notify the kernel of events via that SGI. TF-A stores this SGI number in its internal state. After a kexec, the newly loaded kernel re-registers and may request a different SGI number, but the stale value programmed in TF-A remains, so event notifications are delivered on the old SGI and are missed by the new kernel. The shutdown scope variable has a similar stale state problem. To resolve this, the TF_A_CLEAR_PM_STATE PM API is introduced to clear TF-A-specific state during kexec. On a graceful reboot, this API is triggered by zynqmp_firmware_shutdown(), while in a crash kernel scenario, it is invoked by zynqmp_firmware_probe() in the reloaded kernel. Signed-off-by: Jay Buddhabhatti Reviewed-by: Radhey Shyam Pandey --- drivers/firmware/xilinx/zynqmp.c | 48 +++++++++++++++++++++++++++- include/linux/firmware/xlnx-zynqmp.h | 3 +- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zyn= qmp.c index af838b2dc327..95ffd8f33ce9 100644 --- a/drivers/firmware/xilinx/zynqmp.c +++ b/drivers/firmware/xilinx/zynqmp.c @@ -3,7 +3,7 @@ * Xilinx Zynq MPSoC Firmware layer * * Copyright (C) 2014-2022 Xilinx, Inc. - * Copyright (C) 2022 - 2025 Advanced Micro Devices, Inc. + * Copyright (C) 2022 - 2026 Advanced Micro Devices, Inc. * * Michal Simek * Davorin Mista @@ -13,6 +13,7 @@ =20 #include #include +#include #include #include #include @@ -2065,6 +2066,42 @@ static struct attribute *zynqmp_firmware_attrs[] =3D= { =20 ATTRIBUTE_GROUPS(zynqmp_firmware); =20 +/** + * zynqmp_clear_pm_state() - Clear subsystem state + * @dev: Device pointer used for logging + * + * Clears PM specific data in TF-A. + * + * Return: Returns status, either success or error + */ +static int zynqmp_clear_pm_state(struct device *dev) +{ + u32 pm_family_code; + int ret; + + /* Get the Family code of platform */ + ret =3D zynqmp_pm_get_family_info(&pm_family_code); + if (ret < 0) + return ret; + + if (pm_family_code !=3D PM_ZYNQMP_FAMILY_CODE) { + /* Check if the TF-A supports the TF_A_CLEAR_PM_STATE */ + ret =3D do_feature_check_call(TF_A_CLEAR_PM_STATE); + if (ret >=3D 0 && ((ret & FIRMWARE_VERSION_MASK) >=3D PM_API_VERSION_1))= { + /* Clear PM specific data in TF-A */ + ret =3D zynqmp_pm_invoke_fn(TF_A_CLEAR_PM_STATE, NULL, 0); + if (ret) + dev_err(dev, + "Failed to clear TF-A specific subsystem state: %d\n", ret); + } else { + dev_warn(dev, "TF_A_CLEAR_PM_STATE is not supported in TF-A: %d\n", ret= ); + ret =3D 0; + } + } + + return ret; +} + static int zynqmp_firmware_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; @@ -2118,6 +2155,9 @@ static int zynqmp_firmware_probe(struct platform_devi= ce *pdev) if (ret < 0) return ret; =20 + if (is_kdump_kernel()) + zynqmp_clear_pm_state(dev); + /* Check trustzone version number */ ret =3D zynqmp_pm_get_trustzone_version(&pm_tz_version); if (ret) @@ -2151,6 +2191,11 @@ static int zynqmp_firmware_probe(struct platform_dev= ice *pdev) return of_platform_populate(dev->of_node, NULL, NULL, dev); } =20 +static void zynqmp_firmware_shutdown(struct platform_device *pdev) +{ + zynqmp_clear_pm_state(&pdev->dev); +} + static void zynqmp_firmware_remove(struct platform_device *pdev) { struct pm_api_feature_data *feature_data; @@ -2210,5 +2255,6 @@ static struct platform_driver zynqmp_firmware_driver = =3D { }, .probe =3D zynqmp_firmware_probe, .remove =3D zynqmp_firmware_remove, + .shutdown =3D zynqmp_firmware_shutdown, }; module_platform_driver(zynqmp_firmware_driver); diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/= xlnx-zynqmp.h index 7e27b0f7bf7e..baaa88b0b197 100644 --- a/include/linux/firmware/xlnx-zynqmp.h +++ b/include/linux/firmware/xlnx-zynqmp.h @@ -3,7 +3,7 @@ * Xilinx Zynq MPSoC Firmware layer * * Copyright (C) 2014-2021 Xilinx - * Copyright (C) 2022 - 2025 Advanced Micro Devices, Inc. + * Copyright (C) 2022 - 2026 Advanced Micro Devices, Inc. * * Michal Simek * Davorin Mista @@ -66,6 +66,7 @@ #define FIRMWARE_VERSION_MASK 0xFFFFU =20 /* ATF only commands */ +#define TF_A_CLEAR_PM_STATE 0xa05 #define TF_A_PM_REGISTER_SGI 0xa04 #define PM_GET_TRUSTZONE_VERSION 0xa03 #define PM_SET_SUSPEND_MODE 0xa02 --=20 2.34.1 From nobody Fri Jul 24 05:21:39 2026 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010005.outbound.protection.outlook.com [52.101.61.5]) (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 7B3A74ADD95 for ; Thu, 23 Jul 2026 12:50:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.5 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784811038; cv=fail; b=MpW1v92AFqU+VqwyZkBMYIycnN8y4w3ZwtHEM6M5j5afa3skeQzhJkjTpEJinKIB/7XiCiFmOm6T38MeywxGaj2H4hyO5Ol3Nr14TfuXX1od0+EYocwLzhRKcLkQSrFPsa1E5Xc4HdZW/7DLFALv8+QaIg53ZjGTxpqPyjAuv7w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784811038; c=relaxed/simple; bh=vPZ/Y8K0kgZsmf1TSr/aYAQ2K8dL+nZseDWHxVIpa9Y=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=T/lYTaIojQNKZuu5Jy80B9fP9wLuqIEoaFMEImJ/KpFi4LHK7n8cBZnk37kUCtUW6Q8x/1URN5RBHs/AQFL1hgi1eDVsiQfctY3/R0q+Jdy3jlbDi+Sqtd9F7r1AJd/VnYpI71QOQUmCgsuX/29htLkGx4D+q/e5GBwgai5ctao= 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=rTbASrfl; arc=fail smtp.client-ip=52.101.61.5 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="rTbASrfl" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Vmvs9TV0FqEZR+m7ZhLodZQV/DsE5TlJhEDLJ1E8spQ6U09IzThh7BoqPcKAeqjsi/irMTsKxCO5LCwgVsWxNTdKO1U6MWOITVxezdHnfxnlp6AQpSTzwCCf89NJTSEo821aEsNVfPYSvpkqNmOa4ox91rXkr/gYHb3EmzcG0bbNmYFQd3HqlftHOQghhQm2Oxa7vmhmL+3AnbYUupTbGw4EMxWJEA2c/mbuD3whV4nvsk6RQYFXCUscORLHqL+yF5Kcixvu6AgG5R74kWa+8DKBGTtapy48nmtQ0UD9K9z90pENnoIwhXllXj72aPs8WKBpcTPE91GpYB6ecGOXkw== 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=DMRdgXe/qJEGOYG505Ukz+Vi08z38Rlv5XV1qDbXkuQ=; b=o0zSrYYQWK2EjJg7LCcdk57zdocuNQxqp3v5l7OcuBh52GdHkVf+JVHlhRetEBV+W4HQAuZ3EOIGSsZulF3xf8+bBb3QvdEUhz7WD/rph8zAw189gzf9ixaXBKB9GooYhYwiqvAGpOCV9TCyEH4vLkJ9Sw2GXspQEs8JWKfFcC2xpMgma3EbDq9HnGB1KS46phaBn4AdQNE8G5i5XU6gryEMonDfmGN57TKvw/Pp6PwF4HcMx2Y1epq3Cgmw3TJwbvFQdjUZlzSUIIyBMVS6jp1lvHZMTz4YcB9ggJKv9ETzTCdbXZL/UGeHw++0lmtdkSop76s+MhuCBA+oWsMUFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.infradead.org 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=DMRdgXe/qJEGOYG505Ukz+Vi08z38Rlv5XV1qDbXkuQ=; b=rTbASrflmAF4CswOyJ63EqOrH/80GbRRoK7eOjuXm4euy3YR3/XnDSxM/8vfw+zJtRJlkI20MsOAf4iE9rs5Dp9YsjDAK5nSEcO1Kg6CQPXuDE+mMDQUOGp5sfSmCmdZkopfmHWBX/K1/oxJRQaVSCqfWS4LkiK3WO2IFmDNoRM= Received: from IA4P221CA0005.NAMP221.PROD.OUTLOOK.COM (2603:10b6:208:559::10) by MW4PR12MB7440.namprd12.prod.outlook.com (2603:10b6:303:223::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.11; Thu, 23 Jul 2026 12:50:26 +0000 Received: from MN1PEPF0000ECD9.namprd02.prod.outlook.com (2603:10b6:208:559:cafe::54) by IA4P221CA0005.outlook.office365.com (2603:10b6:208:559::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.245.11 via Frontend Transport; Thu, 23 Jul 2026 12:50:26 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by MN1PEPF0000ECD9.mail.protection.outlook.com (10.167.242.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.270.5 via Frontend Transport; Thu, 23 Jul 2026 12:50:25 +0000 Received: from xsjarunbala50.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Thu, 23 Jul 2026 07:50:13 -0500 From: Jay Buddhabhatti To: , CC: , , Jay Buddhabhatti Subject: [PATCH 2/4] firmware: xilinx: Release all peripheral devices from firmware Date: Thu, 23 Jul 2026 05:48:39 -0700 Message-ID: <20260723124841.2567827-3-jay.buddhabhatti@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260723124841.2567827-1-jay.buddhabhatti@amd.com> References: <20260723124841.2567827-1-jay.buddhabhatti@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: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000ECD9:EE_|MW4PR12MB7440:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c2282cf-b4f0-4cf3-1b91-08dee8b8f77b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|1800799024|82310400026|376014|36860700016|56012099006|11063799006|10067099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: 70GZaxBnc9IOHe0DOzb9WJwuOvl3H1z2GdVde5a44fhpMkzSwLAEKlwnAIG/j0eFY9x3OIPR8Y+1lYFyaMflsd3IAArLtQCpBpxfw3jU+nfNwjT9ZbOKl7nuoRcAxgYyFqmnqvFLr3RF1rrhrQVNGRHTSVF4/HuVOlYr0kHPBUtolks1X7ud7x/TNzxn9bSo7iYeEh5uk9x1TWFHncSNoQXTVDQRwpDvZdgEIKUKVIL+/Mzc4mDTE0isunwmBIHUj8LjS/uFxsURSxiR6e2CCDjvLRNMl7IJ+7xQpcI+EWpn8gVuLbgEihuqBpQ9yvPv9S3SMtO/hgDAtrLS4x2tgPRWXlCb0Scx++Mx3PTgs5hibS58uTkjKsosgLyCMuPqy9Qwfz++fpXj1xWqTmShRprB8A7RmiFZih1K/EdMurc7kW+2R/6ERDxAbRDNCpNJt7/wQv6uXOJbgTOJWm0KEQOD8c/DiMAQfnbhOmompnxF32EK5VLoWR3rQyiop/I54Y+wAD9szOStDcxajSo9n8KrBtTtx4C+3e8WqjHxeSQ77ATp3X/5vf+H7VlRO0gHFNUONnzdKoE9z5ZUSkxiYfej5oYGSGb3rA+S9gH7077YWJaCemAA/wfwlTlOMmRPrv5ytlx/imF5OB0VrhYXOYf7a19hDvt3tNxhrC9MfTlgAeyMa8UFuxy1B1rkLaxjDJ8i4NuY8b5c0vyu5qxAeA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(23010399003)(1800799024)(82310400026)(376014)(36860700016)(56012099006)(11063799006)(10067099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QEIAuGaP+b0x1JY232PRiG7dDhJFucbHUfM01mAvHOGh3ol+GFeDrqhQOXTMnGhMF3cQ4AlD3TQtWJC428sF9HitouRELei2V9Ilap7xX/XMdI2KOSw/iREHflKB1xIYUz781gVja8QI5cou9xYXuoObfmsc+KjkNzI5h1gURvqNpKWRAYInYxnzdC8lDHiGAAHsFOB8qTsmCHq6D6dZ6u2JjFioTU1pIE4FDjj7Inq1kfvtU5Tbg4gfJVqHbiQx46etyhXX/i7Nb2tUrQShY8+LJWiWXXh7erRAbZJn3KU1SU9iOEwiVRntx2nXtY/b0UdVRK3Cw634z1Fwh3Oib94Ik5tfGwXeNDSj5/oupyTui5e4K+I4VGhF15NuDPbSRSCtsHovZQJY3vwEkF3OKxIFUnDQdMwy0Dm6kfDdB691xhNpZLbnIGN+UTNCJVoQ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2026 12:50:25.6364 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c2282cf-b4f0-4cf3-1b91-08dee8b8f77b 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000ECD9.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7440 Content-Type: text/plain; charset="utf-8" During a kexec restart, only the kernel is reloaded while devices allocated in firmware persist, causing state mismatches between the kernel and firmware. Introduce PM_DEV_ALL_PERIPH node ID (0x18224FFFU) to release all peripheral devices during kexec. On graceful restarts, this happens in zynqmp_firmware_shutdown(). On crash kernel restarts, it happens in zynqmp_firmware_probe() of the reloaded kernel. Releasing all peripherals depends on firmware support for the PM_DEV_ALL_PERIPH node ID. On firmware that does not implement it (the feature check reports a version below PM_API_VERSION_3) the release is skipped and a warning such as "Bulk device release is not supported by firmware" is logged, e.g. on Versal NET firmware that predates this API. Signed-off-by: Jay Buddhabhatti Reviewed-by: Radhey Shyam Pandey --- drivers/firmware/xilinx/zynqmp.c | 15 ++++++++++++++- include/linux/firmware/xlnx-zynqmp.h | 4 ++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zyn= qmp.c index 95ffd8f33ce9..64d2109eefd2 100644 --- a/drivers/firmware/xilinx/zynqmp.c +++ b/drivers/firmware/xilinx/zynqmp.c @@ -2070,7 +2070,7 @@ ATTRIBUTE_GROUPS(zynqmp_firmware); * zynqmp_clear_pm_state() - Clear subsystem state * @dev: Device pointer used for logging * - * Clears PM specific data in TF-A. + * Clears PM specific data in TF-A and firmware. * * Return: Returns status, either success or error */ @@ -2097,6 +2097,19 @@ static int zynqmp_clear_pm_state(struct device *dev) dev_warn(dev, "TF_A_CLEAR_PM_STATE is not supported in TF-A: %d\n", ret= ); ret =3D 0; } + + /* Check if the firmware supports the PM_DEV_ALL_PERIPH node ID */ + ret =3D do_feature_check_call(PM_RELEASE_NODE); + if (ret >=3D 0 && ((ret & FIRMWARE_VERSION_MASK) >=3D PM_API_VERSION_3))= { + /* Attempt to release all peripheral devices via firmware */ + ret =3D zynqmp_pm_release_node(PM_DEV_ALL_PERIPH); + if (ret) + dev_err(dev, "Failed to release all peripheral devices: %d\n", ret); + } else { + dev_warn(dev, + "Bulk device release is not supported by firmware: %d\n", ret); + ret =3D 0; + } } =20 return ret; diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/= xlnx-zynqmp.h index baaa88b0b197..ac39e5492961 100644 --- a/include/linux/firmware/xlnx-zynqmp.h +++ b/include/linux/firmware/xlnx-zynqmp.h @@ -50,6 +50,7 @@ /* PM API versions */ #define PM_API_VERSION_1 1 #define PM_API_VERSION_2 2 +#define PM_API_VERSION_3 3 =20 #define PM_PINCTRL_PARAM_SET_VERSION 2 =20 @@ -145,6 +146,9 @@ #define XPM_EVENT_ERROR_MASK_NOC_NCR BIT(13) #define XPM_EVENT_ERROR_MASK_NOC_CR BIT(12) =20 +/* Node ID for all peripheral devices */ +#define PM_DEV_ALL_PERIPH 0x18224FFFU + enum pm_module_id { PM_MODULE_ID =3D 0x0, XPM_MODULE_ID =3D 0x2, --=20 2.34.1 From nobody Fri Jul 24 05:21:39 2026 Received: from BN8PR05CU002.outbound.protection.outlook.com (mail-eastus2azon11011033.outbound.protection.outlook.com [52.101.57.33]) (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 D3748466B11 for ; Thu, 23 Jul 2026 12:50:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.57.33 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784811035; cv=fail; b=AxKb5TYqQd2P1d12kD3vWEwBCIXF7z4gkYp7HXTsrTN4reCPOPY14Px5tkeb/ewpnap11NLzoM0h8fxvqgnExBnqX21C9DnJdAElvQB18PD+oMa0vVlc9LduymEEWP9wUMmgbrE15JS88wRXlGX1r7s8Ak+xbUPHqXWhkGeYsAg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784811035; c=relaxed/simple; bh=P62iZS2i4b2tA+V0bLACLCHFDS/s+Nx2833IN5RXqW8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cBf3p3Wx/BcZGe7kKUilH2VLZg7VZAE1knPyM8B8kqoHfQ+N5EKVnwvQmxyRJNwr4Ep6L7uIcV/n+D+frQykBYpUrhB6OydiG0aND7T+9S1yOJB6C5gSv+U9g6GM91/9aAn8cg41GUGAeyk/SnyIrqpRMvf8jEuQxuCCqkwczSg= 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=s56a2v+k; arc=fail smtp.client-ip=52.101.57.33 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="s56a2v+k" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Csn904zzCSVhxzSHAqYcdMamxdXvU6R0Dc0t03+FNPyHDUJZT7Hc/nJJAuMeDb3T8ZypUvdjt23lVY1pZTVaHSND22EIK7VoqiXmn0bv7717604CkEsFWv0zDhugVAuP0ddRyNJA47VvhpUodVNerbQCoOERyJz32YbwLk6KADunQbatlHUur1v2KumxJx7fLI4tFnsDGKx7jTkxritbCnNEF+B0j2KiRoGw2N5TYaaKN+kja856r/PYK8TQoR0AU5rt9+K4t5zTee6bZ4wdjudr+j5kzmPZEm0fNq49IQ4KOXCGgn0HWVZevb5bupz3ZQSudwIrqtl7G6R8RCQs9w== 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=xsO3hcSuuNu/QgPAhn48Rt/vw0yw1Ot1mi7uVB7yxlk=; b=CVucJ5x/mgJ5nU9e280R8SBBEEwPphKqm92Jl+CP4ffA41j1qmkvIQ9pyyffx0HgvEgV8KGdcf9T2xGnbqVsHIltQi7NLIQUYzftrChXxqodsgQnDEhEj2L/1KEcpOgaB2wH6Dly/VsFEKhhxSzyA8VKV1G08fn02+gjRGzakKk73kLsBwyehpTO8kyJC9yHFCH3Q6OXXy6aV82j+Q8de6ybXG0O6j7EvT1JXYOVdfCqPGaJohzYZGv+XjW6i0xjjbO4tp/FYM3LGUaiWS+fys5eRgJtvcgX4AQLfgZihf26jSn7EK4y2Rw9dHkLC5o9RUHOEAFRZo1R+EbGLrOrlQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.infradead.org 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=xsO3hcSuuNu/QgPAhn48Rt/vw0yw1Ot1mi7uVB7yxlk=; b=s56a2v+kIKJMV1A1tD8w43n0QUxOIvyNucdBmnwtcrT+okeQTbP7Cr/C+nN0YG+V2aouw73P/j7jbm0UjpXepd6KR2edlLj5rVx3qP3xC0DZKhmh9iF+c/FZJpo3bbm7IvxOunohF31sI5etCJR0DJFmRJAwlYwZvnjeDe1YjKI= Received: from IA4P221CA0006.NAMP221.PROD.OUTLOOK.COM (2603:10b6:208:559::9) by CH3PR12MB8934.namprd12.prod.outlook.com (2603:10b6:610:17a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.11; Thu, 23 Jul 2026 12:50:27 +0000 Received: from MN1PEPF0000ECD9.namprd02.prod.outlook.com (2603:10b6:208:559:cafe::5c) by IA4P221CA0006.outlook.office365.com (2603:10b6:208:559::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.245.11 via Frontend Transport; Thu, 23 Jul 2026 12:50:27 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by MN1PEPF0000ECD9.mail.protection.outlook.com (10.167.242.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.270.5 via Frontend Transport; Thu, 23 Jul 2026 12:50:27 +0000 Received: from xsjarunbala50.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Thu, 23 Jul 2026 07:50:14 -0500 From: Jay Buddhabhatti To: , CC: , , Jay Buddhabhatti Subject: [PATCH 3/4] firmware: xilinx: Clear firmware notifiers across kexec transitions Date: Thu, 23 Jul 2026 05:48:40 -0700 Message-ID: <20260723124841.2567827-4-jay.buddhabhatti@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260723124841.2567827-1-jay.buddhabhatti@amd.com> References: <20260723124841.2567827-1-jay.buddhabhatti@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: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000ECD9:EE_|CH3PR12MB8934:EE_ X-MS-Office365-Filtering-Correlation-Id: a64db9b9-b437-44b7-2fa9-08dee8b8f8b6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|23010399003|376014|1800799024|82310400026|56012099006|10067099003|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: DIhCL823rZAI3LgEJoA8EMmf/hc7ZUi0sjywvXfQJqQga8lWUNKa4gH7EWeKFUUGLuS5gdJVunMxkQU4cPePxf0/oisWjduB9H0LtFJKdXSWryTAsTlnx5nNjFJkH7BLCykI17VIvAKZvPBLy65uizDciiUPMnv9ddfCnNlZb2L5mD7vjw2Hi0P67HYqjixfEXZfGM88VGJGB59FqYOATU7dDnPRogTaGYRFpuGH85bhh5wTttwT758F86M9ljgBmRORveNwOQKTtKesibFi3WM32ZhN1obXvdrRXxkFwBV6VmObSJLtP4At0puPQvtA6XmSszOl+8xv9fY6X5bsAXD4MwuS57FIfiy4km5cD6jHplNMrOvCfjx+8Dyv6PWfYsmyQkEs5MsWIA9dY5L2dlPg1ppx2seiLIyXd3z8X1dnjCbj/O6kfwO64sc9jX6ffRmC1b0/3jEUacP7sjhqWvLDkaJMU6kWdbmOLMhYrQ2UwUVkOzVq/77+CWxiakC1jX9+95rbcOYJvWDmo0AhSw63vP/TpNs/1LUN7B9p9Fzz8E1FS57wYM5Q4ebIETaxNcOP0/xPpKcrrrS42B85RoDYnYMYAGYzhf+CcP3sgHfcSp/zqjnChaXJ9myomkl+gRTIT5qxMhHmukN2FNU1VaHmaU5F7LR45wBHcW0EUrLejw7H/vU7T0+Ka6TM04b481ormE9ip61nCiAIcb5UDw== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700016)(23010399003)(376014)(1800799024)(82310400026)(56012099006)(10067099003)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8A86NplGMZ6fEcETh8nUwRL0HkIdx64ncFHwdIbE09If1lqLYTZW9GjKHZo6whTJ34gf3y36teQqEi+WN297BnGG4dI+vYMh1PsRjqNeKwVwBGJPXQA3G7dkVl18N2qWcYVoSr8I2PieGXKiU4lh7NTlR6473h3+I9/i+ZV9jTN3zR+qjInPE1siy0jLEoGLlnk+7mCgOdSorx/dxXNEfzH+vsFjZxC1aRr1NrgcI7okSsCYvRZg0yHc2l0vrdcbszuIVGL9yypy0OotryY0fBY8XN7d9Jt5pBZBwYHv0WdIclbXzOj95GVMgxXBmaug7x9NWDPKs/Re+E8bG3wtb67XVJMbs5khPd6SeF+WIuOj/sXIkVPFwBEI9/GqwvPE0MsjkoYf8IfhRaj9RncofMbyXrJnMgV0vi0r2KuumNTYZtQhsW3GS9NbPtRb87/E X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2026 12:50:27.6539 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a64db9b9-b437-44b7-2fa9-08dee8b8f8b6 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000ECD9.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8934 Content-Type: text/plain; charset="utf-8" During a kexec restart, only the kernel is reloaded but notifier callbacks in firmware persist, causing state mismatches between kernel and firmware. To address this, introduce PM_ALL_NOTIFIERS node ID to unregister all notifier callbacks during kexec. On a graceful kexec restart, this occurs in zynqmp_firmware_shutdown(). On a crash kernel restart, it happens in zynqmp_firmware_probe() in the reloaded kernel. Unregistering all notifiers depends on firmware support for the PM_ALL_NOTIFIERS node ID. On firmware that does not implement it (the feature check reports a version below PM_API_VERSION_3) the step is skipped and a warning such as "Firmware doesn't support unregister all notifiers at once" is logged, e.g. on Versal NET firmware that predates this API. Signed-off-by: Jay Buddhabhatti Reviewed-by: Radhey Shyam Pandey --- drivers/firmware/xilinx/zynqmp.c | 14 ++++++++++++++ include/linux/firmware/xlnx-zynqmp.h | 3 +++ 2 files changed, 17 insertions(+) diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zyn= qmp.c index 64d2109eefd2..fc7212f554ee 100644 --- a/drivers/firmware/xilinx/zynqmp.c +++ b/drivers/firmware/xilinx/zynqmp.c @@ -2110,6 +2110,20 @@ static int zynqmp_clear_pm_state(struct device *dev) "Bulk device release is not supported by firmware: %d\n", ret); ret =3D 0; } + + /* Check if the firmware supports the PM_ALL_NOTIFIERS node ID */ + ret =3D do_feature_check_call(PM_REGISTER_NOTIFIER); + if (ret >=3D 0 && ((ret & FIRMWARE_VERSION_MASK) >=3D PM_API_VERSION_3))= { + /* Attempt to unregister all notifier callbacks via firmware */ + ret =3D zynqmp_pm_register_notifier(PM_ALL_NOTIFIERS, 0, 0, 0); + if (ret) + dev_err(dev, "Failed to unregister all notifiers: %d\n", ret); + } else { + dev_warn(dev, + "Firmware doesn't support unregister all notifiers at once: %d\n", + ret); + ret =3D 0; + } } =20 return ret; diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/= xlnx-zynqmp.h index ac39e5492961..69a2f74269f3 100644 --- a/include/linux/firmware/xlnx-zynqmp.h +++ b/include/linux/firmware/xlnx-zynqmp.h @@ -149,6 +149,9 @@ /* Node ID for all peripheral devices */ #define PM_DEV_ALL_PERIPH 0x18224FFFU =20 +/* Node ID for all notifier callbacks */ +#define PM_ALL_NOTIFIERS 0xFFFFFFFFU + enum pm_module_id { PM_MODULE_ID =3D 0x0, XPM_MODULE_ID =3D 0x2, --=20 2.34.1 From nobody Fri Jul 24 05:21:39 2026 Received: from CY7PR03CU001.outbound.protection.outlook.com (mail-westcentralusazon11010059.outbound.protection.outlook.com [40.93.198.59]) (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 A4E161DED5B for ; Thu, 23 Jul 2026 12:50:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.198.59 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784811034; cv=fail; b=nF0uj60D3ha9v7g/Gw6pyROorBV2ft00MjiDckJxY50Vze3K21SYiohrmbJMZB3LJvsmoq7OXUwbOW+yidqhbDePgvW2zD3FUzbarCBzI19HiD6fNiqzdsv4QAOnTYsW7FwkofTPoy6V4M/0NOmVbRSaTcWg9i/J794R0xB0dOQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784811034; c=relaxed/simple; bh=1zxs8/C93WEdo0lWwX+rYUxDIVKdvj/q0fjksNNClAU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tDtQBpkCpQri5x5bc1CmK8W1ukPEsV5n4RTuDR1/lmIivTVIsO5Ht/wQ3tSjTc2iDQQGGF0cWu6aiir8s6E9Kftr/iMCiNrJvGBXP27e8Wx/X53p+U9ndUwBjgQ2FR7rWNhTdbATVZNNMQZ0C4wAb85hAXxUKZBngxiXv2V1PQY= 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=s0Ic1dSB; arc=fail smtp.client-ip=40.93.198.59 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="s0Ic1dSB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=II+IXbsMML/GUERwh7ZrDuaWpK/iluBaoEmEUKix8RkOrMBPZ0k5gT1kz7zAYtLRoSbwbwkxpSrnvFyMyzvaMtIboPH3dkuqP3uoA59P3/O5rjggJJIJAyr43rYbQuiWQ+NG0JeM23Gg6/ydsZaSXhWfE9EeTjF9HQaoKkHNca/frPdO/yHsyDJpCZ6WsY06xbihSPVDGOhcdyxfA2RPxzTLnFmSl/u7CVGO6mOL0BOt29caynkFK9Aa5saCwXG2MtZEYxSb859JMbfjnchvHJQsZJnBmZzh7Nnb7D/mS8BPimoGWUnaIPiaaxNU0QMP3K6SzalWkCbSH5k5cqg+AQ== 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=S7Ro4rtkHhKek+O7kz9VOvZAHsSx+xr2WyaK4v6vnKk=; b=ne4RlPrW6+fDMMEwud1K7+9Rs3HoqQ0zpJ0ttthuC6li5e7MClShv6cbKGw9hYsTbYIhBNvJMYtGIGfLU4H+pDgMrn3NH17LqMQJcrEtAgWQxpVwagFBlD3Sv+KHoh3O0BhLl52kV5OAOtEaxKGA+A1cfyY2j3dAMGJ9/LUhLu8m1/SZTnkICcg57tyzEYvAFd3Jn0H7ooHR8teI5CGub2On+7eympl9wZtstX9zvIuLzeq0YnA63fmpyhMEgEgvYNDny1TXF/WpPAIx2hHidrMxaIpj6ER0OVHt67sFaLkA+emeFZmxRy25WpzVUBaaegFsxT1tPQJYi54fOHgJtQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.infradead.org 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=S7Ro4rtkHhKek+O7kz9VOvZAHsSx+xr2WyaK4v6vnKk=; b=s0Ic1dSB4tbYE9hf2MlDVS+P38/09/MTZSnthSYrBr/3oLUx9FWi3FsSXYfL5FHLwMU3YLzyZ3AIzibM8RwlvGIU6DtxpPEre7txbN3gZx+LYWUMJTTygZwP+E4y5Jj5SpuWIYeAdu22lfRMzI9DaY/Et8kMELII7DwKmsRh930= Received: from SJ0PR05CA0108.namprd05.prod.outlook.com (2603:10b6:a03:334::23) by DS4PR12MB9563.namprd12.prod.outlook.com (2603:10b6:8:282::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.10; Thu, 23 Jul 2026 12:50:28 +0000 Received: from SJ1PEPF000023D2.namprd02.prod.outlook.com (2603:10b6:a03:334:cafe::84) by SJ0PR05CA0108.outlook.office365.com (2603:10b6:a03:334::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.270.4 via Frontend Transport; Thu, 23 Jul 2026 12:50: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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by SJ1PEPF000023D2.mail.protection.outlook.com (10.167.244.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.270.5 via Frontend Transport; Thu, 23 Jul 2026 12:50:27 +0000 Received: from xsjarunbala50.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Thu, 23 Jul 2026 07:50:14 -0500 From: Jay Buddhabhatti To: , CC: , , Jay Buddhabhatti Subject: [PATCH 4/4] firmware: xilinx: Use TF-A feature check for TF-A specific APIs Date: Thu, 23 Jul 2026 05:48:41 -0700 Message-ID: <20260723124841.2567827-5-jay.buddhabhatti@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260723124841.2567827-1-jay.buddhabhatti@amd.com> References: <20260723124841.2567827-1-jay.buddhabhatti@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: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000023D2:EE_|DS4PR12MB9563:EE_ X-MS-Office365-Filtering-Correlation-Id: e4cc1929-4dc5-4c61-1251-08dee8b8f8ea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|376014|23010399003|82310400026|1800799024|6133799003|56012099006|11063799006|10067099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: Xd2XASZPscC/A/5MotGgKKDTduR7MCwp7+e2kNaMyrzZ7uE46lEounHdEJgnW3u2qLIk7deA7A/WD2GZWtDCcfDhgkCSU0g6uz1wH1R/Oq6uQqjXPV0H9f8Fohividbo5dZfwFafnO+s6M945OZ3CZlnbbrpSiG574Ii5RUWkLD3zCXE8If6u/k9s2sfBJNqB9aYdGQvVHT8CgrW/JAel7jgD4V6dNPjKyY+3iim2CNx5Fu7HKfhfX9M+UvOFPxIYDFHndNEhwxZeBQVdKabvcPX9DJQhA8X4iHx3H8wbG2m3DWeC5KdVNbhEgm79HSZQPFBrzjCUrqrk24tqiPdUZ53ijbzld0xDUDVdKAAjpY+3nCMOfXyvmcIsaW3QUL1vvyWBpNio5o+bpe2wkwW5MyFsbz9EPJMNZL8LIVQsR0d8zAj0UAvBZ3omsDRJfom4bcWgDeU6qlYem8qqOPiCS3FYl33iOibi7YrWuufaCwixUXZHNl5aWMuQK15Rapzj0woyz4Atbog7HkexI8937NserdzvLm4iI4KaWziCzLNxYOh0LiSvKKIWKzwrOCHRAJzePm+Q2qFRJG8UDVnsV1oUW1vwy6QsD/OpofqUlAvPClR1Ex5Rh18SaV14uN4spQMrpj59a5WBYwUQlU0rFDj/aWHSQ0dsSnOzd6JxCRKcTe/2pwXXgi3h/Pvq1bNk5jN4R2GCV52Q/K5RZdRxg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700016)(376014)(23010399003)(82310400026)(1800799024)(6133799003)(56012099006)(11063799006)(10067099003)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AUX3TmYrLeoF1xuEiZbu1K0zhiNWpGwc80X2G7OHvkn+VamFiSSxbrDZtQW0VCdmwUkfLFOu1paqjECvpSfkDZ5qcQiIklFEajJgQsc0kiIsdEikLxI2No1Opb0krJdB2ALZQ9aZsw73j7MbvhdRtgmuS2N5YhGM9Uh2vta8Uke0T/+/LBgexVsLQqKAq8S0nZ8zniHM1LKo9d4SxAClvVryBlXWMF8+01ctLeAbD2duLDw0JXo9VuOuaGjuEQ/+65DJUQeF3N3laAixOWyhOtHE8HA26YetZ/NIG77NKYUqf4lM3yZb/SXDrAry8KFIHtluJqxqOYeN9WJ+di0rcZH1ojDzD1zZNEaAZZBtVXgPwU0y1lDJxwRehGUcjBaVgOmnYec0C2FClyKk1asjTDTe0xmrp7gcpSXRkDVdr0NIlFduEzVaHHGmS7M14lsI X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2026 12:50:27.9869 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e4cc1929-4dc5-4c61-1251-08dee8b8f8ea 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000023D2.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PR12MB9563 Content-Type: text/plain; charset="utf-8" Currently, TF-A-specific APIs are validated using the firmware PM_FEATURE_CHECK API, even though TF-A provides a dedicated mechanism via PM_API_FEATURES API. Ideally it should use the TF-A feature check (PM_API_FEATURES) for TF-A specific APIs. Update the feature check logic for TF-A specific API calls to ensure it is validated using PM_API_FEATURES. If this check fails, fall back to the legacy PM_FEATURE_CHECK to support backward compatibility. When do_fw_call() fails, propagate the errno from zynqmp_pm_ret_code() instead of always returning -EOPNOTSUPP. This applies to every module ID, not only TF-A, because the rewrite sat in the common failure path. Existing callers only test ret < 0 and are unchanged. Signed-off-by: Jay Buddhabhatti Reviewed-by: Radhey Shyam Pandey --- drivers/firmware/xilinx/zynqmp.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zyn= qmp.c index fc7212f554ee..0b6c20a1d8be 100644 --- a/drivers/firmware/xilinx/zynqmp.c +++ b/drivers/firmware/xilinx/zynqmp.c @@ -224,34 +224,37 @@ static int __do_feature_check_call(const u32 api_id, = u32 *ret_payload) module_id =3D FIELD_GET(MODULE_ID_MASK, api_id); =20 /* - * Feature check of APIs belonging to PM, XSEM, and TF-A are handled by c= alling + * Feature check of APIs belonging to PM and XSEM are handled by calling * PM_FEATURE_CHECK API. For other modules, call PM_API_FEATURES API. */ - if (module_id =3D=3D PM_MODULE_ID || module_id =3D=3D XSEM_MODULE_ID || m= odule_id =3D=3D TF_A_MODULE_ID) + if (module_id =3D=3D PM_MODULE_ID || module_id =3D=3D XSEM_MODULE_ID) feature_check_api_id =3D PM_FEATURE_CHECK; else feature_check_api_id =3D PM_API_FEATURES; =20 - /* - * Feature check of TF-A APIs is done in the TF-A layer and it expects for - * MODULE_ID_MASK bits of SMC's arg[0] to be the same as PM_MODULE_ID. - */ - if (module_id =3D=3D TF_A_MODULE_ID) { - module_id =3D PM_MODULE_ID; + if (module_id =3D=3D TF_A_MODULE_ID) smc_arg[1] =3D api_id; - } else { + else smc_arg[1] =3D (api_id & API_ID_MASK); - } =20 smc_arg[0] =3D PM_SIP_SVC | FIELD_PREP(MODULE_ID_MASK, module_id) | featu= re_check_api_id; =20 ret =3D do_fw_call(ret_payload, 2, smc_arg[0], smc_arg[1]); + + /* + * For TF-A APIs, if the feature check with PM_API_FEATURES fails, + * retry with the legacy PM_FEATURE_CHECK for backward compatibility. + */ + if (module_id =3D=3D TF_A_MODULE_ID && ret) { + smc_arg[0] =3D PM_SIP_SVC | FIELD_PREP(MODULE_ID_MASK, PM_MODULE_ID) | + PM_FEATURE_CHECK; + ret =3D do_fw_call(ret_payload, 2, smc_arg[0], smc_arg[1]); + } + if (ret) - ret =3D -EOPNOTSUPP; - else - ret =3D ret_payload[1]; + return ret; =20 - return ret; + return ret_payload[1]; } =20 static int do_feature_check_call(const u32 api_id) --=20 2.34.1