tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

crypto: qat - relocate and rename 4xxx PF2VM definitions

Move and rename ADF_4XXX_PF2VM_OFFSET and ADF_4XXX_VM2PF_OFFSET to
ADF_GEN4_PF2VM_OFFSET and ADF_GEN4_VM2PF_OFFSET respectively.
These definitions are moved from adf_gen4_pfvf.c to adf_gen4_hw_data.h
as they are specific to GEN4 and not just to qat_4xxx.

This change is made in anticipation of their use in live migration.

This does not introduce any functional change.

Signed-off-by: Xin Zeng <xin.zeng@intel.com>
Reviewed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Xin Zeng and committed by
Herbert Xu 1f8d6a16 1894cb1d

+7 -5
+4
drivers/crypto/intel/qat/qat_common/adf_gen4_hw_data.h
··· 197 197 /* Arbiter threads mask with error value */ 198 198 #define ADF_GEN4_ENA_THD_MASK_ERROR GENMASK(ADF_NUM_THREADS_PER_AE, 0) 199 199 200 + /* PF2VM communication channel */ 201 + #define ADF_GEN4_PF2VM_OFFSET(i) (0x40B010 + (i) * 0x20) 202 + #define ADF_GEN4_VM2PF_OFFSET(i) (0x40B014 + (i) * 0x20) 203 + 200 204 void adf_gen4_set_ssm_wdtimer(struct adf_accel_dev *accel_dev); 201 205 202 206 enum icp_qat_gen4_slice_mask {
+3 -5
drivers/crypto/intel/qat/qat_common/adf_gen4_pfvf.c
··· 6 6 #include "adf_accel_devices.h" 7 7 #include "adf_common_drv.h" 8 8 #include "adf_gen4_pfvf.h" 9 + #include "adf_gen4_hw_data.h" 9 10 #include "adf_pfvf_pf_proto.h" 10 11 #include "adf_pfvf_utils.h" 11 - 12 - #define ADF_4XXX_PF2VM_OFFSET(i) (0x40B010 + ((i) * 0x20)) 13 - #define ADF_4XXX_VM2PF_OFFSET(i) (0x40B014 + ((i) * 0x20)) 14 12 15 13 /* VF2PF interrupt source registers */ 16 14 #define ADF_4XXX_VM2PF_SOU 0x41A180 ··· 27 29 28 30 static u32 adf_gen4_pf_get_pf2vf_offset(u32 i) 29 31 { 30 - return ADF_4XXX_PF2VM_OFFSET(i); 32 + return ADF_GEN4_PF2VM_OFFSET(i); 31 33 } 32 34 33 35 static u32 adf_gen4_pf_get_vf2pf_offset(u32 i) 34 36 { 35 - return ADF_4XXX_VM2PF_OFFSET(i); 37 + return ADF_GEN4_VM2PF_OFFSET(i); 36 38 } 37 39 38 40 static void adf_gen4_enable_vf2pf_interrupts(void __iomem *pmisc_addr, u32 vf_mask)