]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
crypto: qat - remove unused character device and IOCTLs
authorGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Mon, 11 May 2026 10:04:08 +0000 (11:04 +0100)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 22 May 2026 12:25:28 +0000 (20:25 +0800)
The QAT driver exposes a character device (qat_adf_ctl) with IOCTLs
for device configuration, start, stop, status query and enumeration.
These IOCTLs are not part of any public uAPI header and have no known
in-tree or out-of-tree users. Device lifecycle is already managed via
sysfs.

The ioctl interface also increases the attack surface and is the
subject of a number of bug reports.

Remove the character device, the IOCTL definitions, and the related
data structures (adf_dev_status_info, adf_user_cfg_key_val,
adf_user_cfg_section, adf_user_cfg_ctl_data). Drop the now-unused
adf_cfg_user.h header and strip adf_ctl_drv.c down to the minimal
module_init/module_exit hooks for workqueue, AER, and crypto/compression
algorithm registration.

Clean up leftover dead code that was only reachable from the removed
IOCTL paths: adf_cfg_del_all(), adf_devmgr_verify_id(),
adf_devmgr_get_num_dev(), adf_devmgr_get_dev_by_id(),
adf_get_vf_real_id() and the unused ADF_CFG macros.

Additionally, drop the entry associated to QAT IOCTLs in
ioctl-number.rst.

Cc: stable@vger.kernel.org
Fixes: d8cba25d2c68 ("crypto: qat - Intel(R) QAT driver framework")
Reported-by: Zhi Wang <wangzhi@stu.xidian.edu.cn>
Reported-by: Bin Yu <byu@xidian.edu.cn>
Reported-by: MingYu Wang <w15303746062@163.com>
Closes: https://lore.kernel.org/all/61d6d499.ab89.19b9b7f3186.Coremail.wangzhi_xd@stu.xidian.edu.cn/
Link: https://lore.kernel.org/all/20260508034841.256794-1-w15303746062@163.com/
Link: https://lore.kernel.org/all/20260508023542.256299-1-w15303746062@163.com/
Link: https://lore.kernel.org/all/20260504025120.98242-1-w15303746062@163.com/
Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: Ahsan Atta <ahsan.atta@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Documentation/userspace-api/ioctl/ioctl-number.rst
drivers/crypto/intel/qat/qat_common/adf_cfg.c
drivers/crypto/intel/qat/qat_common/adf_cfg.h
drivers/crypto/intel/qat/qat_common/adf_cfg_common.h
drivers/crypto/intel/qat/qat_common/adf_cfg_user.h [deleted file]
drivers/crypto/intel/qat/qat_common/adf_common_drv.h
drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c
drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c

index 331223761ffffd881923b279f210c70f24a7b7b5..29a08bc059dd7e80062cc2aafc748eb29034c311 100644 (file)
@@ -229,7 +229,6 @@ Code  Seq#    Include File                                             Comments
                                                                        <mailto:gregkh@linuxfoundation.org>
 'a'   all    linux/atm*.h, linux/sonet.h                               ATM on linux
                                                                        <http://lrcwww.epfl.ch/>
-'a'   00-0F  drivers/crypto/qat/qat_common/adf_cfg_common.h            conflict! qat driver
 'b'   00-FF                                                            conflict! bit3 vme host bridge
                                                                        <mailto:natalia@nikhefk.nikhef.nl>
 'b'   00-0F  linux/dma-buf.h                                           conflict!
index c202209f17d5e3d71a6e1fae19f867f67480f715..ea5d72d5090c03383989b68d254de38484f14224 100644 (file)
@@ -103,16 +103,6 @@ static void adf_cfg_section_del_all(struct list_head *head);
 static void adf_cfg_section_del_all_except(struct list_head *head,
                                           const char *section_name);
 
