Commit fc920ecc authored by Giovanni Cabiddu's avatar Giovanni Cabiddu Committed by Herbert Xu
Browse files

crypto: qat - abstract admin interface 



Abstract access to admin interface and move generation specific code into
adf_gen2_hw_data.c in preparation for the introduction of the qat_4xxx
driver.

Signed-off-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: default avatarFiona Trahe <fiona.trahe@intel.com>
Reviewed-by: default avatarWojciech Ziemba <wojciech.ziemba@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent d1e86b4c

drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ void adf_init_hw_data_c3xxx(struct adf_hw_device_data *hw_data) 
	hw_data->get_misc_bar_id = get_misc_bar_id;

	hw_data->get_pf2vf_offset = get_pf2vf_offset;

	hw_data->get_vintmsk_offset = get_vintmsk_offset;

	hw_data->get_admin_info = adf_gen2_get_admin_info;

	hw_data->get_sku = get_sku;

	hw_data->fw_name = ADF_C3XXX_FW;

	hw_data->fw_mmp_name = ADF_C3XXX_MMP;

drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ void adf_init_hw_data_c62x(struct adf_hw_device_data *hw_data) 
	hw_data->get_misc_bar_id = get_misc_bar_id;

	hw_data->get_pf2vf_offset = get_pf2vf_offset;

	hw_data->get_vintmsk_offset = get_vintmsk_offset;

	hw_data->get_admin_info = adf_gen2_get_admin_info;

	hw_data->get_sku = get_sku;

	hw_data->fw_name = ADF_C62X_FW;

	hw_data->fw_mmp_name = ADF_C62X_MMP;

drivers/crypto/qat/qat_common/adf_accel_devices.h

+7 −0
Original line number Diff line number Diff line
@@ -97,6 +97,12 @@ struct adf_hw_device_class { 
	u32 instances;

} __packed;



struct admin_info {

	u32 admin_msg_ur;

	u32 admin_msg_lr;

	u32 mailbox_offset;

};



struct adf_hw_csr_ops {

	u32 (*read_csr_ring_head)(void __iomem *csr_base_addr, u32 bank,

				  u32 ring);
@@ -138,6 +144,7 @@ struct adf_hw_device_data { 
	u32 (*get_num_accels)(struct adf_hw_device_data *self);

	u32 (*get_pf2vf_offset)(u32 i);

	u32 (*get_vintmsk_offset)(u32 i);

	void (*get_admin_info)(struct admin_info *admin_csrs_info);

	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);

drivers/crypto/qat/qat_common/adf_admin.c

+15 −10
Original line number Diff line number Diff line
@@ -10,11 +10,7 @@ 
#include "adf_common_drv.h"

#include "icp_qat_fw_init_admin.h"



/* Admin Messages Registers */

#define ADF_DH895XCC_ADMINMSGUR_OFFSET (0x3A000 + 0x574)

#define ADF_DH895XCC_ADMINMSGLR_OFFSET (0x3A000 + 0x578)

#define ADF_DH895XCC_MAILBOX_BASE_OFFSET 0x20970

#define ADF_DH895XCC_MAILBOX_STRIDE 0x1000

#define ADF_ADMIN_MAILBOX_STRIDE 0x1000

#define ADF_ADMINMSG_LEN 32

#define ADF_CONST_TABLE_SIZE 1024

#define ADF_ADMIN_POLL_DELAY_US 20
@@ -118,7 +114,7 @@ static int adf_put_admin_msg_sync(struct adf_accel_dev *accel_dev, u32 ae, 
	struct adf_admin_comms *admin = accel_dev->admin;

	int offset = ae * ADF_ADMINMSG_LEN * 2;

	void __iomem *mailbox = admin->mailbox_addr;

	int mb_offset = ae * ADF_DH895XCC_MAILBOX_STRIDE;

	int mb_offset = ae * ADF_ADMIN_MAILBOX_STRIDE;

	struct icp_qat_fw_init_admin_req *request = in;



	mutex_lock(&admin->lock);
@@ -225,8 +221,9 @@ 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 = (void __iomem *)((uintptr_t)csr +

				 ADF_DH895XCC_MAILBOX_BASE_OFFSET);

	struct admin_info admin_csrs_info;

	u32 mailbox_offset, adminmsg_u, adminmsg_l;

	void __iomem *mailbox;

	u64 reg_val;



	admin = kzalloc_node(sizeof(*accel_dev->admin), GFP_KERNEL,
@@ -254,9 +251,17 @@ int adf_init_admin_comms(struct adf_accel_dev *accel_dev) 
	}



	memcpy(admin->virt_tbl_addr, const_tab, sizeof(const_tab));

	hw_data->get_admin_info(&admin_csrs_info);



	mailbox_offset = admin_csrs_info.mailbox_offset;

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

	adminmsg_u = admin_csrs_info.admin_msg_ur;

	adminmsg_l = admin_csrs_info.admin_msg_lr;



	reg_val = (u64)admin->phy_addr;

	ADF_CSR_WR(csr, ADF_DH895XCC_ADMINMSGUR_OFFSET, reg_val >> 32);

	ADF_CSR_WR(csr, ADF_DH895XCC_ADMINMSGLR_OFFSET, reg_val);

	ADF_CSR_WR(csr, adminmsg_u, upper_32_bits(reg_val));

	ADF_CSR_WR(csr, adminmsg_l, lower_32_bits(reg_val));



	mutex_init(&admin->lock);

	admin->mailbox_addr = mailbox;

	accel_dev->admin = admin;

drivers/crypto/qat/qat_common/adf_gen2_hw_data.c

+8 −0
Original line number Diff line number Diff line
@@ -37,6 +37,14 @@ void adf_gen2_cfg_iov_thds(struct adf_accel_dev *accel_dev, bool enable, 
}

EXPORT_SYMBOL_GPL(adf_gen2_cfg_iov_thds);



void adf_gen2_get_admin_info(struct admin_info *admin_csrs_info)

{

	admin_csrs_info->mailbox_offset = ADF_MAILBOX_BASE_OFFSET;

	admin_csrs_info->admin_msg_ur = ADF_ADMINMSGUR_OFFSET;

	admin_csrs_info->admin_msg_lr = ADF_ADMINMSGLR_OFFSET;

}

EXPORT_SYMBOL_GPL(adf_gen2_get_admin_info);



static u32 read_csr_ring_head(void __iomem *csr_base_addr, u32 bank, u32 ring)

{

	return READ_CSR_RING_HEAD(csr_base_addr, bank, ring);