From patchwork Fri Mar 7 23:37:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 14007296 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 47125C28B25 for ; Fri, 7 Mar 2025 23:43:04 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4cFLCcUVpb4fVdYybTqcQl4iUfdLFhB/qPA6ZRJ3EzQ=; b=I4voJRkB+MLsxkGBMrpJOBk8it +48IYheCcqJJLCnDa+IJY/i2/pVr9s8itU4KlwHOzRJYelVroHicZsuhf4NCt4J6caitYHHSBoImh x6L9oGrCrGpjfzkKLEUUEkbfEIpDK00JxftelCDZb9jfqIMDhUmwiFF9VHtGkv86/vkDPuz72CU8P gyBFhV9JQ6HJss3KypLWmr/6AfCabr1KNYq/GnGrREW9gNffqtWxX7gkiQV6L0qdNrtt524LlZxtO V/togzJXcXbJdgv7kkdn2K67RKSbp3uey7Ci1GiHLVT63/Sg3tjnNWbFv03u7vGGVgFmWEJnxB8NT gv9y2w9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tqhLC-0000000FqKb-2haP; Fri, 07 Mar 2025 23:42:54 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tqhGM-0000000FpTU-3IxJ for linux-arm-kernel@lists.infradead.org; Fri, 07 Mar 2025 23:37:55 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 645405C64F6; Fri, 7 Mar 2025 23:35:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2E4DC4CED1; Fri, 7 Mar 2025 23:37:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741390674; bh=ua0QgEy0dtgEEi4JLJEBT5g3dBO7iHT7Cgd7aa1B+Bg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xa4liii3Xc5XxFFQL/XL0QZzGnmQmkhiGfhADFOcOCnT1EjvZ1UHgXBePJR6QYXV3 vRSyXotvvUma0enW3P3Hz5UchElelf+MHveAv49uy8ZtnWSa7B2pTGGtQufFMNwOhu S7JMWx9w41is4jaJncM6XbSpZHKDQHIRFNU/i3pmhHyAyEjFuh/ZXoyq5qzZALLoSF 2DKkZ24v6T2wlcVkoQeFyeHPdaq+MeUc8kAlwNRs/WpRBskBiUBzhyzGjRa8yJHX+2 VbAmbRdLKNgDsWHmQ1fDIwPNcxqQY1vUplr99mv3a4Q26RKQBzX8gpZ1jxKEs7stBY 2ld1PzjsN/poQ== From: Bjorn Helgaas To: Frank Li Cc: Rob Herring , Saravana Kannan , Jingoo Han , Manivannan Sadhasivam , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Richard Zhu , Lucas Stach , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Niklas Cassel , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, imx@lists.linux.dev, Bjorn Helgaas Subject: [PATCH 1/4] PCI: dwc: Move cfg0 setup to dw_pcie_cfg0_setup() Date: Fri, 7 Mar 2025 17:37:41 -0600 Message-Id: <20250307233744.440476-2-helgaas@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250307233744.440476-1-helgaas@kernel.org> References: <20250307233744.440476-1-helgaas@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250307_153754_881451_4FFE1FED X-CRM114-Status: GOOD ( 12.10 ) 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 From: Bjorn Helgaas Move pp->cfg0 setup to dw_pcie_cfg0_setup(). No functional change intended. --- .../pci/controller/dwc/pcie-designware-host.c | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index 1206b26bff3f..de2f2dcf5c40 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -418,22 +418,12 @@ static void dw_pcie_host_request_msg_tlp_res(struct dw_pcie_rp *pp) } } -int dw_pcie_host_init(struct dw_pcie_rp *pp) +static int dw_pcie_cfg0_setup(struct dw_pcie_rp *pp) { struct dw_pcie *pci = to_dw_pcie_from_pp(pp); struct device *dev = pci->dev; - struct device_node *np = dev->of_node; struct platform_device *pdev = to_platform_device(dev); - struct resource_entry *win; - struct pci_host_bridge *bridge; struct resource *res; - int ret; - - raw_spin_lock_init(&pp->lock); - - ret = dw_pcie_get_resources(pci); - if (ret) - return ret; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "config"); if (!res) { @@ -448,6 +438,28 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp) if (IS_ERR(pp->va_cfg0_base)) return PTR_ERR(pp->va_cfg0_base); + return 0; +} + +int dw_pcie_host_init(struct dw_pcie_rp *pp) +{ + struct dw_pcie *pci = to_dw_pcie_from_pp(pp); + struct device *dev = pci->dev; + struct device_node *np = dev->of_node; + struct resource_entry *win; + struct pci_host_bridge *bridge; + int ret; + + raw_spin_lock_init(&pp->lock); + + ret = dw_pcie_get_resources(pci); + if (ret) + return ret; + + ret = dw_pcie_cfg0_setup(pp); + if (ret) + return ret; + bridge = devm_pci_alloc_host_bridge(dev, 0); if (!bridge) return -ENOMEM; From patchwork Fri Mar 7 23:37:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 14007297 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 D5889C282DE for ; Fri, 7 Mar 2025 23:44:41 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mgf9TKVShsbgf58T+DVRs7PUBhUxrsl3Z29fBsYWAlg=; b=zLBkXwz+KwZwT3p3Hd6BKOONRQ +rko4SKqXFEchS2TcXEns7kS7t1csSkh3lBPUwY0kyN2yCvnjx4CUsEsE2uma2H2ZRx0M2+QZWbM0 pyDpJaTPM6rkItF99B+nVAiRYkq7hRb+fumhJsV7NEvkm/xUIFIsSqnR+m9aBTKMFGXkSqfg9W/ca cmg6pxmDF8PIU9pRH35stP+UVrQrJ0HFnuBnLcTkaf7I4aVhZracGDnzZv+oA8he40gAWoIgZC+JZ pJl1UKBoofxG099Ikx0Y0CX6Jrxl6C9hfdKABBn5BkqzWNuDsSYzI9Ut/nYaTNMx/xThoTkFG1ZIM dm8HIl9Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tqhMn-0000000FqVJ-1ABh; Fri, 07 Mar 2025 23:44:33 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tqhGR-0000000FpUF-0Ypw for linux-arm-kernel@lists.infradead.org; Fri, 07 Mar 2025 23:38:00 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 95D655C624E; Fri, 7 Mar 2025 23:35:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E84F2C4CED1; Fri, 7 Mar 2025 23:37:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741390678; bh=/Vd5KWvSiGu6/wCPX+6AfloWDVGSa9tpnOhgexIbXEQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Acw2g1gVGlLFYF0SltDeaIZQ9KwE6vcOMVM6luvqFnf40847eeFswIpbIcKP7nYmK kLfy9MxLzQTzSH6s3Z89HAKeYyAkRWntv/8ABqAaA448ttme/dLea5kZsaYAmqFFP6 ewMoOpEu5OkfDAbLuh5EASyV3tIAxSSUSiaBKwXNsmbTY+PqEmSmd/X16B+bxvRwXa 9F/AJYwbCjcu98r6x2PN4GM8JR6ll0mddTmGzUA4jduF9Jzp4gcmcMbI/9IvFdElM6 jH8I65HYqEKV1VKtGUdzKPSm++TdZHO7sRTdZkbXMfSAhq3YKLvpUe7U34881mIz0B r8S0mvulLLNqA== From: Bjorn Helgaas To: Frank Li Cc: Rob Herring , Saravana Kannan , Jingoo Han , Manivannan Sadhasivam , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Richard Zhu , Lucas Stach , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Niklas Cassel , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, imx@lists.linux.dev, Bjorn Helgaas Subject: [PATCH 2/4] PCI: dwc: Delay cfg0 setup until after discovering bridge windows Date: Fri, 7 Mar 2025 17:37:42 -0600 Message-Id: <20250307233744.440476-3-helgaas@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250307233744.440476-1-helgaas@kernel.org> References: <20250307233744.440476-1-helgaas@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250307_153759_222346_2165631E X-CRM114-Status: GOOD ( 10.22 ) 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 From: Bjorn Helgaas devm_pci_alloc_host_bridge() reads host bridge windows and any translation offsets. Some .cpu_addr_fixup() implementations depend on the window offset, e.g., imx_pcie_cpu_addr_fixup() uses the offset of the first bridge window. --- drivers/pci/controller/dwc/pcie-designware-host.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index de2f2dcf5c40..b9eaba157dae 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -456,14 +456,14 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp) if (ret) return ret; - ret = dw_pcie_cfg0_setup(pp); - if (ret) - return ret; - bridge = devm_pci_alloc_host_bridge(dev, 0); if (!bridge) return -ENOMEM; + ret = dw_pcie_cfg0_setup(pp); + if (ret) + return ret; + pp->bridge = bridge; /* Get the I/O range from DT */ From patchwork Fri Mar 7 23:37:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 14007298 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 995D3C282DE for ; Fri, 7 Mar 2025 23:46:24 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=hFUBkPdrvb3+Gb+g41wZJKmSb+tO09XbzEaZdRyDfMM=; b=aV9hFLQRYKVkSdi3TiM357H+0f tr4MhNz0SS5L3n6yPzNm9nP6SYzvPCcdDOkvsCSoKShfArrAaTLcZdHMYN0rrVeZsV7h/6Gz5tuwS PffrKB5KcGMhGBtVVablFxcC6tb6M0+ZfgWcH8a9cRaHSYdVbR1EVtRZHkLOHug6x0DuzlKB282BL YM5HbP3mr2B3QKg2dy6LCcID+1Vle+QJHTu4pLvUPV6g1/nrT/vrFLUhq8S7zzJ3CVhjdMWrO+JQq fN+GV56zpiOrQIzClxtx5VFZs0prl2HjlZcD5dShIe96yYa8uyRbmFMqrgy6OI2vbRlnDIz7WqvxY CRePYNpA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tqhOQ-0000000FqmB-0Ipz; Fri, 07 Mar 2025 23:46:14 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tqhGW-0000000FpVv-1Df0 for linux-arm-kernel@lists.infradead.org; Fri, 07 Mar 2025 23:38:05 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 9DDE8A45627; Fri, 7 Mar 2025 23:32:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0311C4CEEE; Fri, 7 Mar 2025 23:38:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741390682; bh=9huYHohH+gOJUkoeThHaODlEFocAowbh3DJVYqegdA4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=exc99kmdGHpYV6kL6OhjqqdbMWYSyTNNn80GYi2Uc+VGV55ZsasQb1TE6cGi5R6to 38jeJdJmaoQrR9WMNt9kfO/wzRwJ8vSP1XRtHW22eTs9DdavO/Ye5cXvtEY5hYsMXZ PbTWPMGSCekt20ls3uamd0Xi2PLFd/LjElBtXUnHmepsGBFqztBbEDGcurcL+6iGUM 0PG9WS0ohUvDp11N5TeD1pnusirSM1jZiMfVNEqF41rVNMqttdhmHsv5IT8DusD+Vs gm9ePcCelLJErYpjQlWNp8P3gqtxbqrVukcyKMtvW5n9Rur+rjzM8YTbUUq51t0R6p lxFlFr0Tfm6ag== From: Bjorn Helgaas To: Frank Li Cc: Rob Herring , Saravana Kannan , Jingoo Han , Manivannan Sadhasivam , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Richard Zhu , Lucas Stach , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Niklas Cassel , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, imx@lists.linux.dev, Bjorn Helgaas Subject: [PATCH 3/4] PCI: dwc: Look up 'config' address Date: Fri, 7 Mar 2025 17:37:43 -0600 Message-Id: <20250307233744.440476-4-helgaas@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250307233744.440476-1-helgaas@kernel.org> References: <20250307233744.440476-1-helgaas@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250307_153804_503374_6B55DA26 X-CRM114-Status: GOOD ( 13.50 ) 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 From: Bjorn Helgaas Set pp->parent_bus_offset based on the parent bus address from the "config" reg entry if it exists. .cpu_addr_fixup(res->start) (if implemented) should return the parent bus address corresponding to res->start. Sets pp->parent_bus_offset, but doesn't use it, so no functional change intended yet. --- .../pci/controller/dwc/pcie-designware-host.c | 42 +++++++++++++++++++ drivers/pci/controller/dwc/pcie-designware.h | 1 + 2 files changed, 43 insertions(+) diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index b9eaba157dae..e22f650ada5a 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -423,7 +423,11 @@ static int dw_pcie_cfg0_setup(struct dw_pcie_rp *pp) struct dw_pcie *pci = to_dw_pcie_from_pp(pp); struct device *dev = pci->dev; struct platform_device *pdev = to_platform_device(dev); + struct device_node *np = dev->of_node; struct resource *res; + int index; + u64 reg_addr, fixup_addr; + u64 (*fixup)(struct dw_pcie *pcie, u64 cpu_addr); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "config"); if (!res) { @@ -434,6 +438,44 @@ static int dw_pcie_cfg0_setup(struct dw_pcie_rp *pp) pp->cfg0_size = resource_size(res); pp->cfg0_base = res->start; + /* [mem 0x7ff00000-] in example */ + dev_info(dev, "%pR config CPU physical\n", res); + + /* Look up "config" address on parent bus */ + reg_addr = 0; + index = of_property_match_string(np, "reg-names", "config"); + if (index >= 0) { + of_property_read_reg(np, index, ®_addr, NULL); + /* [ia 0x8ff00000-] in example */ + dev_info(dev, "%#010llx config reg[%d] parent bus addr\n", + reg_addr, index); + } else { + reg_addr = res->start; + dev_warn(dev, "%#010llx assumed parent bus addr (no config reg-names entry)\n", + reg_addr); + } + + fixup = pci->ops->cpu_addr_fixup; + if (fixup) { + fixup_addr = fixup(pci, res->start); + dev_info(dev, "%#010llx result of %ps(%#010llx)\n", + fixup_addr, fixup, res->start); + if (reg_addr == fixup_addr) { + dev_info(dev, "%#010llx config reg[%d] == %#010llx; %ps is redundant\n", + reg_addr, index, fixup_addr, fixup); + } else { + dev_warn(dev, "%#010llx config reg[%d] != %#010llx fixed up addr; DT is broken\n", + reg_addr, index, fixup_addr); + reg_addr = fixup_addr; + } + } + + /* 0x7ff00000 - 0x8ff00000 == 0xf0000000 */ + pp->parent_bus_offset = res->start - reg_addr; + dev_info(dev, "%#010llx config parent bus offset\n", + pp->parent_bus_offset); + + pp->va_cfg0_base = devm_pci_remap_cfg_resource(dev, res); if (IS_ERR(pp->va_cfg0_base)) return PTR_ERR(pp->va_cfg0_base); diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h index ac23604c829f..eeca38ec3a2b 100644 --- a/drivers/pci/controller/dwc/pcie-designware.h +++ b/drivers/pci/controller/dwc/pcie-designware.h @@ -362,6 +362,7 @@ struct dw_pcie_rp { u64 cfg0_base; void __iomem *va_cfg0_base; u32 cfg0_size; + u64 parent_bus_offset; resource_size_t io_base; phys_addr_t io_bus_addr; u32 io_size; From patchwork Fri Mar 7 23:37:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 14007299 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 D5D38C282DE for ; Fri, 7 Mar 2025 23:48:00 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ySsn7dF/7Om+1GZfPcsWhSV1dmkm+FN1w5E4eHT2ni8=; b=eNF4IhfpAoApuNo6DMRWrwyNmT zhu6JsYrWrcEoLHNEU3sQxEJPExwyI6wPFNglkZ1p3E6jpcoEq9bdHltB5qIPL6//fNZKM2xrB0vB Awgban/FqMUwxclEB1TZET2XQMG6LuwveU/YVr++Cb8pXffIm6zc3TD1CNNFi+1XLb9peBD6qrOge 2yFR7B0mOsRe7dB+ogO7MnVJpycqX45mKZDVXe0OZ0gisKSMCNxFspZIq35yPwzdBTbtEAKsZWSqS FS7ZIpz94yZO9889Y2iitEFOI/+HAMKG3WuI94RAhXZ2W8sCKBkMfWOgMKQ5kFM2Moq5skAF9lax+ l1BBq9SA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tqhQ0-0000000Fquv-34Dm; Fri, 07 Mar 2025 23:47:52 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tqhGX-0000000FpWg-1Oqs for linux-arm-kernel@lists.infradead.org; Fri, 07 Mar 2025 23:38:06 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id D8B3C5C64F6; Fri, 7 Mar 2025 23:35:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57CD0C4CEE9; Fri, 7 Mar 2025 23:38:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741390684; bh=awyxVGLYLrPGk2ph0vC9xWww4UwkrrLl5cXRfJqJlA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CTVoSv901qPSH0kq0SRi45h38A2I+kzNId6N7kN8mUDSfb6d97vw8m4klIvm5tqeU GAAPZ5h8bTAR47cLw04L8I7NjH5O/CDqd25IsGFixaVCi5ZEhO4yXYmreSFZzmYMrK XaHNENqH+Q/S6PlDJq0DxFh0/6b+0WoOEf2ZXcZhM2du4yDrJASDBW4+8oX8QNwjdN p54qwFQwhzKPPTNYZw6cjZYMCH1dPSzf3d1OomHr3NmfONYvc+Yfozq1yDf9csiFzw uL8QR7UnDcubB4ogUeQwavpsm9bsM3+0DxVajnJXq4IXlJIuaAT4Ry1NxjECm27jxA wcuiivr40Jl9w== From: Bjorn Helgaas To: Frank Li Cc: Rob Herring , Saravana Kannan , Jingoo Han , Manivannan Sadhasivam , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Richard Zhu , Lucas Stach , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Niklas Cassel , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, imx@lists.linux.dev, Bjorn Helgaas Subject: [PATCH 4/4] PCI: dwc: Use parent_bus_offset Date: Fri, 7 Mar 2025 17:37:44 -0600 Message-Id: <20250307233744.440476-5-helgaas@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250307233744.440476-1-helgaas@kernel.org> References: <20250307233744.440476-1-helgaas@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250307_153805_486829_93B3BC58 X-CRM114-Status: GOOD ( 13.02 ) 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 From: Bjorn Helgaas We know the parent_bus_offset, either computed from a DT reg property (the offset is the CPU physical addr - the 'config' address on the parent bus) or from a .cpu_addr_fixup() (which may have used a host bridge window offset). Apply that parent_bus_offset instead of calling .cpu_addr_fixup() again. This assumes that all intermediate addresses are at the same offset from the CPU physical addresses. --- drivers/pci/controller/dwc/pcie-designware-host.c | 12 ++++++------ drivers/pci/controller/dwc/pcie-designware.c | 3 --- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index e22f650ada5a..3378f905b3bd 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -670,7 +670,7 @@ static void __iomem *dw_pcie_other_conf_map_bus(struct pci_bus *bus, type = PCIE_ATU_TYPE_CFG1; atu.type = type; - atu.parent_bus_addr = pp->cfg0_base; + atu.parent_bus_addr = pp->cfg0_base - pp->parent_bus_offset; atu.pci_addr = busdev; atu.size = pp->cfg0_size; @@ -695,7 +695,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.parent_bus_addr = pp->io_base; + atu.parent_bus_addr = pp->io_base - pp->parent_bus_offset; atu.pci_addr = pp->io_bus_addr; atu.size = pp->io_size; @@ -721,7 +721,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.parent_bus_addr = pp->io_base; + atu.parent_bus_addr = pp->io_base - pp->parent_bus_offset; atu.pci_addr = pp->io_bus_addr; atu.size = pp->io_size; @@ -790,7 +790,7 @@ static int dw_pcie_iatu_setup(struct dw_pcie_rp *pp) atu.index = i; atu.type = PCIE_ATU_TYPE_MEM; - atu.parent_bus_addr = entry->res->start; + atu.parent_bus_addr = entry->res->start - pp->parent_bus_offset; atu.pci_addr = entry->res->start - entry->offset; /* Adjust iATU size if MSG TLP region was allocated before */ @@ -812,7 +812,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.parent_bus_addr = pp->io_base; + atu.parent_bus_addr = pp->io_base - pp->parent_bus_offset; atu.pci_addr = pp->io_bus_addr; atu.size = pp->io_size; @@ -956,7 +956,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.parent_bus_addr = pci->pp.msg_res->start; + atu.parent_bus_addr = pci->pp.msg_res->start - pci->pp.parent_bus_offset; 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 9d0a5f75effc..640caf4a084f 100644 --- a/drivers/pci/controller/dwc/pcie-designware.c +++ b/drivers/pci/controller/dwc/pcie-designware.c @@ -474,9 +474,6 @@ int dw_pcie_prog_outbound_atu(struct dw_pcie *pci, u32 retries, val; u64 limit_addr; - if (pci->ops && pci->ops->cpu_addr_fixup) - parent_bus_addr = pci->ops->cpu_addr_fixup(pci, parent_bus_addr); - limit_addr = parent_bus_addr + atu->size - 1; if ((limit_addr & ~pci->region_limit) != (parent_bus_addr & ~pci->region_limit) ||