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

crypto: qat - Add support for SRIOV 



Add code that enables SRIOV on dh895xcc devices.

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

drivers/crypto/qat/qat_common/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,3 +19,4 @@ intel_qat-objs := adf_cfg.o \ 
	qat_hal.o



intel_qat-$(CONFIG_DEBUG_FS) += adf_transport_debug.o

intel_qat-$(CONFIG_PCI_IOV) += adf_sriov.o adf_pf2vf_msg.o

drivers/crypto/qat/qat_common/adf_accel_devices.h

+37 −0
Original line number Diff line number Diff line
@@ -46,13 +46,17 @@ 
*/

#ifndef ADF_ACCEL_DEVICES_H_

#define ADF_ACCEL_DEVICES_H_

#include <linux/interrupt.h>

#include <linux/module.h>

#include <linux/list.h>

#include <linux/io.h>

#include <linux/ratelimit.h>

#include "adf_cfg_common.h"



#define ADF_DH895XCC_DEVICE_NAME "dh895xcc"

#define ADF_DH895XCCVF_DEVICE_NAME "dh895xccvf"

#define ADF_DH895XCC_PCI_DEVICE_ID 0x435

#define ADF_DH895XCCIOV_PCI_DEVICE_ID 0x443

#define ADF_PCI_MAX_BARS 3

#define ADF_DEVICE_NAME_LENGTH 32

#define ADF_ETR_MAX_RINGS_PER_BANK 16
@@ -79,6 +83,7 @@ struct adf_bar { 
struct adf_accel_msix {

	struct msix_entry *entries;

	char **names;

	u32 num_entries;

} __packed;



struct adf_accel_pci {
@@ -99,6 +104,7 @@ enum dev_sku_info { 
	DEV_SKU_2,

	DEV_SKU_3,

	DEV_SKU_4,

	DEV_SKU_VF,

	DEV_SKU_UNKNOWN,

};
@@ -113,6 +119,8 @@ static inline const char *get_sku_info(enum dev_sku_info info) 
		return "SKU3";

	case DEV_SKU_4:

		return "SKU4";

	case DEV_SKU_VF:

		return "SKUVF";

	case DEV_SKU_UNKNOWN:

	default:

		break;
@@ -140,6 +148,8 @@ struct adf_hw_device_data { 
	uint32_t (*get_etr_bar_id)(struct adf_hw_device_data *self);

	uint32_t (*get_num_aes)(struct adf_hw_device_data *self);

	uint32_t (*get_num_accels)(struct adf_hw_device_data *self);

	uint32_t (*get_pf2vf_offset)(uint32_t i);

	uint32_t (*get_vintmsk_offset)(uint32_t i);

	enum dev_sku_info (*get_sku)(struct adf_hw_device_data *self);

	int (*alloc_irq)(struct adf_accel_dev *accel_dev);

	void (*free_irq)(struct adf_accel_dev *accel_dev);
@@ -151,7 +161,9 @@ struct adf_hw_device_data { 
	void (*exit_arb)(struct adf_accel_dev *accel_dev);

	void (*get_arb_mapping)(struct adf_accel_dev *accel_dev,

				const uint32_t **cfg);

	void (*disable_iov)(struct adf_accel_dev *accel_dev);

	void (*enable_ints)(struct adf_accel_dev *accel_dev);

	int (*enable_vf2pf_comms)(struct adf_accel_dev *accel_dev);

	const char *fw_name;

	const char *fw_mmp_name;

	uint32_t fuses;
@@ -165,6 +177,7 @@ struct adf_hw_device_data { 
	uint8_t num_accel;

	uint8_t num_logical_accel;

	uint8_t num_engines;

	uint8_t min_iov_compat_ver;

} __packed;



/* CSR write macro */
@@ -189,6 +202,15 @@ struct adf_fw_loader_data { 
	const struct firmware *mmp_fw;

};



struct adf_accel_vf_info {

	struct adf_accel_dev *accel_dev;

	struct tasklet_struct vf2pf_bh_tasklet;

	struct mutex pf2vf_lock; /* protect CSR access for PF2VF messages */

	struct ratelimit_state vf2pf_ratelimit;

	u32 vf_nr;

	bool init;

};



struct adf_accel_dev {

	struct adf_etr_data *transport;

	struct adf_hw_device_data *hw_device;
@@ -202,6 +224,21 @@ struct adf_accel_dev { 
	struct list_head list;

	struct module *owner;

	struct adf_accel_pci accel_pci_dev;

	union {

		struct {

			/* vf_info is non-zero when SR-IOV is init'ed */

			struct adf_accel_vf_info *vf_info;

		} pf;

		struct {

			char *irq_name;

			struct tasklet_struct pf2vf_bh_tasklet;

			struct mutex vf2pf_lock; /* protect CSR access */

			struct completion iov_msg_completion;

			uint8_t compatible;

			uint8_t pf_version;

		} vf;

	};

	bool is_vf;

	uint8_t accel_id;

} __packed;

#endif

drivers/crypto/qat/qat_common/adf_aer.c

+3 −0
Original line number Diff line number Diff line
@@ -91,6 +91,9 @@ static void adf_dev_restore(struct adf_accel_dev *accel_dev) 
	dev_info(&GET_DEV(accel_dev), "Resetting device qat_dev%d\n",

		 accel_dev->accel_id);



	if (!parent)

		parent = pdev;



	if (!pci_wait_for_pending_transaction(pdev))

		dev_info(&GET_DEV(accel_dev),

			 "Transaction still in progress. Proceeding\n");

drivers/crypto/qat/qat_common/adf_cfg.c

+3 −0
Original line number Diff line number Diff line
@@ -178,6 +178,9 @@ void adf_cfg_dev_remove(struct adf_accel_dev *accel_dev) 
{

	struct adf_cfg_device_data *dev_cfg_data = accel_dev->cfg;



	if (!dev_cfg_data)

		return;



	down_write(&dev_cfg_data->lock);

	adf_cfg_section_del_all(&dev_cfg_data->sec_list);

	up_write(&dev_cfg_data->lock);

drivers/crypto/qat/qat_common/adf_cfg_common.h

+2 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
#define ADF_CFG_NO_DEVICE 0xFF

#define ADF_CFG_AFFINITY_WHATEVER 0xFF

#define MAX_DEVICE_NAME_SIZE 32

#define ADF_MAX_DEVICES 32

#define ADF_MAX_DEVICES (32 * 32)



enum adf_cfg_val_type {

	ADF_DEC,
@@ -71,6 +71,7 @@ enum adf_cfg_val_type { 
enum adf_device_type {

	DEV_UNKNOWN = 0,

	DEV_DH895XCC,

	DEV_DH895XCCVF,

};



struct adf_dev_status_info {