From patchwork Mon Mar 10 20:16:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 14010643 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CBB6EC282DE for ; Mon, 10 Mar 2025 20:26:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To: In-Reply-To:References:Message-Id:Content-Transfer-Encoding:Content-Type: Subject:Date:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=9b00wJ8U6+8e+wjMwEgaC2piKfj4aomHf12Y98O3/aY=; b=l7HC8ggykdRGSlwLJPgeJsQI0f AnZ3b30zTYbuFi0IWOBNk3PSIiL/RqN+y8Zim95MBVxXvf1w9y5a5kgQ0cKE1V0MuPEw+oQJifah4 Hxd+SYGVPvmHflsQNWdSYYRcTxEqfD3jqjlxPRbI9FuootU/iHdAWneUllM/aR+1BPDD9xUd4Otgk MQqJQtPTbma5wTBZK5NzWHPlLsVq6DW2MnGnGJxzmb8Sw2EnpVJtPqnPrhoiQTo+ErTbhubim7gf8 6s14lSkaYvU3GvLw9F4s7K+qsLqJ3x7pcHuK2lMpG+HP7ojtlRiMTK3gIXFPamvQizn8x+z4jD0gJ UCgthpUA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1trji1-00000003sFV-2Jak; Mon, 10 Mar 2025 20:26:45 +0000 Received: from mail-vi1eur05on20609.outbound.protection.outlook.com ([2a01:111:f403:2613::609] helo=EUR05-VI1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1trjZ8-00000003qUW-0KkU for linux-arm-kernel@lists.infradead.org; Mon, 10 Mar 2025 20:17:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TBkcj/1v0P4PLi1fLVbQNHakQy6EPb2y9dzrfwVLo4TORQZZVrmWoZepzDXT5eXKHjcOFhWp5jz5RMos4lwVCP6xwKqTBMdnQQGgq1KBqY3OV4svfQkVOpCjurK/9QUtcpzRgMMitaUCfKEAXr7ZLEEJtT//+0j+26c8b0vJoF1tdilsr5+CympNYQqH8yrW91M/04knUMsjg1O12H5a69KQJX6s7/4psPk7PzaWGBly710Bj8SwplZjnydi3Pqyn01CIWbL9kl6Sw/ERCQckZgdvJXl6nU2hl+59fz1j5fFA8muf75VZRqVm1/QJag8jYaaS45jw5xCZqhfJRC9uQ== 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=9b00wJ8U6+8e+wjMwEgaC2piKfj4aomHf12Y98O3/aY=; b=hsFIWGOk5nS2PoiVN608x+Czy5lVldG1TctVzbLJm4aNmFUx6wgbRFVEcYe6FdGohhswwfvAY482e3IhVDXM8KZH79mwdGJC5LaGP4ETvWkdZlwvg43hkfv071RT052CJJGJ9RH1rOIrQDtt4xW1O2OySLZ9BWx71PKz6hfbW4EJ5Y0y1/V/TTgjYhsVb8vdk1C4hKfEB6xyI23Ke2U3pDgFyV09a4LDoJd8oETtJMLXOpcJaCvPjCV8QmFhC7gtYnL0cdkaQFZ+SJuiXFSnF2ZkuryOinYsIe000QgrOS73BOpawPkQIzmtEAjC0cAOQuHMR4FUdQHJZB9HUr6+rw== 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=9b00wJ8U6+8e+wjMwEgaC2piKfj4aomHf12Y98O3/aY=; b=f+AYrJld7Oq4vvgguWG4Bd7GphHHe/MjdFiiQgvZzZ5zGRSFyK23XcO8te+MgMm7zxK1TBXLh91XUTBBdCrTpN1PKf6SiztAPo2vOWQdYJRzOVPZE7BgT8QP83NgcaDnaIlQQAwnRFmgSu6XaK4Xfn9UUg1qSxnLqdKfz4Swd97YCaigajcX0tnTpVlk1eZWGkkG3NV8jlYNTudRrWalGUSvyOIJikDnXnLIIDAold2bplsgPl13OzlvvszABUFp6Lalk11cwfSz5QWT2COtL82FfTZCkjG7EBxMKEVYae/eFkJTkxPqY0FfD/CKogCHztYMpyU3OkD7tVB2aDZdxA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by GVXPR04MB10682.eurprd04.prod.outlook.com (2603:10a6:150:214::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.26; Mon, 10 Mar 2025 20:17:29 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%3]) with mapi id 15.20.8511.025; Mon, 10 Mar 2025 20:17:29 +0000 From: Frank Li Date: Mon, 10 Mar 2025 16:16:40 -0400 Subject: [PATCH v10 02/10] PCI: dwc: Rename cpu_addr to parent_bus_addr for ATU configuration Message-Id: <20250310-pci_fixup_addr-v10-2-409dafc950d1@nxp.com> References: <20250310-pci_fixup_addr-v10-0-409dafc950d1@nxp.com> In-Reply-To: <20250310-pci_fixup_addr-v10-0-409dafc950d1@nxp.com> To: Rob Herring , Saravana Kannan , Jingoo Han , Manivannan Sadhasivam , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy?= =?utf-8?q?=C5=84ski?= , Bjorn Helgaas , Richard Zhu , Lucas Stach , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, imx@lists.linux.dev, Niklas Cassel , Frank Li X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1741637834; l=9694; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=0KsQBqHbfFNCq9QD/+whO422n6pj/IJVLtfGCE2rv7c=; b=ql1vAlbXaA+SsVxAkTqL9u5LO9TPROTP64+cuOWA/uORXxTAbyJmeHGR4jQFAo08mAItPb3oU R5K0ysp94noDNFmPVo2aTjM+uhyVJ8FYH5gkVjI1hyoIOLG6uTnmrA0 X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BYAPR08CA0058.namprd08.prod.outlook.com (2603:10b6:a03:117::35) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|GVXPR04MB10682:EE_ X-MS-Office365-Filtering-Correlation-Id: 1eff8700-1c8f-48f5-e456-08dd601094e6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|52116014|366016|1800799024|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?G8ltNYCBxw0NItAjoHpRznd7ArChQK0?= =?utf-8?q?LgNBoiU5In8bezjbsQiwJod97FMgp9FqEX4cGD1XvEOE5+amc70fYZtMg/tgTiVuG?= =?utf-8?q?Q+sSQh5RHIqnw2spsWyom8TfoudtXvsaPldkDKfhHEDDJguxc/npIfdJlDxZ3jRpZ?= =?utf-8?q?Irc+CTRkvpff14M1dJLyyf5hlXH+EA5kzcHjTPfFxp/a9yRWjoeVrCooG/7/zx5On?= =?utf-8?q?DstrT3BY5oGJsZN9clY9h6yc/6xb30JSWv/Zz5zps1KDaQLVhx4me3XRD39p/uukm?= =?utf-8?q?SmQgy9iwGDg5c8RPRgq/tJwlz7yaRGy+++0wd063EuazDqxqyL4CqHNVxQA341Lbn?= =?utf-8?q?BTH+d6/oJiu2m+sQij6CaPqOhD0EolbiAg0Wcb/LcHLoJtl6tbCsJnKCNIOaFffz+?= =?utf-8?q?T5JTp8csK+aBkULs+lUSYZTAXFNRwOqCTcqupaafpUtGroB0YM6/R/3m6OEKAAur/?= =?utf-8?q?CXhpCEoIIiBn624E5x4bVg5oAf9ulo1toDmpcwvPFkuDIAiHEOGV1lXv+mll+zhEb?= =?utf-8?q?iovA0mtXE3dKWJCZ7v6BFfkY+sVPN3zZztDXWBoQEHD07zacyKZi3QVnW7QloWRlw?= =?utf-8?q?SeV3Uk1G/tp2JbAYZu78QNvHRsbf/XBiXa9/DnNFeDfenvCcrQofKLD/DaJrYoVSI?= =?utf-8?q?KkP4Z6FkihRzBlSxBS2i2B3K3XMEI0zvQT+8d1Tqf/JHATy/sMnBigOJHHyrzmcfD?= =?utf-8?q?P888dEVSjRhZYN+H9OxoVnaIm4YpL9KsOX+GH6niztxXivaE3dCiz52KQ7NS5YL0+?= =?utf-8?q?qt2GDazrBURSCFFthx5bn/ZPmBo8Uc9HxlqO7N8UgQsJxSm4cPFq/RzddsVApDOpL?= =?utf-8?q?dmbQ8cUtF0WPAaOnEcPmFPGp+W+n9MjOLZDqkjURcWd7tjD6ee7yrgkHvzG8tYmrq?= =?utf-8?q?8et8+jFUAwvsS9Omd/6UPS1oLFzjbu0/FaJi8crIZh7QhgqRxj6KvuCT17YSMtH18?= =?utf-8?q?qRkDaa7e9cKAELo1s5D5pG5dcDrEvd4KY4rxYC1X13eIw/cgZKMXeXUJaHdVlFUq2?= =?utf-8?q?9ZGmF0mS4uH/WFE0sZhtU3C7sChJIRDtTeQ02oCnrMs2eM3vfU+gqfW9ht12kGNzR?= =?utf-8?q?o+PAuTktbiNNy7vjEr4HfR5uoj9Pxy2b/UOtQq8QtmsyLSb8DhI0PQsuP4bbwCrAb?= =?utf-8?q?qzp72m4K/LdUrf9kjgha5fMgLzzXSDbFxePXTdDxut8T9t+Y8dQEP3fQ5MYYVgA9T?= =?utf-8?q?nI+OY4mHcD7B1Ek4OhjBsg834QlLMNrfbV26CCFvP7nW2+3Be1eUFOXVtPFTn39kb?= =?utf-8?q?OzM4ipT8Z/k5B5fLWx7aMlAY6vL/nyUH/J4ulXu5/KtuLoZgXful125wqC9A7m1ds?= =?utf-8?q?8eDOBPmxehZjCw7IKKWCBRNKs9Pwp+kFC0pZMIQhk2TCzaPhrhHPiDXP+w35IeOb9?= =?utf-8?q?9tomPAIeskJipnYP31YWdoFbLmzRKx5jQ=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(52116014)(366016)(1800799024)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?dQlmoXrGgkWdV16eV4xuuYtyYx8G?= =?utf-8?q?awKYgY7hmf4XtmR7rV6ES1CdeetuPRjP1CX0NTg+TocNXtQt0XazpPLzV8PN1B6AN?= =?utf-8?q?X4JxdE/g57qktbnFfLuTGHqw5LHJFzudDfIMWN6gbql4PEeNA0LBi9MWvdq3n9fJK?= =?utf-8?q?X6PD70jMJ6A9dqrX4P4Qex9zUpolVRISe1w6ONMTV5PXp9T1JslyB7nS+h3hAKPF4?= =?utf-8?q?xBAJLmujEew9oFaQEDLgUhxMU3c+JiVnW+gyOR7LBFGp3DCpy4y9n8Okw1LgjeZBb?= =?utf-8?q?t8IY9BeAGOv704N+tHkyis3rL4078ZuzD/wlTIYWuDF28jJjNiA0I5RBE5rugBM87?= =?utf-8?q?K9foclOot3kKNCnHCinkg5nxvLP1g5nmFMoGFMFrQ3PhPXOaB+SSDsreBFj5BYWt7?= =?utf-8?q?rhTZR3UZWDZ2gwwuNfluGhYf0qRn6NNqahz46gb6y6mfsk/iqXv5KMX56UQQBBp4k?= =?utf-8?q?5vMNvf4gJa0mQ+OkdEIGmHXFVSZO5/jp+VE0F/aW7iwpOE2q9PimS5RPt3Z97UfSW?= =?utf-8?q?Nxy73S2G3OYFMkrJkW0v0F1ChX0RFVBL/Ru4T+aZWnmdB/FRYftuWASk/AplHbt1z?= =?utf-8?q?aODbm0z+zyWb/6Ji4aeNLk1JFoCfqnLrwf8g1GjUh+IsrQVXJ9Rhc6qEzynlTecHC?= =?utf-8?q?CsmmNy4XzOeflq43jvfKGMwNLTOMUPfhAYsa2ocuwzWiS5ryb05BLh3iiutiPoviB?= =?utf-8?q?a3oEV4gGUDN3sw9LQ7rKND3q6hiYE7sxyHvIJHAxqZZXVG0pdxlFO7br39cCf1+AW?= =?utf-8?q?UZEbmo35hRo3PlSA1cfqfurLZ12MnqPdOYiOQ6YelBEMR0vXNu/UIOURi0SV1rzQ8?= =?utf-8?q?18gVZVN6RQD2fOrWmqixD0+IKbniHCk+CRxWfX/0+iWa7ENEsDkxZTWv5EyCL1rvR?= =?utf-8?q?0Zm6jgeQSUFQuPosPpmVWyIwuMDLZc1n0yHgBRW4j4aw0qLVxxETjrySVV2lu5YeP?= =?utf-8?q?fhh83dSUpFzSfPjb/iuwzdeNW3LmWqZ82YdbNQ4/WTABfXle9EJLBDyx8N+oGGLOC?= =?utf-8?q?C9yUw3EFwTPjrwEQgX9l+1o43pCAgETDopPboIpUs+xxurBCOnNMZISRhZLhBEd2G?= =?utf-8?q?V+C9xT0a90J1ADs8yv90tbm35/5cIedTca/JhLyhNs5qAZUhTC2pbPmebWr26bfiI?= =?utf-8?q?GK4UxF9JXNXdpvnk7Wz1SSpGjkMDR4j1UwdePIWfUDlKgYIYpv5Aay7bfC5/R57QM?= =?utf-8?q?FSf+ies/Yc5bkrJ2JIHaRq2+PwTBpmzNWDByXh90ETIYff2/y+E5nFg58qsxdm4MF?= =?utf-8?q?/MU/5e2IckkY0yq/IUjZfkP5ar7h45GgLi+2kqjOwCOZoxIu9OUI8AV8rTy4MonEM?= =?utf-8?q?21vLIOTLWD2/TUZXc9SwjJ62V5SJZQ//eEuZd/OXSqO6Z18CrqfpbjuVk4HrG1rdJ?= =?utf-8?q?WOe3URGoGZlYjwIfpRDmNPVA+BiWXOjTQ+FGhOe3GE1rCm0W77aNdGduFkS0O40RP?= =?utf-8?q?wwu/uJJAs+byqsKazjZRL+/oGK4EMNEFcxQvimHDaPPNpGZQgnkaleQ4=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1eff8700-1c8f-48f5-e456-08dd601094e6 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2025 20:17:29.1720 (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: UZGNDRLNUSlAYRzkFiOzwE9ZFVh6nYguGoQuFWmJdCwX/gL1Ol32KQLKYnqyRLfi5Biqkhuy/elIGtyvJPSTIg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR04MB10682 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250310_131734_297281_A2659BBF X-CRM114-Status: GOOD ( 14.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Rename `cpu_addr` to `parent_bus_addr` in the DesignWare ATU configuration. The ATU translates parent bus addresses to PCI addresses, which are often the same as CPU addresses but can differ in systems where the bus fabric translates addresses before passing them to the PCIe controller. This renaming clarifies the purpose and avoids confusion. Signed-off-by: Frank Li --- change from v9 to v10 - rename header file's cpu_addr for dw_pcie_prog_inbound_atu() and dw_pcie_prog_ep_inbound_atu(); change from v8 to v9 - new patch --- drivers/pci/controller/dwc/pcie-designware-ep.c | 8 +++--- drivers/pci/controller/dwc/pcie-designware-host.c | 12 ++++---- drivers/pci/controller/dwc/pcie-designware.c | 34 +++++++++++------------ drivers/pci/controller/dwc/pcie-designware.h | 7 +++-- 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c index 8e07d432e74f2..80ac2f9e88eb5 100644 --- a/drivers/pci/controller/dwc/pcie-designware-ep.c +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c @@ -128,7 +128,7 @@ static int dw_pcie_ep_write_header(struct pci_epc *epc, u8 func_no, u8 vfunc_no, } static int dw_pcie_ep_inbound_atu(struct dw_pcie_ep *ep, u8 func_no, int type, - dma_addr_t cpu_addr, enum pci_barno bar, + dma_addr_t parent_bus_addr, enum pci_barno bar, size_t size) { int ret; @@ -146,7 +146,7 @@ static int dw_pcie_ep_inbound_atu(struct dw_pcie_ep *ep, u8 func_no, int type, } ret = dw_pcie_prog_ep_inbound_atu(pci, func_no, free_win, type, - cpu_addr, bar, size); + parent_bus_addr, bar, size); if (ret < 0) { dev_err(pci->dev, "Failed to program IB window\n"); return ret; @@ -181,7 +181,7 @@ static int dw_pcie_ep_outbound_atu(struct dw_pcie_ep *ep, return ret; set_bit(free_win, ep->ob_window_map); - ep->outbound_addr[free_win] = atu->cpu_addr; + ep->outbound_addr[free_win] = atu->parent_bus_addr; return 0; } @@ -333,7 +333,7 @@ static int dw_pcie_ep_map_addr(struct pci_epc *epc, u8 func_no, u8 vfunc_no, atu.func_no = func_no; atu.type = PCIE_ATU_TYPE_MEM; - atu.cpu_addr = addr; + atu.parent_bus_addr = addr; atu.pci_addr = pci_addr; atu.size = size; ret = dw_pcie_ep_outbound_atu(ep, &atu); diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index ae3fd2a5dbf85..1206b26bff3f2 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -616,7 +616,7 @@ static void __iomem *dw_pcie_other_conf_map_bus(struct pci_bus *bus, type = PCIE_ATU_TYPE_CFG1; atu.type = type; - atu.cpu_addr = pp->cfg0_base; + atu.parent_bus_addr = pp->cfg0_base; atu.pci_addr = busdev; atu.size = pp->cfg0_size; @@ -641,7 +641,7 @@ static int dw_pcie_rd_other_conf(struct pci_bus *bus, unsigned int devfn, if (pp->cfg0_io_shared) { atu.type = PCIE_ATU_TYPE_IO; - atu.cpu_addr = pp->io_base; + atu.parent_bus_addr = pp->io_base; atu.pci_addr = pp->io_bus_addr; atu.size = pp->io_size; @@ -667,7 +667,7 @@ static int dw_pcie_wr_other_conf(struct pci_bus *bus, unsigned int devfn, if (pp->cfg0_io_shared) { atu.type = PCIE_ATU_TYPE_IO; - atu.cpu_addr = pp->io_base; + atu.parent_bus_addr = pp->io_base; atu.pci_addr = pp->io_bus_addr; atu.size = pp->io_size; @@ -736,7 +736,7 @@ static int dw_pcie_iatu_setup(struct dw_pcie_rp *pp) atu.index = i; atu.type = PCIE_ATU_TYPE_MEM; - atu.cpu_addr = entry->res->start; + atu.parent_bus_addr = entry->res->start; atu.pci_addr = entry->res->start - entry->offset; /* Adjust iATU size if MSG TLP region was allocated before */ @@ -758,7 +758,7 @@ static int dw_pcie_iatu_setup(struct dw_pcie_rp *pp) if (pci->num_ob_windows > ++i) { atu.index = i; atu.type = PCIE_ATU_TYPE_IO; - atu.cpu_addr = pp->io_base; + atu.parent_bus_addr = pp->io_base; atu.pci_addr = pp->io_bus_addr; atu.size = pp->io_size; @@ -902,7 +902,7 @@ static int dw_pcie_pme_turn_off(struct dw_pcie *pci) atu.size = resource_size(pci->pp.msg_res); atu.index = pci->pp.msg_atu_index; - atu.cpu_addr = pci->pp.msg_res->start; + atu.parent_bus_addr = pci->pp.msg_res->start; ret = dw_pcie_prog_outbound_atu(pci, &atu); if (ret) diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c index 145e7f579072c..9d0a5f75effcc 100644 --- a/drivers/pci/controller/dwc/pcie-designware.c +++ b/drivers/pci/controller/dwc/pcie-designware.c @@ -470,25 +470,25 @@ static inline u32 dw_pcie_enable_ecrc(u32 val) int dw_pcie_prog_outbound_atu(struct dw_pcie *pci, const struct dw_pcie_ob_atu_cfg *atu) { - u64 cpu_addr = atu->cpu_addr; + u64 parent_bus_addr = atu->parent_bus_addr; u32 retries, val; u64 limit_addr; if (pci->ops && pci->ops->cpu_addr_fixup) - cpu_addr = pci->ops->cpu_addr_fixup(pci, cpu_addr); + parent_bus_addr = pci->ops->cpu_addr_fixup(pci, parent_bus_addr); - limit_addr = cpu_addr + atu->size - 1; + limit_addr = parent_bus_addr + atu->size - 1; - if ((limit_addr & ~pci->region_limit) != (cpu_addr & ~pci->region_limit) || - !IS_ALIGNED(cpu_addr, pci->region_align) || + if ((limit_addr & ~pci->region_limit) != (parent_bus_addr & ~pci->region_limit) || + !IS_ALIGNED(parent_bus_addr, pci->region_align) || !IS_ALIGNED(atu->pci_addr, pci->region_align) || !atu->size) { return -EINVAL; } dw_pcie_writel_atu_ob(pci, atu->index, PCIE_ATU_LOWER_BASE, - lower_32_bits(cpu_addr)); + lower_32_bits(parent_bus_addr)); dw_pcie_writel_atu_ob(pci, atu->index, PCIE_ATU_UPPER_BASE, - upper_32_bits(cpu_addr)); + upper_32_bits(parent_bus_addr)); dw_pcie_writel_atu_ob(pci, atu->index, PCIE_ATU_LIMIT, lower_32_bits(limit_addr)); @@ -502,7 +502,7 @@ int dw_pcie_prog_outbound_atu(struct dw_pcie *pci, upper_32_bits(atu->pci_addr)); val = atu->type | atu->routing | PCIE_ATU_FUNC_NUM(atu->func_no); - if (upper_32_bits(limit_addr) > upper_32_bits(cpu_addr) && + if (upper_32_bits(limit_addr) > upper_32_bits(parent_bus_addr) && dw_pcie_ver_is_ge(pci, 460A)) val |= PCIE_ATU_INCREASE_REGION_SIZE; if (dw_pcie_ver_is(pci, 490A)) @@ -545,13 +545,13 @@ static inline void dw_pcie_writel_atu_ib(struct dw_pcie *pci, u32 index, u32 reg } int dw_pcie_prog_inbound_atu(struct dw_pcie *pci, int index, int type, - u64 cpu_addr, u64 pci_addr, u64 size) + u64 parent_bus_addr, u64 pci_addr, u64 size) { u64 limit_addr = pci_addr + size - 1; u32 retries, val; if ((limit_addr & ~pci->region_limit) != (pci_addr & ~pci->region_limit) || - !IS_ALIGNED(cpu_addr, pci->region_align) || + !IS_ALIGNED(parent_bus_addr, pci->region_align) || !IS_ALIGNED(pci_addr, pci->region_align) || !size) { return -EINVAL; } @@ -568,9 +568,9 @@ int dw_pcie_prog_inbound_atu(struct dw_pcie *pci, int index, int type, upper_32_bits(limit_addr)); dw_pcie_writel_atu_ib(pci, index, PCIE_ATU_LOWER_TARGET, - lower_32_bits(cpu_addr)); + lower_32_bits(parent_bus_addr)); dw_pcie_writel_atu_ib(pci, index, PCIE_ATU_UPPER_TARGET, - upper_32_bits(cpu_addr)); + upper_32_bits(parent_bus_addr)); val = type; if (upper_32_bits(limit_addr) > upper_32_bits(pci_addr) && @@ -597,18 +597,18 @@ int dw_pcie_prog_inbound_atu(struct dw_pcie *pci, int index, int type, } int dw_pcie_prog_ep_inbound_atu(struct dw_pcie *pci, u8 func_no, int index, - int type, u64 cpu_addr, u8 bar, size_t size) + int type, u64 parent_bus_addr, u8 bar, size_t size) { u32 retries, val; - if (!IS_ALIGNED(cpu_addr, pci->region_align) || - !IS_ALIGNED(cpu_addr, size)) + if (!IS_ALIGNED(parent_bus_addr, pci->region_align) || + !IS_ALIGNED(parent_bus_addr, size)) return -EINVAL; dw_pcie_writel_atu_ib(pci, index, PCIE_ATU_LOWER_TARGET, - lower_32_bits(cpu_addr)); + lower_32_bits(parent_bus_addr)); dw_pcie_writel_atu_ib(pci, index, PCIE_ATU_UPPER_TARGET, - upper_32_bits(cpu_addr)); + upper_32_bits(parent_bus_addr)); dw_pcie_writel_atu_ib(pci, index, PCIE_ATU_REGION_CTRL1, type | PCIE_ATU_FUNC_NUM(func_no)); diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h index 501d9ddfea163..d0d8c622a6e8b 100644 --- a/drivers/pci/controller/dwc/pcie-designware.h +++ b/drivers/pci/controller/dwc/pcie-designware.h @@ -343,7 +343,7 @@ struct dw_pcie_ob_atu_cfg { u8 func_no; u8 code; u8 routing; - u64 cpu_addr; + u64 parent_bus_addr; u64 pci_addr; u64 size; }; @@ -491,9 +491,10 @@ int dw_pcie_wait_for_link(struct dw_pcie *pci); int dw_pcie_prog_outbound_atu(struct dw_pcie *pci, const struct dw_pcie_ob_atu_cfg *atu); int dw_pcie_prog_inbound_atu(struct dw_pcie *pci, int index, int type, - u64 cpu_addr, u64 pci_addr, u64 size); + u64 parent_bus_addr, u64 pci_addr, u64 size); int dw_pcie_prog_ep_inbound_atu(struct dw_pcie *pci, u8 func_no, int index, - int type, u64 cpu_addr, u8 bar, size_t size); + int type, u64 parent_bus_addr, + u8 bar, size_t size); void dw_pcie_disable_atu(struct dw_pcie *pci, u32 dir, int index); void dw_pcie_setup(struct dw_pcie *pci); void dw_pcie_iatu_detect(struct dw_pcie *pci);