Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752353AbdFSRPW (ORCPT ); Mon, 19 Jun 2017 13:15:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37752 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751038AbdFSRPT (ORCPT ); Mon, 19 Jun 2017 13:15:19 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8CE6480475 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=alex.williamson@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8CE6480475 Subject: [PATCH v2 6/9] vfio: Register pci, platform, amba, and mdev bus drivers From: Alex Williamson To: kvm@vger.kernel.org Cc: alex.williamson@redhat.com, eric.auger@redhat.com, Kirti Wankhede , Baptiste Reynal , linux-kernel@vger.kernel.org Date: Mon, 19 Jun 2017 11:15:10 -0600 Message-ID: <20170619171510.14047.87702.stgit@gimli.home> In-Reply-To: <20170619170323.14047.26504.stgit@gimli.home> References: <20170619170323.14047.26504.stgit@gimli.home> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 19 Jun 2017 17:15:18 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3855 Lines: 136 Hook into vfio bus driver register/unregister support. Signed-off-by: Alex Williamson Reviewed-by: Eric Auger Cc: Baptiste Reynal Cc: Kirti Wankhede --- 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 063c1ce6fa42..b9ac5b8c53e6 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");