scsi: ufs-qcom: add probe_defer in case phy driver not probed yet

In case UFS driver is probed before the phy driver does, the UFS driver
should return a PROBE_DEFER code.

Signed-off-by: Yaniv Gardi <ygardi@codeaurora.org>
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index aa43bfea0d004270d79411c91f5ee5b413daba73..ff614613bf8983b06f79f924fdebed075db22ec8 100644 (file)
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -1194,7 +1194,16 @@ static int ufs_qcom_init(struct ufs_hba *hba)
         */
        host->generic_phy = devm_phy_get(dev, "ufsphy");
 
-       if (IS_ERR(host->generic_phy)) {
+       if (host->generic_phy == ERR_PTR(-EPROBE_DEFER)) {
+               /*
+                * UFS driver might be probed before the phy driver does.
+                * In that case we would like to return EPROBE_DEFER code.
+                */
+               err = -EPROBE_DEFER;
+               dev_warn(dev, "%s: required phy device. hasn't probed yet. err = %d\n",
+                       __func__, err);
+               goto out_variant_clear;
+       } else if (IS_ERR(host->generic_phy)) {
                err = PTR_ERR(host->generic_phy);
                dev_err(dev, "%s: PHY get failed %d\n", __func__, err);
                goto out_variant_clear;