Skip to contentSkip to conversation

load ivsc driver modules automatically

PATCH New Wentong Wu 1 participant 4 messages Aug 29, 2023

Subsystems (2)
lore
Share & tools
lore

Wentong Wu

author
#0 lore raw

v4 cover load ivsc driver modules automatically

The modalias of ivsc mei devices are built based only on its own UUID. But with additional name identifier, the driver module alias can't match with ivsc devices' modalias, so remove name identifier to help depmod loading ivsc driver modules automatically. At the same time, this patch makes sure IPU bridge is initialized before probing ace device to fix probe order problem founded after automatically loading ivsc driver modules is enabled.

---
v4:
- add cover letter

v3:
- make commit message more clear

Wentong Wu (3):
media: ivsc: csi: remove name identifier
media: ivsc: ace: remove name identifier
media: ivsc: ace: probe ace device after IPU bridge is initialized.

 drivers/media/pci/intel/ivsc/mei_ace.c | 9 +++++----
 drivers/media/pci/intel/ivsc/mei_csi.c | 5 ++---
 2 files changed, 7 insertions(+), 7 deletions(-)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH v4 1/3 media: ivsc: csi: remove name identifier

Remove name identifier to match the device with the defined UUID when load driver module.

---
 drivers/media/pci/intel/ivsc/mei_csi.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/media/pci/intel/ivsc/mei_csi.c +2 -3
index 264b85b..648c6a8 100644
@@ -30,7 +30,6 @@
 #include <media/v4l2-fwnode.h>
 #include <media/v4l2-subdev.h>
 
-#define MEI_CSI_DRIVER_NAME "ivsc_csi"
 #define MEI_CSI_ENTITY_NAME "Intel IVSC CSI"
 
 #define MEI_CSI_LINK_FREQ_400MHZ 400000000ULL
@@ -804,14 +803,14 @@ static void mei_csi_remove(struct mei_cl_device *cldev)
 			     0xAF, 0x93, 0x7b, 0x44, 0x53, 0xAC, 0x29, 0xDA)
 
 static const struct mei_cl_device_id mei_csi_tbl[] = {
-	{ MEI_CSI_DRIVER_NAME, MEI_CSI_UUID, MEI_CL_VERSION_ANY },
+	{ .uuid = MEI_CSI_UUID, .version = MEI_CL_VERSION_ANY },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(mei, mei_csi_tbl);
 
 static struct mei_cl_driver mei_csi_driver = {
 	.id_table = mei_csi_tbl,
-	.name = MEI_CSI_DRIVER_NAME,
+	.name = KBUILD_MODNAME,
 
 	.probe = mei_csi_probe,
 	.remove = mei_csi_remove,
Signature · 1 line
2.7.4
author
#2 lore raw

PATCH v4 2/3 media: ivsc: ace: remove name identifier

In reply to Wentong Wu

Remove name identifier to match the device with the defined UUID when load driver module.

---
 drivers/media/pci/intel/ivsc/mei_ace.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/media/pci/intel/ivsc/mei_ace.c +2 -4
index bc37f6d..7879f1f 100644
@@ -30,8 +30,6 @@
 #include <linux/uuid.h>
 #include <linux/workqueue.h>
 
-#define	MEI_ACE_DRIVER_NAME	"ivsc_ace"
-
 /* indicating driver message */
 #define	ACE_DRV_MSG		1
 /* indicating set command */
@@ -554,14 +552,14 @@ static const struct dev_pm_ops mei_ace_pm_ops = {
 			     0x9B, 0x78, 0x03, 0x61, 0x63, 0x5E, 0x24, 0x47)
 
 static const struct mei_cl_device_id mei_ace_tbl[] = {
-	{ MEI_ACE_DRIVER_NAME, MEI_ACE_UUID, MEI_CL_VERSION_ANY },
+	{ .uuid = MEI_ACE_UUID, .version = MEI_CL_VERSION_ANY },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(mei, mei_ace_tbl);
 
 static struct mei_cl_driver mei_ace_driver = {
 	.id_table = mei_ace_tbl,
-	.name = MEI_ACE_DRIVER_NAME,
+	.name = KBUILD_MODNAME,
 
 	.probe = mei_ace_probe,
 	.remove = mei_ace_remove,
Signature · 1 line
2.7.4
author
#3 lore raw

PATCH v4 3/3 media: ivsc: ace: probe ace device after IPU bridge is initialized.

In reply to Wentong Wu

During probe ivsc ace device, acpi_dev_clear_dependencies() will be called to clear the consumer and supplier relationship between camera sensor device and ivsc device. But IPU bridge will setup the connection swnodes for ivsc device and camera sensor device based on this consumer and supplier relationship. This patch defers ivsc ace's probe to make sure IPU bridge is initialized before this consumer and supplier relationship between camera sensor device and IVSC device is cleared.

---
 drivers/media/pci/intel/ivsc/mei_ace.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/media/pci/intel/ivsc/mei_ace.c +3 -0
index 7879f1f..627ec40 100644
@@ -406,6 +406,9 @@ static int mei_ace_setup_dev_link(struct mei_ace *ace)
 	if (!csi_dev) {
 		ret = -EPROBE_DEFER;
 		goto err;
+	} else if (!dev_fwnode(csi_dev)) {
+		ret = -EPROBE_DEFER;
+		goto err_put;
 	}
 
 	/* setup link between mei_ace and mei_csi */
Signature · 1 line
2.7.4