From: Minda Chen <minda.chen@starfivetech.com> To: "Lorenzo Pieralisi" <lpieralisi@kernel.org>, "Conor Dooley" <conor@kernel.org>, "Krzysztof Wilczyński" <kw@linux.com>, "Rob Herring" <robh+dt@kernel.org>, "Bjorn Helgaas" <bhelgaas@google.com>, "Thomas Gleixner" <tglx@linutronix.de>, "Daire McNamara" <daire.mcnamara@microchip.com>, "Emil Renner Berthing" <emil.renner.berthing@canonical.com>, "Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org> Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-pci@vger.kernel.org, Paul Walmsley <paul.walmsley@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, Philipp Zabel <p.zabel@pengutronix.de>, Mason Huo <mason.huo@starfivetech.com>, Leyfoon Tan <leyfoon.tan@starfivetech.com>, Kevin Xie <kevin.xie@starfivetech.com>, Minda Chen <minda.chen@starfivetech.com> Subject: [PATCH v16 08/22] PCI: microchip: Change the argument of plda_pcie_setup_iomems() Date: Thu, 28 Mar 2024 17:18:21 +0800 [thread overview] Message-ID: <20240328091835.14797-9-minda.chen@starfivetech.com> (raw) In-Reply-To: <20240328091835.14797-1-minda.chen@starfivetech.com> If other vendor do not select PCI_HOST_COMMON, the driver data is not struct pci_host_bridge. Move calling platform_get_drvdata() to mc_platform_init(). Signed-off-by: Minda Chen <minda.chen@starfivetech.com> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> --- drivers/pci/controller/plda/pcie-microchip-host.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c index 9b367927cd32..805870aed61d 100644 --- a/drivers/pci/controller/plda/pcie-microchip-host.c +++ b/drivers/pci/controller/plda/pcie-microchip-host.c @@ -876,11 +876,10 @@ static void plda_pcie_setup_window(void __iomem *bridge_base_addr, u32 index, writel(0, bridge_base_addr + ATR0_PCIE_WIN0_SRC_ADDR); } -static int plda_pcie_setup_iomems(struct platform_device *pdev, +static int plda_pcie_setup_iomems(struct pci_host_bridge *bridge, struct plda_pcie_rp *port) { void __iomem *bridge_base_addr = port->bridge_addr; - struct pci_host_bridge *bridge = platform_get_drvdata(pdev); struct resource_entry *entry; u64 pci_addr; u32 index = 1; @@ -1018,6 +1017,7 @@ static int mc_platform_init(struct pci_config_window *cfg) { struct device *dev = cfg->parent; struct platform_device *pdev = to_platform_device(dev); + struct pci_host_bridge *bridge = platform_get_drvdata(pdev); void __iomem *bridge_base_addr = port->axi_base_addr + MC_PCIE_BRIDGE_ADDR; int ret; @@ -1031,7 +1031,7 @@ static int mc_platform_init(struct pci_config_window *cfg) mc_pcie_enable_msi(port, cfg->win); /* Configure non-config space outbound ranges */ - ret = plda_pcie_setup_iomems(pdev, &port->plda); + ret = plda_pcie_setup_iomems(bridge, &port->plda); if (ret) return ret; -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Minda Chen <minda.chen@starfivetech.com> To: "Lorenzo Pieralisi" <lpieralisi@kernel.org>, "Conor Dooley" <conor@kernel.org>, "Krzysztof Wilczyński" <kw@linux.com>, "Rob Herring" <robh+dt@kernel.org>, "Bjorn Helgaas" <bhelgaas@google.com>, "Thomas Gleixner" <tglx@linutronix.de>, "Daire McNamara" <daire.mcnamara@microchip.com>, "Emil Renner Berthing" <emil.renner.berthing@canonical.com>, "Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org> Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-pci@vger.kernel.org, Paul Walmsley <paul.walmsley@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, Philipp Zabel <p.zabel@pengutronix.de>, Mason Huo <mason.huo@starfivetech.com>, Leyfoon Tan <leyfoon.tan@starfivetech.com>, Kevin Xie <kevin.xie@starfivetech.com>, Minda Chen <minda.chen@starfivetech.com> Subject: [PATCH v16 08/22] PCI: microchip: Change the argument of plda_pcie_setup_iomems() Date: Thu, 28 Mar 2024 17:18:21 +0800 [thread overview] Message-ID: <20240328091835.14797-9-minda.chen@starfivetech.com> (raw) In-Reply-To: <20240328091835.14797-1-minda.chen@starfivetech.com> If other vendor do not select PCI_HOST_COMMON, the driver data is not struct pci_host_bridge. Move calling platform_get_drvdata() to mc_platform_init(). Signed-off-by: Minda Chen <minda.chen@starfivetech.com> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> --- drivers/pci/controller/plda/pcie-microchip-host.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c index 9b367927cd32..805870aed61d 100644 --- a/drivers/pci/controller/plda/pcie-microchip-host.c +++ b/drivers/pci/controller/plda/pcie-microchip-host.c @@ -876,11 +876,10 @@ static void plda_pcie_setup_window(void __iomem *bridge_base_addr, u32 index, writel(0, bridge_base_addr + ATR0_PCIE_WIN0_SRC_ADDR); } -static int plda_pcie_setup_iomems(struct platform_device *pdev, +static int plda_pcie_setup_iomems(struct pci_host_bridge *bridge, struct plda_pcie_rp *port) { void __iomem *bridge_base_addr = port->bridge_addr; - struct pci_host_bridge *bridge = platform_get_drvdata(pdev); struct resource_entry *entry; u64 pci_addr; u32 index = 1; @@ -1018,6 +1017,7 @@ static int mc_platform_init(struct pci_config_window *cfg) { struct device *dev = cfg->parent; struct platform_device *pdev = to_platform_device(dev); + struct pci_host_bridge *bridge = platform_get_drvdata(pdev); void __iomem *bridge_base_addr = port->axi_base_addr + MC_PCIE_BRIDGE_ADDR; int ret; @@ -1031,7 +1031,7 @@ static int mc_platform_init(struct pci_config_window *cfg) mc_pcie_enable_msi(port, cfg->win); /* Configure non-config space outbound ranges */ - ret = plda_pcie_setup_iomems(pdev, &port->plda); + ret = plda_pcie_setup_iomems(bridge, &port->plda); if (ret) return ret; -- 2.17.1 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2024-03-28 9:19 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-03-28 9:18 [PATCH v16 00/22] Refactoring Microchip PCIe driver and add StarFive PCIe Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 01/22] dt-bindings: PCI: Add PLDA XpressRICH PCIe host common properties Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 02/22] PCI: microchip: Move pcie-microchip-host.c to plda directory Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 03/22] PCI: microchip: Move PLDA IP register macros to pcie-plda.h Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 04/22] PCI: microchip: Add bridge_addr field to struct mc_pcie Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 05/22] PCI: microchip: Rename two PCIe data structures Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 06/22] PCI: microchip: Move PCIe host data structures to plda-pcie.h Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 07/22] PCI: microchip: Rename two setup functions Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` Minda Chen [this message] 2024-03-28 9:18 ` [PATCH v16 08/22] PCI: microchip: Change the argument of plda_pcie_setup_iomems() Minda Chen 2024-03-28 9:18 ` [PATCH v16 09/22] PCI: microchip: Move setup functions to pcie-plda-host.c Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 10/22] PCI: microchip: Rename interrupt related functions Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 11/22] PCI: microchip: Add num_events field to struct plda_pcie_rp Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 12/22] PCI: microchip: Add request_event_irq() callback function Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 13/22] PCI: microchip: Add INTx and MSI event num to struct plda_event Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 14/22] PCI: microchip: Add get_events() callback and add PLDA get_event() Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 15/22] PCI: microchip: Add event irqchip field to host port and add PLDA irqchip Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-04-30 0:50 ` Minda Chen 2024-04-30 0:50 ` Minda Chen 2024-04-30 1:10 ` Minda Chen 2024-04-30 1:10 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 16/22] PCI: microchip: Move IRQ functions to pcie-plda-host.c Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 17/22] PCI: plda: Add event bitmap field to struct plda_pcie_rp Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 18/22] PCI: plda: Add host init/deinit and map bus functions Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 19/22] dt-bindings: PCI: Add StarFive JH7110 PCIe controller Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 20/22] PCI: Add PCIE_RESET_CONFIG_DEVICE_WAIT_MS waiting time value Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 21/22] PCI: starfive: Add JH7110 PCIe controller Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-03-28 9:18 ` [PATCH v16 22/22] riscv: dts: starfive: add PCIe dts configuration for JH7110 Minda Chen 2024-03-28 9:18 ` Minda Chen 2024-04-30 0:53 ` 回复: [PATCH v16 00/22] Refactoring Microchip PCIe driver and add StarFive PCIe Minda Chen 2024-04-30 0:53 ` Minda Chen
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=20240328091835.14797-9-minda.chen@starfivetech.com \ --to=minda.chen@starfivetech.com \ --cc=aou@eecs.berkeley.edu \ --cc=bhelgaas@google.com \ --cc=conor@kernel.org \ --cc=daire.mcnamara@microchip.com \ --cc=devicetree@vger.kernel.org \ --cc=emil.renner.berthing@canonical.com \ --cc=kevin.xie@starfivetech.com \ --cc=krzysztof.kozlowski+dt@linaro.org \ --cc=kw@linux.com \ --cc=leyfoon.tan@starfivetech.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=linux-riscv@lists.infradead.org \ --cc=lpieralisi@kernel.org \ --cc=mason.huo@starfivetech.com \ --cc=p.zabel@pengutronix.de \ --cc=palmer@dabbelt.com \ --cc=paul.walmsley@sifive.com \ --cc=robh+dt@kernel.org \ --cc=tglx@linutronix.de \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.