pci: controller: mobiveil: Hold reference returned by of_parse_phandle()
Subsystems (3)
PATCH 1/1 pci: controller: mobiveil: Hold reference returned by of_parse_phandle()
In ls_g4_pcie_probe(), we should hold the reference returned by of_parse_phandle() and use it to call of_node_put() for refcount balance.
--- drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c +4 -2
@@ -204,13 +204,15 @@ static int __init ls_g4_pcie_probe(struct platform_device *pdev)struct pci_host_bridge *bridge;struct mobiveil_pcie *mv_pci;struct ls_g4_pcie *pcie; -struct device_node *np = dev->of_node; +struct device_node *np = dev->of_node, *parse_np;int ret; -if (!of_parse_phandle (np,"msi-parent" ,0 )) { + parse_np =of_parse_phandle (np,"msi-parent" ,0 ); +if (!parse_np) {dev_err (dev,"Failed to find msi-parent\n" );return -EINVAL ; } +of_node_put (parse_np); bridge =devm_pci_alloc_host_bridge (dev,sizeof (*pcie));if (!bridge)
Signature · 1 line
2.25.1
Quoted 16 lines · Liang He
In
ls_g4_pcie_probe(), we should hold the reference returned byof_parse_phandle()and use it to callof_node_put()for refcount balance.Fixes d29ad70a813b ("PCI: mobiveil: Add PCIe Gen4 RC driver for Layerscape SoCs")Co-authored-by Miaoqian Lin <[email protected]>Signed-off-by Liang He <[email protected]>--- drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c +0
-0
drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c static int __init ls_g4_pcie_probe(struct platform_device *pdev) · line 210
Quoted 9 lines
drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c +2
-2@@ -204,13 +204,15 @@ static int __init ls_g4_pcie_probe(struct platform_device *pdev)struct pci_host_bridge *bridge;struct mobiveil_pcie *mv_pci;struct ls_g4_pcie *pcie; -struct device_node *np = dev->of_node; +struct device_node *np = dev->of_node, *parse_np;int ret; -if (!of_parse_phandle (np,"msi-parent" ,0 )) { + parse_np =of_parse_phandle (np,"msi-parent" ,0 );
I don't understand what's going on here. Where is "msi-parent" actually used? If we just need to know whether "msi-parent" exists, can we use of_property_read_bool() instead? Or can we call of_parse_phandle() closer to where it is used?
Quoted 11 lines
drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c +2
-0+if (!parse_np) {dev_err (dev,"Failed to find msi-parent\n" );return -EINVAL ; } +of_node_put (parse_np); bridge =devm_pci_alloc_host_bridge (dev,sizeof (*pcie));if (!bridge)Signature · 1 line
2.25.1
Quoted 24 lines · Bjorn Helgaas
Quoted 23 lines · Liang He
In
ls_g4_pcie_probe(), we should hold the reference returned byof_parse_phandle()and use it to callof_node_put()for refcount balance.Fixes d29ad70a813b ("PCI: mobiveil: Add PCIe Gen4 RC driver for Layerscape SoCs")Co-authored-by Miaoqian Lin <[email protected]>Signed-off-by Liang He <[email protected]>--- drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c +1
-1@@ -204,13 +204,15 @@ static int __init ls_g4_pcie_probe(struct platform_device *pdev)struct pci_host_bridge *bridge;struct mobiveil_pcie *mv_pci;struct ls_g4_pcie *pcie; -struct device_node *np = dev->of_node; +struct device_node *np = dev->of_node, *parse_np;int ret;
Quoted 8 lines
drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c static int __init ls_g4_pcie_probe(struct platform_device *pdev) · line 210
Quoted 2 lines
drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c +1
-1-if (!of_parse_phandle (np,"msi-parent" ,0 )) { + parse_np =of_parse_phandle (np,"msi-parent" ,0 );I don't understand what's going on here. Where is "msi-parent" actually used? If we just need to know whether "msi-parent" exists, can we use
of_property_read_bool()instead? Or can we callof_parse_phandle()closer to where it is used?
Hi, Bjorn,
I think this code is used to check the existence of the device_node whose property is "msi-parent". of_property_read_bool() can only be used to check current device_node 'np'.
If this is right, I think we can use a helper to make thing simple like this:
https://lore.kernel.org/all/[email protected]/
If it is ok, I will prepare the helper in new version.
Thanks again,
Liang
Quoted 11 lines
Quoted 11 lines
drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c +2
-0+if (!parse_np) {dev_err (dev,"Failed to find msi-parent\n" );return -EINVAL ; } +of_node_put (parse_np); bridge =devm_pci_alloc_host_bridge (dev,sizeof (*pcie));if (!bridge)Signature · 1 line
2.25.1
Quoted 37 lines · Liang He
Quoted 24 lines · Bjorn Helgaas
Quoted 23 lines · Liang He
In
ls_g4_pcie_probe(), we should hold the reference returned byof_parse_phandle()and use it to callof_node_put()for refcount balance.Fixes d29ad70a813b ("PCI: mobiveil: Add PCIe Gen4 RC driver for Layerscape SoCs")Co-authored-by Miaoqian Lin <[email protected]>Signed-off-by Liang He <[email protected]>--- drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c +1
-1@@ -204,13 +204,15 @@ static int __init ls_g4_pcie_probe(struct platform_device *pdev)struct pci_host_bridge *bridge;struct mobiveil_pcie *mv_pci;struct ls_g4_pcie *pcie; -struct device_node *np = dev->of_node; +struct device_node *np = dev->of_node, *parse_np;int ret;Quoted 7 lines
drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c static int __init ls_g4_pcie_probe(struct platform_device *pdev) · line 210
Quoted 2 lines
drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c +1
-1-if (!of_parse_phandle (np,"msi-parent" ,0 )) { + parse_np =of_parse_phandle (np,"msi-parent" ,0 );I don't understand what's going on here. Where is "msi-parent" actually used? If we just need to know whether "msi-parent" exists, can we use
of_property_read_bool()instead? Or can we callof_parse_phandle()closer to where it is used?I think this code is used to check the existence of the
device_nodewhose property is "msi-parent".of_property_read_bool()can only be used to check currentdevice_node'np'.
Quoted 6 lines
If this is right, I think we can use a helper to make thing simple like this:
https://lore.kernel.org/all/[email protected]/
If it is ok, I will prepare the helper in new version.
I dunno. The helper in that patch has nothing ftgmac100-specific in it, so if the helper is correct and useful, it seems like it should be somewhere generic so we don't end up with a zillion copies of it. Maybe Rob will chime in.
I just want drivers/pci/controller/* to deal with "msi-parent" consistently.
dw_pcie_host_init() uses of_property_read_bool().
ls_g4_pcie_probe(), brcm_pcie_probe(), and iproc_pcie_msi_enable() use of_parse_phandle().
It's not clear to me that these uses are fundamentally different and need to use different interfaces.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c +2
-0+if (!parse_np) {dev_err (dev,"Failed to find msi-parent\n" );return -EINVAL ; } +of_node_put (parse_np); bridge =devm_pci_alloc_host_bridge (dev,sizeof (*pcie));if (!bridge)Signature · 1 line
2.25.1