-void adf_cfg_del_all(struct adf_accel_dev *accel_dev)
-{
-       struct adf_cfg_device_data *dev_cfg_data = accel_dev->cfg;
-
-       down_write(&dev_cfg_data->lock);
-       adf_cfg_section_del_all(&dev_cfg_data->sec_list);
-       up_write(&dev_cfg_data->lock);
-       clear_bit(ADF_STATUS_CONFIGURED, &accel_dev->status);
-}
-
 void adf_cfg_del_all_except(struct adf_accel_dev *accel_dev,
                            const char *section_name)
 {
index 2afa6f0d15c511e2c91a793a3459aa0cd5d409ee..108032b392425d58242fc93ed6223e7844b4a384 100644 (file)
@@ -34,7 +34,6 @@ void adf_cfg_dev_remove(struct adf_accel_dev *accel_dev);
 void adf_cfg_dev_dbgfs_add(struct adf_accel_dev *accel_dev);
 void adf_cfg_dev_dbgfs_rm(struct adf_accel_dev *accel_dev);
 int adf_cfg_section_add(struct adf_accel_dev *accel_dev, const char *name);
-void adf_cfg_del_all(struct adf_accel_dev *accel_dev);
 void adf_cfg_del_all_except(struct adf_accel_dev *accel_dev,
                            const char *section_name);
 int adf_cfg_add_key_value_param(struct adf_accel_dev *accel_dev,
index 81e9e9d7eccd22374076bb961e5632b12c2053a1..d63f4dcccbb5d1c6e54d0e631dec7a789adf488a 100644 (file)
@@ -4,18 +4,11 @@
 #define ADF_CFG_COMMON_H_
 
 #include <linux/types.h>
-#include <linux/ioctl.h>
 
 #define ADF_CFG_MAX_STR_LEN 64
 #define ADF_CFG_MAX_KEY_LEN_IN_BYTES ADF_CFG_MAX_STR_LEN
 #define ADF_CFG_MAX_VAL_LEN_IN_BYTES ADF_CFG_MAX_STR_LEN
 #define ADF_CFG_MAX_SECTION_LEN_IN_BYTES ADF_CFG_MAX_STR_LEN
-#define ADF_CFG_BASE_DEC 10
-#define ADF_CFG_BASE_HEX 16
-#define ADF_CFG_ALL_DEVICES 0xFE
-#define ADF_CFG_NO_DEVICE 0xFF
-#define ADF_CFG_AFFINITY_WHATEVER 0xFF
-#define MAX_DEVICE_NAME_SIZE 32
 #define ADF_MAX_DEVICES (32 * 32)
 #define ADF_DEVS_ARRAY_SIZE BITS_TO_LONGS(ADF_MAX_DEVICES)
 
@@ -51,29 +44,4 @@ enum adf_device_type {
        DEV_420XX,
        DEV_6XXX,
 };
-
-struct adf_dev_status_info {
-       enum adf_device_type type;
-       __u32 accel_id;
-       __u32 instance_id;
-       __u8 num_ae;
-       __u8 num_accel;
-       __u8 num_logical_accel;
-       __u8 banks_per_accel;
-       __u8 state;
-       __u8 bus;
-       __u8 dev;
-       __u8 fun;
-       char name[MAX_DEVICE_NAME_SIZE];
-};
-
-#define ADF_CTL_IOC_MAGIC 'a'
-#define IOCTL_CONFIG_SYS_RESOURCE_PARAMETERS _IOW(ADF_CTL_IOC_MAGIC, 0, \
-               struct adf_user_cfg_ctl_data)
-#define IOCTL_STOP_ACCEL_DEV _IOW(ADF_CTL_IOC_MAGIC, 1, \
-               struct adf_user_cfg_ctl_data)
-#define IOCTL_START_ACCEL_DEV _IOW(ADF_CTL_IOC_MAGIC, 2, \
-               struct adf_user_cfg_ctl_data)
-#define IOCTL_STATUS_ACCEL_DEV _IOW(ADF_CTL_IOC_MAGIC, 3, __u32)
-#define IOCTL_GET_NUM_DEVICES _IOW(ADF_CTL_IOC_MAGIC, 4, __s32)
 #endif
