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 PFVF disabled function

Move the function pfvf_comms_disabled() from the qat_4xxx module to
intel_qat as it will be used by other components to keep the PFVF
feature disabled.

Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: Marco Chiappero <marco.chiappero@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Giovanni Cabiddu and committed by
Herbert Xu 6f2e2801 7e00fb3f

+10 -6
+1 -6
drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c
··· 191 191 return ret; 192 192 } 193 193 194 - static int pfvf_comms_disabled(struct adf_accel_dev *accel_dev) 195 - { 196 - return 0; 197 - } 198 - 199 194 static u32 uof_get_num_objs(void) 200 195 { 201 196 return ARRAY_SIZE(adf_4xxx_fw_config); ··· 254 259 hw_data->uof_get_ae_mask = uof_get_ae_mask; 255 260 hw_data->set_msix_rttable = set_msix_default_rttable; 256 261 hw_data->set_ssm_wdtimer = adf_gen4_set_ssm_wdtimer; 257 - hw_data->enable_pfvf_comms = pfvf_comms_disabled; 262 + hw_data->enable_pfvf_comms = adf_pfvf_comms_disabled; 258 263 hw_data->get_vf2pf_sources = get_vf2pf_sources; 259 264 hw_data->disable_iov = adf_disable_sriov; 260 265 hw_data->min_iov_compat_ver = ADF_PFVF_COMPAT_THIS_VERSION;
+2
drivers/crypto/qat/qat_common/adf_common_drv.h
··· 130 130 int adf_vf_isr_resource_alloc(struct adf_accel_dev *accel_dev); 131 131 void adf_vf_isr_resource_free(struct adf_accel_dev *accel_dev); 132 132 133 + int adf_pfvf_comms_disabled(struct adf_accel_dev *accel_dev); 134 + 133 135 int qat_hal_init(struct adf_accel_dev *accel_dev); 134 136 void qat_hal_deinit(struct icp_qat_fw_loader_handle *handle); 135 137 int qat_hal_start(struct icp_qat_fw_loader_handle *handle);
+7
drivers/crypto/qat/qat_common/adf_gen4_hw_data.c
··· 1 1 // SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0-only) 2 2 /* Copyright(c) 2020 Intel Corporation */ 3 3 #include "adf_accel_devices.h" 4 + #include "adf_common_drv.h" 4 5 #include "adf_gen4_hw_data.h" 5 6 6 7 static u64 build_csr_ring_base_addr(dma_addr_t addr, u32 size) ··· 140 139 ADF_CSR_WR(pmisc_addr, ADF_SSMWDTPKEH_OFFSET, ssm_wdt_pke_high); 141 140 } 142 141 EXPORT_SYMBOL_GPL(adf_gen4_set_ssm_wdtimer); 142 + 143 + int adf_pfvf_comms_disabled(struct adf_accel_dev *accel_dev) 144 + { 145 + return 0; 146 + } 147 + EXPORT_SYMBOL_GPL(adf_pfvf_comms_disabled);