From: Frank Li <Frank.Li@nxp.com>
To: "Rob Herring" <robh@kernel.org>,
"Saravana Kannan" <saravanak@google.com>,
"Jingoo Han" <jingoohan1@gmail.com>,
"Manivannan Sadhasivam" <manivannan.sadhasivam@linaro.org>,
"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Richard Zhu" <hongxing.zhu@nxp.com>,
"Lucas Stach" <l.stach@pengutronix.de>,
"Shawn Guo" <shawnguo@kernel.org>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Pengutronix Kernel Team" <kernel@pengutronix.de>,
"Fabio Estevam" <festevam@gmail.com>
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 <cassel@kernel.org>,
Frank Li <Frank.Li@nxp.com>
Subject: [PATCH v11 03/11] PCI: dwc: Move cfg0 setup to dw_pcie_cfg0_setup()
Date: Thu, 13 Mar 2025 11:38:39 -0400 [thread overview]
Message-ID: <20250313-pci_fixup_addr-v11-3-01d2313502ab@nxp.com> (raw)
In-Reply-To: <20250313-pci_fixup_addr-v11-0-01d2313502ab@nxp.com>
From: Bjorn Helgaas <bhelgaas@google.com>
Move pp->cfg0 setup to dw_pcie_cfg0_setup(). No functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
Change from v10 v0 v11
- none
Change from v9 to v10
v9 means https://lore.kernel.org/linux-pci/20250307233744.440476-1-helgaas@kernel.org/T/#maa0134c1826bffcccab6028c7732a13f7adcec4d
- move dw_pcie_cfg0_setup() ahead of dw_pcie_host_request_msg_tlp_res() to
nice git diff and easy to review.
---
drivers/pci/controller/dwc/pcie-designware-host.c | 40 +++++++++++++++--------
1 file changed, 26 insertions(+), 14 deletions(-)
diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index 1206b26bff3f2..c57831902686e 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -392,6 +392,29 @@ static int dw_pcie_msi_host_init(struct dw_pcie_rp *pp)
return 0;
}
+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 resource *res;
+
+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "config");
+ if (!res) {
+ dev_err(dev, "Missing \"config\" reg space\n");
+ return -ENODEV;
+ }
+
+ pp->cfg0_size = resource_size(res);
+ pp->cfg0_base = res->start;
+
+ 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);
+
+ return 0;
+}
+
static void dw_pcie_host_request_msg_tlp_res(struct dw_pcie_rp *pp)
{
struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
@@ -423,10 +446,8 @@ 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 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);
@@ -435,18 +456,9 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp)
if (ret)
return ret;
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "config");
- if (!res) {
- dev_err(dev, "Missing \"config\" reg space\n");
- return -ENODEV;
- }
-
- pp->cfg0_size = resource_size(res);
- pp->cfg0_base = res->start;
-
- 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);
+ ret = dw_pcie_cfg0_setup(pp);
+ if (ret)
+ return ret;
bridge = devm_pci_alloc_host_bridge(dev, 0);
if (!bridge)
--
2.34.1
next prev parent reply other threads:[~2025-03-13 15:39 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-13 15:38 [PATCH v11 00/11] PCI: Use device bus range info to cleanup RC Host/EP pci_fixup_addr() Frank Li
2025-03-13 15:38 ` [PATCH v11 01/11] PCI: dwc: Use resource start as iomap() input in dw_pcie_pme_turn_off() Frank Li
2025-03-13 15:38 ` [PATCH v11 02/11] PCI: dwc: Rename cpu_addr to parent_bus_addr for ATU configuration Frank Li
2025-03-13 15:38 ` Frank Li [this message]
2025-03-13 15:38 ` [PATCH v11 04/11] PCI: dwc: Move devm_pci_alloc_host_bridge() to the beginning of dw_pcie_host_init() Frank Li
2025-03-13 19:22 ` Bjorn Helgaas
2025-03-13 20:45 ` Frank Li
2025-03-13 21:25 ` Bjorn Helgaas
2025-03-13 15:38 ` [PATCH v11 05/11] PCI: dwc: Add helper dw_pcie_init_parent_bus_offset() Frank Li
2025-03-13 15:38 ` [PATCH v11 06/11] PCI: dwc: Use devicetree 'ranges' property to get rid of cpu_addr_fixup() callback Frank Li
2025-03-13 22:04 ` Bjorn Helgaas
2025-03-13 22:56 ` Frank Li
2025-03-14 15:21 ` Frank Li
2025-03-14 22:10 ` Bjorn Helgaas
2025-03-14 23:21 ` Frank Li
2025-03-13 15:38 ` [PATCH v11 07/11] PCI: dwc: ep: Add parent_bus_addr for outbound window Frank Li
2025-03-13 15:38 ` [PATCH v11 08/11] PCI: dwc: ep: Ensure proper iteration over outbound map windows Frank Li
2025-03-13 15:38 ` [PATCH v11 09/11] PCI: dwc: Use parent_bus_offset Frank Li
2025-03-13 15:38 ` [PATCH v11 10/11] PCI: dwc: Print warning message when cpu_addr_fixup() exists Frank Li
2025-06-12 14:46 ` Manivannan Sadhasivam
2025-06-12 15:51 ` Frank Li
2025-06-12 16:08 ` Manivannan Sadhasivam
2025-06-12 16:19 ` Frank Li
2025-06-12 16:26 ` Manivannan Sadhasivam
2025-03-13 15:38 ` [PATCH v11 11/11] PCI: imx6: Remove cpu_addr_fixup() Frank Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250313-pci_fixup_addr-v11-3-01d2313502ab@nxp.com \
--to=frank.li@nxp.com \
--cc=bhelgaas@google.com \
--cc=cassel@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=hongxing.zhu@nxp.com \
--cc=imx@lists.linux.dev \
--cc=jingoohan1@gmail.com \
--cc=kernel@pengutronix.de \
--cc=kw@linux.com \
--cc=l.stach@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=robh@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=saravanak@google.com \
--cc=shawnguo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).