Hi Bingbu,
On Tue, 2023-10-24 at 19:29 +0800, bingbu.cao@xxxxxxxxx wrote:
> From: Bingbu Cao <bingbu.cao@xxxxxxxxx>
>
> Input system driver do basic isys hardware setup and irq handling
> and work with fwnode and v4l2 to register the ISYS v4l2 devices.
>
> Signed-off-by: Bingbu Cao <bingbu.cao@xxxxxxxxx>
> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
> Reported-by: Claus Stovgaard <claus.stovgaard@xxxxxxxxx>
> ---
> drivers/media/pci/intel/ipu6/ipu6-isys.c | 1345 ++++++++++++++++++++++
> drivers/media/pci/intel/ipu6/ipu6-isys.h | 201 ++++
> 2 files changed, 1546 insertions(+)
> create mode 100644 drivers/media/pci/intel/ipu6/ipu6-isys.c
> create mode 100644 drivers/media/pci/intel/ipu6/ipu6-isys.h
>
> diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.c b/drivers/media/pci/intel/ipu6/ipu6-isys.c
...
> +static void isys_notifier_cleanup(struct ipu6_isys *isys)
> +{
> + v4l2_async_nf_unregister(&isys->notifier);
> + v4l2_async_nf_cleanup(&isys->notifier);
> +}
> +
> +static int isys_register_devices(struct ipu6_isys *isys)
> +{
> + struct device *dev = &isys->adev->auxdev.dev;
> + struct pci_dev *pdev = isys->adev->isp->pdev;
> + int ret;
> +
> + isys->media_dev.dev = dev;
> + media_device_pci_init(&isys->media_dev,
> + pdev, IPU6_MEDIA_DEV_MODEL_NAME);
> +
> + strscpy(isys->v4l2_dev.name, isys->media_dev.model,
> + sizeof(isys->v4l2_dev.name));
> +
> + ret = media_device_register(&isys->media_dev);
> + if (ret < 0)
> + goto out_media_device_unregister;
> +
> + isys->v4l2_dev.mdev = &isys->media_dev;
> + isys->v4l2_dev.ctrl_handler = NULL;
> +
> + ret = v4l2_device_register(dev->parent, &isys->v4l2_dev);
> + if (ret < 0)
> + goto out_media_device_unregister;
> +
> + ret = isys_register_video_devices(isys);
> + if (ret)
> + goto out_v4l2_device_unregister;
> +
> + ret = isys_csi2_register_subdevices(isys);
> + if (ret)
> + goto out_isys_unregister_video_device;
> +
> + ret = isys_csi2_create_media_links(isys);
> + if (ret)
> + goto out_isys_unregister_subdevices;
> +
> + ret = isys_notifier_init(isys);
> + if (ret)
> + goto out_isys_unregister_subdevices;
> +
> + return 0;
> +
> +out_isys_unregister_subdevices:
> + isys_csi2_unregister_subdevices(isys);
> +
> +out_isys_unregister_video_device:
> + isys_unregister_video_devices(isys);
> +
> +out_v4l2_device_unregister:
> + v4l2_device_unregister(&isys->v4l2_dev);
> +
> +out_media_device_unregister:
> + media_device_unregister(&isys->media_dev);
> + media_device_cleanup(&isys->media_dev);
> +
> + dev_err(dev, "failed to register isys devices\n");
> +
> + return ret;
> +}
> +
> +static void isys_unregister_devices(struct ipu6_isys *isys)
> +{
> + isys_unregister_video_devices(isys);
> + isys_csi2_unregister_subdevices(isys);
> + v4l2_device_unregister(&isys->v4l2_dev);
> + media_device_unregister(&isys->media_dev);
> + media_device_cleanup(&isys->media_dev);
> +}
...
> +static void isys_remove(struct auxiliary_device *auxdev)
> +{
> + struct ipu6_bus_device *adev = auxdev_to_adev(auxdev);
> + struct ipu6_isys *isys = dev_get_drvdata(&auxdev->dev);
> + struct ipu6_device *isp = adev->isp;
> + struct isys_fw_msgs *fwmsg, *safe;
> + unsigned int i;
> +
> + for (i = 0; i < IPU6_ISYS_MAX_STREAMS; i++)
> + mutex_destroy(&isys->streams[i].mutex);
In my testing with IPU4, I had to move these mutex_destroy's to the end
of isys_remove. If we're streaming, they are needed, presumably until
isys_unregister_devices is called.
> +
> + list_for_each_entry_safe(fwmsg, safe, &isys->framebuflist, head)
> + dma_free_attrs(&auxdev->dev, sizeof(struct isys_fw_msgs),
> + fwmsg, fwmsg->dma_addr, 0);
> +
> + list_for_each_entry_safe(fwmsg, safe, &isys->framebuflist_fw, head)
> + dma_free_attrs(&auxdev->dev, sizeof(struct isys_fw_msgs),
> + fwmsg, fwmsg->dma_addr, 0);
> +
> + isys_iwake_watermark_cleanup(isys);
> + isys_notifier_cleanup(isys);
> + isys_unregister_devices(isys);
Again in IPU4 testing:
I get crashing in `stop_streaming` when unbinding during streaming. If
I move isys_unregister_devices before isys_notifier_cleanup, this no
longer happens.
> +
> + cpu_latency_qos_remove_request(&isys->pm_qos);
> +
> + if (!isp->secure_mode) {
> + ipu6_cpd_free_pkg_dir(adev);
> + ipu6_buttress_unmap_fw_image(adev, &adev->fw_sgt);
> + release_firmware(adev->fw);
> + }
> +
> + mutex_destroy(&isys->stream_mutex);
> + mutex_destroy(&isys->mutex);
> +}
/Andreas