diff --git a/drivers/crypto/intel/qat/qat_common/adf_cfg_user.h b/drivers/crypto/intel/qat/qat_common/adf_cfg_user.h
deleted file mode 100644 (file)
index 421f4fb..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0-only) */
-/* Copyright(c) 2014 - 2020 Intel Corporation */
-#ifndef ADF_CFG_USER_H_
-#define ADF_CFG_USER_H_
-
-#include "adf_cfg_common.h"
-#include "adf_cfg_strings.h"
-
-struct adf_user_cfg_key_val {
-       char key[ADF_CFG_MAX_KEY_LEN_IN_BYTES];
-       char val[ADF_CFG_MAX_VAL_LEN_IN_BYTES];
-       union {
-               struct adf_user_cfg_key_val *next;
-               __u64 padding3;
-       };
-       enum adf_cfg_val_type type;
-} __packed;
-
-struct adf_user_cfg_section {
-       char name[ADF_CFG_MAX_SECTION_LEN_IN_BYTES];
-       union {
-               struct adf_user_cfg_key_val *params;
-               __u64 padding1;
-       };
-       union {
-               struct adf_user_cfg_section *next;
-               __u64 padding3;
-       };
-} __packed;
-
-struct adf_user_cfg_ctl_data {
-       union {
-               struct adf_user_cfg_section *config_section;
-               __u64 padding;
-       };
-       __u8 device_id;
-} __packed;
-#endif
index fb0fd46a79b00832c06af58cf96afed5cf66e216..e8dd76751dfbd39636064ee7763bbc45dd9d3a27 100644 (file)
@@ -68,10 +68,7 @@ int adf_devmgr_add_dev(struct adf_accel_dev *accel_dev,
 void adf_devmgr_rm_dev(struct adf_accel_dev *accel_dev,
                       struct adf_accel_dev *pf);
 struct list_head *adf_devmgr_get_head(void);
-struct adf_accel_dev *adf_devmgr_get_dev_by_id(u32 id);
 struct adf_accel_dev *adf_devmgr_pci_to_accel_dev(struct pci_dev *pci_dev);
-int adf_devmgr_verify_id(u32 id);
-void adf_devmgr_get_num_dev(u32 *num);
 int adf_devmgr_in_reset(struct adf_accel_dev *accel_dev);
 int adf_dev_started(struct adf_accel_dev *accel_dev);
 int adf_dev_restarting_notify(struct adf_accel_dev *accel_dev);
index c2e6f0cb7480b16b5940d7870d67e41207d425e1..f01f2946de6e87662e8282ea954fb909c751272d 100644 (file)
 /* Copyright(c) 2014 - 2020 Intel Corporation */
 
 #include <crypto/algapi.h>
+#include <linux/errno.h>
 #include <linux/module.h>
-#include <linux/mutex.h>
-#include <linux/slab.h>
-#include <linux/fs.h>
-#include <linux/bitops.h>
-#include <linux/pci.h>
-#include <linux/cdev.h>
-#include <linux/uaccess.h>
 
-#include "adf_accel_devices.h"
 #include "adf_common_drv.h"
-#include "adf_cfg.h"
-#include "adf_cfg_common.h"
-#include "adf_cfg_user.h"
-
-#define ADF_CFG_MAX_SECTION 512
-#define ADF_CFG_MAX_KEY_VAL 256
-
-#define DEVICE_NAME "qat_adf_ctl"
-
-static DEFINE_MUTEX(adf_ctl_lock);
-static long adf_ctl_ioctl(struct file *fp, unsigned int cmd, unsigned long arg);
-
-static const struct file_operations adf_ctl_ops = {
-       .owner = THIS_MODULE,
-       .unlocked_ioctl = adf_ctl_ioctl,
-       .compat_ioctl = compat_ptr_ioctl,
-};
-
-static const struct class adf_ctl_class = {
-       .name = DEVICE_NAME,
-};
-
-struct adf_ctl_drv_info {
-       unsigned int major;
-       struct cdev drv_cdev;
-};
-
-static struct adf_ctl_drv_info adf_ctl_drv;
-
-static void adf_chr_drv_destroy(void)
-{
-       device_destroy(&adf_ctl_class, MKDEV(adf_ctl_drv.major, 0));
-       cdev_del(&adf_ctl_drv.drv_cdev);
-       class_unregister(&adf_ctl_class);
-       unregister_chrdev_region(MKDEV(adf_ctl_drv.major, 0), 1);
-}
-
-static int adf_chr_drv_create(void)
-{
-       dev_t dev_id;
-       struct device *drv_device;
-       int ret;
-
-       if (alloc_chrdev_region(&dev_id, 0, 1, DEVICE_NAME)) {
-               pr_err("QAT: unable to allocate chrdev region\n");
-               return -EFAULT;
-       }
-
-       ret = class_register(&adf_ctl_class);
-       if (ret)
-               goto err_chrdev_unreg;
-
-       adf_ctl_drv.major = MAJOR(dev_id);
-       cdev_init(&adf_ctl_drv.drv_cdev, &adf_ctl_ops);
-       if (cdev_add(&adf_ctl_drv.drv_cdev, dev_id, 1)) {
-               pr_err("QAT: cdev add failed\n");
-               goto err_class_destr;
-       }
-
-       drv_device = device_create(&adf_ctl_class, NULL,
-                                  MKDEV(adf_ctl_drv.major, 0),
-                                  NULL, DEVICE_NAME);
-       if (IS_ERR(drv_device)) {
-               pr_err("QAT: failed to create device\n");
-               goto err_cdev_del;
-       }
-       return 0;
-err_cdev_del:
-       cdev_del(&adf_ctl_drv.drv_cdev);
-err_class_destr:
-       class_unregister(&adf_ctl_class);
-err_chrdev_unreg:
-       unregister_chrdev_region(dev_id, 1);
-       return -EFAULT;
-}
-
-static struct adf_user_cfg_ctl_data *adf_ctl_alloc_resources(unsigned long arg)
-{
-       struct adf_user_cfg_ctl_data *cfg_data;
-
-       cfg_data = memdup_user((void __user *)arg, sizeof(*cfg_data));
-       if (IS_ERR(cfg_data))
-               pr_err("QAT: failed to copy from user cfg_data.\n");
-       return cfg_data;
-}
-
-static int adf_add_key_value_data(struct adf_accel_dev *accel_dev,
-                                 const char *section,
-                                 const struct adf_user_cfg_key_val *key_val)
-{
-       if (key_val->type == ADF_HEX) {
-               long *ptr = (long *)key_val->val;
-               long val = *ptr;
-
-               if (adf_cfg_add_key_value_param(accel_dev, section,
-                                               key_val->key, (void *)val,
-                                               key_val->type)) {
-                       dev_err(&GET_DEV(accel_dev),
-                               "failed to add hex keyvalue.\n");
-                       return -EFAULT;
-               }
-       } else {
-               if (adf_cfg_add_key_value_param(accel_dev, section,
-                                               key_val->key, key_val->val,
-                                               key_val->type)) {
-                       dev_err(&GET_DEV(accel_dev),
-                               "failed to add keyvalue.\n");
-                       return -EFAULT;
-               }
-       }
-       return 0;
-}
-
-static int adf_copy_key_value_data(struct adf_accel_dev *accel_dev,
-                                  struct adf_user_cfg_ctl_data *ctl_data)
-{
-       struct adf_user_cfg_key_val key_val;
-       struct adf_user_cfg_key_val *params_head;
-       struct adf_user_cfg_section section, *section_head;
-       int i, j;
-
-       section_head = ctl_data->config_section;
-
-       for (i = 0; section_head && i < ADF_CFG_MAX_SECTION; i++) {
-               if (copy_from_user(&section, (void __user *)section_head,
-                                  sizeof(*section_head))) {
-                       dev_err(&GET_DEV(accel_dev),
-                               "failed to copy section info\n");
-                       goto out_err;
-               }
-
-               if (adf_cfg_section_add(accel_dev, section.name)) {
-                       dev_err(&GET_DEV(accel_dev),
-                               "failed to add section.\n");
-                       goto out_err;
-               }
-
-               params_head = section.params;
-
-               for (j = 0; params_head && j < ADF_CFG_MAX_KEY_VAL; j++) {
-                       if (copy_from_user(&key_val, (void __user *)params_head,
-                                          sizeof(key_val))) {
-                               dev_err(&GET_DEV(accel_dev),
-                                       "Failed to copy keyvalue.\n");
-                               goto out_err;
-                       }
-                       if (adf_add_key_value_data(accel_dev, section.name,
-                                                  &key_val)) {
-                               goto out_err;
-                       }
-                       params_head = key_val.next;
-               }
-               section_head = section.next;
-       }
-       return 0;
-out_err:
-       adf_cfg_del_all(accel_dev);
-       return -EFAULT;
-}
-
-static int adf_ctl_ioctl_dev_config(struct file *fp, unsigned int cmd,
-                                   unsigned long arg)
-{
-       struct adf_user_cfg_ctl_data *ctl_data;
-       struct adf_accel_dev *accel_dev;
-       int ret = 0;
-
-       ctl_data = adf_ctl_alloc_resources(arg);
-       if (IS_ERR(ctl_data))
-               return PTR_ERR(ctl_data);
-
-       accel_dev = adf_devmgr_get_dev_by_id(ctl_data->device_id);
-       if (!accel_dev) {
-               ret = -EFAULT;
-               goto out;
-       }
-
-       if (adf_dev_started(accel_dev)) {
-               ret = -EFAULT;
-               goto out;
-       }
-
-       if (adf_copy_key_value_data(accel_dev, ctl_data)) {
-               ret = -EFAULT;
-               goto out;
-       }
-       set_bit(ADF_STATUS_CONFIGURED, &accel_dev->status);
-out:
-       kfree(ctl_data);
-       return ret;
-}
-
-static int adf_ctl_is_device_in_use(int id)
-{
-       struct adf_accel_dev *dev;
-
-       list_for_each_entry(dev, adf_devmgr_get_head(), list) {
-               if (id == dev->accel_id || id == ADF_CFG_ALL_DEVICES) {
-                       if (adf_devmgr_in_reset(dev) || adf_dev_in_use(dev)) {
-                               dev_info(&GET_DEV(dev),
-                                        "device qat_dev%d is busy\n",
-                                        dev->accel_id);
-                               return -EBUSY;
-                       }
-               }
-       }
-       return 0;
-}
-
-static void adf_ctl_stop_devices(u32 id)
-{
-       struct adf_accel_dev *accel_dev;
-
-       list_for_each_entry(accel_dev, adf_devmgr_get_head(), list) {
-               if (id == accel_dev->accel_id || id == ADF_CFG_ALL_DEVICES) {
-                       if (!adf_dev_started(accel_dev))
-                               continue;
-
-                       /* First stop all VFs */
-                       if (!accel_dev->is_vf)
-                               continue;
-
-                       adf_dev_down(accel_dev);
-               }
-       }
-
-       list_for_each_entry(accel_dev, adf_devmgr_get_head(), list) {
-               if (id == accel_dev->accel_id || id == ADF_CFG_ALL_DEVICES) {
-                       if (!adf_dev_started(accel_dev))
-                               continue;
-
-                       adf_dev_down(accel_dev);
-               }
-       }
-}
-
-static int adf_ctl_ioctl_dev_stop(struct file *fp, unsigned int cmd,
-                                 unsigned long arg)
-{
-       int ret;
-       struct adf_user_cfg_ctl_data *ctl_data;
-
-       ctl_data = adf_ctl_alloc_resources(arg);
-       if (IS_ERR(ctl_data))
-               return PTR_ERR(ctl_data);
-
-       if (adf_devmgr_verify_id(ctl_data->device_id)) {
-               pr_err("QAT: Device %d not found\n", ctl_data->device_id);
-               ret = -ENODEV;
-               goto out;
-       }
-
-       ret = adf_ctl_is_device_in_use(ctl_data->device_id);
-       if (ret)
-               goto out;
-
-       if (ctl_data->device_id == ADF_CFG_ALL_DEVICES)
-               pr_info("QAT: Stopping all acceleration devices.\n");
-       else
-               pr_info("QAT: Stopping acceleration device qat_dev%d.\n",
-                       ctl_data->device_id);
-
-       adf_ctl_stop_devices(ctl_data->device_id);
-
-out:
-       kfree(ctl_data);
-       return ret;
-}
-
-static int adf_ctl_ioctl_dev_start(struct file *fp, unsigned int cmd,
-                                  unsigned long arg)
-{
-       int ret;
-       struct adf_user_cfg_ctl_data *ctl_data;
-       struct adf_accel_dev *accel_dev;
-
-       ctl_data = adf_ctl_alloc_resources(arg);
-       if (IS_ERR(ctl_data))
-               return PTR_ERR(ctl_data);
-
-       ret = -ENODEV;
-       accel_dev = adf_devmgr_get_dev_by_id(ctl_data->device_id);
-       if (!accel_dev)
-               goto out;
-
-       dev_info(&GET_DEV(accel_dev),
-                "Starting acceleration device qat_dev%d.\n",
-                ctl_data->device_id);
-
-       ret = adf_dev_up(accel_dev, false);
-
-       if (ret) {
-               dev_err(&GET_DEV(accel_dev), "Failed to start qat_dev%d\n",
-                       ctl_data->device_id);
-               adf_dev_down(accel_dev);
-       }
-out:
-       kfree(ctl_data);
-       return ret;
-}
-
-static int adf_ctl_ioctl_get_num_devices(struct file *fp, unsigned int cmd,
-                                        unsigned long arg)
-{
-       u32 num_devices = 0;
-
-       adf_devmgr_get_num_dev(&num_devices);
-       if (copy_to_user((void __user *)arg, &num_devices, sizeof(num_devices)))
-               return -EFAULT;
-
-       return 0;
-}
-
-static int adf_ctl_ioctl_get_status(struct file *fp, unsigned int cmd,
-                                   unsigned long arg)
-{
-       struct adf_hw_device_data *hw_data;
-       struct adf_dev_status_info dev_info;
-       struct adf_accel_dev *accel_dev;
-
-       if (copy_from_user(&dev_info, (void __user *)arg,
-                          sizeof(struct adf_dev_status_info))) {
-               pr_err("QAT: failed to copy from user.\n");
-               return -EFAULT;
-       }
-
-       accel_dev = adf_devmgr_get_dev_by_id(dev_info.accel_id);
-       if (!accel_dev)
-               return -ENODEV;
-
-       hw_data = accel_dev->hw_device;
-       dev_info.state = adf_dev_started(accel_dev) ? DEV_UP : DEV_DOWN;
-       dev_info.num_ae = hw_data->get_num_aes(hw_data);
-       dev_info.num_accel = hw_data->get_num_accels(hw_data);
-       dev_info.num_logical_accel = hw_data->num_logical_accel;
-       dev_info.banks_per_accel = hw_data->num_banks
-                                       / hw_data->num_logical_accel;
-       strscpy(dev_info.name, hw_data->dev_class->name, sizeof(dev_info.name));
-       dev_info.instance_id = hw_data->instance_id;
-       dev_info.type = hw_data->dev_class->type;
-       dev_info.bus = accel_to_pci_dev(accel_dev)->bus->number;
-       dev_info.dev = PCI_SLOT(accel_to_pci_dev(accel_dev)->devfn);
-       dev_info.fun = PCI_FUNC(accel_to_pci_dev(accel_dev)->devfn);
-
-       if (copy_to_user((void __user *)arg, &dev_info,
-                        sizeof(struct adf_dev_status_info))) {
-               dev_err(&GET_DEV(accel_dev), "failed to copy status.\n");
-               return -EFAULT;
-       }
-       return 0;
-}
-
-static long adf_ctl_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
-{
-       int ret;
-
-       if (mutex_lock_interruptible(&adf_ctl_lock))
-               return -EFAULT;
-
-       switch (cmd) {
-       case IOCTL_CONFIG_SYS_RESOURCE_PARAMETERS:
-               ret = adf_ctl_ioctl_dev_config(fp, cmd, arg);
-               break;
-
-       case IOCTL_STOP_ACCEL_DEV:
-               ret = adf_ctl_ioctl_dev_stop(fp, cmd, arg);
-               break;
-
-       case IOCTL_START_ACCEL_DEV:
-               ret = adf_ctl_ioctl_dev_start(fp, cmd, arg);
-               break;
-
-       case IOCTL_GET_NUM_DEVICES:
-               ret = adf_ctl_ioctl_get_num_devices(fp, cmd, arg);
-               break;
-
-       case IOCTL_STATUS_ACCEL_DEV:
-               ret = adf_ctl_ioctl_get_status(fp, cmd, arg);
-               break;
-       default:
-               pr_err_ratelimited("QAT: Invalid ioctl %d\n", cmd);
-               ret = -EFAULT;
-               break;
-       }
-       mutex_unlock(&adf_ctl_lock);
-       return ret;
-}
 
 static int __init adf_register_ctl_device_driver(void)
 {
-       if (adf_chr_drv_create())
-               goto err_chr_dev;
-
        if (adf_init_misc_wq())
                goto err_misc_wq;
 
@@ -437,15 +40,11 @@ err_pf_wq:
 err_aer:
        adf_exit_misc_wq();
 err_misc_wq:
-       adf_chr_drv_destroy();
-err_chr_dev:
-       mutex_destroy(&adf_ctl_lock);
        return -EFAULT;
 }
 
 static void __exit adf_unregister_ctl_device_driver(void)
 {
-       adf_chr_drv_destroy();
        adf_exit_misc_wq();
        adf_exit_aer();
        adf_exit_vf_wq();
@@ -453,7 +52,6 @@ static void __exit adf_unregister_ctl_device_driver(void)
        qat_crypto_unregister();
        qat_compression_unregister();
        adf_clean_vf_map(false);
-       mutex_destroy(&adf_ctl_lock);
 }
 
 module_init(adf_register_ctl_device_driver);
index e050de16ab5d0913b2c20f48a8654f56363b0cf2..161863841a527d1dae5ccb0d0ddc10dbdca54e45 100644 (file)
@@ -45,19 +45,6 @@ static struct vf_id_map *adf_find_vf(u32 bdf)
        return NULL;
 }
 
