Commit bc63dabe authored by Marco Chiappero's avatar Marco Chiappero Committed by Herbert Xu
Browse files

crypto: qat - add pfvf_ops 



Add pfvf_ops structure to isolate PFVF related functions inside the
adf_hw_device_data structure.

For GEN2, the structure is populated using one of the two helper
functions, adf_gen2_init_pf_pfvf_ops() or adf_gen2_init_vf_pfvf_ops(),
for the PF and VF driver respectively.

For the DH895XCC PF driver, the structure is populated using
adf_gen2_init_pf_pfvf_ops() but some of the functions are then
overwritten.

Signed-off-by: default avatarMarco Chiappero <marco.chiappero@intel.com>
Co-developed-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6f2e2801

drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c

+2 −2
Original line number Diff line number Diff line
@@ -254,8 +254,8 @@ void adf_init_hw_data_4xxx(struct adf_hw_device_data *hw_data) 
	hw_data->uof_get_ae_mask = uof_get_ae_mask;

	hw_data->set_msix_rttable = set_msix_default_rttable;

	hw_data->set_ssm_wdtimer = adf_gen4_set_ssm_wdtimer;

	hw_data->enable_pfvf_comms = adf_pfvf_comms_disabled;

	hw_data->get_vf2pf_sources = get_vf2pf_sources;

	hw_data->pfvf_ops.enable_comms = adf_pfvf_comms_disabled;

	hw_data->pfvf_ops.get_vf2pf_sources = get_vf2pf_sources;

	hw_data->disable_iov = adf_disable_sriov;

	hw_data->min_iov_compat_ver = ADF_PFVF_COMPAT_THIS_VERSION;

drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c

+1 −5
Original line number Diff line number Diff line
@@ -136,14 +136,10 @@ void adf_init_hw_data_c3xxx(struct adf_hw_device_data *hw_data) 
	hw_data->enable_ints = adf_enable_ints;

	hw_data->reset_device = adf_reset_flr;

	hw_data->set_ssm_wdtimer = adf_gen2_set_ssm_wdtimer;

	hw_data->get_pf2vf_offset = adf_gen2_pf_get_pf2vf_offset;

	hw_data->get_vf2pf_sources = adf_gen2_get_vf2pf_sources;

	hw_data->enable_vf2pf_interrupts = adf_gen2_enable_vf2pf_interrupts;

	hw_data->disable_vf2pf_interrupts = adf_gen2_disable_vf2pf_interrupts;

	hw_data->enable_pfvf_comms = adf_enable_pf2vf_comms;

	hw_data->disable_iov = adf_disable_sriov;

	hw_data->min_iov_compat_ver = ADF_PFVF_COMPAT_THIS_VERSION;



	adf_gen2_init_pf_pfvf_ops(&hw_data->pfvf_ops);

	adf_gen2_init_hw_csr_ops(&hw_data->csr_ops);

}

drivers/crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c

+1 −2
Original line number Diff line number Diff line
@@ -82,13 +82,12 @@ void adf_init_hw_data_c3xxxiov(struct adf_hw_device_data *hw_data) 
	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_pf2vf_offset = adf_gen2_vf_get_pf2vf_offset;

	hw_data->get_sku = get_sku;

	hw_data->enable_ints = adf_vf_void_noop;

	hw_data->enable_pfvf_comms = adf_enable_vf2pf_comms;

	hw_data->min_iov_compat_ver = ADF_PFVF_COMPAT_THIS_VERSION;

	hw_data->dev_class->instances++;

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

}

drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c

+1 −5
Original line number Diff line number Diff line
@@ -138,14 +138,10 @@ void adf_init_hw_data_c62x(struct adf_hw_device_data *hw_data) 
	hw_data->enable_ints = adf_enable_ints;

	hw_data->reset_device = adf_reset_flr;

	hw_data->set_ssm_wdtimer = adf_gen2_set_ssm_wdtimer;

	hw_data->get_pf2vf_offset = adf_gen2_pf_get_pf2vf_offset;

	hw_data->get_vf2pf_sources = adf_gen2_get_vf2pf_sources;

	hw_data->enable_vf2pf_interrupts = adf_gen2_enable_vf2pf_interrupts;

	hw_data->disable_vf2pf_interrupts = adf_gen2_disable_vf2pf_interrupts;

	hw_data->enable_pfvf_comms = adf_enable_pf2vf_comms;

	hw_data->disable_iov = adf_disable_sriov;

	hw_data->min_iov_compat_ver = ADF_PFVF_COMPAT_THIS_VERSION;



	adf_gen2_init_pf_pfvf_ops(&hw_data->pfvf_ops);

	adf_gen2_init_hw_csr_ops(&hw_data->csr_ops);

}

drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c

+1 −2
Original line number Diff line number Diff line
@@ -82,13 +82,12 @@ void adf_init_hw_data_c62xiov(struct adf_hw_device_data *hw_data) 
	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_pf2vf_offset = adf_gen2_vf_get_pf2vf_offset;

	hw_data->get_sku = get_sku;

	hw_data->enable_ints = adf_vf_void_noop;

	hw_data->enable_pfvf_comms = adf_enable_vf2pf_comms;

	hw_data->min_iov_compat_ver = ADF_PFVF_COMPAT_THIS_VERSION;

	hw_data->dev_class->instances++;

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

}