platform/chrome: cros_ec_typec: allow deferred probe of switch handles

`fwnode_typec_{retimer,mux,switch}_get()` could return `-EPROBE_DEFER`,
which is called from `cros_typec_get_switch_handles`. When this happens,
it does not indicate absence of switches; instead, it only hints that
probing of switches should occur at a later time.

Progagate `-EPROBE_DEFER` to upper layer logic so that they can re-try
probing switches as a better time.

Signed-off-by: Victor Ding <victording@chromium.org>
Reviewed-by: Benson Leung <bleung@chromium.org>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20230124075555.v3.1.I6c0a089123fdf143f94ef4cca8677639031856cf@changeid
Signed-off-by: Prashant Malani <pmalani@chromium.org>

diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index e02107a6870a6daa53f1691ba2e2a4f4e9b467a7..1abb471840d521d7f845197ffc9c4bd524bfad51 100644 (file)
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -75,27 +75,33 @@ static int cros_typec_get_switch_handles(struct cros_typec_port *port,
                                         struct fwnode_handle *fwnode,
                                         struct device *dev)
 {
+       int ret = 0;
+
        port->mux = fwnode_typec_mux_get(fwnode, NULL);
        if (IS_ERR(port->mux)) {
-               dev_dbg(dev, "Mux handle not found.\n");
+               ret = PTR_ERR(port->mux);
+               dev_dbg(dev, "Mux handle not found: %d.\n", ret);
                goto mux_err;
        }
 
        port->retimer = fwnode_typec_retimer_get(fwnode);
        if (IS_ERR(port->retimer)) {
-               dev_dbg(dev, "Retimer handle not found.\n");
+               ret = PTR_ERR(port->retimer);
+               dev_dbg(dev, "Retimer handle not found: %d.\n", ret);
                goto retimer_sw_err;
        }
 
        port->ori_sw = fwnode_typec_switch_get(fwnode);
        if (IS_ERR(port->ori_sw)) {
-               dev_dbg(dev, "Orientation switch handle not found.\n");
+               ret = PTR_ERR(port->ori_sw);
+               dev_dbg(dev, "Orientation switch handle not found: %d\n", ret);
                goto ori_sw_err;
        }
 
        port->role_sw = fwnode_usb_role_switch_get(fwnode);
        if (IS_ERR(port->role_sw)) {
-               dev_dbg(dev, "USB role switch handle not found.\n");
+               ret = PTR_ERR(port->role_sw);
+               dev_dbg(dev, "USB role switch handle not found: %d\n", ret);
                goto role_sw_err;
        }
 
@@ -111,7 +117,7 @@ retimer_sw_err:
        typec_mux_put(port->mux);
        port->mux = NULL;
 mux_err:
-       return -ENODEV;
+       return ret;
 }
 
 static int cros_typec_add_partner(struct cros_typec_data *typec, int port_num,
@@ -359,9 +365,11 @@ static int cros_typec_init_ports(struct cros_typec_data *typec)
                }
 
                ret = cros_typec_get_switch_handles(cros_port, fwnode, dev);
-               if (ret)
-                       dev_dbg(dev, "No switch control for port %d\n",
-                               port_num);
+               if (ret) {
+                       dev_dbg(dev, "No switch control for port %d, err: %d\n", port_num, ret);
+                       if (ret == -EPROBE_DEFER)
+                               goto unregister_ports;
+               }
 
                ret = cros_typec_register_port_altmodes(typec, port_num);
                if (ret) {