From patchwork Mon Feb 24 15:50:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Havalige, Thippeswamy" X-Patchwork-Id: 13988415 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2077.outbound.protection.outlook.com [40.107.220.77]) (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 93D9A13AD18; Mon, 24 Feb 2025 15:50:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740412242; cv=fail; b=m38oAwNI+mmS9OXqSfZCq96s5qFADhCyzMEhTa8pBk/dG3gJwvRXHHPg3N8ZzCF/wSDhHATCpTIWsGawlvYgJ13LmnaztQ0J3PZCpQwn3pInxytHX5m6gh+Wbs+M6OIUwOsuEon77KNhFNQv8lAd6n8zJ7jK38J61iMpfIcR57A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740412242; c=relaxed/simple; bh=hm11OjUBcKuyHt9E7RUpufImbw1CnKEUOWZYYW5mG7k=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GeYVEV9jdY/wb6KgspdctnDEXxhaxgOxykOhSReNY1qH3eJE/5rod2uVo7mvgIaedHoLt9/fL0QsMDWXjT3LXfCYGhpK/YJnUgPmwtoYcpO2JboS3YPx+mp1h0KR4Az6Fpim2Qr+t5ikbtYhYmP1G/KehaKcNwRD6lyR7YmgmN0= 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=d5PpgGma; arc=fail smtp.client-ip=40.107.220.77 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="d5PpgGma" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dVu1S2nmkrtQNaJKQfGobRI+rgbrL0x38pOe0xYVBazqVkBwiPOtq6JBQESafbakfBPuL/j82svfY9ss+8bCBvxAlKzxDTOEi58gIa5H3PSJaRoDcGtQmdE0NqrL1Jb+vDOdn6KaPiPuSMBV29vmBZhLapg2jOQ950bBlFi/pxb25Obgwvcd6a64fhjHcS8k5miFjnvBI9DbIULBwWfDSqj03+StjzG7S+NhLGW9l8lO5cqckhRB2C4Zq3zH4ps2/C71wHVv86+bnKcte4TNhas+V2KkfUn5mQHGratXkk61iZXWUwRsUdEMilJFQ7ht13k2WAu6FtgwJUiJyTialg== 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=ntlClmMXET9zcOmhO0KJUSg+V8TO1G/QbcLwLN5gDp0=; b=kos9mEInQpekNBPHTZWJt24Q+8n8R2z8OstuAA8Munkh5Xe5fB37c1D1HCXnrbfTPlOP63hgO/gl9YK+6ssotCsY9mg+ix9avScVa2ex/2IueI45woZyj5m0ZhGgeoSgr3ogSaFagnbFXhXz07bfa3PY69dqNcS4pqxSEPSyDxaTtRHkvO4vGGwNHUgwZSIKXKoKeZ/fNBQJwMC9U7kDaPCOqlZcVATJVBvKQZeJnPF/gFWD7ek4Qd57PwU3EKDx6TxJSXfh3gaV7kLl3/nwv3qMRM4GECrx2bnPh7WqETYcbMen2kL8Tf9o5Nb96wHEy+YWimX+prdiKjjqYfPfDg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=google.com 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=ntlClmMXET9zcOmhO0KJUSg+V8TO1G/QbcLwLN5gDp0=; b=d5PpgGmaVTtv2+groyKrheNJWyueLd6e7iI1qoIAmYO70YV0STNySXLg5qolYOrFOdOuzhHmV22ECZNesEi8TfSrZkg9K64WmzGiMQAg8Y5S03uWIApL+WdMzPXJBEfpejwokfv/jRTAX59B5YCpldOj3qkr3Cm1mpmdZxg8Lys= Received: from SJ0PR03CA0204.namprd03.prod.outlook.com (2603:10b6:a03:2ef::29) by SA1PR12MB9472.namprd12.prod.outlook.com (2603:10b6:806:45b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.20; Mon, 24 Feb 2025 15:50:35 +0000 Received: from SJ5PEPF000001F3.namprd05.prod.outlook.com (2603:10b6:a03:2ef:cafe::2c) by SJ0PR03CA0204.outlook.office365.com (2603:10b6:a03:2ef::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.19 via Frontend Transport; Mon, 24 Feb 2025 15:50:35 +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 SJ5PEPF000001F3.mail.protection.outlook.com (10.167.242.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8489.16 via Frontend Transport; Mon, 24 Feb 2025 15:50:35 +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; Mon, 24 Feb 2025 09:50:34 -0600 Received: from xhdthippesw40.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; Mon, 24 Feb 2025 09:50:31 -0600 From: Thippeswamy Havalige To: , , , , , , CC: , , , , , Thippeswamy Havalige Subject: [PATCH v5 1/3] PCI: xilinx-cpm: Fix IRQ domain leak in error path of probe. Date: Mon, 24 Feb 2025 21:20:22 +0530 Message-ID: <20250224155025.782179-2-thippeswamy.havalige@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250224155025.782179-1-thippeswamy.havalige@amd.com> References: <20250224155025.782179-1-thippeswamy.havalige@amd.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Received-SPF: None (SATLEXMB04.amd.com: thippeswamy.havalige@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001F3:EE_|SA1PR12MB9472:EE_ X-MS-Office365-Filtering-Correlation-Id: 2436773d-4877-4754-b3f4-08dd54eafa5f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: lFS3tbKzUnsYdL4+e2QwRtwepdF3Oqw5G3VdJhK5UUvoOxQM1L2RZpwH43kHjz65b8kZVaGfYRGmy/ANW1AHi2GeKXvB3mJjDjydmCfAXwpoVPIOo10pfUvuBmPXzOv1JXBYdIUeruCUTbgXbfBIxhj5GbWRnal8BYcy57leAxPC1toosB9IA7eBdK6VJXsuN3TjDj04Nj6/oP+xybygkl9gYLSMr2xEdnKijP5BhmyuirSNlXCvGtJNOXxZlqPzyLjkdG+TmeRMG3fZIT1gKsrPU1EKCpAIUT+wdMKwvlafml4hvfm6BLg6cUe5jSUS53bWtZSZUOSlOlcva1pcVduaE0Pscs1AQyGOtWFFF0X++s6pFI9911qW7X+DRvCCoWHxQqVJKmcqm5MT2wKjzxHSpjnxF8dGcVC01Ly2oBHXJwLJrfraFV8Io7W5gDrjxMvvbDPAhhojpFu0VXpYqVts3ULeXIJEJ6s4K7wkTAV/6akmYmQmQC7/fvuJOV60BOEHYRYv4kWDL5C5SgYzff58kvcMKqqrok6UC8TAbRGbr2VrNVvKZu2HV7+eogfExUGje6KnEgIVSeRUAZYk/fIKsEv/YOh7Z3Lzoorn4ybIoncCPEcGr+p55AEGbpZqJo3uKsAacAIMZmt7Mge/mJa14mGwPNPF/bJSYh4+7CnJAhFQk+biPLccb4dv8yJTD1BIYqVWf/c1qaiXNwEGpXUB3QZqiTAPtUZGzsthBVj0mE487VYZUNFZAY/i5aF8mA6WAUy05wu/XXdptwDlFdyo0KNwhzpp1Hh/q6oNlULpI5iX5l5W7q94ntjyFOhKtcB4JpyDBHRoaBdYtwqxRDt4XdNuCpsXHif0phDNa3onUwF0M9y8vjjv/9TNGCmyPkihnjcuKd0ZlIDE8NS7iG8kNc/DtmruuAuwPK73oSjkBLYu5lRXvCilf+5qRKJxCVJc30FKVhaxsdRVx4mXo2aoHLg1UeHwv6kPsEjhT/nnVQ+wCMwXw+B9Jwt5yUawOFNE+Q/01AFeFg34ngIshyd7aJuhBwc0XPkyeUHAu8PQ1wNyo6vvM/XAWGYsiaCSb/EJoy2Mum7JEvuiWtOfhEGn1WlkqHXj/0KaoBRl0ULISFA1iYxpbg6EjIV6YF4ppUHtWUcFTUcLKn5sl7/bu0+Cd4KS3f+6YJe0XkFUzutwCWr2oyoZR7o4s+g0ze7sQzWn/n+VocIbQnu3BBBarmfLl7AyRgVOkySlF5EE8Y8rJQrGwRCFsIePb6DKiL9/YyVIbXlD9Vwu2FsVV+6SZoZzY+vBdnr3oHvuT9hePQoQPi5MX4F7szMyCBkOA1jAda9cNum2NGGGGZhT3AMiEhw8e6nnzyZfAq3T5KqsVvlqdw+mCESwzywbJ6Ek4QusUjBy03dRpf8uh5dSdGder7KiTyvBJWX7nNST0IoZFbqRvVBIho36c18zsEE93yo9zQxurNUIfmyi30j+ifwJbxqbJSAfTmD/JGKMyRXFdlI= 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)(376014)(7416014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 15:50:35.4259 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2436773d-4877-4754-b3f4-08dd54eafa5f 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: SJ5PEPF000001F3.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB9472 The IRQ domain allocated for the PCIe controller is not freed if resource_list_first_type returns NULL, leading to a resource leak. This fix ensures properly cleaning up the allocated IRQ domain in the error path. Signed-off-by: Thippeswamy Havalige --- drivers/pci/controller/pcie-xilinx-cpm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-xilinx-cpm.c b/drivers/pci/controller/pcie-xilinx-cpm.c index 81e8bfae53d0..660b12fc4631 100644 --- a/drivers/pci/controller/pcie-xilinx-cpm.c +++ b/drivers/pci/controller/pcie-xilinx-cpm.c @@ -583,8 +583,10 @@ static int xilinx_cpm_pcie_probe(struct platform_device *pdev) return err; bus = resource_list_first_type(&bridge->windows, IORESOURCE_BUS); - if (!bus) + if (!bus) { + xilinx_cpm_free_irq_domains(port); return -ENODEV; + } port->variant = of_device_get_match_data(dev); From patchwork Mon Feb 24 15:50:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Havalige, Thippeswamy" X-Patchwork-Id: 13988417 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2053.outbound.protection.outlook.com [40.107.94.53]) (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 B57DC26157A; Mon, 24 Feb 2025 15:50:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740412248; cv=fail; b=nPSnJA3JRqggrwVO8gsOF0EN0SG6RWj60UPe1nNeJWSZkL+PATCoJ980l3GCIP0IdZAElU8zQxsu5pYa3ZWle8Ih9yPRd6h3GJuVWkaThB0GavpQmUWPKg7b+gxbA/tpw3CLA7ejGDGsGnEphrG3al8Enw8PvlS/EvuvylL1Z5w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740412248; c=relaxed/simple; bh=yKYPPxGuNopiJX972gaVEzZZD5L3YwPgsCWXktV4VUg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CgV/++TCMb5xY9BYD4pJsq1F5J5eP2y8bNkWBaTsXkluvcCeoLhqGb/F9xbJYiiItBsCkN4Z29aohiBZOXsHsP5kJwHznyxceSN9aQBr5fAJIqoFIKmnJ7KYeym+Woia+hLarbwLK8BV9Wy2N07oJKBSveQMdD6+QozgmaXy2BA= 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=rXW93wew; arc=fail smtp.client-ip=40.107.94.53 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="rXW93wew" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tGV6xOmn9CXlbGzGVUncQZye4qxG4slpTerZY71jubb8C4ErYyp+6EH71j0+m63NwhM0sjfXpK0JliD9bfCg0L8NItq61haKlfdCujO9T3bKTHTSmIAcEtgYj4WYI+07iiRxjpFWFemykyWM11RmfC+cc6jBJci6zeX6ijDKg3RgAaGwEqInZCmMxcFJqRLiDzRvZEvks6RfPqWAARmBoWtTU3WAw5TaeYEaEUGZpmdmh0dMLpQuT63EuNm408R7jK5ehd2eRYc090iAMFq4EJwEuD2RSi+QSwB1DO2gjRAQvTRnD2nuBLAtCKf24b63NjDrVQzFKCbRlsO0jiktpg== 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=WS6vKUjNrwzBwmBLAOIseFiGCw82kPWhNVktwvX/eGo=; b=Mn6kNpSFu/mvRRZB40n9011jSdGadqmEO0c2EFvvVmeZzmpEsdiyksNL3xVWfdBr6Te/wcfE+RG/7rKCGMq2UVgQLD0XWRbvAL+HRN1NA/oSlF95NppP66ELhJq35wksJ5V0swWBmOR9mvq7OKRcJeX6/big4e1rPT6dbPaVL/U9szroJ4xvkZ0m/6DzuN6fo577E8jTiw35Lkx0Lzq9ceVF6kNMc2LyJdya1S2YZDsw1EvW2IP/lCmCGQ62w+TcOBWCNX8S5aY9EPUol+n/vNnzzpXnBjIWz70B3Q+ehV0oosuw6s/AtmZmZSY+S/HDtwZw/+EmUEJF4pBmdLoXWg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=google.com 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=WS6vKUjNrwzBwmBLAOIseFiGCw82kPWhNVktwvX/eGo=; b=rXW93wew2cRgt2q+EL2y3y6zM86NLPKjYZ9NgHEfqIDPCQkavyEyB1ijDFqbc3msLk2DwsOVNmqBP8LK6siHycc589sZS7Lu2wA9+AAPcCP//T7TBF7OMhhB8a6Czwqfib9lRjRZSyBt2BQwr7OJVSU3kZ4Yqe/fDdcoIZnX58U= Received: from BN0PR03CA0055.namprd03.prod.outlook.com (2603:10b6:408:e7::30) by DM6PR12MB4420.namprd12.prod.outlook.com (2603:10b6:5:2a7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.21; Mon, 24 Feb 2025 15:50:39 +0000 Received: from BL02EPF00029927.namprd02.prod.outlook.com (2603:10b6:408:e7:cafe::6e) by BN0PR03CA0055.outlook.office365.com (2603:10b6:408:e7::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.20 via Frontend Transport; Mon, 24 Feb 2025 15:50:39 +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=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by BL02EPF00029927.mail.protection.outlook.com (10.167.249.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8489.16 via Frontend Transport; Mon, 24 Feb 2025 15:50:39 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 24 Feb 2025 09:50:38 -0600 Received: from xhdthippesw40.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; Mon, 24 Feb 2025 09:50:34 -0600 From: Thippeswamy Havalige To: , , , , , , CC: , , , , , Thippeswamy Havalige , Conor Dooley Subject: [PATCH v5 2/3] dt-bindings: PCI: xilinx-cpm: Add compatible string for CPM5NC Versal Net host Date: Mon, 24 Feb 2025 21:20:23 +0530 Message-ID: <20250224155025.782179-3-thippeswamy.havalige@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250224155025.782179-1-thippeswamy.havalige@amd.com> References: <20250224155025.782179-1-thippeswamy.havalige@amd.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Received-SPF: None (SATLEXMB03.amd.com: thippeswamy.havalige@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF00029927:EE_|DM6PR12MB4420:EE_ X-MS-Office365-Filtering-Correlation-Id: 51c9859a-cc51-4826-3720-08dd54eafc71 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|7416014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: UxYK6x8z2fcK7Iro41Tbg+6u+9bmQ7iO6ykYrAUtx+2XGmR0KfDaryDLA/BIjtTknL+cpjzTOPTH889cN6beyexGv1Ndsurak6iaYbf2RzOpg3UHsjY+SB3ozFT4TBh6B8YvVR09owbHdNLGQkV1O0vJAZCkxioG6IW7JO8kLY0c5kK31i40vHdq8MtcvyzxkhbYn/UHf9CrfV0banChv8+fNlmf9ewyL2ykw5Cmnlbf0X5n4lvD8S9sC8+SXqKa7tVgXcQn91tK0YPoQipTdMj+DU39LBgu7hcDtsz5MZ2OqOpiYcrTXjhoppl8H/hLWX5U8BdCjlrAIacn6q7tEVAEZ1E4QLcFieGS+JzcS3IRayzlduoEngsm4Qgy7eJDVUkisjRdFBAUbLe6Mpm7kvNXfpo6qWE5vEQthNRgNlhJyHKkauYu9AC/hA7rdY+OR1r/+RBaXbSnZg7UnKISs5a4znYEueQOfs/zmVVsZy9IAaHLdfFxUtLMrvNZ/0HD8nO9IitgEdE+jHsTR8s/gS7ZL7Hk9OfzietBsLrSfstcLYRIDNArhugQPk6U1ULzPKzA0QO5KMjd9N44WZKkCKmHRShVm6iYOTvMja3ZcCILcAcWGG8ckkHZQA3MHE8Kn285ondpdOnt+D314MyBj0+3JS1OV8uWScuaKdNjc+bWqV2ybazzBQ4PCljCbPdXu1JDLuUK9o44ILbIBdoqDcpr3jpiL0zfjD8O2GhAIfpTGcO5GGzCZCTehO7NV3swwZG/zg7HDy/6kwTuwQcnHG1NecY6EEQyMvBmzahb85J90F5evBaXXroSujTWihAucOpuX8UScmpi4KSIwlGaybIS8YD4qTQESdFF6mIGQ+62H2zIlUDlTpKFpfVIHByVan0EjUUW9R3+lh0rCtq8kmM8kID8zDYSFZDL60E3VkO3ZAY0Wq7jzwfu4ixMff+gVXiGmgBDQTWYJkLMpGzjh8v9XYufxBoRR808RJsfWn7WYSjZYMKN2FP/qRN824exYiUDLs8GFZVuC/KDxvBaeuz7Mq28vncSjgOQuGUhGI3EvwnU2acMu3fAr9jF5aqNrwSoVo2jMrLixTVidqVzhBON09sIRfoRRdzwswgZcyRpCXTbOGzBypX/77/wu7Sho38rD2P1nKSz9vjjPifkF+pQuPJ2h6IcP6Yx6HLmsZdf+CBZHzamo/d6t2TE/uzQ7Ww4CEDODREWVNkBGwLDw0Uf3qpve2eVVHaJdURlRFIlPFVg6luSlaKG2GgccGlBP72aNjz3asfmlMyWkv6WtPzXHxE1w/sqd4QZ27dGsxfRh2Tf0rfKvEbhhWnhwFlElJwy2vf599D7Uh6IuxnssD2YoTtwuatY414ghNqp++IH/UmdgmeEdMG7DjMoGpjwZYrWBKgK2Xs8+DhIqd2gbvPr7jdiDtx+TgUAySg0/Pl3l2zOA/hoPxRPIdjJsdVwcbpNI+EsjtjyEWh/vGtCRKdeN2OoPNo0Fvc0xCPAYIs= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(7416014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 15:50:39.0524 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 51c9859a-cc51-4826-3720-08dd54eafc71 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=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF00029927.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4420 The Xilinx Versal Net series has Coherency and PCIe Gen5 Module Next-Generation compact (CPM5NC) block which supports Root Port controller functionality at Gen5 speed. Error interrupts are handled CPM5NC specific interrupt line and INTx interrupt is not support. Signed-off-by: Thippeswamy Havalige Acked-by: Conor Dooley Acked-by: Manivannan Sadhasivam --- Changes in v2: - Update commit message to INTx Changes in v3: - None --- Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml b/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml index b63a759ec2d7..d674a24c8ccc 100644 --- a/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml +++ b/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml @@ -18,6 +18,7 @@ properties: - xlnx,versal-cpm-host-1.00 - xlnx,versal-cpm5-host - xlnx,versal-cpm5-host1 + - xlnx,versal-cpm5nc-host reg: items: From patchwork Mon Feb 24 15:50:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Havalige, Thippeswamy" X-Patchwork-Id: 13988418 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2047.outbound.protection.outlook.com [40.107.100.47]) (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 3706D2586E8; Mon, 24 Feb 2025 15:50:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.100.47 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740412250; cv=fail; b=BghDFz9sKB2xxEN6pMWinLrJbxGXnZrOH6EUUA+bxpwAc9pquYurGW1nWqQGA2yB8mnqJA93bZIeqOgxxeCGuAdIhqxvsngJu2x1+Ao8TYBZaCgWypVFZKgDEOKZ6jNmq+fr9IMgz/mgfRyZ7KiZv0dUbWDEurJo9NM+p2u0gPg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740412250; c=relaxed/simple; bh=30M90+FFNZgAX0nC9aQJh7G9TnbqTI25GYLNymG9G1g=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GN4w/wzicudR8gJ4D8m5zoQWDKQeQ2JBXro0GUqEaYJ11RZLta5pD7Zccql2rhhJc9VXSCaDazyaV+fEMsauZ3EuFvyUHWsCZKCb1HJ8jwNO5RAjJJEillQMi0FTOAhMkMfDZKTpeA70WS6kYYboXeH6DsAJj3HP5r3XTDKLmdA= 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=O10pax7r; arc=fail smtp.client-ip=40.107.100.47 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="O10pax7r" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NEujT+ihO6ufTWjTmvvRRT0zTGwUH4Q8l1klGp93iWn7J/1X4gQB6q+z3lFkPYbz+7myQnwh8G1a3J4d8d2PkpC5SG+AO1RNdiA5C41QAbSDJWOGSuEofFEIIpEN8j6mJuVp6PgbXQe59U045af59w7s9x9tNQVlrrMGmO/bcVsuUrVwhKw9XxRCU3yC3PYcb3sDfgfC8Hty5G2BWkkpoCYNMu/Ge0+mheGcRIH+8q+XQHdkw/nsQik8VEw7zLD8ff92rhk2JGyspjVpj2FMgMvDvn5fsfMo1lDcJ2lkqHw1p2QaNU6g0bBdjbS2Cj5mULvSPI3qSWkBROJ06MR/KQ== 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=Eec2Q0/mCopHqpi0GybIWMt0npK+LktCDstuVeGMhls=; b=bQSzG00Kbp61T93AMlCokIWYTC4FkbkM4uEM9sikDQ8ud7z94zeBcdYWpw4efO6thkRn9uolklqg9BawVjnLlLd4vgsce4gZs+pPANEvnsX/nM9eBY0rj8vDmmLu0YQiQxfqqC+fFuaII2PkdGDi8TCX2fCFPj6GtMoSA2e1vctKRPzmavXCSjsh/qS4ISBg++600un53g7KPsUS2uRxGzxzA1Ocg0bvBn670FjrkIVRx1LZ/yY2bSHdQBt2Fx1klH/n9T2f8GHFhMNtotOG3/q3ptDj7hqsoSuyBMr8fo2Po3YAeSPXPBAwpN+dnwrGLojifSJvSQQ/1nmhw2xemg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=google.com 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=Eec2Q0/mCopHqpi0GybIWMt0npK+LktCDstuVeGMhls=; b=O10pax7rk6SVtkEkXEuMlVyDTPh3GNLheMI+K3pxxeJeUhVwNZa7lTaRx70OU2K48DCFrcC6NJ+L0Gz6T1jXeJcEb4cIrcwrtegbmQYXW/v1HuyqDu8H8so25Al3zMuR4tA06ofd2uDMPAup1seMZkiouMkB7SOiKVynYNU7rBc= Received: from BN9PR03CA0351.namprd03.prod.outlook.com (2603:10b6:408:f6::26) by MN2PR12MB4222.namprd12.prod.outlook.com (2603:10b6:208:19a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.21; Mon, 24 Feb 2025 15:50:43 +0000 Received: from BL02EPF0002992D.namprd02.prod.outlook.com (2603:10b6:408:f6:cafe::9a) by BN9PR03CA0351.outlook.office365.com (2603:10b6:408:f6::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.19 via Frontend Transport; Mon, 24 Feb 2025 15:50:43 +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=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by BL02EPF0002992D.mail.protection.outlook.com (10.167.249.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8489.16 via Frontend Transport; Mon, 24 Feb 2025 15:50:43 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 24 Feb 2025 09:50:42 -0600 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; Mon, 24 Feb 2025 09:50:42 -0600 Received: from xhdthippesw40.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; Mon, 24 Feb 2025 09:50:39 -0600 From: Thippeswamy Havalige To: , , , , , , CC: , , , , , Thippeswamy Havalige Subject: [PATCH v5 3/3] PCI: xilinx-cpm: Add support for Versal Net CPM5NC Root Port controller Date: Mon, 24 Feb 2025 21:20:24 +0530 Message-ID: <20250224155025.782179-4-thippeswamy.havalige@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250224155025.782179-1-thippeswamy.havalige@amd.com> References: <20250224155025.782179-1-thippeswamy.havalige@amd.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0002992D:EE_|MN2PR12MB4222:EE_ X-MS-Office365-Filtering-Correlation-Id: 3da703d8-05df-47a9-ee66-08dd54eafef2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: vljjkxPWafqtSUL2BBai3SDN7U0W1KVD6muGJs9aTW+JbWPw46pkB3l1cTcYstocmzrKRywNPt85WcggCOQpZqk/zYWbuErwuUeheJ1e682C5g11PAxTG6jA3tvkiyZkCEv5KplFuaH/+6PVNyaAttyCmHsof+E6g0Ax0utoHj2iIuKrNTFECpKZ/R7m5a3BpkFBG06OobHCH7cg9PikQH7iYYwmO75lMR1yozbXuVyH5pWAjHMgom0uunTieO5MZIc0VvUidbFtMRI94CxNeTDQUhQDa/JwHshxMIyp0xfClZ00ZXqwQ2rilm6wZt1uqU2m24KKq0fRxmFzRU2lW5NADWTrsY/Ir5NS6iv02xzGZPgHa0H9INZk1wfQ9g8jrBl+uSdSEVf20jp4FPt9NAKMgdpW3y8vx93ZmtyXepqYcWNPu7JeLSG0seJ6KKSg9iSpCdj+YkA63MuqtTC2Rs2Vc9V0KrUYJbepHvLAUkKjCj7gNNIk5ni0O5ycCItHH3f5bZmB7257yhfFNBbcYNjNXmD947Icq7ld0WiNlUNX629vWy1miGayfJCJbdkzAKlFdi+Ye3HA/E0NcECFrJxcJl3xBwc7uKkgSV83ZjIlU8YxoA8FQ0ZXDKyK+AtXC9Mmph9uzLl+vo3pisnU9vaNarPJvTW4Lx+XJQdCi1MpQCmwNJcoY6JUwKS4FdG+RHxubF5S3qMbeCdY2mxaYEF8G08BPPs//jHofspLd8KCPSzYBM6P01F0AURAqX+//sp0fc3zQc7k/G94EsSDWGJUHS6JOjb16qA8jJ9Yb14zTCPLT7E56F63t6ZzeOeVB6e8HZGVnv5cINE4yvDGsa7hQPr1cBFlu4GuMbpDX6M5v/z760YEOpDOkf0WXDur551DSvG6xE+6LLHt6lrShCm+Jvo15Ok1+vEjlfhBWGktqBRgtwn/6tNFaxBZWQ+4XalP9RYv5zBwPsKCmf/7p8kD8kkneiOFyyWyZKGvSwbWxKV59z6MsTPltmMNa7JroQX6IEbNrfTN4sc/ThCkMomFttBphtD+zpjgV1aWNpZpkO7/+x4rQEKYr/VFORxzFP3vSfKaIvLjch8tZk1S1EP7QGpyEnmW5G1MvKlw251crzaJ7nhJjWLE9uePoZxfSwuRpD+E2iBC50dgQDW26tYbdBIKj3D5/o6XKvSZBIfAMRt3Hva9ds+b7F6jZKPdexpvJ5sM+fOBx3+tDVCWYB/NaKC0PbtfnGPOrjBknosrBpGk68UlwYYgx0OEC9PWzSYdUSrgMXg68ynUPNNUTqAp/d2P/wvnzrrTiCXicTl2NHUfL22UBvVDW42G+8s9i2Sqg0sufNyaSztSwiPQzyZftOZ+4+FIwllAudOpdUCEO5LK2jro6rQRgDLAENPbSpZUz8KN1JpdnGjDIAgep0wiusksKAd3g2WH+nCS6CN8zlTWzOYeF5ctJ2p8LREuKwsE0M6USl69bdER1qisTlkeXekGjggqdaKsQCwB6hY= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(7416014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 15:50:43.2267 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3da703d8-05df-47a9-ee66-08dd54eafef2 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=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0002992D.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4222 The Versal Net ACAP (Adaptive Compute Acceleration Platform) devices incorporate the Coherency and PCIe Gen5 Module, specifically the Next-Generation Compact Module (CPM5NC). The integrated CPM5NC block, along with the built-in bridge, can function as a PCIe Root Port & supports the PCIe Gen5 protocol with data transfer rates of up to 32 GT/s, capable of supporting up to a x16 lane-width configuration. Bridge errors are managed using a specific interrupt line designed for CPM5N. INTx interrupt support is not available. Currently in this commit platform specific Bridge errors support is not added. Signed-off-by: Thippeswamy Havalige Reviewed-by: Manivannan Sadhasivam --- Changes in v2: - Update commit message. Changes in v3: - Address review comments. Changes in v4: - Add reviewed by. --- drivers/pci/controller/pcie-xilinx-cpm.c | 40 +++++++++++++++++------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/drivers/pci/controller/pcie-xilinx-cpm.c b/drivers/pci/controller/pcie-xilinx-cpm.c index 660b12fc4631..55a8b14473be 100644 --- a/drivers/pci/controller/pcie-xilinx-cpm.c +++ b/drivers/pci/controller/pcie-xilinx-cpm.c @@ -84,6 +84,7 @@ enum xilinx_cpm_version { CPM, CPM5, CPM5_HOST1, + CPM5NC_HOST, }; /** @@ -478,6 +479,9 @@ static void xilinx_cpm_pcie_init_port(struct xilinx_cpm_pcie *port) { const struct xilinx_cpm_variant *variant = port->variant; + if (variant->version != CPM5NC_HOST) + return; + if (cpm_pcie_link_up(port)) dev_info(port->dev, "PCIe Link is UP\n"); else @@ -578,9 +582,13 @@ static int xilinx_cpm_pcie_probe(struct platform_device *pdev) port->dev = dev; - err = xilinx_cpm_pcie_init_irq_domain(port); - if (err) - return err; + port->variant = of_device_get_match_data(dev); + + if (port->variant->version != CPM5NC_HOST) { + err = xilinx_cpm_pcie_init_irq_domain(port); + if (err) + return err; + } bus = resource_list_first_type(&bridge->windows, IORESOURCE_BUS); if (!bus) { @@ -588,8 +596,6 @@ static int xilinx_cpm_pcie_probe(struct platform_device *pdev) return -ENODEV; } - port->variant = of_device_get_match_data(dev); - err = xilinx_cpm_pcie_parse_dt(port, bus->res); if (err) { dev_err(dev, "Parsing DT failed\n"); @@ -598,10 +604,12 @@ static int xilinx_cpm_pcie_probe(struct platform_device *pdev) xilinx_cpm_pcie_init_port(port); - err = xilinx_cpm_setup_irq(port); - if (err) { - dev_err(dev, "Failed to set up interrupts\n"); - goto err_setup_irq; + if (port->variant->version != CPM5NC_HOST) { + err = xilinx_cpm_setup_irq(port); + if (err) { + dev_err(dev, "Failed to set up interrupts\n"); + goto err_setup_irq; + } } bridge->sysdata = port->cfg; @@ -614,11 +622,13 @@ static int xilinx_cpm_pcie_probe(struct platform_device *pdev) return 0; err_host_bridge: - xilinx_cpm_free_interrupts(port); + if (port->variant->version != CPM5NC_HOST) + xilinx_cpm_free_interrupts(port); err_setup_irq: pci_ecam_free(port->cfg); err_parse_dt: - xilinx_cpm_free_irq_domains(port); + if (port->variant->version != CPM5NC_HOST) + xilinx_cpm_free_irq_domains(port); return err; } @@ -641,6 +651,10 @@ static const struct xilinx_cpm_variant cpm5_host1 = { .ir_enable = XILINX_CPM_PCIE1_IR_ENABLE, }; +static const struct xilinx_cpm_variant cpm5n_host = { + .version = CPM5NC_HOST, +}; + static const struct of_device_id xilinx_cpm_pcie_of_match[] = { { .compatible = "xlnx,versal-cpm-host-1.00", @@ -654,6 +668,10 @@ static const struct of_device_id xilinx_cpm_pcie_of_match[] = { .compatible = "xlnx,versal-cpm5-host1", .data = &cpm5_host1, }, + { + .compatible = "xlnx,versal-cpm5nc-host", + .data = &cpm5n_host, + }, {} };