soc: qcom: qmi: Return EPROBE_DEFER if no address family

If a client comes up early in the boot process (perhaps was a built-in
driver), qmi_handle_init() will likely fail with a EAFNOSUPPORT since the
underlying ipc router hasn't init'd and registered the address family.
This should not be a fatal error since chances are, the router will come
up later, so recode the error to EPROBE_DEFER so that clients will retry
later.

Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com>
Link: https://lore.kernel.org/r/20191106230511.1290-1-jeffrey.l.hugo@gmail.com
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/drivers/soc/qcom/qmi_interface.c b/drivers/soc/qcom/qmi_interface.c
index f9e309f0acd32debbb44cb116386ed8bc9fc3093..1a03eaa38c46c9add3b13076d6e840799449b4f7 100644 (file)
--- a/drivers/soc/qcom/qmi_interface.c
+++ b/drivers/soc/qcom/qmi_interface.c
@@ -655,8 +655,12 @@ int qmi_handle_init(struct qmi_handle *qmi, size_t recv_buf_size,
 
        qmi->sock = qmi_sock_create(qmi, &qmi->sq);
        if (IS_ERR(qmi->sock)) {
-               pr_err("failed to create QMI socket\n");
-               ret = PTR_ERR(qmi->sock);
+               if (PTR_ERR(qmi->sock) == -EAFNOSUPPORT) {
+                       ret = -EPROBE_DEFER;
+               } else {
+                       pr_err("failed to create QMI socket\n");
+                       ret = PTR_ERR(qmi->sock);
+               }
                goto err_destroy_wq;
        }