Commit 6f2e2801 authored by Giovanni Cabiddu's avatar Giovanni Cabiddu Committed by Herbert Xu
Browse files

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: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: default avatarMarco Chiappero <marco.chiappero@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 7e00fb3f

drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c

+1 −6
Original line number Diff line number Diff line
@@ -191,11 +191,6 @@ static int adf_init_device(struct adf_accel_dev *accel_dev) 
	return ret;

}



static int pfvf_comms_disabled(struct adf_accel_dev *accel_dev)

{

	return 0;

}



static u32 uof_get_num_objs(void)

{

	return ARRAY_SIZE(adf_4xxx_fw_config);
@@ -259,7 +254,7 @@ 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 = pfvf_comms_disabled;

	hw_data->enable_pfvf_comms = adf_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;

drivers/crypto/qat/qat_common/adf_common_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ void adf_isr_resource_free(struct adf_accel_dev *accel_dev); 
int adf_vf_isr_resource_alloc(struct adf_accel_dev *accel_dev);

void adf_vf_isr_resource_free(struct adf_accel_dev *accel_dev);



int adf_pfvf_comms_disabled(struct adf_accel_dev *accel_dev);



int qat_hal_init(struct adf_accel_dev *accel_dev);

void qat_hal_deinit(struct icp_qat_fw_loader_handle *handle);

int qat_hal_start(struct icp_qat_fw_loader_handle *handle);

drivers/crypto/qat/qat_common/adf_gen4_hw_data.c

+7 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0-only)

/* Copyright(c) 2020 Intel Corporation */

#include "adf_accel_devices.h"

#include "adf_common_drv.h"

#include "adf_gen4_hw_data.h"



static u64 build_csr_ring_base_addr(dma_addr_t addr, u32 size)
@@ -139,3 +140,9 @@ void adf_gen4_set_ssm_wdtimer(struct adf_accel_dev *accel_dev) 
	ADF_CSR_WR(pmisc_addr, ADF_SSMWDTPKEH_OFFSET, ssm_wdt_pke_high);

}

EXPORT_SYMBOL_GPL(adf_gen4_set_ssm_wdtimer);



int adf_pfvf_comms_disabled(struct adf_accel_dev *accel_dev)

{

	return 0;

}

EXPORT_SYMBOL_GPL(adf_pfvf_comms_disabled);