Commit e19e2263 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fix from Herbert Xu:
 "Fix a regression in the qat driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: qat - do not handle PFVF sources for qat_4xxx
parents 2f47a9a4 27750a31

drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c

+7 −0
Original line number Diff line number Diff line
@@ -211,6 +211,12 @@ static u32 uof_get_ae_mask(u32 obj_num) 
	return adf_4xxx_fw_config[obj_num].ae_mask;

}



static u32 get_vf2pf_sources(void __iomem *pmisc_addr)

{

	/* For the moment do not report vf2pf sources */

	return 0;

}



void adf_init_hw_data_4xxx(struct adf_hw_device_data *hw_data)

{

	hw_data->dev_class = &adf_4xxx_class;
@@ -254,6 +260,7 @@ void adf_init_hw_data_4xxx(struct adf_hw_device_data *hw_data) 
	hw_data->set_msix_rttable = set_msix_default_rttable;

	hw_data->set_ssm_wdtimer = adf_gen4_set_ssm_wdtimer;

	hw_data->enable_pfvf_comms = pfvf_comms_disabled;

	hw_data->get_vf2pf_sources = get_vf2pf_sources;

	hw_data->disable_iov = adf_disable_sriov;

	hw_data->min_iov_compat_ver = ADF_PFVF_COMPAT_THIS_VERSION;