From: Dave Jiang <dave.jiang@intel.com>
To: vkoul@kernel.org
Cc: Dan Williams <dan.j.williams@intel.com>, dmaengine@vger.kernel.org
Subject: [PATCH v3 14/18] dmaengine: idxd: create idxd_device sub-driver
Date: Thu, 15 Jul 2021 11:44:24 -0700 [thread overview]
Message-ID: <162637466439.744545.15210886092627144577.stgit@djiang5-desk3.ch.intel.com> (raw)
In-Reply-To: <162637445139.744545.6008938867943724701.stgit@djiang5-desk3.ch.intel.com>
The original architecture of /sys/bus/dsa invented a scheme whereby a
single entry in the list of bus drivers, /sys/bus/drivers/dsa, handled
all device types and internally routed them to different drivers.
Those internal drivers were invisible to userspace. Now, as
/sys/bus/dsa wants to grow support for alternate drivers for a given
device, for example vfio-mdev instead of kernel-internal-dmaengine, a
proper bus device-driver model is needed. The first step in that process
is separating the existing omnibus/implicit "dsa" driver into proper
individual drivers registered on /sys/bus/dsa. Establish the idxd_drv
driver that control the enabling and disabling of the accelerator device.
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
---
drivers/dma/idxd/device.c | 13 +++++++++++++
drivers/dma/idxd/idxd.h | 3 +++
drivers/dma/idxd/init.c | 7 +++++++
3 files changed, 23 insertions(+)
diff --git a/drivers/dma/idxd/device.c b/drivers/dma/idxd/device.c
index d5a0b6fff3b9..12ae3f1639f1 100644
--- a/drivers/dma/idxd/device.c
+++ b/drivers/dma/idxd/device.c
@@ -1349,3 +1349,16 @@ void idxd_device_drv_remove(struct idxd_dev *idxd_dev)
if (test_bit(IDXD_FLAG_CONFIGURABLE, &idxd->flags))
idxd_device_reset(idxd);
}
+
+static enum idxd_dev_type dev_types[] = {
+ IDXD_DEV_DSA,
+ IDXD_DEV_IAX,
+ IDXD_DEV_NONE,
+};
+
+struct idxd_device_driver idxd_drv = {
+ .type = dev_types,
+ .probe = idxd_device_drv_probe,
+ .remove = idxd_device_drv_remove,
+ .name = "idxd",
+};
diff --git a/drivers/dma/idxd/idxd.h b/drivers/dma/idxd/idxd.h
index beb906bf7d66..8cfe96682097 100644
--- a/drivers/dma/idxd/idxd.h
+++ b/drivers/dma/idxd/idxd.h
@@ -58,6 +58,7 @@ struct idxd_device_driver {
};
extern struct idxd_device_driver dsa_drv;
+extern struct idxd_device_driver idxd_drv;
struct idxd_irq_entry {
struct idxd_device *idxd;
@@ -493,6 +494,8 @@ void idxd_mask_msix_vector(struct idxd_device *idxd, int vec_id);
void idxd_unmask_msix_vector(struct idxd_device *idxd, int vec_id);
/* device control */
+int idxd_register_idxd_drv(void);
+void idxd_unregister_idxd_drv(void);
int idxd_device_drv_probe(struct idxd_dev *idxd_dev);
void idxd_device_drv_remove(struct idxd_dev *idxd_dev);
int drv_enable_wq(struct idxd_wq *wq);
diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c
index f04ee7f0de60..bb869109b3f1 100644
--- a/drivers/dma/idxd/init.c
+++ b/drivers/dma/idxd/init.c
@@ -832,6 +832,10 @@ static int __init idxd_init_module(void)
if (err < 0)
return err;
+ err = idxd_driver_register(&idxd_drv);
+ if (err < 0)
+ goto err_idxd_driver_register;
+
err = idxd_driver_register(&dsa_drv);
if (err < 0)
goto err_dsa_driver_register;
@@ -851,6 +855,8 @@ static int __init idxd_init_module(void)
err_cdev_register:
idxd_driver_unregister(&dsa_drv);
err_dsa_driver_register:
+ idxd_driver_unregister(&idxd_drv);
+err_idxd_driver_register:
idxd_unregister_bus_type();
return err;
}
@@ -858,6 +864,7 @@ module_init(idxd_init_module);
static void __exit idxd_exit_module(void)
{
+ idxd_driver_unregister(&idxd_drv);
idxd_driver_unregister(&dsa_drv);
pci_unregister_driver(&idxd_pci_driver);
idxd_cdev_remove();
next prev parent reply other threads:[~2021-07-15 18:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-15 18:43 [PATCH v3 00/18] Fix idxd sub-drivers setup Dave Jiang
2021-07-15 18:43 ` [PATCH v3 01/18] dmaengine: idxd: add driver register helper Dave Jiang
2021-07-15 18:43 ` [PATCH v3 02/18] dmaengine: idxd: add driver name Dave Jiang
2021-07-15 18:43 ` [PATCH v3 03/18] dmaengine: idxd: add 'struct idxd_dev' as wrapper for conf_dev Dave Jiang
2021-07-15 18:43 ` [PATCH v3 04/18] dmaengine: idxd: remove IDXD_DEV_CONF_READY Dave Jiang
2021-07-15 18:43 ` [PATCH v3 05/18] dmaengine: idxd: move wq_enable() to device.c Dave Jiang
2021-07-15 18:43 ` [PATCH v3 06/18] dmaengine: idxd: move wq_disable() " Dave Jiang
2021-07-15 18:43 ` [PATCH v3 07/18] dmaengine: idxd: remove bus shutdown Dave Jiang
2021-07-15 18:43 ` [PATCH v3 08/18] dmaengine: idxd: remove iax_bus_type prototype Dave Jiang
2021-07-15 18:43 ` [PATCH v3 09/18] dmaengine: idxd: fix bus_probe() and bus_remove() for dsa_bus Dave Jiang
2021-07-15 18:44 ` [PATCH v3 10/18] dmaengine: idxd: move probe() bits for idxd 'struct device' to device.c Dave Jiang
2021-07-15 18:44 ` [PATCH v3 11/18] dmaengine: idxd: idxd: move remove() " Dave Jiang
2021-07-15 18:44 ` [PATCH v3 12/18] dmanegine: idxd: open code the dsa_drv registration Dave Jiang
2021-07-15 18:44 ` [PATCH v3 13/18] dmaengine: idxd: add type to driver in order to allow device matching Dave Jiang
2021-07-15 18:44 ` Dave Jiang [this message]
2021-07-15 18:44 ` [PATCH v3 15/18] dmaengine: idxd: create dmaengine driver for wq 'device' Dave Jiang
2021-07-15 18:44 ` [PATCH v3 16/18] dmaengine: idxd: create user " Dave Jiang
2021-07-15 18:44 ` [PATCH v3 17/18] dmaengine: dsa: move dsa_bus_type out of idxd driver to standalone Dave Jiang
2021-07-15 18:44 ` [PATCH v3 18/18] dmaengine: idxd: move dsa_drv support to compatible mode Dave Jiang
2021-07-20 13:49 ` [PATCH v3 00/18] Fix idxd sub-drivers setup Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=162637466439.744545.15210886092627144577.stgit@djiang5-desk3.ch.intel.com \
--to=dave.jiang@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).