From patchwork Tue Mar 4 17:49:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 14001215 X-Patchwork-Delegate: kw@linux.com Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2050.outbound.protection.outlook.com [40.107.22.50]) (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 0D97D27C868; Tue, 4 Mar 2025 17:50:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741110604; cv=fail; b=BfcMwGHbojJMMW9iAruwpsFcPOP5+xOimTgk2QNpXHri6H0TuyFv/Zn7WL1qy0KwthB71W2eu6JouHSX3h85c+9f7jd0uK5y4V8mrLWRVV5RNy4TsKjYfjqTBs3Q/Ea3yri+7s9wkzGYAO8pISXsGBj7qRbJ46dgyBEjEIZuYpc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741110604; c=relaxed/simple; bh=r2utdgobkfrXSOYize/edAOscCvHcWtAL66Re5Iy+0I=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=QlytADYqdn1eMPPBBgZ/k6qSJIIxpuSvIfsAxPLiKoilGrt8vs92oThbCj0Gptn5RpaZSlCX/CqAI9njjAqCTYAA5zNy9p0vhGxI2yKHWMYr1CnfwrDuLCH+2sRbC97eW+00DLWJ/O81t+uSV7giV8t0KyTxasN1OdZktzoFi5c= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=VkoPOMhU; arc=fail smtp.client-ip=40.107.22.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="VkoPOMhU" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TeBV8QGhOSxoAoyeqY3oOs51EyexWlJ6UkVV9wxlkHoYohSN6C5L8hxt3A5Q5wXA/A5SQWKtPAMl5f1hDGvsGW7boR+CdN5XRtujHLiqRw1E8pm6pvJrCVvEykdKvLwNwYeZ3xE+5ZpjxTI2iUfiSCbnsdrbMwixeWuYWRldgKp1UJhrCYvJS5U47JddO2o8l1UR8qCroFhkHLBVncKkW5PgqKlEOgeGoyOqfyAj5qA4QiuUZl/fTfifW/u9akSoEUa4sm+V4Dd0HFoQQkK22CDAXDeHpr0pybQGjZ89kuIvnBSH4NSukO4yD6VQ2BvSA5UdhUH6+Q2eFBxHzcPV4Q== 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=1KyzKNnAFLWDWd8UvRbH1xzgxfn+F5HKjlO2FJnDdoo=; b=gwn1ab2NMc9YBDORuqr6Ig3vMAV0Nyl+FGMynT0YW4VZr9AKC9b3kyWIAYTR8t7a4U2+dHeVG4KCGz2sIFHhMOGyej7nyc/+fOgjwVldQR1+U91IfjqcXNsDl5JD+LO+nwxFAoXCn9UGShit45oNqozX0wRvTpx4uZyBOHojrL2XqWbQSi+n2Ed3wOg3no2pzrf6JFzwNhP7yaU4wymMamgzO9uR5UHo2FSx3MXBXqRQmpEDxG1v8ZuuGwysXtGKU+GHR2b6qDIqS4UDSas3S7mgvgS5dKx+4m+bGusTQ0SCYD3H0PN9V8Lk/Ymk92fgR/wz+yov/3excX7QdyIyYg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1KyzKNnAFLWDWd8UvRbH1xzgxfn+F5HKjlO2FJnDdoo=; b=VkoPOMhUWvPmIFNUjv6Au4j248xXPJ4HZ6e9cP96MJmPOA/V+qewByj2x7CXByzkhnAvSF4iumzKXB/i2VRfe0P9+bvkybxEVxJnVT72YtMIvZRqxTUdF8KY2oeR7tii+pSNghISyNHLm56Lj3kLwpB+4xBCWSj6eNY5Qw+co9pHhzOJ+CUM4BGDBgUCDudebDDra5XfiZB3p3dyeEJwdnQRSEkgukiENXAvNXTO9pF7NHqKmT3X8Gj9cRHjMBZgG+rgYylRanwFQ6Oy8cSfiUCxaisD+b1/w4TrZ3um7jcR8di9goxOVgZv/wj1lq53nFaOR/iqD+492t3LrvaPDQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) by PA1PR04MB10504.eurprd04.prod.outlook.com (2603:10a6:102:444::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.28; Tue, 4 Mar 2025 17:49:59 +0000 Received: from DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::e81:b393:ebc5:bc3d]) by DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::e81:b393:ebc5:bc3d%4]) with mapi id 15.20.8489.025; Tue, 4 Mar 2025 17:49:59 +0000 From: Frank Li Date: Tue, 04 Mar 2025 12:49:35 -0500 Subject: [PATCH RFC NOT TESTED 1/2] ARM: dts: artpec6: Move PCIe nodes under bus@c0000000 Message-Id: <20250304-axis-v1-1-ed475ab3a3ed@nxp.com> References: <20250304-axis-v1-0-ed475ab3a3ed@nxp.com> In-Reply-To: <20250304-axis-v1-0-ed475ab3a3ed@nxp.com> To: Jesper Nilsson , Lars Persson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy?= =?utf-8?q?=C5=84ski?= , Manivannan Sadhasivam , Bjorn Helgaas Cc: linux-arm-kernel@axis.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Frank Li X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1741110592; l=4187; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=r2utdgobkfrXSOYize/edAOscCvHcWtAL66Re5Iy+0I=; b=OdOjNItza5RThmzWbu5VNXTrXH8ULV/GW8bceJfhpiigotm90ssRlg3xt9CKLDDL9nD1u983l YjQvZ/M2v7MCK/Z4dtWKBnLYjzadz+FcvLAFBThRTE+JveLoXs0BFrV X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BYAPR08CA0007.namprd08.prod.outlook.com (2603:10b6:a03:100::20) To DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR04MB9626:EE_|PA1PR04MB10504:EE_ X-MS-Office365-Filtering-Correlation-Id: 07a28259-9b17-401a-30a5-08dd5b44fbb1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?QwipzpBxjoNm9dgYHTak/lENq5zGXzV?= =?utf-8?q?9c4apsXPIw5IBUH9+T+DGEq0HdvZD7t+eQxg1pk5xPBJmeZ5pF7E//BMhviKpzWFR?= =?utf-8?q?RHEzIWdbxkQEfD/3f6CnUlTgvJoTOzGVA9OisGxUIDmpeZOKMYEGuiw5mht1XvnDG?= =?utf-8?q?jIVec7jY57K7T1d1hWFlwoNUiX9nO081sPdlvnhAZXQ8baa99YuWildDYfwC9jZST?= =?utf-8?q?vmNpTG0qwjrUCR3zgo9yu3/OElZzcJjwAvpx9n/dAeg47ALJOOT9OU3M4HRVQiNx1?= =?utf-8?q?Hesy8y5oE6ULoDkb2naVlGwuPQfcX2CF+/KHSIvs2pgk0JHFxkMunIvAFTv4yncXi?= =?utf-8?q?vjxI0POJCoDsm5uABFZSah2tg/dmTnSVH/uo25zEwfoJsGT2A4Uryb3dIJqfi4npt?= =?utf-8?q?4RtKtfX5vk/uSmOdY3SS1eXBXpZyeRi9ZS+O8qVIA/Alyf8LMiD506tp4RDs6ooys?= =?utf-8?q?xtZnORgI772D1amxXUEFOjgCO3ffcemmhIe6OdzZp3uQxrgILSS6RHGln2bz+lJ5z?= =?utf-8?q?sud0eHEl+bP5hd31x7EuvnGrBjPdC+GwOEhdUbtrpkKGPSfmW1RvJ/aYAxzdgXaxK?= =?utf-8?q?w2WqaPQnIBegLjJ18MIOCRqeonW4h40NFAzVPX3QEPnlQF6v1IuPAY9nkW154z1Hr?= =?utf-8?q?kdMWPxsM/hNQlJ2b8GdiVYC2hCUs/OQjtNm0EKveH3MFtFoKgv/kUSkCXd/IJm1vx?= =?utf-8?q?PD7VfE3EDhNWf1irZMXQ51gtJjVd48e39Y7nz0g46stXfS/SEQ0Xwxp9WCujRNk/U?= =?utf-8?q?OdYVo56n+ajr1IsJKqU2HlBy7nCn0Yh5CMcY8xKz82PES5MZXVGsy08ibOeG8sCjy?= =?utf-8?q?ZEeWfqb9coAj7OpefRO1uFR193VyeXpigAuMt3+obV0wbhYy8Da+FWvafCJ9rP3XW?= =?utf-8?q?1H/n3hQUJdgoQPWLw/5sBBpFp4f+XT+Nhewp3MqmGqNbVfxBrEoEkfxfBwk4v0rB7?= =?utf-8?q?ryCnh2uBscQHL+DGwhUVdiSJLUVFygF+9XMGqON2PSPLsZI+gxa+K4GVmW0Ai+cTB?= =?utf-8?q?hA475hDzfUOCvBzvPgn0GZyBOztJy1Knragukfkb6IBqvd9eFqhLGAWsdlf26/mVt?= =?utf-8?q?iepd62ylv1h3YRL73nUDWztXnySY33IhquiwZEyuvXiRcD96KfmzElTnqXYIpH0KD?= =?utf-8?q?ow5/hiOXULLxuH2e8l/+L8eo2AhWpPvVSe1IVtzsMQwaKKzEo4tumyERsV2UVurGb?= =?utf-8?q?3PUTChDu4QXHKS4jzunsrLlFAd72LY1HW8M6JVkhjiwrnuHkDdAlktAyBfnYh1zAd?= =?utf-8?q?SW7gvoHS7Jr5LR13elefpcTuydtS48RgQGwA/2m6PwkHLZQD//c0soOzcYTYV5rNg?= =?utf-8?q?5jQLfT7RZdQMAeMQUlEY1VLPc9FxyNOTw8farH//FTof/o6fH1iaiIahOvhhHwERy?= =?utf-8?q?jGLfgA+cc4C?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR04MB9626.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(52116014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?CbEo/TIdjM/Jo9+P/m03jOIn2vjt?= =?utf-8?q?ZtC+PxcjZHKGQ8ctCuDsKHXKiMxFbzg8WzMn8A51lnEc9IgER98tzTIhIwy9ThbuE?= =?utf-8?q?NwxIp5GxR3I2r77mAxGfM0inhKABd45pSiTuwfHKAfxOv7x//C4fZ0Gv0SrrnfPvc?= =?utf-8?q?8/HlDSbdSyjXB346FTrJaQXe9soQarwLFzVWDiOFFLGZecPku1GD1QFKjA7c+3JIh?= =?utf-8?q?mSQN1TM1hXxq+umBjdbyD2vdVm+AaVgQFZoOlDpbEHMOPAXYVf/BL5FXjv9/fgwmw?= =?utf-8?q?CN9v39mPDSAhsflVDpLBFElii+r5himsaP+SufqZ8SRoHbEvIZDnah2JjDGJNVdsS?= =?utf-8?q?Ckiy5DJRXD+Ixnn36oTbnoaPg21dFPCC4i/tajJd41t9Nvx+4ob4T+fIlbTUbtpj/?= =?utf-8?q?bcdPoxaJin0D8xbUgTSVRvVeShi69dNAza3JjZMAMcFhzEllI5LuMjnpkWGJO0FCE?= =?utf-8?q?CpZaj4GzURdvtED23bUu0vKcoRnPdqniU5/o7QiIByeisL1UNK4iq5q8z0KSynPFl?= =?utf-8?q?tcuJhO7Db9Ei1z9Ai8A+VdXMF2GTIlGAwX1QYCgOpbUgMSI1pg5twVdSgqUGKhzfe?= =?utf-8?q?HUEknpp7y1C727zST4L3EfZONqgg/3nTlMiensj+3YBiOMX7+3iLNZwMU6ST4xVfu?= =?utf-8?q?6Q73tf1/Hle9Zg4BRsOHQds+pOFZMY9t/Dk0fuAoM0dXyHYxrsGPbb2I1q5NXeb1w?= =?utf-8?q?Hep90GGgYTPW1OxaoQDPWeQBRdcpVez/jOnLqD3Y3sFEH987TiYFnEq9MqQfQ6PIS?= =?utf-8?q?75dnULmEcFSCAb8vojC6O1d1Hi1BQ1pjK2nHdK5c+7P3vTrupdDf27gD36wS4hMOS?= =?utf-8?q?FnbxbhpLDT6BOAFhAV/ygkfaZ88W3fAHBzHd+6m1TAsNxnBO+yaiWedBORxjhpgdO?= =?utf-8?q?hW2N8rW9QKpFhRRm4svxk9O9E0FKzlsXauytfdKYKpdsh9m6MykOjhCIP8ulyKfne?= =?utf-8?q?D1ri+X/V/AdcWdrWFKRLt7Mzua+xLUTK2/1KigUbywIAjoxAEvnWuovRjxIgbxNO5?= =?utf-8?q?VtcOWkTdbEOVPIGCi2rtg9DmTbFRLRiofNI0AGFP/lb+Yoal9qoM9GzzuqHIxZlUA?= =?utf-8?q?zGwRRrzDTxKeqdWA2wCO917r9emHNnkT6VPZUVPpinfUPpJOyT1EvaYJj+QlJVaYQ?= =?utf-8?q?rmPe+sq3gnWebILGnRNN3aAIdM2KvrXF9FwPqg4/Z61Bip4/UvhsoFKUUp6ah/pjO?= =?utf-8?q?j6g3746FtcdY3s3TguIsKzppCTnS/0naY0E3Pz1uSWAAjZcLOzKlq6ZS/lK3eyVjB?= =?utf-8?q?y/ER7yZcNpGvdAaqUmNfvwjJh0vnpaXFPs0ZDzKh+JuRM7Sn1sQD3qX+pRqhtkTox?= =?utf-8?q?+aqfHFRc9/GE1JDDEfZz95OsWeJ56pexFC7amLwfLXUmw8KRiiIcHbQ9LkOhVq1i4?= =?utf-8?q?jXx3F0PgXzBVJwn562gO6xzKDpCAhh1D2wAZhFZoluExPtq7JNoEyhetcldoSrUj1?= =?utf-8?q?alVGPN4OsJns+dFpibJ25U4cOGJJd4lgLGEkzW3Ea1HrYU0Hdz+vzgi0UYPAO8CSv?= =?utf-8?q?dBlK2y+RPDVQ?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07a28259-9b17-401a-30a5-08dd5b44fbb1 X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9626.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 17:49:59.6380 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gQRO1LlNYBOVpNu38pTCXFqhc6FIk/j25kOVL/COH/FCS572es6kCm1rDWlbX/w3k7rScvhYa6yMqtsuKkYNqA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA1PR04MB10504 Move PCIe nodes under bus@c0000000 to correctly reflect hardware behavior. Use ranges in bus@c0000000 to indicate address translation, as the bus fabric trims CPU address 0xc000_0000..0xdfff_ffff to 0x0000_0000..0x1fff_ffff. Set 'config' and 'addr_space' reg values to 0. Change parent bus address of downstream I/O and non-prefetchable memory to 0. Ensure no functional impact on the final address translation result. Prepare for the removal of the driver’s cpu_addr_fixup(). Signed-off-by: Frank Li --- arch/arm/boot/dts/axis/artpec6.dtsi | 92 ++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 42 deletions(-) diff --git a/arch/arm/boot/dts/axis/artpec6.dtsi b/arch/arm/boot/dts/axis/artpec6.dtsi index 037157e6c5ee3..399e87f72865f 100644 --- a/arch/arm/boot/dts/axis/artpec6.dtsi +++ b/arch/arm/boot/dts/axis/artpec6.dtsi @@ -155,49 +155,57 @@ pmu { interrupt-affinity = <&cpu0>, <&cpu1>; }; - /* - * Both pci nodes cannot be enabled at the same time, - * leave the unwanted node as disabled. - */ - pcie: pcie@f8050000 { - compatible = "axis,artpec6-pcie", "snps,dw-pcie"; - reg = <0xf8050000 0x2000 - 0xf8040000 0x1000 - 0xc0000000 0x2000>; - reg-names = "dbi", "phy", "config"; - #address-cells = <3>; - #size-cells = <2>; - device_type = "pci"; - /* downstream I/O */ - ranges = <0x81000000 0 0 0xc0002000 0 0x00010000 - /* non-prefetchable memory */ - 0x82000000 0 0xc0012000 0xc0012000 0 0x1ffee000>; - num-lanes = <2>; - bus-range = <0x00 0xff>; - interrupts = ; - interrupt-names = "msi"; - #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &intc GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &intc GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &intc GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; - axis,syscon-pcie = <&syscon>; - status = "disabled"; - }; + bus@c0000000 { + compatible = "simple-bus"; + ranges = <0x0 0xc0000000 0x20000000>, + <0xf8000000 0xf8000000 0x80000>; + #address-cells = <1>; + #size-cells = <1>; - pcie_ep: pcie_ep@f8050000 { - compatible = "axis,artpec6-pcie-ep", "snps,dw-pcie"; - reg = <0xf8050000 0x2000 - 0xf8051000 0x2000 - 0xf8040000 0x1000 - 0xc0000000 0x20000000>; - reg-names = "dbi", "dbi2", "phy", "addr_space"; - num-ib-windows = <6>; - num-ob-windows = <2>; - num-lanes = <2>; - axis,syscon-pcie = <&syscon>; - status = "disabled"; + /* + * Both pci nodes cannot be enabled at the same time, + * leave the unwanted node as disabled. + */ + pcie: pcie@f8050000 { + compatible = "axis,artpec6-pcie", "snps,dw-pcie"; + reg = <0xf8050000 0x2000 + 0xf8040000 0x1000 + 0x00000000 0x2000>; + reg-names = "dbi", "phy", "config"; + #address-cells = <3>; + #size-cells = <2>; + device_type = "pci"; + /* downstream I/O */ + ranges = <0x81000000 0 0 0x00002000 0 0x00010000 + /* non-prefetchable memory */ + 0x82000000 0 0xc0012000 0x00012000 0 0x1ffee000>; + num-lanes = <2>; + bus-range = <0x00 0xff>; + interrupts = ; + interrupt-names = "msi"; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 0x7>; + interrupt-map = <0 0 0 1 &intc GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 2 &intc GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 3 &intc GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 4 &intc GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; + axis,syscon-pcie = <&syscon>; + status = "disabled"; + }; + + pcie_ep: pcie_ep@f8050000 { + compatible = "axis,artpec6-pcie-ep", "snps,dw-pcie"; + reg = <0xf8050000 0x2000 + 0xf8051000 0x2000 + 0xf8040000 0x1000 + 0x00000000 0x20000000>; + reg-names = "dbi", "dbi2", "phy", "addr_space"; + num-ib-windows = <6>; + num-ob-windows = <2>; + num-lanes = <2>; + axis,syscon-pcie = <&syscon>; + status = "disabled"; + }; }; pinctrl: pinctrl@f801d000 { From patchwork Tue Mar 4 17:49:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 14001216 X-Patchwork-Delegate: kw@linux.com Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2050.outbound.protection.outlook.com [40.107.22.50]) (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 93696203718; Tue, 4 Mar 2025 17:50:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741110607; cv=fail; b=uelYhW7/Z3JXA4+Ge0LzazAufW915u1L1cCgW7WphH9byRizFDBQld9lfIaQfI7ZNh2Pi0TiBZhz7+F8HcBExpOVJdyWt/tjWAH1qIhx5tj3ygTSCEF+ba+nWvxpMuGi6pJ7ePEexbpCPLjXAyp+tVW1mjrC/rDXFEzT34d8FCg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741110607; c=relaxed/simple; bh=Q0PA7KpngVz9cQ4OYEw0jqkYg6BS9VumbAyz300JzVE=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=RNKUuBkq4c0U5g5/vXQzY9Ef2r3wBNorAu5OitR1f/mst/IgwNz12LjjpuktNcxGyu+lC0SY5TY1kezbPoqXJ7pEk0PdmJHeu95iCHfLdGEd5ctatbJz+sGJ1n+alkpV3tsP3scFqXVQKDAxfzASk2hn/bLokgrVJ7C4NTO2eoc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=bFjeXcHO; arc=fail smtp.client-ip=40.107.22.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="bFjeXcHO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yaXf2wzv1KJNMTgqH+Iy+qy/Us9JT3TsZN6t8ksLfJcJpiNtNKXDKr9phAqNg6yIfnj/M3iIMpSXVcaMiukYMmoVbWTgf4jqgb4WAe9YDDxEvdasocDPJi7704VAUVrPPqL0uTb7xI85GdSDduWgnb6Z3F/QyAD96Ci6djO5GlLGwpz5ps+qL20/TCs8q+136UmiihOgd/Ze4nCH4R+qUri21GXzi5ESavEwqC5cwc6E4GZ1bfHgAMv4K/KKOs4ofUw7TPsSPzlWuk+Tsls9tbvn7Z4QIdiDZwuMHSNRnJxtPd1+fQaaSeVT9ryhUoy+fk5/PTqoj++wnIDbcpODqg== 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=KsK+v1j5WElGMphUwWPmhuQLs7ahqe2Pd3S5t3E3am0=; b=nI4SywNmGvctn3M1jYfhR2W3gQ2QqNsIjsAlSncr2NDOZvn6GmlP6i2LKIFgRIBFVT1SQDUKBa9zuiePSHceZ84KHrSx1Jw0Oj22LqVn4thpLhjcb1VYFcvK8W9szHoEucC5CX9yG7FbHRqK8WaD35MTAGHEqoQE7ml5lKPbwEEe3N609z13bc4xMhjRcPTpCoYiMmCe9BKNyZk+3SGKBedJE6M3Lda7pz0I4DqL5mZ+EjTvr8fhu02APvFzH0GEPrwb17ijdRKjRj3TMWgEu1u1ftRL1RIjQNpkBrdUwgubX5fSzHRFGpqC60ZJkq+g1xDWMeOEVbYYk9gAnrgOxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KsK+v1j5WElGMphUwWPmhuQLs7ahqe2Pd3S5t3E3am0=; b=bFjeXcHOWB24N8nLdRZ1ZDS5O39zsIxdG3wJi8FqjNdzpHonOb0/ijO2NeAvz4fmTKiBEovWblTbFOul4xxymLv1sj2Qke7+qZuY/w8kepfg2b0XoQrYFlMPJ7aTP8i0D7FaLdO1MB/R9Q5E3cgz1d+1zCWdPKYXFVhLNmc4vzAdlFpH1BWVEj7ovMJpG8wxNWo04aaGGbS7I0GckjYF2jCzEV5sGHnQDMEVDgyZGhvwWz2+RxJZ99AglPnLM2NE1SWDsE6n0+L/ZwMV5q+bQqXLkjlGKEuGCZPB8Jp7+UQpzfCK+JUUhFyFJWfiVdUuqk1RjY5LekwFiAJ8vKI6oQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) by PA1PR04MB10504.eurprd04.prod.outlook.com (2603:10a6:102:444::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.28; Tue, 4 Mar 2025 17:50:03 +0000 Received: from DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::e81:b393:ebc5:bc3d]) by DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::e81:b393:ebc5:bc3d%4]) with mapi id 15.20.8489.025; Tue, 4 Mar 2025 17:50:03 +0000 From: Frank Li Date: Tue, 04 Mar 2025 12:49:36 -0500 Subject: [PATCH RFC NOT TESTED 2/2] PCI: artpec6: Use use_parent_dt_ranges and clean up artpec6_pcie_cpu_addr_fixup() Message-Id: <20250304-axis-v1-2-ed475ab3a3ed@nxp.com> References: <20250304-axis-v1-0-ed475ab3a3ed@nxp.com> In-Reply-To: <20250304-axis-v1-0-ed475ab3a3ed@nxp.com> To: Jesper Nilsson , Lars Persson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy?= =?utf-8?q?=C5=84ski?= , Manivannan Sadhasivam , Bjorn Helgaas Cc: linux-arm-kernel@axis.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Frank Li X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1741110592; l=1946; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=Q0PA7KpngVz9cQ4OYEw0jqkYg6BS9VumbAyz300JzVE=; b=9IKSF9jEzuU1pUNsGv1UZAUXg0YzlMGsUsHlFi5QQC44H1VIRicda4Ty/Xol+Jw///0utFVag feKJ3jaI9FkDIx9v6WFUvU82zkkeEovBFSI22rSznkiowZqmLpA+1dl X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BYAPR08CA0007.namprd08.prod.outlook.com (2603:10b6:a03:100::20) To DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR04MB9626:EE_|PA1PR04MB10504:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d600c8a-7766-4215-09c3-08dd5b44fdc2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?LSoQ3i55p8BJnJuM9krl3x1yVmJ3LWB?= =?utf-8?q?Idjk2z0VR/A+AiI3Ggaav5p4wI1eiunn2JG9X6ks4Jmdx5b3KlZMZ9Q6Cuym+mJCI?= =?utf-8?q?Gs2BQuPkO4sUVSI2D958kHl0+xa8n6GvzefJ+ToRMrrViIYyXrhPSgSu6nOHgsJAj?= =?utf-8?q?zXhBBbpZ3eE/wysLutVa+c6LDzaHju/7eNDjIucJe0Z8NrxHqNSEkUpD4TTEt9CgY?= =?utf-8?q?drPkBgADno+dQ6J3np1Ce1j0fHkrP56m3iGxIXbRrMHpl+DoCaXK8BPBlKdgUY7Ji?= =?utf-8?q?X6gji/FWcGg2zaYqALCuwDCIDj5IXiAn56jK/HRS4mrlnxqY4B9l+EbLY3BANh7Df?= =?utf-8?q?57IVSql+y4Ny38WBANZ9bdkcHC1dcRGZAWODjcrDisDZbHKomu042KFd4KPsPp+Ag?= =?utf-8?q?l6P/OLp5L/YZMgGimhe42ZC7dHbo1IpJX4KID/synYtFgBuAxnWAmy6Op4kNtIDtm?= =?utf-8?q?fujO7ILS/qD5y2w40heHKD0RHporqaAEybUO2Sv8F/y+NJowgOsE5p4O8slEXGA+S?= =?utf-8?q?9Cz7BM/1cXqWlrwB+lVBcBZpWMfOA+O6GWWhq8qk7jIxSGbAH2orHP8XgM0A8MOFC?= =?utf-8?q?zrVT18v5MAbcRM+gkj4fgM1wNpNmWGUhRiJptsyTvNVW+Pd0MOI57vXaaB+rbvz9f?= =?utf-8?q?tWBCtquKwGw8lxyIjDg377pIiRFj1SiTUYLkumrO2TuqTVI1gD/x8CkePJBHUYR0Z?= =?utf-8?q?kLGByYCNkbv3Xn1aGYtCrVGwGvtnUFKROEYJCcpDNWSEYWYf4FWvVUTXalctxRzOh?= =?utf-8?q?0+fBkuJdsrmIad92mka7CO4JHqx2cFN2uUEQEOtCvt6bDuKtB3zBLdmnS39d8WgCQ?= =?utf-8?q?opiRz6fLdXTuJ68TvldehsS1noC7BPinJBUt2UpPry7Pk2lvwdDa+VSJeykmyeEfz?= =?utf-8?q?eblu0c+G7AdXUeQo+1WmpXG55QCPhYW+ovQ9VpX21VnXTaWCfJc7lUsbp6JXcNZb1?= =?utf-8?q?1F4KlN0LezfH2KnJVLxWLMxRtHK9O4kJBwZIoNKVqjOwR7OfmGO7DdhxqknZFx0AI?= =?utf-8?q?nncyqDqFGW3VYcc8RDbTFBphMK5SY8ys6lcI3Q63J1i44kS67woJHOIWfJhxo2Sqw?= =?utf-8?q?0+WU6POYsSTWiZNnOYICvBuyREuZYgW8VHgf4qLK3ckEsKzZK4Kt/+vzQnlfbFD6l?= =?utf-8?q?f1KJhiQjbvGKEVaRg82dPaihLLN2g0ELcY33z2T9KiOodHcBrMg/SkX43R34BPfR4?= =?utf-8?q?LVkeTdKcF16rNLsHdqC3/9AHiIt6poweCoOcpG4moKUCbZiuQpJGwBDzq+CgFrPWZ?= =?utf-8?q?VxSBgMcR9PdIx27yPnIJHU0LWPMX80isWhXwX7Pndda9OXcMrzIyi1rVwlesVPrlP?= =?utf-8?q?yk9QrGd/7SDuyrAizoUv2VNENW8NJtSQLnr3tS4yVc1mlblPRaBk4+fmxzoT5Nw2V?= =?utf-8?q?gsAI0MBrmBS?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR04MB9626.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(52116014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?4UdfNBsKfpbVCIyOoomJoLd2eWT0?= =?utf-8?q?rHbvp6AUbFJsdO8yljGUvfsJ2MXQSYV8uKQ+0DyQDQgA1cZHNQ3XkPsHM7P3Q97uW?= =?utf-8?q?x/Cz9r1cy6Nt8A5tvo7cnB77mrKc5WUYF8ZrnTNyssqi9dzN9MSiYAD2voEoIlDkm?= =?utf-8?q?M6u0R4hg2o1UntPiW2J9LTR9vloLVgI0lzCeW4YOXwE83WvrpqeV7EuXkID4jDPy4?= =?utf-8?q?ws7kWtWJlrELn5o56ipr0UpTsTDNeE/dhZ0O29tWJZybb343qVZbf0ZB34FMsVDVC?= =?utf-8?q?H4iNoynLXN0m/TZRFFo9XZU2wGDaQr8S0v/6lUJYXJwa6xxWVn/hg94aoL2vzbDTc?= =?utf-8?q?IemKqo5jmMLfi/2mWfgGuzsH231TTxi9vWZPaSNuMp5uTIf8chFNLY2kAC7CAvaQi?= =?utf-8?q?MI7lqrPrifYxtOKVuUouJv0nvygzxagbOz/3lGjbcMk6ifUoQvGVtIdiJeQJUfBLK?= =?utf-8?q?8LDQTj35tN7TQPT2ge7AsoIBymUCuuNGIVa11t27ibnuZasUzPPe1Ufl5h/Lf25vc?= =?utf-8?q?tabLCUQmqwZJq9j1HyJM/i/SSMFdn49u5Mm38MC8dH85lmjkWojBeB2inACtPcPBJ?= =?utf-8?q?Xv+DUdVLnTCIyQNfLQRTEQUoAO9ExdpHKBa/1RyKI+VZc7cKkDsACW9PXJo+/Ux7m?= =?utf-8?q?owphF1yuOwCgkRyxrBKyPhT8QOmwok42V4ieZd/Yor7oBsmAdyBhborD4z2jLShqs?= =?utf-8?q?i2r5vG/Vu2rRjFsKsmeY481G7qdZNuZTgls4K2eUyqQngPMFalt1KeZmCch485BAd?= =?utf-8?q?EPPoIswGXqiK1PWN7LkkU8BMVE6qOnp3wU90PZQplcpebAtd0cEcMYvOt5HcywEVb?= =?utf-8?q?afwANW8QSvzWyZhVwt6ApfQ0KTANzQ7FCvZIZNhc7ELebcAGrdY4oBgHoZni+yox7?= =?utf-8?q?Rgmwd0lC088skGV1mJTJAQdW5h2gnLJJG0lPWZWconUXU1zpoahEQrEbckDBYfgO6?= =?utf-8?q?P1ml827t3jpFCXdUCh1aS/sf556DGwpqwURf5kp5OeldHm0sXqk+jkyEVPwxX9Hbz?= =?utf-8?q?kaosdcvxywxSejvsbsjZuP0yYZaaWZXy24wK5j50djnO+lG7Ieo8mRZ0mSJ8gv+fJ?= =?utf-8?q?NAYD5SM4znEx3no1qTFmdeTU2DRS1slkS9ggJE23I35DeckeORi+gSYt2WNGM2JkU?= =?utf-8?q?VjLLjjYK5LCZErYItSmrb37NRfiS6QN3KsbfaKavFxkWy+/8hiqcbRU11XYO+/N+h?= =?utf-8?q?yACsQRd1Ii1BrM+1ynD5c2f9MctPyTmvJGY/Ym1mBnPXim2KN9Dd795bLwnDBfG03?= =?utf-8?q?N15K1YfoWeF9Xq2D+w4sxrbWf7nh2AasJzOBIpB+jrN9CGd7N9wyUj9z3azE5vpQl?= =?utf-8?q?cUolASTCZo+0CzjxLibYDhClc8znFTYe2ymSzN60712YUQ8t67dbXIGPnkGvyIaMt?= =?utf-8?q?inVOmVFgmQT+YJo33KrfW/xRF6J+V82hKbPN1j4zuAMTRW/pnn9SRjhNcPUDf3/pn?= =?utf-8?q?Gul1KpeIRN1G+wRWQizOyLselMkdhpYQjk8m3gEXT4DHBzXX6M23QiTiveBDE7T2V?= =?utf-8?q?CeP8P5yPGzT3?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d600c8a-7766-4215-09c3-08dd5b44fdc2 X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9626.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 17:50:03.0715 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: H67ALbhKBfZ7rUOr9rDreW6Ucl7nSWpFyW/iRQ59EuKNO2BsKAga7oc8SEYAi7eljSVZqXGeJ90FkFRPOpCCEw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA1PR04MB10504 Remove artpec6_pcie_cpu_addr_fixup() as the DT bus fabric should provide correct address translation. Set use_parent_dt_ranges to allow the DWC core driver to fetch address translation from the device tree. Signed-off-by: Frank Li --- drivers/pci/controller/dwc/pcie-artpec6.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-artpec6.c b/drivers/pci/controller/dwc/pcie-artpec6.c index 234c8cbcae3af..d2a628a0fdc17 100644 --- a/drivers/pci/controller/dwc/pcie-artpec6.c +++ b/drivers/pci/controller/dwc/pcie-artpec6.c @@ -94,23 +94,6 @@ static void artpec6_pcie_writel(struct artpec6_pcie *artpec6_pcie, u32 offset, u regmap_write(artpec6_pcie->regmap, offset, val); } -static u64 artpec6_pcie_cpu_addr_fixup(struct dw_pcie *pci, u64 cpu_addr) -{ - struct artpec6_pcie *artpec6_pcie = to_artpec6_pcie(pci); - struct dw_pcie_rp *pp = &pci->pp; - struct dw_pcie_ep *ep = &pci->ep; - - switch (artpec6_pcie->mode) { - case DW_PCIE_RC_TYPE: - return cpu_addr - pp->cfg0_base; - case DW_PCIE_EP_TYPE: - return cpu_addr - ep->phys_base; - default: - dev_err(pci->dev, "UNKNOWN device type\n"); - } - return cpu_addr; -} - static int artpec6_pcie_establish_link(struct dw_pcie *pci) { struct artpec6_pcie *artpec6_pcie = to_artpec6_pcie(pci); @@ -134,7 +117,6 @@ static void artpec6_pcie_stop_link(struct dw_pcie *pci) } static const struct dw_pcie_ops dw_pcie_ops = { - .cpu_addr_fixup = artpec6_pcie_cpu_addr_fixup, .start_link = artpec6_pcie_establish_link, .stop_link = artpec6_pcie_stop_link, }; @@ -433,6 +415,8 @@ static int artpec6_pcie_probe(struct platform_device *pdev) platform_set_drvdata(pdev, artpec6_pcie); + pci->use_parent_dt_ranges = true; + switch (artpec6_pcie->mode) { case DW_PCIE_RC_TYPE: if (!IS_ENABLED(CONFIG_PCIE_ARTPEC6_HOST))