From nobody Wed Oct 8 05:54:43 2025 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2089.outbound.protection.outlook.com [40.107.243.89]) (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 B35692749E6; Tue, 1 Jul 2025 12:40:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.89 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751373602; cv=fail; b=SwKVNX3bhbK7Fh3roZTgredTA8lBGVJjAiBcotD2S25BCk3iZf7i1tQvLYX3h7FXIXFLAucHxVWTf1Q6JL4d5nrMTjCTJbIiltcHQYuR8C29gouf3Pz9OpHlTPC4ZiurPskPgGz1G6iaa4cQK7iqcB1ReWX9zW9HFTGlX0vlxY0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751373602; c=relaxed/simple; bh=pUBHphU30GqL08aBPvFeKHrrvtL+qnt2Ot8vuafflB8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nkLk0Ffsm77DjiaNc5zcYi+2gUJbwmyX4OlmR3JmsDLVGVN1fsntnNd8nSyqcTlWnfdNhR2OmA3Wi1Q+iRYdoHOoPsbaOWGOcO5jCFGcVUApbnkUhn+evphx2QyWMY6uR/bb5jJXajotJi4WGICSI/qKE8uBS4CMWc0gCOerGrg= 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=HVw5phXl; arc=fail smtp.client-ip=40.107.243.89 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="HVw5phXl" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PUnH/4jCHkrAsazSWZ6pDOn3TjSRaG35XTDOKglNdEQopS68EZAnkY2lnqT6Bn6xvrNH2+efzU0j2+tYX1spiK5kiiS0ev3CDW/sER3gtBQOGmqVqHcY62m/rR3vUaSblUfVA0cW7A3kMcGcEtfl6vKqB229BQt+id/XAIviWfNkc23WgBbCIudFag1bkUAIVpZWxc6Rt3wV+UmWgeiR0sKa68+z7EDtJSQzgUD1Xyjx08BGhjqeTjmgWRjzzsFb+w0t59iuM8PiibbtfUUeCYdEEeRhdNN0b3xzIZAj4syZ98bdeRiaOa7f5/c+ZTJZ5eXCrGEjtkd3c0mEfloN4w== 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=walO4ieAjnSlQmIbG0kq1CD94eH2uL4Fpm9aeKyzreI=; b=bGzX+Wv3J1gKpJ6qCqKizazfw8zqBrjR6vY+oV8YxICuCGvV7k2RdLvtdj3Xa3WQjMfk5HH+ap43j6NxUiWtpNw1JG39pDneUOGQga0Gjq1aa/iz593cN8Wekiji+V6O+dxJArY9HRy4KSMD74t4Fq+9rwv0s8Z1HJlHZT/zhW+7VaVjYBMXqIgpHmnx3q9W+H4w9+zWadSTGm4fsXc5XsHKansV4InoHbPaijqPRMUyfZmRiajfY1LyMOPh35lSJOr8DAE5IHQ+VjEAZ3MNrcp70/u2n1ZSYmGdMqBnNIl/+VnsJQfUjnPFc/7iuqGh1bGXGHwifelujvKiT8F6Jw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linaro.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=walO4ieAjnSlQmIbG0kq1CD94eH2uL4Fpm9aeKyzreI=; b=HVw5phXlvaNhjA2/wMRg4I22Sq57NyXeL2aTHKYhAvAvjOXCyuuIBYNsNt6Djv1O4YaAlhhFkZpCZTAgSImUwp9s0GdPuW/uBn6dlbdMbebvEGSHy+3yoU6Jx9Ux3rp1tR8QjbvkvN7U07ZkstWX2+hsyU42OonMxYfszuXKTNM= Received: from MW4PR04CA0119.namprd04.prod.outlook.com (2603:10b6:303:83::34) by MN0PR12MB6248.namprd12.prod.outlook.com (2603:10b6:208:3c0::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.28; Tue, 1 Jul 2025 12:39:54 +0000 Received: from SJ1PEPF00001CE4.namprd03.prod.outlook.com (2603:10b6:303:83:cafe::70) by MW4PR04CA0119.outlook.office365.com (2603:10b6:303:83::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8901.19 via Frontend Transport; Tue, 1 Jul 2025 12:39:54 +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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SJ1PEPF00001CE4.mail.protection.outlook.com (10.167.242.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Tue, 1 Jul 2025 12:39:54 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 1 Jul 2025 07:39:52 -0500 Received: from xsjarunbala50.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Tue, 1 Jul 2025 07:39:52 -0500 From: Jay Buddhabhatti To: , , , , , CC: Jay Buddhabhatti Subject: [PATCH 1/3] firmware: xilinx: Add Versal NET platform compatible string Date: Tue, 1 Jul 2025 05:38:49 -0700 Message-ID: <20250701123851.1314531-2-jay.buddhabhatti@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250701123851.1314531-1-jay.buddhabhatti@amd.com> References: <20250701123851.1314531-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 Received-SPF: None (SATLEXMB04.amd.com: jay.buddhabhatti@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE4:EE_|MN0PR12MB6248:EE_ X-MS-Office365-Filtering-Correlation-Id: 7763bf50-fa69-48a0-079e-08ddb89c6168 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ZAexiTncdfcK78SM+vvBJXXD4SkvsmNKPOnWOrmy4HmyJvRWB34LAXWHm/qQ?= =?us-ascii?Q?jkmJyJlOuBul0NF88xy2BFinrKX3P6MyWT1yc90dGDsy8SkpLXMnyW4mOrC5?= =?us-ascii?Q?UNERBj036X5BEwAVGLN1NCPPCYsFxadm48JxbnzoeyhF41nHRAPgXEfcx+0S?= =?us-ascii?Q?JfEjVclKdTg6mu49fadbF6YRjeXL7FHsdoaa4YvHvvRs60ZKRPwmpWFUDWUi?= =?us-ascii?Q?DYBomytOiFFmCtaHcyM5RRtGGxAnAamkN+JgVguSgg1n0kVUkKUP+FZsEUr9?= =?us-ascii?Q?OHb8fC9/CGLIzn5v3Pw7V5mXjP8J2KOMtSb8YHWgpeo/t4t3aN8AJZ6M1O1a?= =?us-ascii?Q?bjteiuKkuTb2jAGDpGgwRgiJ47toXppbfCR9cuIm30HxwPCtYslLkAsvRd5L?= =?us-ascii?Q?4CWPq0bIpTKvyyz5cD1+lxKEnO1T6v7n4yyxHwWYpvYEraCAqkGPiZjuaXFu?= =?us-ascii?Q?O1wmR9yDSGFBC4fh4f4bSmw5UKWQ4afCYb39cn//xW/del63zZCCqFCGIfa2?= =?us-ascii?Q?4Y6M+Sjm7mVRQJi1Me6hkgKwIaAMLN5EQlPOlWImBgR3hu0SDrS52w8Hs/DG?= =?us-ascii?Q?kjWwtvwShEFcrc1P3FWnQTQDDDEyJUJNBvYbovArfNPGYuDKGuxI7rjftHjo?= =?us-ascii?Q?fj+B9KJsIhQrbZPkIiVDqkt1KlPJgi8/ytCce835KVtXtQgsMT4Jh0mgj0uB?= =?us-ascii?Q?0tMkSJutgTELGHuPAZxagf3VQXd1j5I029T9kU88NA9qBbT7Unwk4HpyRAVK?= =?us-ascii?Q?jyaa/PMIY23raGMunpAINGsaVqFdNqTwQwUngEOtOqiegIBH3/RUvpZhg8AO?= =?us-ascii?Q?+z/PstME4KEDDueLlXcCvq7afPGIymaLfkpmH749U0pmxJ2Q6drRZGxSCU1z?= =?us-ascii?Q?7Hzcmk2NcCu3s9X4vyT4kcVcTBjM2sW6SE+0ivyf/MwhZlkjfI4bwEOoPGSD?= =?us-ascii?Q?Ou3KnQIG7tBC6hxxg33dH9C1syLLkOxNeGjP8nJmw07DBqm9PkBeRbVInTbN?= =?us-ascii?Q?6pkPGFTVFbik0sQOdE1LmPe+YCHiZLRgTZvQFHJId5EoVvkJlhDBfIbuUAax?= =?us-ascii?Q?8I/dSkG1Mn+5OnHeILCpEsaZ8KqkOmCA+WSJ4VGYhnJJ5UdDM9x2g7R7R5NT?= =?us-ascii?Q?yMDuwdFTRKifoH4BAyO+Y6o7ZTJulLn+NMLB/W/SFVrc6M7oHo67yYhfMNeL?= =?us-ascii?Q?d1YL75aableBcR/8Ae8U+N5ob4AdTUOXhb7pF32Ul5H0FkKMe9rLC8yN9CoK?= =?us-ascii?Q?/wf/ISvlPJqCaddePHeM6Nqn+oD7Jeg9izCoAgm1YGgQ9DX+WwFRMlT93xEV?= =?us-ascii?Q?tiQJ7STWCVlAaXBVkWdr54ngi9Mm5rhk9skCf04qaXQPw42cpxyLyKLVg5QK?= =?us-ascii?Q?Yc3NVy0nbCWC5cWcUfslUC/lALBs56hoo2TmozJSVAK68KduVlHrmI91XNeg?= =?us-ascii?Q?kRqbGffSqdzrC9p4PTKyUq+QQYykkS2j/tQdKm0+ndso9TkOaH2LwEf1m8QK?= =?us-ascii?Q?EDBBtSQbkytz+CMEf928gcUrD86CGSPDY/Wd?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2025 12:39:54.3158 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7763bf50-fa69-48a0-079e-08ddb89c6168 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF00001CE4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6248 Content-Type: text/plain; charset="utf-8" Introduce a compatible string for the Versal NET platform which enables platform identification based on the compatible property for platform specific configurations. Signed-off-by: Jay Buddhabhatti --- drivers/firmware/xilinx/zynqmp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zyn= qmp.c index 7356e860e65c..89e0eef219ff 100644 --- a/drivers/firmware/xilinx/zynqmp.c +++ b/drivers/firmware/xilinx/zynqmp.c @@ -2103,6 +2103,7 @@ static void zynqmp_firmware_remove(struct platform_de= vice *pdev) static const struct of_device_id zynqmp_firmware_of_match[] =3D { {.compatible =3D "xlnx,zynqmp-firmware"}, {.compatible =3D "xlnx,versal-firmware"}, + {.compatible =3D "xlnx,versal-net-firmware"}, {}, }; MODULE_DEVICE_TABLE(of, zynqmp_firmware_of_match); --=20 2.34.1 From nobody Wed Oct 8 05:54:43 2025 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2043.outbound.protection.outlook.com [40.107.220.43]) (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 76C832749F8; Tue, 1 Jul 2025 12:40:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751373603; cv=fail; b=GnoFe8Peyj+xy2QjP9v93xBl5AhKmu2DJGbs3/KEV4iyNNA4YMhZrtDAK1yOKZq3g2wCXJn26trDdU5HaKzxabr0F4jjTwYROtfH/YaaK+k+/AAr/yJyJEug0HWsDErC2l+L1QaHPGLlVcqJGzwxM0KT2r5m18dqE0EHVrHzT9E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751373603; c=relaxed/simple; bh=1XChm4KYQ8Jc9JUrxUUMwt5s/VgKOBPSuRLnunKCoeY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UwVDOb079Ai4FM/gvbkJrfeNr4A8lzv99gLYT/tNmo84hbsDVbGewoKnuHXx2hVQAvbK4CF43H1oFHP7YSMSYxOX6yk11Ap9r2MAziUqCYHp2RxZS+DedvGdD7HKKRtfuLwSgphbiGwroWVzo6BPX+gUFvdKOf3eajGLNWF2AaU= 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=B4nkj+M6; arc=fail smtp.client-ip=40.107.220.43 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="B4nkj+M6" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=smmuwMngF2+JBuLnWW0DkelBb8ld34LlJvVZn7lycJGnSCSq62lnsmLmiQ0S4cZCUSNOzBCy433dMgbEsVg6/h8YL0fYthMSpSZM5+suQeM8g0YBnmRtaMm7ZbIxTLJI1mieoC37VC6QgBjTEJrvACfqw4m5Y7seUaC6MusdtFT0VZYHCNRB778XzkG8kdPkJvS4iHRWI2hY4aBd91IPrCg9P6/0Id3mQ+iNCJFx84rMvWLCUz3rMFI16sOIXhd6qk93pmT98q7apCarXoadT2jWB7lAAB7amq2s/4kNxrl6oe6SgqIpaduj2gcCTQ+MVv1IoOwUODitEp3syoHFsA== 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=Z8YyMNEML0TMeQJHvU6/NoZV3PA2jwoUEU1p/KWM3mE=; b=DQp2PumqSD7JTCOVwA5XaUpOOirRMhNfvZGONDu6aasAzIsFp17IiSzuSrlPARI5T1/2buSGwRlMxaeUU2AdfERRlcbNG3yMSlTV4+RYKnJ/mKQeUwsyzndJeV+/h/0yM2jFv00PgF0aYiPW6zN0gOSRY0qMduQFsnbwMOvD1KszhJXTl5lR2owoOsj2OYWhOlTo8zGLgH6aa+QvtbsQ+q87qFUIchCmZPSARhNPELyF6zTsUNNage+b31WczG6qR2kXZCLxajSIUkCtum5EKyWo2eKtU68y0DCjFgUsPYZE47dfLgDkPwr//8imMyOLwlniQi0OHtQCAp+6f5mDvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linaro.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=Z8YyMNEML0TMeQJHvU6/NoZV3PA2jwoUEU1p/KWM3mE=; b=B4nkj+M6HBMeDXTidMGQXLzyrsI2jeXpn/p0WHjmgjPvQszLWQCtBL94suF/fPwtIpsOATNxhTsS3lSZkQfyBQGtFjFv2wPfcE34CcQPvJbyb3Yw5XZLfcdXu1El34tPGNTYmsSMgSlz6PTrrTeaqvvy7C6lXipkTWv8DRCu9Ts= Received: from MW4PR04CA0100.namprd04.prod.outlook.com (2603:10b6:303:83::15) by CH2PR12MB9518.namprd12.prod.outlook.com (2603:10b6:610:27e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.26; Tue, 1 Jul 2025 12:39:55 +0000 Received: from SJ1PEPF00001CE4.namprd03.prod.outlook.com (2603:10b6:303:83:cafe::fc) by MW4PR04CA0100.outlook.office365.com (2603:10b6:303:83::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8901.19 via Frontend Transport; Tue, 1 Jul 2025 12:39:55 +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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SJ1PEPF00001CE4.mail.protection.outlook.com (10.167.242.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Tue, 1 Jul 2025 12:39:55 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 1 Jul 2025 07:39:53 -0500 Received: from xsjarunbala50.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Tue, 1 Jul 2025 07:39:52 -0500 From: Jay Buddhabhatti To: , , , , , CC: Jay Buddhabhatti Subject: [PATCH 2/3] drivers: firmware: xilinx: Add unique family code for all platforms Date: Tue, 1 Jul 2025 05:38:50 -0700 Message-ID: <20250701123851.1314531-3-jay.buddhabhatti@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250701123851.1314531-1-jay.buddhabhatti@amd.com> References: <20250701123851.1314531-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 Received-SPF: None (SATLEXMB04.amd.com: jay.buddhabhatti@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE4:EE_|CH2PR12MB9518:EE_ X-MS-Office365-Filtering-Correlation-Id: e7270580-fda8-4a12-a256-08ddb89c61f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?dFI1drr78/8dTlBfJFo1P+OHK5cylfXeqwyfmbd0JiwgVnJ/XD3ulaTfcGVd?= =?us-ascii?Q?ZIwsUdugTH4CnzBwM5G6+3KOIrU5OlFS0SxLmVFLJAwsHf7WawwWovFpTX0T?= =?us-ascii?Q?v6VVI+VQxZe+1toynvMlttqlt+8ogix6bsn5Ta/zChGExTa3lhZGHnFv0zQV?= =?us-ascii?Q?RbtKvDnRYS+ydIHcMKoXMNwzHh97BKqClWTkY56nxznzrX9DmnWx6pf9LjhX?= =?us-ascii?Q?1QnDnB2Ug51O7HddwkUnPxs0uRWP8G4pkfAKd4AxNZK11n1aGv8rl/gs5FxL?= =?us-ascii?Q?DChlnZoyjnKIwiiRcAKcrvSnCZj2EkHOp5QXuyu2dj9+fd723g9ERiYQVuyW?= =?us-ascii?Q?iNCckHdQXd6/mSAmmonCHElTmxTrkqe1wmDohh2GjD9n4kOp4VA4xbctf3Eb?= =?us-ascii?Q?f6X5/wWJUla/FqBzg7y7jC0qZfRCwg9ARY8VUCFe4GZTn9yhkCY3zvY+lcpV?= =?us-ascii?Q?qpqu3ezu8m1mkr630luMm3sE1OZuHmlKr7JyR0KnAS36AzEK2JsO8ll8ZMvl?= =?us-ascii?Q?Sqc3OBRdyWxCnv5FatcAJYKuF9m6y9Pny+C8e+qSW4oVndqIMfYLa2eIkw8z?= =?us-ascii?Q?H9K9EgpzjI0Q64/knoPEmXNQYNAQRjQxJxFJgsQytJ/RTPtd0C3Mi6tYKQTG?= =?us-ascii?Q?YE+qObY9qbHgxzml24JEJQ5FJqjyotTJIqkqFtTtAamo1KsaAI2+OdeSdJ0G?= =?us-ascii?Q?yzGmQCOgzMgARLHDhSBhTWB3cq8ghvUR7GUQe6/L1Rvf+in2S1Q01vIAAOQx?= =?us-ascii?Q?eWcIBCzld4rz9iEWPYIK/x11YUsj6s4/uPPwyHdcrd8X+eE0SNWRcaYxt3Ik?= =?us-ascii?Q?X7NmV05PxklvHbnwyjCiTfwb+RhqedeZk3+UyDaRkC06fHijWXrc4APj7w+2?= =?us-ascii?Q?3H7MizgwSTD+B6R8h/zUy9ZX9Z3uRNCC0VyLntIMRmvA7zBwmTeoNhuU9SW2?= =?us-ascii?Q?FxBK9ebXahsS+htPlIwz6+2fMPVi4cqOrUMXw70JCMiNEq5Lgtq7aqXXJ5rW?= =?us-ascii?Q?mLCbSHmpXM4r1cdkmio3zTSahTLqqp9mhao1miqo47lbRC5N++mS+oCCJmqE?= =?us-ascii?Q?oyJF4QKsu7LrnP0Q5JtP49Q0yNNI0soXo7RMekPp72ac2YsuzI8Dhc/ZmUba?= =?us-ascii?Q?NVSRkfUrlSc0Wi5d6VdelYCwIAJY8vAvLNeHKq0R0Kd9onh7P5Vis+ngwEot?= =?us-ascii?Q?Uh0mugsgnJQbnii1PKwbinQbrnKjj8LyLcYSr/99TQ0yeM+GTkIbmvVyi028?= =?us-ascii?Q?V5beAJRhk1+x90rbgEW57NLp0yEY3Tb7Woc0nT13J+ehcGCuSw1hFAbkKZ1s?= =?us-ascii?Q?QPd5aCe4SlWOxS7q+qnnOw53EP7mlZ2IkJ/WQmBxd7Ww7I1xnzTyK+XDGXgL?= =?us-ascii?Q?IlJgFw6NCzYnsbUL7J1THYugDNpA34VGXQM82QIamhSbdcBtPSSWGnRUtUx2?= =?us-ascii?Q?rJHKUXXaGf45d5QJ46kq3qJdFBqhrOJH2SpWTVyEN+AAOc5eWyHYwice9wOx?= =?us-ascii?Q?oR676e1Ss0T/ke1GwP5LR1MWekkOum3A/M46?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(36860700013)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2025 12:39:55.3025 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e7270580-fda8-4a12-a256-08ddb89c61f5 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF00001CE4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB9518 Content-Type: text/plain; charset="utf-8" The family code is currently derived from the PMC_TAP_IDCODE register value, but there are issues where Versal, Versal NET, and future platforms share the same family code. Additionally for some platforms have identical subfamily code, making it challenging to differentiate between platforms based on the family and subfamily codes. To resolve this, a new family code member is added to the platform data, initialized with unique values. This change enables better platform distinction via the compatible string. Signed-off-by: Jay Buddhabhatti --- drivers/firmware/xilinx/zynqmp.c | 32 +++++++++++++++++++++++++--- include/linux/firmware/xlnx-zynqmp.h | 5 +++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zyn= qmp.c index 89e0eef219ff..2fb1c29314b7 100644 --- a/drivers/firmware/xilinx/zynqmp.c +++ b/drivers/firmware/xilinx/zynqmp.c @@ -71,6 +71,15 @@ struct pm_api_feature_data { struct hlist_node hentry; }; =20 +struct platform_fw_data { + /* + * Family code for platform. + */ + const u32 family_code; +}; + +static struct platform_fw_data *active_platform_fw_data; + static const struct mfd_cell firmware_devs[] =3D { { .name =3D "zynqmp_power_controller", @@ -2013,6 +2022,11 @@ static int zynqmp_firmware_probe(struct platform_dev= ice *pdev) if (ret) return ret; =20 + /* Get platform-specific firmware data from device tree match */ + active_platform_fw_data =3D (struct platform_fw_data *)device_get_match_d= ata(dev); + if (!active_platform_fw_data) + return -EINVAL; + /* Get SiP SVC version number */ ret =3D zynqmp_pm_get_sip_svc_version(&sip_svc_version); if (ret) @@ -2100,10 +2114,22 @@ static void zynqmp_firmware_remove(struct platform_= device *pdev) platform_device_unregister(em_dev); } =20 +static const struct platform_fw_data platform_fw_data_versal =3D { + .family_code =3D PM_VERSAL_FAMILY_CODE, +}; + +static const struct platform_fw_data platform_fw_data_versal_net =3D { + .family_code =3D PM_VERSAL_NET_FAMILY_CODE, +}; + +static const struct platform_fw_data platform_fw_data_zynqmp =3D { + .family_code =3D PM_ZYNQMP_FAMILY_CODE, +}; + static const struct of_device_id zynqmp_firmware_of_match[] =3D { - {.compatible =3D "xlnx,zynqmp-firmware"}, - {.compatible =3D "xlnx,versal-firmware"}, - {.compatible =3D "xlnx,versal-net-firmware"}, + {.compatible =3D "xlnx,zynqmp-firmware", .data =3D &platform_fw_data_zynq= mp}, + {.compatible =3D "xlnx,versal-firmware", .data =3D &platform_fw_data_vers= al}, + {.compatible =3D "xlnx,versal-net-firmware", .data =3D &platform_fw_data_= versal_net}, {}, }; MODULE_DEVICE_TABLE(of, zynqmp_firmware_of_match); diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/= xlnx-zynqmp.h index 6d4dbc196b93..f112cd211c5e 100644 --- a/include/linux/firmware/xlnx-zynqmp.h +++ b/include/linux/firmware/xlnx-zynqmp.h @@ -54,6 +54,11 @@ #define ZYNQMP_FAMILY_CODE 0x23 #define VERSAL_FAMILY_CODE 0x26 =20 +/* Family codes */ +#define PM_ZYNQMP_FAMILY_CODE 0x1 /* ZynqMP family code */ +#define PM_VERSAL_FAMILY_CODE 0x2 /* Versal family code */ +#define PM_VERSAL_NET_FAMILY_CODE 0x3 /* Versal NET family code */ + /* When all subfamily of platform need to support */ #define ALL_SUB_FAMILY_CODE 0x00 #define VERSAL_SUB_FAMILY_CODE 0x01 --=20 2.34.1 From nobody Wed Oct 8 05:54:43 2025 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2071.outbound.protection.outlook.com [40.107.223.71]) (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 09C422749C5; Tue, 1 Jul 2025 12:39:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751373600; cv=fail; b=ouf3QnuOdF3YEaZnM1NL8Q8jWkBoyIWwXJPlADdsIKPalmVUG2uHZ7fN+mAbZdgEq+BPxCVcCcy7K13SbvXVX1dRqWWGIF2NJv2HB9ILCN0iBp9XnBeXGmSqqrrDCYKNs2mPhAy3UmW0uIjeKqGjDslOJATzKGEdYscBxd22G4Q= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751373600; c=relaxed/simple; bh=/3UH7IAI6govNjy+N/5L4ozr/+OdBEQDTROh8DjjhnU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kIpk9DURYHex4YzrnV/uF2VhQ5BHBzu6cHnDXJ28UaXHsat2HZj820hlbWL2ytoDhUXU/dD4QDLBZZrv1JMjBdsnCG2ozsYXOEqAWwi7+DOmxFqmR7xWtr7aL2y2V0yDt08RwRfULOKk5rR0fopje8/VXb5oo3JGQzHVvgEaRzA= 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=RfVUWE9Q; arc=fail smtp.client-ip=40.107.223.71 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="RfVUWE9Q" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SMxbSDG0DWXu6YRxm3O7rI8Iy2CcMofrp8kZ8cUdwJ7pEmO3fb4CR8Y9Fi2EmCseAk0GKb9O+ClELPuYU9TjMrS9ytq4mowE4V1uFZGawA8ajQxmwCq1ULgEtpc3w/caUectgmhlgqQNjIxmmfUnoX8qo57CEYUItFXMU7663oVXtLVnjoWBSmPDCIHNoeRxAcOKY0cKNr6kYG1WIVO6Vd56WlbyIgTZzJqe619Htraic/YWFqRgm4CUwcAlvqjCUyr1FXhFnZdYVWzxLqi650tXFCO1hKUy92N3bjcnfDkgqTsn/IfKUia703NsehwXtOXc4SNs20tH0CBiZjsKRw== 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=5bUodoDEB9M6C/kNFoF7PwuLtrAZCuStWYe8oa8hRCM=; b=gnKl02D61ih0iXxHZMzhvowe33R8hHTDs8iTigBMSeKDWiZCFi0Y98PkWepOaQF/2/zUamx101c7IFxZyK/lt1VubWx5UbcjAN7hJV30EUN2MainXmUVtcSG0J86R56BGiTbXZ4JvyY100lQjOwX0Id8qJIPj4bR2z4I3MpT5rkURMi4zj1CHILCcgQqwSUrFUXZVdRM3icrUuVmLO/GUNztVUlOzbxMg+etaK6tV02cH18JOqZrt/1dF+ZClx9pNHwrIsJ6w1Xcs5i490B+MshG+R4pf0bWqK0CinMLHRNXYwRkTDnPvVJzjtfqNVrQ7qYnyi4CNxoFG7U4dfXgpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linaro.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=5bUodoDEB9M6C/kNFoF7PwuLtrAZCuStWYe8oa8hRCM=; b=RfVUWE9Q4rdJGGd5RNsysUw7yuKJR5FH+O0bphvJlecJ4JqiW3+X0oXz6WNrdn+V1zyvJox6+rzSqZUX7ywJDywRkBLw/1TfRnaHrE19JzWLERkgipyZ6L/7T6L0P/8JPsjs/5BHiojFSCKRYrM3EwhAGSN1bZ2U1dQE5bbOc2c= Received: from MW4PR04CA0099.namprd04.prod.outlook.com (2603:10b6:303:83::14) by CYYPR12MB8870.namprd12.prod.outlook.com (2603:10b6:930:bb::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.26; Tue, 1 Jul 2025 12:39:56 +0000 Received: from SJ1PEPF00001CE4.namprd03.prod.outlook.com (2603:10b6:303:83:cafe::16) by MW4PR04CA0099.outlook.office365.com (2603:10b6:303:83::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8901.19 via Frontend Transport; Tue, 1 Jul 2025 12:39:56 +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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SJ1PEPF00001CE4.mail.protection.outlook.com (10.167.242.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Tue, 1 Jul 2025 12:39:56 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 1 Jul 2025 07:39:55 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 1 Jul 2025 07:39:54 -0500 Received: from xsjarunbala50.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Tue, 1 Jul 2025 07:39:53 -0500 From: Jay Buddhabhatti To: , , , , , CC: Jay Buddhabhatti Subject: [PATCH 3/3] drivers: firmware: xilinx: Switch to new family code in zynqmp_pm_get_family_info() Date: Tue, 1 Jul 2025 05:38:51 -0700 Message-ID: <20250701123851.1314531-4-jay.buddhabhatti@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250701123851.1314531-1-jay.buddhabhatti@amd.com> References: <20250701123851.1314531-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-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE4:EE_|CYYPR12MB8870:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ba55613-6cc7-45f5-f58d-08ddb89c6274 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?NfhL4vjV6byAYEfqxkZf2DIqcUV5BUrLz3QRR7hoomOClEixCtDWFBoOtJrI?= =?us-ascii?Q?pjS7h+Cjw+L9VeEQw+GuczXdZ5+VL5I8SaR/PDRM/Z/bTwOC85+ABSjiOY5Q?= =?us-ascii?Q?o5wDxnrkcSefxErkHRcdl8253RNxeKFjZdrhsO+3fD6swLbiALg96UaR4LEn?= =?us-ascii?Q?zOG7OytGI+eHFB890EMToQSwAWtBkNn5gGZ5cKMTxc/tI3GUs0AD+pWy2AND?= =?us-ascii?Q?imDnH4u67fMjGYODgp1FwX8VI9+celzpUSlomTaZv+w9Q1PvQP6efQfhCNoU?= =?us-ascii?Q?E8OkRjZoku3mg2SpyiQoLFMaOTnWmNFvrM5qhipfS32qejrRAjJiDbgpxXQv?= =?us-ascii?Q?EYr+NJmDS/y8VSatqDU/La6P5NnUBvbb8Sfr5xY0+61S+lATDqx717Pei0jV?= =?us-ascii?Q?ANp2YZD+r8HYTr1INToiPydizXrPO8ZEhpE6MOyyUGSFng8uRBbR+BmNHMMt?= =?us-ascii?Q?hK2EK1qEOZP6IzW7Ke2uH+y2qvO1MqoLzGyEFn/3gdx48W5aL+yLhGFpgsS2?= =?us-ascii?Q?Yc5SQRGMpC9RSp22+8ym/AREPsH9xKz/x0TQiPZRWzS6UYKh7O72gpJMnouP?= =?us-ascii?Q?OdzR2EswB5q7wtkIgJ8br8Lmhv4ROuBF6hFC8VO8CySKEgJbCgUS/qCvXxd3?= =?us-ascii?Q?nXYcG1BYktkY3i7F+R1z2soZ7LKUzp+/yulyZh6oaUi9RpETnIjnn56mVek3?= =?us-ascii?Q?PSUG312vQlvecgXmX5zYhhgGX9QSsMU6qiFqbXnbHics0DnWpOMfagyu22nw?= =?us-ascii?Q?ShRGwxaZHqE+3Zt6ogqIfi1tEYea2oVnDs0nIHkM4y/GSrvmvAadPB0za6fW?= =?us-ascii?Q?OC1ZS1BMBIVLhzxUQOhOlug0O/Of9wBB3OKn7ihU9XJHDqXwnkCoX33+0o1Y?= =?us-ascii?Q?dmWcPoPK8dLt71OLn5Ff0neQ4g8tgzheTKEb/DjJhZFoc7L6xBWfxUncOs7x?= =?us-ascii?Q?T4CEKzowF0OPFAiGIKE7B8g8PAWYP9jGw2i7oqZdEQvQxkTFrofk+hBGVnUv?= =?us-ascii?Q?r2BEXzUCG5IVulskZ96CLuwlOMrEF8T59JV7shKHC7hPH08JrGFTkW3I4zyK?= =?us-ascii?Q?ipA6PDTmd3BiSWJH8rM8eA4Vlom4PQMChn2jmwit58WMEzHFEooBxO0DpXOY?= =?us-ascii?Q?RBpE3MGACNn03iyxnaBmatvNbXnlbdMwRdEburPplofnLnGT3XWhv1cDyVNk?= =?us-ascii?Q?lQ4BCstwWLhM8TYEW5QvRcLYRXwksfBb2f29Cx/Bi4pogYJHheX/uxPTafyX?= =?us-ascii?Q?yyFQUv86m08Kj4SmYzJWua5bE0g4EM6awMEoz8TA6nWAwY0rJCUliL/AL/Uq?= =?us-ascii?Q?iAnKKBJNgAKxzH6yUSj3mhsRX2RrQQHHE/UU8phVSHrxEtVL8ibPlyeujfku?= =?us-ascii?Q?HZ2PptoMpB+4nYQXhproHb6IGGRGz1F2KegX3SG4spqqBV4PlZCxJI2d3hFB?= =?us-ascii?Q?l5SVsF0jQY8TsPospAZoQvygRtZ21Ta5d7Gdxvhclr+AdIozqPOX0sTDjDB5?= =?us-ascii?Q?YHc6i6vGHs9Og49nH3euUSm4znRA4RWEUUEH?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2025 12:39:56.1376 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9ba55613-6cc7-45f5-f58d-08ddb89c6274 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF00001CE4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8870 Content-Type: text/plain; charset="utf-8" Currently, the family code and subfamily code are derived from the PMC_TAP_IDCODE register. Versal, Versal NET share the same family code. Also some platforms share the same subfamily code, making it difficult to distinguish between platforms. Update zynqmp_pm_get_family_info() to use IDs derived from the compatible string instead of silicon ID codes derived from PMC_TAP_IDCODE register. Signed-off-by: Jay Buddhabhatti --- drivers/firmware/xilinx/zynqmp.c | 42 ++++++++++--------------- drivers/pinctrl/pinctrl-zynqmp.c | 7 ++--- drivers/soc/xilinx/xlnx_event_manager.c | 8 ++--- drivers/soc/xilinx/zynqmp_power.c | 10 +++--- include/linux/firmware/xlnx-zynqmp.h | 15 ++------- 5 files changed, 31 insertions(+), 51 deletions(-) diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zyn= qmp.c index 2fb1c29314b7..17156eea78f2 100644 --- a/drivers/firmware/xilinx/zynqmp.c +++ b/drivers/firmware/xilinx/zynqmp.c @@ -472,8 +472,6 @@ int zynqmp_pm_invoke_fn(u32 pm_api_id, u32 *ret_payload= , u32 num_args, ...) =20 static u32 pm_api_version; static u32 pm_tz_version; -static u32 pm_family_code; -static u32 pm_sub_family_code; =20 int zynqmp_pm_register_sgi(u32 sgi_num, u32 reset) { @@ -540,32 +538,18 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_get_chipid); /** * zynqmp_pm_get_family_info() - Get family info of platform * @family: Returned family code value - * @subfamily: Returned sub-family code value * * Return: Returns status, either success or error+reason */ -int zynqmp_pm_get_family_info(u32 *family, u32 *subfamily) +int zynqmp_pm_get_family_info(u32 *family) { - u32 ret_payload[PAYLOAD_ARG_CNT]; - u32 idcode; - int ret; - - /* Check is family or sub-family code already received */ - if (pm_family_code && pm_sub_family_code) { - *family =3D pm_family_code; - *subfamily =3D pm_sub_family_code; - return 0; - } + if (!active_platform_fw_data) + return -ENODEV; =20 - ret =3D zynqmp_pm_invoke_fn(PM_GET_CHIPID, ret_payload, 0); - if (ret < 0) - return ret; + if (!family) + return -EINVAL; =20 - idcode =3D ret_payload[1]; - pm_family_code =3D FIELD_GET(FAMILY_CODE_MASK, idcode); - pm_sub_family_code =3D FIELD_GET(SUB_FAMILY_CODE_MASK, idcode); - *family =3D pm_family_code; - *subfamily =3D pm_sub_family_code; + *family =3D active_platform_fw_data->family_code; =20 return 0; } @@ -1246,8 +1230,13 @@ int zynqmp_pm_pinctrl_set_config(const u32 pin, cons= t u32 param, u32 value) { int ret; + u32 pm_family_code; + + ret =3D zynqmp_pm_get_family_info(&pm_family_code); + if (ret) + return ret; =20 - if (pm_family_code =3D=3D ZYNQMP_FAMILY_CODE && + if (pm_family_code =3D=3D PM_ZYNQMP_FAMILY_CODE && param =3D=3D PM_PINCTRL_CONFIG_TRI_STATE) { ret =3D zynqmp_pm_feature(PM_PINCTRL_CONFIG_PARAM_SET); if (ret < PM_PINCTRL_PARAM_SET_VERSION) { @@ -2016,6 +2005,7 @@ static int zynqmp_firmware_probe(struct platform_devi= ce *pdev) { struct device *dev =3D &pdev->dev; struct zynqmp_devinfo *devinfo; + u32 pm_family_code; int ret; =20 ret =3D get_set_conduit_method(dev->of_node); @@ -2059,8 +2049,8 @@ static int zynqmp_firmware_probe(struct platform_devi= ce *pdev) pr_info("%s Platform Management API v%d.%d\n", __func__, pm_api_version >> 16, pm_api_version & 0xFFFF); =20 - /* Get the Family code and sub family code of platform */ - ret =3D zynqmp_pm_get_family_info(&pm_family_code, &pm_sub_family_code); + /* Get the Family code of platform */ + ret =3D zynqmp_pm_get_family_info(&pm_family_code); if (ret < 0) return ret; =20 @@ -2087,7 +2077,7 @@ static int zynqmp_firmware_probe(struct platform_devi= ce *pdev) =20 zynqmp_pm_api_debugfs_init(); =20 - if (pm_family_code =3D=3D VERSAL_FAMILY_CODE) { + if (pm_family_code !=3D PM_ZYNQMP_FAMILY_CODE) { em_dev =3D platform_device_register_data(&pdev->dev, "xlnx_event_manager= ", -1, NULL, 0); if (IS_ERR(em_dev)) diff --git a/drivers/pinctrl/pinctrl-zynqmp.c b/drivers/pinctrl/pinctrl-zyn= qmp.c index fddf0fef4b13..71eaac81deb1 100644 --- a/drivers/pinctrl/pinctrl-zynqmp.c +++ b/drivers/pinctrl/pinctrl-zynqmp.c @@ -100,7 +100,6 @@ struct zynqmp_pctrl_group { =20 static struct pinctrl_desc zynqmp_desc; static u32 family_code; -static u32 sub_family_code; =20 static int zynqmp_pctrl_get_groups_count(struct pinctrl_dev *pctldev) { @@ -605,7 +604,7 @@ static int zynqmp_pinctrl_prepare_func_groups(struct de= vice *dev, u32 fid, return -ENOMEM; =20 for (pin =3D 0; pin < groups[resp[i]].npins; pin++) { - if (family_code =3D=3D ZYNQMP_FAMILY_CODE) + if (family_code =3D=3D PM_ZYNQMP_FAMILY_CODE) __set_bit(groups[resp[i]].pins[pin], used_pins); else __set_bit((u8)groups[resp[i]].pins[pin] - 1, used_pins); @@ -958,11 +957,11 @@ static int zynqmp_pinctrl_probe(struct platform_devic= e *pdev) if (!pctrl) return -ENOMEM; =20 - ret =3D zynqmp_pm_get_family_info(&family_code, &sub_family_code); + ret =3D zynqmp_pm_get_family_info(&family_code); if (ret < 0) return ret; =20 - if (family_code =3D=3D ZYNQMP_FAMILY_CODE) { + if (family_code =3D=3D PM_ZYNQMP_FAMILY_CODE) { ret =3D zynqmp_pinctrl_prepare_pin_desc(&pdev->dev, &zynqmp_desc.pins, &zynqmp_desc.npins); } else { diff --git a/drivers/soc/xilinx/xlnx_event_manager.c b/drivers/soc/xilinx/x= lnx_event_manager.c index a572d15f6161..6fdf4d14b7e7 100644 --- a/drivers/soc/xilinx/xlnx_event_manager.c +++ b/drivers/soc/xilinx/xlnx_event_manager.c @@ -77,17 +77,17 @@ struct registered_event_data { =20 static bool xlnx_is_error_event(const u32 node_id) { - u32 pm_family_code, pm_sub_family_code; + u32 pm_family_code; =20 - zynqmp_pm_get_family_info(&pm_family_code, &pm_sub_family_code); + zynqmp_pm_get_family_info(&pm_family_code); =20 - if (pm_sub_family_code =3D=3D VERSAL_SUB_FAMILY_CODE) { + if (pm_family_code =3D=3D PM_VERSAL_FAMILY_CODE) { if (node_id =3D=3D VERSAL_EVENT_ERROR_PMC_ERR1 || node_id =3D=3D VERSAL_EVENT_ERROR_PMC_ERR2 || node_id =3D=3D VERSAL_EVENT_ERROR_PSM_ERR1 || node_id =3D=3D VERSAL_EVENT_ERROR_PSM_ERR2) return true; - } else { + } else if (pm_family_code =3D=3D PM_VERSAL_NET_FAMILY_CODE) { if (node_id =3D=3D VERSAL_NET_EVENT_ERROR_PMC_ERR1 || node_id =3D=3D VERSAL_NET_EVENT_ERROR_PMC_ERR2 || node_id =3D=3D VERSAL_NET_EVENT_ERROR_PMC_ERR3 || diff --git a/drivers/soc/xilinx/zynqmp_power.c b/drivers/soc/xilinx/zynqmp_= power.c index ae59bf16659a..9b7b2858b22a 100644 --- a/drivers/soc/xilinx/zynqmp_power.c +++ b/drivers/soc/xilinx/zynqmp_power.c @@ -285,7 +285,7 @@ static int register_event(struct device *dev, const enu= m pm_api_cb_id cb_type, c static int zynqmp_pm_probe(struct platform_device *pdev) { int ret, irq; - u32 pm_api_version, pm_family_code, pm_sub_family_code, node_id; + u32 pm_api_version, pm_family_code, node_id; struct mbox_client *client; =20 ret =3D zynqmp_pm_get_api_version(&pm_api_version); @@ -315,14 +315,16 @@ static int zynqmp_pm_probe(struct platform_device *pd= ev) INIT_WORK(&zynqmp_pm_init_suspend_work->callback_work, zynqmp_pm_init_suspend_work_fn); =20 - ret =3D zynqmp_pm_get_family_info(&pm_family_code, &pm_sub_family_code); + ret =3D zynqmp_pm_get_family_info(&pm_family_code); if (ret < 0) return ret; =20 - if (pm_sub_family_code =3D=3D VERSALNET_SUB_FAMILY_CODE) + if (pm_family_code =3D=3D PM_VERSAL_NET_FAMILY_CODE) node_id =3D PM_DEV_ACPU_0_0; - else + else if (pm_family_code =3D=3D PM_VERSAL_FAMILY_CODE) node_id =3D PM_DEV_ACPU_0; + else + return -ENODEV; =20 ret =3D register_event(&pdev->dev, PM_NOTIFY_CB, node_id, EVENT_SUBSYSTE= M_RESTART, false, subsystem_restart_event_callback); diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/= xlnx-zynqmp.h index f112cd211c5e..4bfe314e99ef 100644 --- a/include/linux/firmware/xlnx-zynqmp.h +++ b/include/linux/firmware/xlnx-zynqmp.h @@ -51,22 +51,11 @@ =20 #define PM_PINCTRL_PARAM_SET_VERSION 2 =20 -#define ZYNQMP_FAMILY_CODE 0x23 -#define VERSAL_FAMILY_CODE 0x26 - /* Family codes */ #define PM_ZYNQMP_FAMILY_CODE 0x1 /* ZynqMP family code */ #define PM_VERSAL_FAMILY_CODE 0x2 /* Versal family code */ #define PM_VERSAL_NET_FAMILY_CODE 0x3 /* Versal NET family code */ =20 -/* When all subfamily of platform need to support */ -#define ALL_SUB_FAMILY_CODE 0x00 -#define VERSAL_SUB_FAMILY_CODE 0x01 -#define VERSALNET_SUB_FAMILY_CODE 0x03 - -#define FAMILY_CODE_MASK GENMASK(27, 21) -#define SUB_FAMILY_CODE_MASK GENMASK(20, 19) - #define API_ID_MASK GENMASK(7, 0) #define MODULE_ID_MASK GENMASK(11, 8) #define PLM_MODULE_ID_MASK GENMASK(15, 8) @@ -569,7 +558,7 @@ int zynqmp_pm_invoke_fw_fn(u32 pm_api_id, u32 *ret_payl= oad, u32 num_args, ...); #if IS_REACHABLE(CONFIG_ZYNQMP_FIRMWARE) int zynqmp_pm_get_api_version(u32 *version); int zynqmp_pm_get_chipid(u32 *idcode, u32 *version); -int zynqmp_pm_get_family_info(u32 *family, u32 *subfamily); +int zynqmp_pm_get_family_info(u32 *family); int zynqmp_pm_query_data(struct zynqmp_pm_query_data qdata, u32 *out); int zynqmp_pm_clock_enable(u32 clock_id); int zynqmp_pm_clock_disable(u32 clock_id); @@ -649,7 +638,7 @@ static inline int zynqmp_pm_get_chipid(u32 *idcode, u32= *version) return -ENODEV; } =20 -static inline int zynqmp_pm_get_family_info(u32 *family, u32 *subfamily) +static inline int zynqmp_pm_get_family_info(u32 *family) { return -ENODEV; } --=20 2.34.1