From patchwork Sat Mar 15 20:15:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 14018249 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 CFC7CC28B28 for ; Sat, 15 Mar 2025 20:40:49 +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=bdcaMbi4oS3gAbNBB6eL5DV1a8Bd3MFwA9EH+9OLYas=; b=kw19BcwDhP419plNSEx1zd86F6 EUwHrkTjyUbNJz178o7mqsj4T/kJJEyK7plRfO3WKqrqYuU1ev4UcqSIjSoq8LamdiCv5V4JFEvOp 57TzsSyTB1nXltJ/qIRnzrGrwmz/zduuVd4EPRyomZPOeCCWH/dL58tGoDvjbLLbUQrtJlK4NdA+O U7UcXyyO91L/OsbG7XRhL/0u4onUMOu86fsPwbDBw36yKtLbSdNYPPQuou3MghFAmNxdXJVL6MuhW smryeRNe3nj9AfgkYqLOf+HEGRZlD8BxIkZp0QX9fSp4+CIXN2mVCRbLKVi3LpaLLupjNUCZfIbFx 71Op0sXQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1ttYJE-0000000Gq2k-2mSR; Sat, 15 Mar 2025 20:40:40 +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 1ttXvc-0000000GnZ2-3ZGe for linux-arm-kernel@lists.infradead.org; Sat, 15 Mar 2025 20:16:18 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 823995C4638; Sat, 15 Mar 2025 20:13:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA906C4CEE5; Sat, 15 Mar 2025 20:16:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742069776; bh=105HHpfUPVd9t7/zj1iauZX4cIcW9Ve3yTFuWMtBj1A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FzEWSv+OcMks1F40iFgZwoL+iixaSs6Z593H634Pxe7H90l/FPNGHJvIcxotyCYCg +SD3zL0pFeY9Oge30U4evm7k4KzF3eJfvma4aRMmwg6oxixmFHVWvCFmvMalHMFBfL J3YcUCzNEheJ9DS6pBQULj1yJmypwztI8y4VuRKffNvt45udPHbOOgd3Ar4fNTJFoI /yMcYNdFOUvtJe3QzJph721u1iNA0Ynv6Vhk/hnOWu1D7Yqg5vcLrRJdQePK5MeqPy N1JMS0ILNC6KJyZ9MtYR5aCWkgfnEXMaj7alXqOGfK5IwP0pjcdDLkXOGUlBZMcMMZ 3ApTAdRFvHJiA== 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 , Fabio Estevam , Niklas Cassel , Pengutronix Kernel Team , 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 v12 13/13] PCI: imx6: Remove cpu_addr_fixup() Date: Sat, 15 Mar 2025 15:15:48 -0500 Message-Id: <20250315201548.858189-14-helgaas@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250315201548.858189-1-helgaas@kernel.org> References: <20250315201548.858189-1-helgaas@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250315_131616_980631_D865E851 X-CRM114-Status: GOOD ( 11.69 ) 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: Frank Li Remove cpu_addr_fixup() because dwc common driver already handle address translation. Link: https://lore.kernel.org/r/20250313-pci_fixup_addr-v11-11-01d2313502ab@nxp.com Signed-off-by: Frank Li Signed-off-by: Bjorn Helgaas Reviewed-by: Manivannan Sadhasivam Acked-by: Richard Zhu --- drivers/pci/controller/dwc/pci-imx6.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 90ace941090f..d1eb535df73e 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1217,22 +1217,6 @@ static void imx_pcie_host_exit(struct dw_pcie_rp *pp) regulator_disable(imx_pcie->vpcie); } -static u64 imx_pcie_cpu_addr_fixup(struct dw_pcie *pcie, u64 cpu_addr) -{ - struct imx_pcie *imx_pcie = to_imx_pcie(pcie); - struct dw_pcie_rp *pp = &pcie->pp; - struct resource_entry *entry; - - if (!(imx_pcie->drvdata->flags & IMX_PCIE_FLAG_CPU_ADDR_FIXUP)) - return cpu_addr; - - entry = resource_list_first_type(&pp->bridge->windows, IORESOURCE_MEM); - if (!entry) - return cpu_addr; - - return cpu_addr - entry->offset; -} - /* * In old DWC implementations, PCIE_ATU_INHIBIT_PAYLOAD in iATU Ctrl2 * register is reserved, so the generic DWC implementation of sending the @@ -1263,7 +1247,6 @@ static const struct dw_pcie_host_ops imx_pcie_host_dw_pme_ops = { static const struct dw_pcie_ops dw_pcie_ops = { .start_link = imx_pcie_start_link, .stop_link = imx_pcie_stop_link, - .cpu_addr_fixup = imx_pcie_cpu_addr_fixup, }; static void imx_pcie_ep_init(struct dw_pcie_ep *ep) @@ -1645,6 +1628,7 @@ static int imx_pcie_probe(struct platform_device *pdev) if (ret) return ret; + pci->use_parent_dt_ranges = true; if (imx_pcie->drvdata->mode == DW_PCIE_EP_TYPE) { ret = imx_add_pcie_ep(imx_pcie, pdev); if (ret < 0)