Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a72d3a6 authored by Tadeusz Struk's avatar Tadeusz Struk Committed by Herbert Xu
Browse files

crypto: qat - move isr files to qat common so that they can be reused 



Move qat_isr.c and qat_isrvf.c files to qat_common dir
so that they can be reused by all devices.
Remove adf_drv.h files because thay are not longer needed.
Move adf_dev_configure() function to qat_common so it can be reused.
Also some minor updates to common code for multidevice.

Signed-off-by: default avatarTadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent b0272276

drivers/crypto/qat/qat_common/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ clean-files += qat_rsaprivkey-asn1.c qat_rsaprivkey-asn1.h 


obj-$(CONFIG_CRYPTO_DEV_QAT) += intel_qat.o

intel_qat-objs := adf_cfg.o \

	adf_isr.o \

	adf_vf_isr.o \

	adf_ctl_drv.o \

	adf_dev_mgr.o \

	adf_init.o \

drivers/crypto/qat/qat_common/adf_accel_devices.h

+3 −1
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 
#define ADF_C3XXXIOV_PCI_DEVICE_ID 0x19e3

#define ADF_ERRSOU3 (0x3A000 + 0x0C)

#define ADF_ERRSOU5 (0x3A000 + 0xD8)

#define ADF_DEVICE_FUSECTL_OFFSET 0x40

#define ADF_DEVICE_LEGFUSE_OFFSET 0x4C

#define ADF_PCI_MAX_BARS 3

#define ADF_DEVICE_NAME_LENGTH 32

#define ADF_ETR_MAX_RINGS_PER_BANK 16
@@ -178,11 +180,11 @@ struct adf_hw_device_data { 
	const char *fw_mmp_name;

	uint32_t fuses;

	uint32_t accel_capabilities_mask;

	uint32_t instance_id;

	uint16_t accel_mask;

	uint16_t ae_mask;

	uint16_t tx_rings_mask;

	uint8_t tx_rx_gap;

	uint8_t instance_id;

	uint8_t num_banks;

	uint8_t num_accel;

	uint8_t num_logical_accel;

drivers/crypto/qat/qat_common/adf_admin.c

+3 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include "adf_accel_devices.h"

#include "adf_common_drv.h"

#include "icp_qat_fw_init_admin.h"



/* Admin Messages Registers */
@@ -234,7 +235,8 @@ int adf_init_admin_comms(struct adf_accel_dev *accel_dev) 
	struct adf_bar *pmisc =

		&GET_BARS(accel_dev)[hw_data->get_misc_bar_id(hw_data)];

	void __iomem *csr = pmisc->virt_addr;

	void __iomem *mailbox = csr + ADF_DH895XCC_MAILBOX_BASE_OFFSET;

	void __iomem *mailbox = (void __iomem *)((uintptr_t)csr +

				 ADF_DH895XCC_MAILBOX_BASE_OFFSET);

	u64 reg_val;



	admin = kzalloc_node(sizeof(*accel_dev->admin), GFP_KERNEL,

drivers/crypto/qat/qat_common/adf_aer.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ struct adf_reset_dev_data { 
	struct work_struct reset_work;

};



static void adf_dev_restore(struct adf_accel_dev *accel_dev)

void adf_dev_restore(struct adf_accel_dev *accel_dev)

{

	struct pci_dev *pdev = accel_to_pci_dev(accel_dev);

	struct pci_dev *parent = pdev->bus->self;

drivers/crypto/qat/qat_common/adf_common_drv.h

+8 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
#include "icp_qat_hal.h"



#define ADF_MAJOR_VERSION	0

#define ADF_MINOR_VERSION	2

#define ADF_MINOR_VERSION	6

#define ADF_BUILD_VERSION	0

#define ADF_DRV_VERSION		__stringify(ADF_MAJOR_VERSION) "." \

				__stringify(ADF_MINOR_VERSION) "." \
@@ -143,6 +143,7 @@ int adf_ae_stop(struct adf_accel_dev *accel_dev); 


int adf_enable_aer(struct adf_accel_dev *accel_dev, struct pci_driver *adf);

void adf_disable_aer(struct adf_accel_dev *accel_dev);

void adf_dev_restore(struct adf_accel_dev *accel_dev);

int adf_init_aer(void);

void adf_exit_aer(void);

int adf_init_admin_comms(struct adf_accel_dev *accel_dev);
@@ -159,6 +160,7 @@ int adf_init_etr_data(struct adf_accel_dev *accel_dev); 
void adf_cleanup_etr_data(struct adf_accel_dev *accel_dev);

int qat_crypto_register(void);

int qat_crypto_unregister(void);

int qat_crypto_dev_config(struct adf_accel_dev *accel_dev);

struct qat_crypto_instance *qat_crypto_get_instance_node(int node);

void qat_crypto_put_instance(struct qat_crypto_instance *inst);

void qat_alg_callback(void *resp);
@@ -168,6 +170,11 @@ void qat_algs_unregister(void); 
int qat_asym_algs_register(void);

void qat_asym_algs_unregister(void);



int adf_isr_resource_alloc(struct adf_accel_dev *accel_dev);

void adf_isr_resource_free(struct adf_accel_dev *accel_dev);

int adf_vf_isr_resource_alloc(struct adf_accel_dev *accel_dev);

void adf_vf_isr_resource_free(struct adf_accel_dev *accel_dev);



int qat_hal_init(struct adf_accel_dev *accel_dev);

void qat_hal_deinit(struct icp_qat_fw_loader_handle *handle);

void qat_hal_start(struct icp_qat_fw_loader_handle *handle, unsigned char ae,