-static int adf_get_vf_real_id(u32 fake)
-{
-       struct list_head *itr;
-
-       list_for_each(itr, &vfs_table) {
-               struct vf_id_map *ptr =
-                       list_entry(itr, struct vf_id_map, list);
-               if (ptr->fake_id == fake)
-                       return ptr->id;
-       }
-       return -1;
-}
-
 /**
  * adf_clean_vf_map() - Cleans VF id mappings
  * @vf: flag indicating whether mappings is cleaned
@@ -304,63 +291,6 @@ struct adf_accel_dev *adf_devmgr_pci_to_accel_dev(struct pci_dev *pci_dev)
 }
 EXPORT_SYMBOL_GPL(adf_devmgr_pci_to_accel_dev);
 
-struct adf_accel_dev *adf_devmgr_get_dev_by_id(u32 id)
-{
-       struct list_head *itr;
-       int real_id;
-
-       mutex_lock(&table_lock);
-       real_id = adf_get_vf_real_id(id);
-       if (real_id < 0)
-               goto unlock;
-
-       id = real_id;
-
-       list_for_each(itr, &accel_table) {
-               struct adf_accel_dev *ptr =
-                               list_entry(itr, struct adf_accel_dev, list);
-               if (ptr->accel_id == id) {
-                       mutex_unlock(&table_lock);
-                       return ptr;
-               }
-       }
-unlock:
-       mutex_unlock(&table_lock);
-       return NULL;
-}
-
-int adf_devmgr_verify_id(u32 id)
-{
-       if (id == ADF_CFG_ALL_DEVICES)
-               return 0;
-
-       if (adf_devmgr_get_dev_by_id(id))
-               return 0;
-
-       return -ENODEV;
-}
-
-static int adf_get_num_dettached_vfs(void)
-{
-       struct list_head *itr;
-       int vfs = 0;
-
-       mutex_lock(&table_lock);
-       list_for_each(itr, &vfs_table) {
-               struct vf_id_map *ptr =
-                       list_entry(itr, struct vf_id_map, list);
-               if (ptr->bdf != ~0 && !ptr->attached)
-                       vfs++;
-       }
-       mutex_unlock(&table_lock);
-       return vfs;
-}
-
-void adf_devmgr_get_num_dev(u32 *num)
-{
-       *num = num_devices - adf_get_num_dettached_vfs();
-}
-
 /**
  * adf_dev_in_use() - Check whether accel_dev is currently in use
  * @accel_dev: Pointer to acceleration device.