Commit 4fefd69d authored by Alex Williamson's avatar Alex Williamson
Browse files

Merge branch 'vfio' of... 

Merge branch 'vfio' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6 into v6.10/vfio/qat-v7
parents 848e447e f0bbfc39

drivers/crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c

+3 −0
Original line number Diff line number Diff line
@@ -10,12 +10,14 @@ 
#include <adf_fw_config.h>

#include <adf_gen4_config.h>

#include <adf_gen4_dc.h>

#include <adf_gen4_hw_csr_data.h>

#include <adf_gen4_hw_data.h>

#include <adf_gen4_pfvf.h>

#include <adf_gen4_pm.h>

#include <adf_gen4_ras.h>

#include <adf_gen4_timer.h>

#include <adf_gen4_tl.h>

#include <adf_gen4_vf_mig.h>

#include "adf_420xx_hw_data.h"

#include "icp_qat_hw.h"
@@ -487,6 +489,7 @@ void adf_init_hw_data_420xx(struct adf_hw_device_data *hw_data, u32 dev_id) 
	adf_gen4_init_dc_ops(&hw_data->dc_ops);

	adf_gen4_init_ras_ops(&hw_data->ras_ops);

	adf_gen4_init_tl_data(&hw_data->tl_data);

	adf_gen4_init_vf_mig_ops(&hw_data->vfmig_ops);

	adf_init_rl_data(&hw_data->rl_data);

}

drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c

+5 −0
Original line number Diff line number Diff line
@@ -10,12 +10,14 @@ 
#include <adf_fw_config.h>

#include <adf_gen4_config.h>

#include <adf_gen4_dc.h>

#include <adf_gen4_hw_csr_data.h>

#include <adf_gen4_hw_data.h>

#include <adf_gen4_pfvf.h>

#include <adf_gen4_pm.h>

#include "adf_gen4_ras.h"

#include <adf_gen4_timer.h>

#include <adf_gen4_tl.h>

#include <adf_gen4_vf_mig.h>

#include "adf_4xxx_hw_data.h"

#include "icp_qat_hw.h"
@@ -454,6 +456,8 @@ void adf_init_hw_data_4xxx(struct adf_hw_device_data *hw_data, u32 dev_id) 
	hw_data->get_ring_to_svc_map = adf_gen4_get_ring_to_svc_map;

	hw_data->disable_iov = adf_disable_sriov;

	hw_data->ring_pair_reset = adf_gen4_ring_pair_reset;

	hw_data->bank_state_save = adf_gen4_bank_state_save;

	hw_data->bank_state_restore = adf_gen4_bank_state_restore;

	hw_data->enable_pm = adf_gen4_enable_pm;

	hw_data->handle_pm_interrupt = adf_gen4_handle_pm_interrupt;

	hw_data->dev_config = adf_gen4_dev_config;
@@ -469,6 +473,7 @@ void adf_init_hw_data_4xxx(struct adf_hw_device_data *hw_data, u32 dev_id) 
	adf_gen4_init_dc_ops(&hw_data->dc_ops);

	adf_gen4_init_ras_ops(&hw_data->ras_ops);

	adf_gen4_init_tl_data(&hw_data->tl_data);

	adf_gen4_init_vf_mig_ops(&hw_data->vfmig_ops);

	adf_init_rl_data(&hw_data->rl_data);

}

drivers/crypto/intel/qat/qat_c3xxx/adf_c3xxx_hw_data.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <adf_common_drv.h>

#include <adf_gen2_config.h>

#include <adf_gen2_dc.h>

#include <adf_gen2_hw_csr_data.h>

#include <adf_gen2_hw_data.h>

#include <adf_gen2_pfvf.h>

#include "adf_c3xxx_hw_data.h"

drivers/crypto/intel/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <adf_common_drv.h>

#include <adf_gen2_config.h>

#include <adf_gen2_dc.h>

#include <adf_gen2_hw_csr_data.h>

#include <adf_gen2_hw_data.h>

#include <adf_gen2_pfvf.h>

#include <adf_pfvf_vf_msg.h>

drivers/crypto/intel/qat/qat_c62x/adf_c62x_hw_data.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <adf_common_drv.h>

#include <adf_gen2_config.h>

#include <adf_gen2_dc.h>

#include <adf_gen2_hw_csr_data.h>

#include <adf_gen2_hw_data.h>

#include <adf_gen2_pfvf.h>

#include "adf_c62x_hw_data.h"