drivers: phy: Handle gracefully NULL pointers

[oweals/u-boot.git] / drivers / phy / phy-uclass.c

diff --git a/drivers/phy/phy-uclass.c b/drivers/phy/phy-uclass.c
index 0d8bef76dbdab7c3504ead2dd301b05b1dc89db5..e201a90c8c8df3d5ac604bc62f8a4dba30de5a2c 100644 (file)
--- a/drivers/phy/phy-uclass.c
+++ b/drivers/phy/phy-uclass.c
@@ -1,23 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/
  * Written by Jean-Jacques Hiblot  <jjhiblot@ti.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <dm.h>
 #include <generic-phy.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 static inline struct phy_ops *phy_dev_ops(struct udevice *dev)
 {
        return (struct phy_ops *)dev->driver->ops;
 }
 
 static int generic_phy_xlate_offs_flags(struct phy *phy,
-                                struct fdtdec_phandle_args *args)
+                                       struct ofnode_phandle_args *args)
 {
        debug("%s(phy=%p)\n", __func__, phy);
 
@@ -31,35 +28,47 @@ static int generic_phy_xlate_offs_flags(struct phy *phy,
        else
                phy->id = 0;
 
-
        return 0;
 }
 
 int generic_phy_get_by_index(struct udevice *dev, int index,
                             struct phy *phy)
 {
-       struct fdtdec_phandle_args args;
+       struct ofnode_phandle_args args;
        struct phy_ops *ops;
-       int ret;
        struct udevice *phydev;
+       int i, ret;
 
        debug("%s(dev=%p, index=%d, phy=%p)\n", __func__, dev, index, phy);
 
        assert(phy);
-       ret = fdtdec_parse_phandle_with_args(gd->fdt_blob, dev_of_offset(dev),
-                                            "phys", "#phy-cells", 0, index,
-                                            &args);
+       phy->dev = NULL;
+       ret = dev_read_phandle_with_args(dev, "phys", "#phy-cells", 0, index,
+                                        &args);
        if (ret) {
-               debug("%s: fdtdec_parse_phandle_with_args failed: err=%d\n",
+               debug("%s: dev_read_phandle_with_args failed: err=%d\n",
                      __func__, ret);
                return ret;
        }
 
-       ret = uclass_get_device_by_of_offset(UCLASS_PHY, args.node, &phydev);
+       ret = uclass_get_device_by_ofnode(UCLASS_PHY, args.node, &phydev);
        if (ret) {
-               debug("%s: uclass_get_device_by_of_offset failed: err=%d\n",
+               debug("%s: uclass_get_device_by_ofnode failed: err=%d\n",
                      __func__, ret);
-               return ret;
+
+               /* Check if args.node's parent is a PHY provider */
+               ret = uclass_get_device_by_ofnode(UCLASS_PHY,
+                                                 ofnode_get_parent(args.node),
+                                                 &phydev);
+               if (ret)
+                       return ret;
+
+               /* insert phy idx at first position into args array */
+               for (i = args.args_count; i >= 1 ; i--)
+                       args.args[i] = args.args[i - 1];
+
+               args.args_count++;
+               args.args[0] = ofnode_read_u32_default(args.node, "reg", -1);
        }
 
        phy->dev = phydev;
@@ -88,10 +97,9 @@ int generic_phy_get_by_name(struct udevice *dev, const char *phy_name,
 
        debug("%s(dev=%p, name=%s, phy=%p)\n", __func__, dev, phy_name, phy);
 
-       index = fdt_stringlist_search(gd->fdt_blob, dev_of_offset(dev),
-                                     "phy-names", phy_name);
+       index = dev_read_stringlist_search(dev, "phy-names", phy_name);
        if (index < 0) {
-               debug("fdt_stringlist_search() failed: %d\n", index);
+               debug("dev_read_stringlist_search() failed: %d\n", index);
                return index;
        }
 
@@ -100,35 +108,55 @@ int generic_phy_get_by_name(struct udevice *dev, const char *phy_name,
 
 int generic_phy_init(struct phy *phy)
 {
-       struct phy_ops const *ops = phy_dev_ops(phy->dev);
+       struct phy_ops const *ops;
+
+       if (!phy)
+               return 0;
+       ops = phy_dev_ops(phy->dev);
 
        return ops->init ? ops->init(phy) : 0;
 }
 
 int generic_phy_reset(struct phy *phy)
 {
-       struct phy_ops const *ops = phy_dev_ops(phy->dev);
+       struct phy_ops const *ops;
+
+       if (!phy)
+               return 0;
+       ops = phy_dev_ops(phy->dev);
 
        return ops->reset ? ops->reset(phy) : 0;
 }
 
 int generic_phy_exit(struct phy *phy)
 {
-       struct phy_ops const *ops = phy_dev_ops(phy->dev);
+       struct phy_ops const *ops;
+
+       if (!phy)
+               return 0;
+       ops = phy_dev_ops(phy->dev);
 
        return ops->exit ? ops->exit(phy) : 0;
 }
 
 int generic_phy_power_on(struct phy *phy)
 {
-       struct phy_ops const *ops = phy_dev_ops(phy->dev);
+       struct phy_ops const *ops;
+
+       if (!phy)
+               return 0;
+       ops = phy_dev_ops(phy->dev);
 
        return ops->power_on ? ops->power_on(phy) : 0;
 }
 
 int generic_phy_power_off(struct phy *phy)
 {
-       struct phy_ops const *ops = phy_dev_ops(phy->dev);
+       struct phy_ops const *ops;
+
+       if (!phy)
+               return 0;
+       ops = phy_dev_ops(phy->dev);
 
        return ops->power_off ? ops->power_off(phy) : 0;
 }