| Message ID | 20250319092951.37667-8-jirislaby@kernel.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | irqdomain: Cleanups and Documentation | expand |
On Wed, Mar 19, 2025 at 10:29:00AM +0100, Jiri Slaby (SUSE) wrote: > of_node_to_fwnode() is irqdomain's reimplementation of the "officially" > defined of_fwnode_handle(). The former is in the process of being > removed, so use the latter instead. I'm fine with these and happy to apply via the PCI tree, but it sounds like you're planning a v3 with a few updates, so I'll hold off for now: https://lore.kernel.org/r/4bc0e1ca-a523-424a-8759-59e353317fba@kernel.org
On 21. 03. 25, 17:32, Bjorn Helgaas wrote: > On Wed, Mar 19, 2025 at 10:29:00AM +0100, Jiri Slaby (SUSE) wrote: >> of_node_to_fwnode() is irqdomain's reimplementation of the "officially" >> defined of_fwnode_handle(). The former is in the process of being >> removed, so use the latter instead. > > I'm fine with these and happy to apply via the PCI tree, but it sounds > like you're planning a v3 with a few updates, so I'll hold off for > now: > > https://lore.kernel.org/r/4bc0e1ca-a523-424a-8759-59e353317fba@kernel.org Right, there will be a v3 to deal better with irq_domain_create_*()'s first parameter (patches 13-39/57 later in this series). But this very patch (of_fwnode_handle() cleanup sub-series) won't be affected, so please take it through your tree, if you can. I will fix up the _create_ subseries and resend non-merged patches from this series in v3 later. So it's also fine to wait for v3. (But less I have to resend (unmodified), the better ;).) thanks,
On 07. 04. 25, 9:17, Jiri Slaby wrote: > On 21. 03. 25, 17:32, Bjorn Helgaas wrote: >> On Wed, Mar 19, 2025 at 10:29:00AM +0100, Jiri Slaby (SUSE) wrote: >>> of_node_to_fwnode() is irqdomain's reimplementation of the "officially" >>> defined of_fwnode_handle(). The former is in the process of being >>> removed, so use the latter instead. >> >> I'm fine with these and happy to apply via the PCI tree, but it sounds >> like you're planning a v3 with a few updates, so I'll hold off for >> now: >> >> https://lore.kernel.org/r/4bc0e1ca-a523-424a-8759-59e353317fba@kernel.org > > Right, there will be a v3 to deal better with irq_domain_create_*()'s > first parameter (patches 13-39/57 later in this series). > > But this very patch (of_fwnode_handle() cleanup sub-series) won't be > affected, so please take it through your tree, if you can. FWIW, the patch was 20250319092951.37667-8-jirislaby@kernel.org if you already dropped it. > I will fix up the _create_ subseries and resend non-merged patches from > this series in v3 later. So it's also fine to wait for v3. (But less I > have to resend (unmodified), the better ;).) > > thanks,
On Wed, Mar 19, 2025 at 10:29:00AM +0100, Jiri Slaby (SUSE) wrote: > of_node_to_fwnode() is irqdomain's reimplementation of the "officially" > defined of_fwnode_handle(). The former is in the process of being > removed, so use the latter instead. > > Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org> > Cc: Jingoo Han <jingoohan1@gmail.com> > Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > Cc: Lorenzo Pieralisi <lpieralisi@kernel.org> > Cc: "Krzysztof Wilczyński" <kw@linux.com> > Cc: Rob Herring <robh@kernel.org> > Cc: Bjorn Helgaas <bhelgaas@google.com> > Cc: Karthikeyan Mitran <m.karthikeyan@mobiveil.co.in> > Cc: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > Cc: Toan Le <toan@os.amperecomputing.com> > Cc: Joyce Ooi <joyce.ooi@intel.com> > Cc: Jim Quinlan <jim2101024@gmail.com> > Cc: Nicolas Saenz Julienne <nsaenz@kernel.org> > Cc: Florian Fainelli <florian.fainelli@broadcom.com> > Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com> > Cc: Ray Jui <rjui@broadcom.com> > Cc: Scott Branden <sbranden@broadcom.com> > Cc: Ryder Lee <ryder.lee@mediatek.com> > Cc: Jianjun Wang <jianjun.wang@mediatek.com> > Cc: Michal Simek <michal.simek@amd.com> > Cc: Daire McNamara <daire.mcnamara@microchip.com> > Cc: linux-pci@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-rpi-kernel@lists.infradead.org > Cc: linux-mediatek@lists.infradead.org Applied to pci/irq for v6.16, thanks! > --- > drivers/pci/controller/dwc/pcie-designware-host.c | 2 +- > drivers/pci/controller/mobiveil/pcie-mobiveil-host.c | 2 +- > drivers/pci/controller/pci-xgene-msi.c | 2 +- > drivers/pci/controller/pcie-altera-msi.c | 2 +- > drivers/pci/controller/pcie-brcmstb.c | 2 +- > drivers/pci/controller/pcie-iproc-msi.c | 2 +- > drivers/pci/controller/pcie-mediatek.c | 2 +- > drivers/pci/controller/pcie-xilinx-dma-pl.c | 2 +- > drivers/pci/controller/pcie-xilinx-nwl.c | 2 +- > drivers/pci/controller/plda/pcie-plda-host.c | 2 +- > 10 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c > index ecc33f6789e3..d1cd48efad43 100644 > --- a/drivers/pci/controller/dwc/pcie-designware-host.c > +++ b/drivers/pci/controller/dwc/pcie-designware-host.c > @@ -227,7 +227,7 @@ static const struct irq_domain_ops dw_pcie_msi_domain_ops = { > int dw_pcie_allocate_domains(struct dw_pcie_rp *pp) > { > struct dw_pcie *pci = to_dw_pcie_from_pp(pp); > - struct fwnode_handle *fwnode = of_node_to_fwnode(pci->dev->of_node); > + struct fwnode_handle *fwnode = of_fwnode_handle(pci->dev->of_node); > > pp->irq_domain = irq_domain_create_linear(fwnode, pp->num_vectors, > &dw_pcie_msi_domain_ops, pp); > diff --git a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c > index 0e088e74155d..6628eed9d26e 100644 > --- a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c > +++ b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c > @@ -435,7 +435,7 @@ static const struct irq_domain_ops msi_domain_ops = { > static int mobiveil_allocate_msi_domains(struct mobiveil_pcie *pcie) > { > struct device *dev = &pcie->pdev->dev; > - struct fwnode_handle *fwnode = of_node_to_fwnode(dev->of_node); > + struct fwnode_handle *fwnode = of_fwnode_handle(dev->of_node); > struct mobiveil_msi *msi = &pcie->rp.msi; > > mutex_init(&msi->lock); > diff --git a/drivers/pci/controller/pci-xgene-msi.c b/drivers/pci/controller/pci-xgene-msi.c > index 7bce327897c9..69a9c0a87639 100644 > --- a/drivers/pci/controller/pci-xgene-msi.c > +++ b/drivers/pci/controller/pci-xgene-msi.c > @@ -247,7 +247,7 @@ static int xgene_allocate_domains(struct xgene_msi *msi) > if (!msi->inner_domain) > return -ENOMEM; > > - msi->msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(msi->node), > + msi->msi_domain = pci_msi_create_irq_domain(of_fwnode_handle(msi->node), > &xgene_msi_domain_info, > msi->inner_domain); > > diff --git a/drivers/pci/controller/pcie-altera-msi.c b/drivers/pci/controller/pcie-altera-msi.c > index e1cee3c0575f..5fb3a2e0017e 100644 > --- a/drivers/pci/controller/pcie-altera-msi.c > +++ b/drivers/pci/controller/pcie-altera-msi.c > @@ -164,7 +164,7 @@ static const struct irq_domain_ops msi_domain_ops = { > > static int altera_allocate_domains(struct altera_msi *msi) > { > - struct fwnode_handle *fwnode = of_node_to_fwnode(msi->pdev->dev.of_node); > + struct fwnode_handle *fwnode = of_fwnode_handle(msi->pdev->dev.of_node); > > msi->inner_domain = irq_domain_add_linear(NULL, msi->num_of_vectors, > &msi_domain_ops, msi); > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index 8b2b099e81eb..1f356fca07a2 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -581,7 +581,7 @@ static const struct irq_domain_ops msi_domain_ops = { > > static int brcm_allocate_domains(struct brcm_msi *msi) > { > - struct fwnode_handle *fwnode = of_node_to_fwnode(msi->np); > + struct fwnode_handle *fwnode = of_fwnode_handle(msi->np); > struct device *dev = msi->dev; > > msi->inner_domain = irq_domain_add_linear(NULL, msi->nr, &msi_domain_ops, msi); > diff --git a/drivers/pci/controller/pcie-iproc-msi.c b/drivers/pci/controller/pcie-iproc-msi.c > index 649fcb449f34..804b3a5787c5 100644 > --- a/drivers/pci/controller/pcie-iproc-msi.c > +++ b/drivers/pci/controller/pcie-iproc-msi.c > @@ -451,7 +451,7 @@ static int iproc_msi_alloc_domains(struct device_node *node, > if (!msi->inner_domain) > return -ENOMEM; > > - msi->msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(node), > + msi->msi_domain = pci_msi_create_irq_domain(of_fwnode_handle(node), > &iproc_msi_domain_info, > msi->inner_domain); > if (!msi->msi_domain) { > diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c > index 811a8b4acd50..efcc4a7c17be 100644 > --- a/drivers/pci/controller/pcie-mediatek.c > +++ b/drivers/pci/controller/pcie-mediatek.c > @@ -485,7 +485,7 @@ static struct msi_domain_info mtk_msi_domain_info = { > > static int mtk_pcie_allocate_msi_domains(struct mtk_pcie_port *port) > { > - struct fwnode_handle *fwnode = of_node_to_fwnode(port->pcie->dev->of_node); > + struct fwnode_handle *fwnode = of_fwnode_handle(port->pcie->dev->of_node); > > mutex_init(&port->lock); > > diff --git a/drivers/pci/controller/pcie-xilinx-dma-pl.c b/drivers/pci/controller/pcie-xilinx-dma-pl.c > index dd117f07fc95..71cf13ae51c7 100644 > --- a/drivers/pci/controller/pcie-xilinx-dma-pl.c > +++ b/drivers/pci/controller/pcie-xilinx-dma-pl.c > @@ -470,7 +470,7 @@ static int xilinx_pl_dma_pcie_init_msi_irq_domain(struct pl_dma_pcie *port) > struct device *dev = port->dev; > struct xilinx_msi *msi = &port->msi; > int size = BITS_TO_LONGS(XILINX_NUM_MSI_IRQS) * sizeof(long); > - struct fwnode_handle *fwnode = of_node_to_fwnode(port->dev->of_node); > + struct fwnode_handle *fwnode = of_fwnode_handle(port->dev->of_node); > > msi->dev_domain = irq_domain_add_linear(NULL, XILINX_NUM_MSI_IRQS, > &dev_msi_domain_ops, port); > diff --git a/drivers/pci/controller/pcie-xilinx-nwl.c b/drivers/pci/controller/pcie-xilinx-nwl.c > index 8d6e2a89b067..9cf8a96f7bc4 100644 > --- a/drivers/pci/controller/pcie-xilinx-nwl.c > +++ b/drivers/pci/controller/pcie-xilinx-nwl.c > @@ -495,7 +495,7 @@ static int nwl_pcie_init_msi_irq_domain(struct nwl_pcie *pcie) > { > #ifdef CONFIG_PCI_MSI > struct device *dev = pcie->dev; > - struct fwnode_handle *fwnode = of_node_to_fwnode(dev->of_node); > + struct fwnode_handle *fwnode = of_fwnode_handle(dev->of_node); > struct nwl_msi *msi = &pcie->msi; > > msi->dev_domain = irq_domain_add_linear(NULL, INT_PCI_MSI_NR, > diff --git a/drivers/pci/controller/plda/pcie-plda-host.c b/drivers/pci/controller/plda/pcie-plda-host.c > index 4153214ca410..4c7a9fa311e3 100644 > --- a/drivers/pci/controller/plda/pcie-plda-host.c > +++ b/drivers/pci/controller/plda/pcie-plda-host.c > @@ -150,7 +150,7 @@ static struct msi_domain_info plda_msi_domain_info = { > static int plda_allocate_msi_domains(struct plda_pcie_rp *port) > { > struct device *dev = port->dev; > - struct fwnode_handle *fwnode = of_node_to_fwnode(dev->of_node); > + struct fwnode_handle *fwnode = of_fwnode_handle(dev->of_node); > struct plda_msi *msi = &port->msi; > > mutex_init(&port->msi.lock); > -- > 2.49.0 >
diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index ecc33f6789e3..d1cd48efad43 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -227,7 +227,7 @@ static const struct irq_domain_ops dw_pcie_msi_domain_ops = { int dw_pcie_allocate_domains(struct dw_pcie_rp *pp) { struct dw_pcie *pci = to_dw_pcie_from_pp(pp); - struct fwnode_handle *fwnode = of_node_to_fwnode(pci->dev->of_node); + struct fwnode_handle *fwnode = of_fwnode_handle(pci->dev->of_node); pp->irq_domain = irq_domain_create_linear(fwnode, pp->num_vectors, &dw_pcie_msi_domain_ops, pp); diff --git a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c index 0e088e74155d..6628eed9d26e 100644 --- a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c +++ b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c @@ -435,7 +435,7 @@ static const struct irq_domain_ops msi_domain_ops = { static int mobiveil_allocate_msi_domains(struct mobiveil_pcie *pcie) { struct device *dev = &pcie->pdev->dev; - struct fwnode_handle *fwnode = of_node_to_fwnode(dev->of_node); + struct fwnode_handle *fwnode = of_fwnode_handle(dev->of_node); struct mobiveil_msi *msi = &pcie->rp.msi; mutex_init(&msi->lock); diff --git a/drivers/pci/controller/pci-xgene-msi.c b/drivers/pci/controller/pci-xgene-msi.c index 7bce327897c9..69a9c0a87639 100644 --- a/drivers/pci/controller/pci-xgene-msi.c +++ b/drivers/pci/controller/pci-xgene-msi.c @@ -247,7 +247,7 @@ static int xgene_allocate_domains(struct xgene_msi *msi) if (!msi->inner_domain) return -ENOMEM; - msi->msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(msi->node), + msi->msi_domain = pci_msi_create_irq_domain(of_fwnode_handle(msi->node), &xgene_msi_domain_info, msi->inner_domain); diff --git a/drivers/pci/controller/pcie-altera-msi.c b/drivers/pci/controller/pcie-altera-msi.c index e1cee3c0575f..5fb3a2e0017e 100644 --- a/drivers/pci/controller/pcie-altera-msi.c +++ b/drivers/pci/controller/pcie-altera-msi.c @@ -164,7 +164,7 @@ static const struct irq_domain_ops msi_domain_ops = { static int altera_allocate_domains(struct altera_msi *msi) { - struct fwnode_handle *fwnode = of_node_to_fwnode(msi->pdev->dev.of_node); + struct fwnode_handle *fwnode = of_fwnode_handle(msi->pdev->dev.of_node); msi->inner_domain = irq_domain_add_linear(NULL, msi->num_of_vectors, &msi_domain_ops, msi); diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 8b2b099e81eb..1f356fca07a2 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -581,7 +581,7 @@ static const struct irq_domain_ops msi_domain_ops = { static int brcm_allocate_domains(struct brcm_msi *msi) { - struct fwnode_handle *fwnode = of_node_to_fwnode(msi->np); + struct fwnode_handle *fwnode = of_fwnode_handle(msi->np); struct device *dev = msi->dev; msi->inner_domain = irq_domain_add_linear(NULL, msi->nr, &msi_domain_ops, msi); diff --git a/drivers/pci/controller/pcie-iproc-msi.c b/drivers/pci/controller/pcie-iproc-msi.c index 649fcb449f34..804b3a5787c5 100644 --- a/drivers/pci/controller/pcie-iproc-msi.c +++ b/drivers/pci/controller/pcie-iproc-msi.c @@ -451,7 +451,7 @@ static int iproc_msi_alloc_domains(struct device_node *node, if (!msi->inner_domain) return -ENOMEM; - msi->msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(node), + msi->msi_domain = pci_msi_create_irq_domain(of_fwnode_handle(node), &iproc_msi_domain_info, msi->inner_domain); if (!msi->msi_domain) { diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c index 811a8b4acd50..efcc4a7c17be 100644 --- a/drivers/pci/controller/pcie-mediatek.c +++ b/drivers/pci/controller/pcie-mediatek.c @@ -485,7 +485,7 @@ static struct msi_domain_info mtk_msi_domain_info = { static int mtk_pcie_allocate_msi_domains(struct mtk_pcie_port *port) { - struct fwnode_handle *fwnode = of_node_to_fwnode(port->pcie->dev->of_node); + struct fwnode_handle *fwnode = of_fwnode_handle(port->pcie->dev->of_node); mutex_init(&port->lock); diff --git a/drivers/pci/controller/pcie-xilinx-dma-pl.c b/drivers/pci/controller/pcie-xilinx-dma-pl.c index dd117f07fc95..71cf13ae51c7 100644 --- a/drivers/pci/controller/pcie-xilinx-dma-pl.c +++ b/drivers/pci/controller/pcie-xilinx-dma-pl.c @@ -470,7 +470,7 @@ static int xilinx_pl_dma_pcie_init_msi_irq_domain(struct pl_dma_pcie *port) struct device *dev = port->dev; struct xilinx_msi *msi = &port->msi; int size = BITS_TO_LONGS(XILINX_NUM_MSI_IRQS) * sizeof(long); - struct fwnode_handle *fwnode = of_node_to_fwnode(port->dev->of_node); + struct fwnode_handle *fwnode = of_fwnode_handle(port->dev->of_node); msi->dev_domain = irq_domain_add_linear(NULL, XILINX_NUM_MSI_IRQS, &dev_msi_domain_ops, port); diff --git a/drivers/pci/controller/pcie-xilinx-nwl.c b/drivers/pci/controller/pcie-xilinx-nwl.c index 8d6e2a89b067..9cf8a96f7bc4 100644 --- a/drivers/pci/controller/pcie-xilinx-nwl.c +++ b/drivers/pci/controller/pcie-xilinx-nwl.c @@ -495,7 +495,7 @@ static int nwl_pcie_init_msi_irq_domain(struct nwl_pcie *pcie) { #ifdef CONFIG_PCI_MSI struct device *dev = pcie->dev; - struct fwnode_handle *fwnode = of_node_to_fwnode(dev->of_node); + struct fwnode_handle *fwnode = of_fwnode_handle(dev->of_node); struct nwl_msi *msi = &pcie->msi; msi->dev_domain = irq_domain_add_linear(NULL, INT_PCI_MSI_NR, diff --git a/drivers/pci/controller/plda/pcie-plda-host.c b/drivers/pci/controller/plda/pcie-plda-host.c index 4153214ca410..4c7a9fa311e3 100644 --- a/drivers/pci/controller/plda/pcie-plda-host.c +++ b/drivers/pci/controller/plda/pcie-plda-host.c @@ -150,7 +150,7 @@ static struct msi_domain_info plda_msi_domain_info = { static int plda_allocate_msi_domains(struct plda_pcie_rp *port) { struct device *dev = port->dev; - struct fwnode_handle *fwnode = of_node_to_fwnode(dev->of_node); + struct fwnode_handle *fwnode = of_fwnode_handle(dev->of_node); struct plda_msi *msi = &port->msi; mutex_init(&port->msi.lock);
of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead. Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org> Cc: Jingoo Han <jingoohan1@gmail.com> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Cc: Lorenzo Pieralisi <lpieralisi@kernel.org> Cc: "Krzysztof Wilczyński" <kw@linux.com> Cc: Rob Herring <robh@kernel.org> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Karthikeyan Mitran <m.karthikeyan@mobiveil.co.in> Cc: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> Cc: Toan Le <toan@os.amperecomputing.com> Cc: Joyce Ooi <joyce.ooi@intel.com> Cc: Jim Quinlan <jim2101024@gmail.com> Cc: Nicolas Saenz Julienne <nsaenz@kernel.org> Cc: Florian Fainelli <florian.fainelli@broadcom.com> Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com> Cc: Ray Jui <rjui@broadcom.com> Cc: Scott Branden <sbranden@broadcom.com> Cc: Ryder Lee <ryder.lee@mediatek.com> Cc: Jianjun Wang <jianjun.wang@mediatek.com> Cc: Michal Simek <michal.simek@amd.com> Cc: Daire McNamara <daire.mcnamara@microchip.com> Cc: linux-pci@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-rpi-kernel@lists.infradead.org Cc: linux-mediatek@lists.infradead.org --- drivers/pci/controller/dwc/pcie-designware-host.c | 2 +- drivers/pci/controller/mobiveil/pcie-mobiveil-host.c | 2 +- drivers/pci/controller/pci-xgene-msi.c | 2 +- drivers/pci/controller/pcie-altera-msi.c | 2 +- drivers/pci/controller/pcie-brcmstb.c | 2 +- drivers/pci/controller/pcie-iproc-msi.c | 2 +- drivers/pci/controller/pcie-mediatek.c | 2 +- drivers/pci/controller/pcie-xilinx-dma-pl.c | 2 +- drivers/pci/controller/pcie-xilinx-nwl.c | 2 +- drivers/pci/controller/plda/pcie-plda-host.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-)