scsi: hisi_sas: support deferred probe for v2 hw

In the hip06 and hip07 SoCs, the interrupt lines from the SAS
controllers are connected to mbigen hw module [1].  The mbigen module is
probed with module_init, and, as such, is not guaranteed to probe before
the SAS driver. So we need to support deferred probe.

We check for probe deferral in the hw layer probe, so we not probe into
the main layer and allocate shost, memories, etc., to later learn that
we need to defer the probe.

[1] ./Documentation/devicetree/bindings/interrupt-controller/hisilicon,mbigen-v2.txt

Signed-off-by: John Garry <john.garry@huawei.com>
Reviewed-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index 93876c0137eba9517daec587b59a12d4e5da28e5..b934aec1eebba87ef31ac7c4dc0a831492e4748e 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -2790,6 +2790,18 @@ static const struct hisi_sas_hw hisi_sas_v2_hw = {
 
 static int hisi_sas_v2_probe(struct platform_device *pdev)
 {
+       /*
+        * Check if we should defer the probe before we probe the
+        * upper layer, as it's hard to defer later on.
+        */
+       int ret = platform_get_irq(pdev, 0);
+
+       if (ret < 0) {
+               if (ret != -EPROBE_DEFER)
+                       dev_err(&pdev->dev, "cannot obtain irq\n");
+               return ret;
+       }
+
        return hisi_sas_probe(pdev, &hisi_sas_v2_hw);
 }