crypto: qat - Move driver to drivers/crypto/intel/qat

With the growing number of Intel crypto drivers, it makes sense to
group them all into a single drivers/crypto/intel/ directory.

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

4 files changed, 0 insertions, 356 deletions

diff --git a/drivers/crypto/qat/qat_c62xvf/Makefile b/drivers/crypto/qat/qat_c62xvf/Makefile
deleted file mode 100644
index 446c3d638605..000000000000
--- a/drivers/crypto/qat/qat_c62xvf/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-ccflags-y := -I $(srctree)/$(src)/../qat_common
-obj-$(CONFIG_CRYPTO_DEV_QAT_C62XVF) += qat_c62xvf.o
-qat_c62xvf-objs := adf_drv.o adf_c62xvf_hw_data.o
diff --git a/drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c b/drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c
deleted file mode 100644
index 751d7aa57fc7..000000000000
--- a/drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c
+++ /dev/null
@@ -1,102 +0,0 @@
-// SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0-only)
-/* Copyright(c) 2015 - 2021 Intel Corporation */
-#include <adf_accel_devices.h>
-#include <adf_common_drv.h>
-#include <adf_gen2_config.h>
-#include <adf_gen2_dc.h>
-#include <adf_gen2_hw_data.h>
-#include <adf_gen2_pfvf.h>
-#include <adf_pfvf_vf_msg.h>
-#include "adf_c62xvf_hw_data.h"
-
-static struct adf_hw_device_class c62xiov_class = {
-	.name = ADF_C62XVF_DEVICE_NAME,
-	.type = DEV_C62XVF,
-	.instances = 0
-};
-
-static u32 get_accel_mask(struct adf_hw_device_data *self)
-{
-	return ADF_C62XIOV_ACCELERATORS_MASK;
-}
-
-static u32 get_ae_mask(struct adf_hw_device_data *self)
-{
-	return ADF_C62XIOV_ACCELENGINES_MASK;
-}
-
-static u32 get_num_accels(struct adf_hw_device_data *self)
-{
-	return ADF_C62XIOV_MAX_ACCELERATORS;
-}
-
-static u32 get_num_aes(struct adf_hw_device_data *self)
-{
-	return ADF_C62XIOV_MAX_ACCELENGINES;
-}
-
-static u32 get_misc_bar_id(struct adf_hw_device_data *self)
-{
-	return ADF_C62XIOV_PMISC_BAR;
-}
-
-static u32 get_etr_bar_id(struct adf_hw_device_data *self)
-{
-	return ADF_C62XIOV_ETR_BAR;
-}
-
-static enum dev_sku_info get_sku(struct adf_hw_device_data *self)
-{
-	return DEV_SKU_VF;
-}
-
-static int adf_vf_int_noop(struct adf_accel_dev *accel_dev)
-{
-	return 0;
-}
-
-static void adf_vf_void_noop(struct adf_accel_dev *accel_dev)
-{
-}
-
-void adf_init_hw_data_c62xiov(struct adf_hw_device_data *hw_data)
-{
-	hw_data->dev_class = &c62xiov_class;
-	hw_data->num_banks = ADF_C62XIOV_ETR_MAX_BANKS;
-	hw_data->num_rings_per_bank = ADF_ETR_MAX_RINGS_PER_BANK;
-	hw_data->num_accel = ADF_C62XIOV_MAX_ACCELERATORS;
-	hw_data->num_logical_accel = 1;
-	hw_data->num_engines = ADF_C62XIOV_MAX_ACCELENGINES;
-	hw_data->tx_rx_gap = ADF_C62XIOV_RX_RINGS_OFFSET;
-	hw_data->tx_rings_mask = ADF_C62XIOV_TX_RINGS_MASK;
-	hw_data->ring_to_svc_map = ADF_GEN2_DEFAULT_RING_TO_SRV_MAP;
-	hw_data->alloc_irq = adf_vf_isr_resource_alloc;
-	hw_data->free_irq = adf_vf_isr_resource_free;
-	hw_data->enable_error_correction = adf_vf_void_noop;
-	hw_data->init_admin_comms = adf_vf_int_noop;
-	hw_data->exit_admin_comms = adf_vf_void_noop;
-	hw_data->send_admin_init = adf_vf2pf_notify_init;
-	hw_data->init_arb = adf_vf_int_noop;
-	hw_data->exit_arb = adf_vf_void_noop;
-	hw_data->disable_iov = adf_vf2pf_notify_shutdown;
-	hw_data->get_accel_mask = get_accel_mask;
-	hw_data->get_ae_mask = get_ae_mask;
-	hw_data->get_num_accels = get_num_accels;
-	hw_data->get_num_aes = get_num_aes;
-	hw_data->get_etr_bar_id = get_etr_bar_id;
-	hw_data->get_misc_bar_id = get_misc_bar_id;
-	hw_data->get_sku = get_sku;
-	hw_data->enable_ints = adf_vf_void_noop;
-	hw_data->dev_class->instances++;
-	hw_data->dev_config = adf_gen2_dev_config;
-	adf_devmgr_update_class_index(hw_data);
-	adf_gen2_init_vf_pfvf_ops(&hw_data->pfvf_ops);
-	adf_gen2_init_hw_csr_ops(&hw_data->csr_ops);
-	adf_gen2_init_dc_ops(&hw_data->dc_ops);
-}
-
-void adf_clean_hw_data_c62xiov(struct adf_hw_device_data *hw_data)
-{
-	hw_data->dev_class->instances--;
-	adf_devmgr_update_class_index(hw_data);
-}
diff --git a/drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.h b/drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.h
deleted file mode 100644
index a1a62c003ebf..000000000000
--- a/drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0-only) */
-/* Copyright(c) 2015 - 2020 Intel Corporation */
-#ifndef ADF_C62XVF_HW_DATA_H_
-#define ADF_C62XVF_HW_DATA_H_
-
-#define ADF_C62XIOV_PMISC_BAR 1
-#define ADF_C62XIOV_ACCELERATORS_MASK 0x1
-#define ADF_C62XIOV_ACCELENGINES_MASK 0x1
-#define ADF_C62XIOV_MAX_ACCELERATORS 1
-#define ADF_C62XIOV_MAX_ACCELENGINES 1
-#define ADF_C62XIOV_RX_RINGS_OFFSET 8
-#define ADF_C62XIOV_TX_RINGS_MASK 0xFF
-#define ADF_C62XIOV_ETR_BAR 0
-#define ADF_C62XIOV_ETR_MAX_BANKS 1
-
-void adf_init_hw_data_c62xiov(struct adf_hw_device_data *hw_data);
-void adf_clean_hw_data_c62xiov(struct adf_hw_device_data *hw_data);
-#endif
diff --git a/drivers/crypto/qat/qat_c62xvf/adf_drv.c b/drivers/crypto/qat/qat_c62xvf/adf_drv.c
deleted file mode 100644
index 37566309df94..000000000000
--- a/drivers/crypto/qat/qat_c62xvf/adf_drv.c
+++ /dev/null
@@ -1,232 +0,0 @@
-// SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0-only)
-/* Copyright(c) 2014 - 2020 Intel Corporation */
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/fs.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/device.h>
-#include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
-#include <linux/workqueue.h>
-#include <linux/io.h>
-#include <adf_accel_devices.h>
-#include <adf_common_drv.h>
-#include <adf_cfg.h>
-#include "adf_c62xvf_hw_data.h"
-
-static const struct pci_device_id adf_pci_tbl[] = {
-	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QAT_C62X_VF), },
-	{ }
-};
-MODULE_DEVICE_TABLE(pci, adf_pci_tbl);
-
-static int adf_probe(struct pci_dev *dev, const struct pci_device_id *ent);
-static void adf_remove(struct pci_dev *dev);
-
-static struct pci_driver adf_driver = {
-	.id_table = adf_pci_tbl,
-	.name = ADF_C62XVF_DEVICE_NAME,
-	.probe = adf_probe,
-	.remove = adf_remove,
-};
-
-static void adf_cleanup_pci_dev(struct adf_accel_dev *accel_dev)
-{
-	pci_release_regions(accel_dev->accel_pci_dev.pci_dev);
-	pci_disable_device(accel_dev->accel_pci_dev.pci_dev);
-}
-
-static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)
-{
-	struct adf_accel_pci *accel_pci_dev = &accel_dev->accel_pci_dev;
-	struct adf_accel_dev *pf;
-	int i;
-
-	for (i = 0; i < ADF_PCI_MAX_BARS; i++) {
-		struct adf_bar *bar = &accel_pci_dev->pci_bars[i];
-
-		if (bar->virt_addr)
-			pci_iounmap(accel_pci_dev->pci_dev, bar->virt_addr);
-	}
-
-	if (accel_dev->hw_device) {
-		switch (accel_pci_dev->pci_dev->device) {
-		case PCI_DEVICE_ID_INTEL_QAT_C62X_VF:
-			adf_clean_hw_data_c62xiov(accel_dev->hw_device);
-			break;
-		default:
-			break;
-		}
-		kfree(accel_dev->hw_device);
-		accel_dev->hw_device = NULL;
-	}
-	adf_cfg_dev_remove(accel_dev);
-	debugfs_remove(accel_dev->debugfs_dir);
-	pf = adf_devmgr_pci_to_accel_dev(accel_pci_dev->pci_dev->physfn);
-	adf_devmgr_rm_dev(accel_dev, pf);
-}
-
-static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-	struct adf_accel_dev *accel_dev;
-	struct adf_accel_dev *pf;
-	struct adf_accel_pci *accel_pci_dev;
-	struct adf_hw_device_data *hw_data;
-	char name[ADF_DEVICE_NAME_LENGTH];
-	unsigned int i, bar_nr;
-	unsigned long bar_mask;
-	int ret;
-
-	switch (ent->device) {
-	case PCI_DEVICE_ID_INTEL_QAT_C62X_VF:
-		break;
-	default:
-		dev_err(&pdev->dev, "Invalid device 0x%x.\n", ent->device);
-		return -ENODEV;
-	}
-
-	accel_dev = kzalloc_node(sizeof(*accel_dev), GFP_KERNEL,
-				 dev_to_node(&pdev->dev));
-	if (!accel_dev)
-		return -ENOMEM;
-
-	accel_dev->is_vf = true;
-	pf = adf_devmgr_pci_to_accel_dev(pdev->physfn);
-	accel_pci_dev = &accel_dev->accel_pci_dev;
-	accel_pci_dev->pci_dev = pdev;
-
-	/* Add accel device to accel table */
-	if (adf_devmgr_add_dev(accel_dev, pf)) {
-		dev_err(&pdev->dev, "Failed to add new accelerator device.\n");
-		kfree(accel_dev);
-		return -EFAULT;
-	}
-	INIT_LIST_HEAD(&accel_dev->crypto_list);
-
-	accel_dev->owner = THIS_MODULE;
-	/* Allocate and configure device configuration structure */
-	hw_data = kzalloc_node(sizeof(*hw_data), GFP_KERNEL,
-			       dev_to_node(&pdev->dev));
-	if (!hw_data) {
-		ret = -ENOMEM;
-		goto out_err;
-	}
-	accel_dev->hw_device = hw_data;
-	adf_init_hw_data_c62xiov(accel_dev->hw_device);
-
-	/* Get Accelerators and Accelerators Engines masks */
-	hw_data->accel_mask = hw_data->get_accel_mask(hw_data);
-	hw_data->ae_mask = hw_data->get_ae_mask(hw_data);
-	accel_pci_dev->sku = hw_data->get_sku(hw_data);
-
-	/* Create dev top level debugfs entry */
-	snprintf(name, sizeof(name), "%s%s_%s", ADF_DEVICE_NAME_PREFIX,
-		 hw_data->dev_class->name, pci_name(pdev));
-
-	accel_dev->debugfs_dir = debugfs_create_dir(name, NULL);
-
-	/* Create device configuration table */
-	ret = adf_cfg_dev_add(accel_dev);
-	if (ret)
-		goto out_err;
-
-	/* enable PCI device */
-	if (pci_enable_device(pdev)) {
-		ret = -EFAULT;
-		goto out_err;
-	}
-
-	/* set dma identifier */
-	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
-	if (ret) {
-		dev_err(&pdev->dev, "No usable DMA configuration\n");
-		goto out_err_disable;
-	}
-
-	if (pci_request_regions(pdev, ADF_C62XVF_DEVICE_NAME)) {
-		ret = -EFAULT;
-		goto out_err_disable;
-	}
-
-	/* Find and map all the device's BARS */
-	i = 0;
-	bar_mask = pci_select_bars(pdev, IORESOURCE_MEM);
-	for_each_set_bit(bar_nr, &bar_mask, ADF_PCI_MAX_BARS * 2) {
-		struct adf_bar *bar = &accel_pci_dev->pci_bars[i++];
-
-		bar->base_addr = pci_resource_start(pdev, bar_nr);
-		if (!bar->base_addr)
-			break;
-		bar->size = pci_resource_len(pdev, bar_nr);
-		bar->virt_addr = pci_iomap(accel_pci_dev->pci_dev, bar_nr, 0);
-		if (!bar->virt_addr) {
-			dev_err(&pdev->dev, "Failed to map BAR %d\n", bar_nr);
-			ret = -EFAULT;
-			goto out_err_free_reg;
-		}
-	}
-	pci_set_master(pdev);
-	/* Completion for VF2PF request/response message exchange */
-	init_completion(&accel_dev->vf.msg_received);
-
-	ret = adf_dev_up(accel_dev, false);
-	if (ret)
-		goto out_err_dev_stop;
-
-	return ret;
-
-out_err_dev_stop:
-	adf_dev_down(accel_dev, false);
-out_err_free_reg:
-	pci_release_regions(accel_pci_dev->pci_dev);
-out_err_disable:
-	pci_disable_device(accel_pci_dev->pci_dev);
-out_err:
-	adf_cleanup_accel(accel_dev);
-	kfree(accel_dev);
-	return ret;
-}
-
-static void adf_remove(struct pci_dev *pdev)
-{
-	struct adf_accel_dev *accel_dev = adf_devmgr_pci_to_accel_dev(pdev);
-
-	if (!accel_dev) {
-		pr_err("QAT: Driver removal failed\n");
-		return;
-	}
-	adf_flush_vf_wq(accel_dev);
-	adf_dev_down(accel_dev, false);
-	adf_cleanup_accel(accel_dev);
-	adf_cleanup_pci_dev(accel_dev);
-	kfree(accel_dev);
-}
-
-static int __init adfdrv_init(void)
-{
-	request_module("intel_qat");
-
-	if (pci_register_driver(&adf_driver)) {
-		pr_err("QAT: Driver initialization failed\n");
-		return -EFAULT;
-	}
-	return 0;
-}
-
-static void __exit adfdrv_release(void)
-{
-	pci_unregister_driver(&adf_driver);
-	adf_clean_vf_map(true);
-}
-
-module_init(adfdrv_init);
-module_exit(adfdrv_release);
-
-MODULE_LICENSE("Dual BSD/GPL");
-MODULE_AUTHOR("Intel");
-MODULE_DESCRIPTION("Intel(R) QuickAssist Technology");
-MODULE_VERSION(ADF_DRV_VERSION);