Re: [PATCH 6/7] vfio: Register pci, platform, amba, and mdev bus drivers

[Auger Eric]

Hi Alex,

On 10/06/2017 00:00, Alex Williamson wrote:
> Hook into vfio bus driver register/unregister support.
> 
> Signed-off-by: Alex Williamson <alex.williamson@xxxxxxxxxx>
> Cc: Baptiste Reynal <b.reynal@xxxxxxxxxxxxxxxxxxxxxx>
> Cc: Kirti Wankhede <kwankhede@xxxxxxxxxx>
> Cc: Eric Auger <eric.auger@xxxxxxxxxx>

Reviewed-by: Eric Auger <eric.auger@xxxxxxxxxx>

Thanks

Eric
> ---
>  drivers/vfio/mdev/vfio_mdev.c         |   13 ++++++++++++-
>  drivers/vfio/pci/vfio_pci.c           |    7 +++++++
>  drivers/vfio/platform/vfio_amba.c     |   24 +++++++++++++++++++++++-
>  drivers/vfio/platform/vfio_platform.c |   24 +++++++++++++++++++++++-
>  4 files changed, 65 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/vfio/mdev/vfio_mdev.c b/drivers/vfio/mdev/vfio_mdev.c
> index fa848a701b8b..b73d6f3e8ad5 100644
> --- a/drivers/vfio/mdev/vfio_mdev.c
> +++ b/drivers/vfio/mdev/vfio_mdev.c
> @@ -131,11 +131,22 @@ struct mdev_driver vfio_mdev_driver = {
>  
>  static int __init vfio_mdev_init(void)
>  {
> -	return mdev_register_driver(&vfio_mdev_driver, THIS_MODULE);
> +	int ret;
> +
> +	ret = mdev_register_driver(&vfio_mdev_driver, THIS_MODULE);
> +	if (ret)
> +		return ret;
> +
> +	ret = vfio_register_bus_driver(&vfio_mdev_driver.driver);
> +	if (ret)
> +		mdev_unregister_driver(&vfio_mdev_driver);
> +
> +	return ret;
>  }
>  
>  static void __exit vfio_mdev_exit(void)
>  {
> +	vfio_unregister_bus_driver(&vfio_mdev_driver.driver);
>  	mdev_unregister_driver(&vfio_mdev_driver);
>  }
>  
> diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
> index 324c52e3a1a4..15f4b190ad88 100644
> --- a/drivers/vfio/pci/vfio_pci.c
> +++ b/drivers/vfio/pci/vfio_pci.c
> @@ -1397,6 +1397,7 @@ static void vfio_pci_try_bus_reset(struct vfio_pci_device *vdev)
>  
>  static void __exit vfio_pci_cleanup(void)
>  {
> +	vfio_unregister_bus_driver(&vfio_pci_driver.driver);
>  	pci_unregister_driver(&vfio_pci_driver);
>  	vfio_pci_uninit_perm_bits();
>  }
> @@ -1456,6 +1457,12 @@ static int __init vfio_pci_init(void)
>  	if (ret)
>  		goto out_driver;
>  
> +	ret = vfio_register_bus_driver(&vfio_pci_driver.driver);
> +	if (ret) {
> +		pci_unregister_driver(&vfio_pci_driver);
> +		goto out_driver;
> +	}
> +
>  	vfio_pci_fill_ids();
>  
>  	return 0;
> diff --git a/drivers/vfio/platform/vfio_amba.c b/drivers/vfio/platform/vfio_amba.c
> index 31372fbf6c5b..7fd9cb4a6756 100644
> --- a/drivers/vfio/platform/vfio_amba.c
> +++ b/drivers/vfio/platform/vfio_amba.c
> @@ -109,7 +109,29 @@ static int vfio_amba_remove(struct amba_device *adev)
>  	},
>  };
>  
> -module_amba_driver(vfio_amba_driver);
> +static void __exit vfio_amba_exit(void)
> +{
> +	vfio_unregister_bus_driver(&vfio_amba_driver.drv);
> +	amba_driver_unregister(&vfio_amba_driver);
> +}
> +
> +static int __init vfio_amba_init(void)
> +{
> +	int ret;
> +
> +	ret = amba_driver_register(&vfio_amba_driver);
> +	if (ret)
> +		return ret;
> +
> +	ret = vfio_register_bus_driver(&vfio_amba_driver.drv);
> +	if (ret)
> +		amba_driver_unregister(&vfio_amba_driver);
> +
> +	return ret;
> +}
> +
> +module_init(vfio_amba_init);
> +module_exit(vfio_amba_exit);
>  
>  MODULE_VERSION(DRIVER_VERSION);
>  MODULE_LICENSE("GPL v2");
> diff --git a/drivers/vfio/platform/vfio_platform.c b/drivers/vfio/platform/vfio_platform.c
> index 6561751a1063..3974dc65e6dc 100644
> --- a/drivers/vfio/platform/vfio_platform.c
> +++ b/drivers/vfio/platform/vfio_platform.c
> @@ -100,7 +100,29 @@ static int vfio_platform_remove(struct platform_device *pdev)
>  	},
>  };
>  
> -module_platform_driver(vfio_platform_driver);
> +static void __exit vfio_platform_exit(void)
> +{
> +	vfio_unregister_bus_driver(&vfio_platform_driver.driver);
> +	platform_driver_unregister(&vfio_platform_driver);
> +}
> +
> +static int __init vfio_platform_init(void)
> +{
> +	int ret;
> +
> +	ret = platform_driver_register(&vfio_platform_driver);
> +	if (ret)
> +		return ret;
> +
> +	ret = vfio_register_bus_driver(&vfio_platform_driver.driver);
> +	if (ret)
> +		platform_driver_unregister(&vfio_platform_driver);
> +
> +	return ret;
> +}
> +
> +module_init(vfio_platform_init);
> +module_exit(vfio_platform_exit);
>  
>  MODULE_VERSION(DRIVER_VERSION);
>  MODULE_LICENSE("GPL v2");
>