media: ivsc: csi: Use IPU bridge

Use IPU bridge to instantiate software nodes for IPU6 related devices. If
the IPU6 device is probed before the MEI CSI device is created, neither
will probe unless there are further devices probed successfully which
triggers re-probe of both IPU6 and MEI CSI.

This patch ensures the necessary software nodes are in place when the MEI
CSI driver is probed.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/pci/intel/ivsc/mei_csi.c b/drivers/media/pci/intel/ivsc/mei_csi.c
index 55e0c60c420cd575c71ff909d7f82a2bf7550c0b..89b582a221ab41c9b517c1da058c064e0e5c762d 100644 (file)
--- a/drivers/media/pci/intel/ivsc/mei_csi.c
+++ b/drivers/media/pci/intel/ivsc/mei_csi.c
@@ -19,12 +19,15 @@
 #include <linux/mei_cl_bus.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/pci.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/units.h>
 #include <linux/uuid.h>
 #include <linux/workqueue.h>
 
+#include <media/ipu-bridge.h>
+#include <media/ipu6-pci-table.h>
 #include <media/v4l2-async.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-fwnode.h>
@@ -661,11 +664,23 @@ static int mei_csi_probe(struct mei_cl_device *cldev,
                         const struct mei_cl_device_id *id)
 {
        struct device *dev = &cldev->dev;
+       struct pci_dev *ipu;
        struct mei_csi *csi;
+       unsigned int i;
        int ret;
 
-       if (!dev_fwnode(dev))
-               return -EPROBE_DEFER;
+       for (i = 0, ipu = NULL; !ipu && ipu6_pci_tbl[i].vendor; i++)
+               ipu = pci_get_device(ipu6_pci_tbl[i].vendor,
+                                    ipu6_pci_tbl[i].device, NULL);
+
+       if (!ipu)
+               return -ENODEV;
+
+       ret = ipu_bridge_init(&ipu->dev, ipu_bridge_parse_ssdb);
+       if (ret < 0)
+               return ret;
+       if (WARN_ON(!dev_fwnode(dev)))
+               return -ENXIO;
 
        csi = devm_kzalloc(dev, sizeof(struct mei_csi), GFP_KERNEL);
        if (!csi)
@@ -784,6 +799,7 @@ static struct mei_cl_driver mei_csi_driver = {
 
 module_mei_cl_driver(mei_csi_driver);
 
+MODULE_IMPORT_NS(INTEL_IPU_BRIDGE);
 MODULE_AUTHOR("Wentong Wu <wentong.wu@intel.com>");
 MODULE_AUTHOR("Zhifeng Wang <zhifeng.wang@intel.com>");
 MODULE_DESCRIPTION("Device driver for IVSC CSI");