From patchwork Fri Sep 6 09:31:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thippeswamy Havalige X-Patchwork-Id: 13793744 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2067.outbound.protection.outlook.com [40.107.102.67]) (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 025B01C7B7E; Fri, 6 Sep 2024 09:32:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.67 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725615140; cv=fail; b=WquZXNi/NggvMTFRItv+vyzdKyRPeIHDaHmh46hHZWvVE97T/5L+vYhc8A75yvP1J+18rJiJ74hdYHCIwFGXjUUjmpj3YpQ9ccdjZk64G7/pfU234PSPBOIRn20XOygEZfN2KhMZjwaMbgvk4Z7PnfXo4t7AMcroYbkw03bRbpo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725615140; c=relaxed/simple; bh=uskjeL5xIuXZWCqOz1+8+zJGK3VAprz+ickQnf5u9Wc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LvXOBToQVuqbtMNuzp8blXG8a9C0ADS1fvhQg6NbeUFdpcrwJ/DC2WLO64TCgwnePpqCOxeo+pPOJGpST/DacA9s3GBZ9iqdd8SXBip2dkgBDjy2I1mzS2l3nrF1eqTHc/29wglrTluYZuKfg1qWopoMAOJG7gCDPxtLc2y/res= 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=tC/gSBLk; arc=fail smtp.client-ip=40.107.102.67 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="tC/gSBLk" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nfyDL5w4xybOO3nBH8Fc6e+ZcCRLJSZYUu/d/Gh00VfnIzAQBqe+0SIJ08ZEXBlWJl1ttX1Gqv3jPmDr+S4lEC+NYih3Cl2B07PNdP0eS9MCgCasOV1Qjvqh3GJutQAZ5aKHqlltd8XcAOv9o/ewZhE9vrIKuZEhjV7JMBNKaek9Hw3nT4Zdj7PQkHie/ZbdoO7vJZhnwB2QKMHQdPVHnBEAV5O96iYS6T2cfw8BLkG9fkKr+eA3OC2ukQTBddMgQgXG2U4z+Rh8arfKMWMzKhVjCaVgJebiDWxx/fo7DqmDyOBKC1dzgY7KyXqgNm7s0+zaTZGSJOsqCUEJ6pEhIQ== 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=3p59eL/vE1fY4ph6Vl27sjnaBX5/zEpfJ+mFybmwT+c=; b=kzzEueq1Gk+RwrSlnE6BMigN95fTeIoY48OFVKGgniVqC8gzWuUzu+F+l8XaEgIu/rCHLGWgo3kwloskleBjN1Mn4WboTHMvBAilbltOhohbLyQRRZNGdJWmKChyaxJzOQMeaXM1WXyeS9AcOODzJo5upjXJoVhmEG2BgkbJbXY3TZW4AN2jt8pwxIrN9eegv7Gjr8Qj/CPfkb/W/lTtkV9sf+rl2bdFnYlryi4Px7AHiaULK9Qc/OBVjnQhvaFSXrxDSE5xZBtxv+h8QKqtf1czlBY+/LAFI91fcSsEYmDMsxGLKC61YGw0fRIxJSmDpgFZx+Z+k/KqNRCcXGJm8w== 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=3p59eL/vE1fY4ph6Vl27sjnaBX5/zEpfJ+mFybmwT+c=; b=tC/gSBLkCBhakbUxPA3XB+NBBnc66agtJOfl1gN+HKImEjvyQjrG2AhEgXfpIJT0xT1WH2X4JXTeqiM2MCYV2Cn9Z92t2vw35CziXZmrngjCIijfjrxjG2re0OmjvzLV0zjJNNuUzIv6H6jzNWNkON20r694va7mGSrFR3yyk2M= Received: from MN2PR01CA0020.prod.exchangelabs.com (2603:10b6:208:10c::33) by DS0PR12MB8218.namprd12.prod.outlook.com (2603:10b6:8:f2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.27; Fri, 6 Sep 2024 09:32:15 +0000 Received: from BL02EPF0001A103.namprd05.prod.outlook.com (2603:10b6:208:10c:cafe::d5) by MN2PR01CA0020.outlook.office365.com (2603:10b6:208:10c::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.28 via Frontend Transport; Fri, 6 Sep 2024 09:32:15 +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 BL02EPF0001A103.mail.protection.outlook.com (10.167.241.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7918.13 via Frontend Transport; Fri, 6 Sep 2024 09:32:15 +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; Fri, 6 Sep 2024 04:32:14 -0500 Received: from xhdbharatku40.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; Fri, 6 Sep 2024 04:32:10 -0500 From: Thippeswamy Havalige To: , , , , , , , , CC: , , , , Thippeswamy Havalige Subject: [PATCH 1/2] dt-bindings: PCI: xilinx-cpm: Add compatible string for CPM5 controller-1. Date: Fri, 6 Sep 2024 15:01:47 +0530 Message-ID: <20240906093148.830452-2-thippesw@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240906093148.830452-1-thippesw@amd.com> References: <20240906093148.830452-1-thippesw@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: thippesw@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A103:EE_|DS0PR12MB8218:EE_ X-MS-Office365-Filtering-Correlation-Id: 430969aa-ae08-48ee-5c9f-08dcce56cb3d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|36860700013|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: pU7VHhDXZMIdu0vKSuGpK1cedd+O1LaNYgRWojOyUtNPz3zsRbpDODeDp/C3YZd1CEdTeh0GUZATkX63BpsQ4sskfD8lrl8NsKN/t3yx8q5WuvnNQdjVRv61mQeF+pjDGcDaQbpuPR2ieaVugU7SLCuiTpudokVjBiNcUDup2z+6oCBjXSuFFhnrxDARa7ts/Fs9+v93GBVtxFS1NsZD6DgBFusN4wQO+vISqnf4dX/01aZ1mRDdwUBzi/0sZR3g5oGG63ZkWujx8CZRHSvBTnjNuxKYs9cGHqYCON+c2qs/2nbh3j9Br9K57Oy+N1ysHxyin+04CrSt91ifFAfjaLwGcsnfTPtE7napJdRmuaHy2710SqhT3aygd1qJgCKtyaUAXzjQa+rQ/nodenlvbEDecaP/jVmqujZSt68CIYBWvU9nIEBgOiCH3oXDoHB9IiKu/h6T8Dzf/CYZDH8v5Sfj3by4utVia0JYol37c2qWne9bdcQYFRjoA+TVVqoOyxBUe+/sZ0Ela59m+JYG9tgPD69tBnnpyGfxPb63lamO2uFQWalt3BuQOGa6VzWmILmDaBifHuC4dsxTY/JaeKPBzOuMM5Qldh0C9c6dyXylj7x3JvwLt5Ousr81SZDaYhvFuz2AKXOYGrhcW8pItvVRjSjQhP/4kjRCK9i6DwbzSlY/bIAacQmF/ctofjQEVWg8CAk7VnkTyC0zVnOC/zBvyXO4tDuBsuxEL5hXmPgsxj/GCvTAJARps0EpLU5S6E8gm0t9wG3rIva6RbRTDx2wuJwBKDleqUmRY5aAoMehw5roQpjBZzdMMDEDgZ9NvwquUYYVpEpovUmxv6UQhQlPFnWN0XQS0zxYXq2mYWnidczeASF3UenmbxuzVuRnEb0UDuWXFByp3aNmL9JEru3dcPNXQSrmv/oEt58bR7aIrvbV4wuWOnfd8WoyqQYeWd3rmzZFZ1/3/0W/6I2LWQjY4pRl1KF/u1YP1L2cGxoth9PKg0nuY+QeCCM4e1VsTrGfmoFZMvZtUuT+zLkwM3INJlIKsdU0wx0M+ZG4g3dMNDacYu6s8Bc/WRy2PNvHfO+6fggJpmKkWrkEv+8hmVjs3ZsTbuq6RFPjthiJToPkvoboyydJz8mgDjeBygBpwOQkTUi5vuFgVXl3pO8TrgskyyDHRkV5egFwHZ/l0NjxhoO9KJONQrxp4jmbnp6IH9k/6p/9/tGiksqketbHpTa+61tJT95PYk0vOdHMUn9yl09144Hx8ctYMAsfcOHMG6hPH9Tbpe1fXcvO2VH7oYlTIaDZ5Y++cRAffbbmGPS7loSGFNO2lzqyfsCpqvJEoUr11zDsxC2TuhzjAUdh15webE/cvI21KiGp0hdBIavTR+uN6QZeivN2WCWA18zBc2HCo2luxfZjoSFDPTL4kKgnmUV//k/XVETgck3afq3q7CJ4Z/1YQpp+bCFkIuNM 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)(36860700013)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2024 09:32:15.1135 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 430969aa-ae08-48ee-5c9f-08dcce56cb3d 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: BL02EPF0001A103.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8218 The Xilinx Versal premium series has CPM5 block which supports two typeA Root Port controller functionality at Gen5 speed. Add compatible string to distinguish between two CPM5 rootport controller1. Error interrupt register and bits for both the controllers are at different. Signed-off-by: Thippeswamy Havalige --- 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 989fb0fa2577..b63a759ec2d7 100644 --- a/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml +++ b/Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml @@ -17,6 +17,7 @@ properties: enum: - xlnx,versal-cpm-host-1.00 - xlnx,versal-cpm5-host + - xlnx,versal-cpm5-host1 reg: items: From patchwork Fri Sep 6 09:31:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thippeswamy Havalige X-Patchwork-Id: 13793746 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2083.outbound.protection.outlook.com [40.107.220.83]) (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 206B41C86F3; Fri, 6 Sep 2024 09:32:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.83 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725615148; cv=fail; b=V41Vm2ddi1hG5xsxl4xODbJ30HGQCpS2Q1Y2GDDwsEvvFk/DbHkAYgrOFMyGMsIeVVCmq/uIyEnO0ODBHNFVS+ZEa6pBZirvsC3kfuOpks4p0IOwxSB9eB38CaVrsvyXYpEYZZvIrpwMqD24Y4VmZ2XP/mpTXUrWlza4vzwOauc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725615148; c=relaxed/simple; bh=QGAbhZGzJ8xWMqwR0n5g6/14Lu5AC79BbsFpR5v2L4w=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=aZu2S9aiy91CmBwE0LAcDmx9VRJr0HVjdE8iI+MYkjLI7EH0UctwtftRSll+ZpFGvS8Fd2MSxCNyiRYXWjb1fwyr28UcAupXrHk5yQWOx4SnxD67xIqSzwhsslzWMWHhrXNhPRn58cl5g7SO41rXVo6ZYKezdb8/4xXeyOVWQnA= 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=YA/KwICx; arc=fail smtp.client-ip=40.107.220.83 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="YA/KwICx" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hk7OS5Mkunnb1LbYqD2d1AiShxxfwP8rtxyM7l+mjhFIAjanFX+/JU6G5Q3GXxMXs0qVwmr09TKeccr7sX3ihOubWvHNVHoKBvUcVw1L91Bhfyt3pYeEO+hnuxh6WKCilXTnqnoHqjZf07EdcTf8T8MRRXTbxNqsTDxaBkJ9X4hq3BhvxxKplMYNd+aYXJ0Lu62hcP8+s7sXBK1lsYlLQhoekKdMdQF9cuQZjuY1jRdefI4rip5VSGjAhgz8XGOL7gqxFWfdZzmGAPjKHtoXppyXhjMkIxoxJYdCzLt2v+cHUUo4Cz937yp0+r3BthvlFZls7nX23HHEGBkUSRIxlw== 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=1YOqrT0AojDcSKqnRtXqUNbpkncz4YmnEBLi7chPvdE=; b=lg8ZhwLZRErIS0g5rJggdP8IB6M5mPSuKubodMvU6Pfjh9lznL+6ziEM7W0AXNzuU7XuqG3rW+B7bwtnp4iq4Zf99BJbstm2Y62vRg7mtWBUEwrDKSyXXeEUY2JS++4kCxfq9FttAJGyBpDuZwhHBtsJJSpEYDnx1rYMwdwtwu5H8Dtl3ZXCJ84SakURziMrkDh6g1jGyycojBRGsjAtv+z2+TdFUr3WxhU2DNuvIk/zcPDgz1dHwkdqav8g9iFXOXwOYemM86hHHAlXuGsMUbE6rpcbhsx9SjzAj8yaWjMHgjXZW+jS0S9Us7CWxkSBh8ykBTK4NqVuBJICkfFTDA== 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=1YOqrT0AojDcSKqnRtXqUNbpkncz4YmnEBLi7chPvdE=; b=YA/KwICx/6SlidyO5qhxNL3WH6rjzvabD1faC2CP0J76poGn4tjcYjObu45MPsnjkSJ+sn3buPi44LVXt58yVNsp4dt6qXE7hGEldIExRlXyQ/5ZxL89WQ2Z0QJ4soMFYxtGj2jq3goPJpfip80/QI/YEtV9Mb2QzuyfAJ5zehc= Received: from MW3PR05CA0010.namprd05.prod.outlook.com (2603:10b6:303:2b::15) by IA1PR12MB7760.namprd12.prod.outlook.com (2603:10b6:208:418::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.27; Fri, 6 Sep 2024 09:32:23 +0000 Received: from SJ1PEPF000023D1.namprd02.prod.outlook.com (2603:10b6:303:2b:cafe::f2) by MW3PR05CA0010.outlook.office365.com (2603:10b6:303:2b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7939.17 via Frontend Transport; Fri, 6 Sep 2024 09:32:22 +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 SJ1PEPF000023D1.mail.protection.outlook.com (10.167.244.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7918.13 via Frontend Transport; Fri, 6 Sep 2024 09:32:22 +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; Fri, 6 Sep 2024 04:32:18 -0500 Received: from xhdbharatku40.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; Fri, 6 Sep 2024 04:32:14 -0500 From: Thippeswamy Havalige To: , , , , , , , , CC: , , , , Thippeswamy Havalige Subject: [PATCH 2/2] PCI: xilinx-cpm: Add support for Versal CPM5 Root Port controller-1 Date: Fri, 6 Sep 2024 15:01:48 +0530 Message-ID: <20240906093148.830452-3-thippesw@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240906093148.830452-1-thippesw@amd.com> References: <20240906093148.830452-1-thippesw@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: thippesw@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000023D1:EE_|IA1PR12MB7760:EE_ X-MS-Office365-Filtering-Correlation-Id: d9f89fac-557a-4b03-a6b0-08dcce56cf97 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|7416014|376014|82310400026; X-Microsoft-Antispam-Message-Info: bl9yClukUxYZCOgSCVq8tsz3O8DBLwxytdMahanJ83jQ+sTKzRXNqpVGD3zTGdFF310qBLB2rQKKRAeLHvrzjlcAecjLoLdg/tNJWH2Py+DE6Z+7LYRoTq83h45SSyhJsG6FnGNgMxGi9GPG5xnojNuNkyablSA/lMj9AG3wJELThAm6uF9wSd2Sz4Ouav14XORYd/3ZHgjC8sPg7+k0jtvDDEBpyfJfywON04ByegkqNbs3uHKLqDrZgSAJOTNoHNxiqiGKUOWpPjE05WbXzuwZsdPDh18KPYVKLEIbrPl9jJlFsACIv0mCQ6Hw4Ngx+64Sn+Ee4MrVt2bMGJQ6ew+9E/adQGDJz+TcIW8FHY1bla2T0KuzcNKE1hX0Fbu8bCrU1bKO/LVr2D1keJN5Z77B3P02SungQRdGWG6NBFpJOIHT4bjuNe2pYhnyVhvqmYFRDN5vGDIQgulDZprkrRHsp9syQMis5WxdNOEBIe3ih9w2u6PKo2unP9cFWxKX2UnZ+UmClPW0LB15vD/yekzoziycrE4qUfm6OTmfBQb19mPErAoMCf6Nk/+OnFybPFIosKPIrpchm6Hqa62OeFBEygT0cFO8xn5KMVLoKYpci9T8yjsD2i985WQDLIAoHwNcjYrXZysNwAgHnqVc99oC9plgRTJ+/xSfYGgiR7nSP8Rkhzht0tJ2o7sLXbHWumIK1XUfKIuCtwG2DuEKJQy63Oogx1AP61rgxc1h2H0Nb3Hed5/RBFnBFnYuAzqIZ/s7/9MYk8QubraXp9yNkCpf1FhFPwl9RuoueiLiDpP546OPhlwVSyIhtcUjgDWlPNyyqYxHGcJ6RPcEin7jVSYjs5Y49QSF//xQgf9kNqIRyU2bUhz3bcuUPQM2tJjuRN5Mk4YiWJ07Ova02DmWCG17ltNl79qOldjW+dmsSWJnnxVQmHK1/jzCUb/J/fhvwJEhNWGH0SCQQR7Lh8qADOXPIOXuqlGKC2NeV8Y6HL29xPx4d9WFz7h4w3Bxze0DVDC1DAPWlVHZxACj+XNlSZWiKqCXxZHkD6YNlj0cqj4XM8n6r16xxVh/xQmFoFeWwTgdjzEwCMQjqYH/uqxiI+DVt6RUYzOl29Uoz5mHs9hsWgNNTvMu0YsuiGdA9517DXsF0F4cs5zFw9vceLFMWMWzL/mtMju0MpX4xnJXHh+pFxwJ6RtquONG9qTqRrHs4nw8ixYYvXkoYqKUF1l6DxlPnqMavfHRWy5jcaoLOyatZaJrFhHwoLfSxvtAo/VTwYU7pUA8Vn1x09nN++dqLk+W3ncgv7Tod8u4DfICBbmlLEtekv2sUyyWokxwH2BWpxGOjauhNjeEvaD6uaLTdPt+UmWOK8X1nRYl5lwFfOBDJ4ArErztGv/5Ur/4foz/B6jVQ18Rv3fzwZv4+Z6KHzjbKyyop4XkwheYQKyJyg8= 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)(1800799024)(36860700013)(7416014)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2024 09:32:22.3380 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d9f89fac-557a-4b03-a6b0-08dcce56cf97 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: SJ1PEPF000023D1.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7760 In the CPM5, controller-1 has platform-specific error interrupt bits located at different offsets compared to controller-0. Signed-off-by: Thippeswamy Havalige --- drivers/pci/controller/pcie-xilinx-cpm.c | 39 +++++++++++++++++++----- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/drivers/pci/controller/pcie-xilinx-cpm.c b/drivers/pci/controller/pcie-xilinx-cpm.c index a0f5e1d67b04..d672f620bc4c 100644 --- a/drivers/pci/controller/pcie-xilinx-cpm.c +++ b/drivers/pci/controller/pcie-xilinx-cpm.c @@ -30,10 +30,13 @@ #define XILINX_CPM_PCIE_REG_IDRN_MASK 0x00000E3C #define XILINX_CPM_PCIE_MISC_IR_STATUS 0x00000340 #define XILINX_CPM_PCIE_MISC_IR_ENABLE 0x00000348 -#define XILINX_CPM_PCIE_MISC_IR_LOCAL BIT(1) +#define XILINX_CPM_PCIE0_MISC_IR_LOCAL BIT(1) +#define XILINX_CPM_PCIE1_MISC_IR_LOCAL BIT(2) -#define XILINX_CPM_PCIE_IR_STATUS 0x000002A0 -#define XILINX_CPM_PCIE_IR_ENABLE 0x000002A8 +#define XILINX_CPM_PCIE0_IR_STATUS 0x000002A0 +#define XILINX_CPM_PCIE1_IR_STATUS 0x000002B4 +#define XILINX_CPM_PCIE0_IR_ENABLE 0x000002A8 +#define XILINX_CPM_PCIE1_IR_ENABLE 0x000002BC #define XILINX_CPM_PCIE_IR_LOCAL BIT(0) #define IMR(x) BIT(XILINX_PCIE_INTR_ ##x) @@ -280,10 +283,17 @@ static void xilinx_cpm_pcie_event_flow(struct irq_desc *desc) pcie_write(port, val, XILINX_CPM_PCIE_REG_IDR); if (port->variant->version == CPM5) { - val = readl_relaxed(port->cpm_base + XILINX_CPM_PCIE_IR_STATUS); + val = readl_relaxed(port->cpm_base + XILINX_CPM_PCIE0_IR_STATUS); if (val) writel_relaxed(val, port->cpm_base + - XILINX_CPM_PCIE_IR_STATUS); + XILINX_CPM_PCIE0_IR_STATUS); + } + + else if (port->variant->version == CPM5_HOST1) { + val = readl_relaxed(port->cpm_base + XILINX_CPM_PCIE1_IR_STATUS); + if (val) + writel_relaxed(val, port->cpm_base + + XILINX_CPM_PCIE1_IR_STATUS); } /* @@ -483,12 +493,19 @@ static void xilinx_cpm_pcie_init_port(struct xilinx_cpm_pcie *port) * XILINX_CPM_PCIE_MISC_IR_ENABLE register is mapped to * CPM SLCR block. */ - writel(XILINX_CPM_PCIE_MISC_IR_LOCAL, + writel(XILINX_CPM_PCIE0_MISC_IR_LOCAL, port->cpm_base + XILINX_CPM_PCIE_MISC_IR_ENABLE); if (port->variant->version == CPM5) { writel(XILINX_CPM_PCIE_IR_LOCAL, - port->cpm_base + XILINX_CPM_PCIE_IR_ENABLE); + port->cpm_base + XILINX_CPM_PCIE0_IR_ENABLE); + } + + else if (port->variant->version == CPM5_HOST1) { + writel(XILINX_CPM_PCIE1_MISC_IR_LOCAL, + port->cpm_base + XILINX_CPM_PCIE_MISC_IR_ENABLE); + writel(XILINX_CPM_PCIE_IR_LOCAL, + port->cpm_base + XILINX_CPM_PCIE1_IR_ENABLE); } /* Enable the Bridge enable bit */ @@ -615,6 +632,10 @@ static const struct xilinx_cpm_variant cpm5_host = { .version = CPM5, }; +static const struct xilinx_cpm_variant cpm5_host = { + .version = CPM5_HOST1, +}; + static const struct of_device_id xilinx_cpm_pcie_of_match[] = { { .compatible = "xlnx,versal-cpm-host-1.00", @@ -624,6 +645,10 @@ static const struct of_device_id xilinx_cpm_pcie_of_match[] = { .compatible = "xlnx,versal-cpm5-host", .data = &cpm5_host, }, + { + .compatible = "xlnx,versal-cpm5-host1", + .data = &cpm5_host1, + }, {} };