Commit 720aa72a authored by Marco Chiappero's avatar Marco Chiappero Committed by Herbert Xu
Browse files

crypto: qat - move interrupt code out of the PFVF handler 



Move the interrupt handling call from the PF specific protocol file,
adf_pf2vf_msg.c, to adf_sriov.c to maintain the PFVF files focused on
the protocol handling.

The function adf_vf2pf_req_hndl() has been renamed as
adf_recv_and_handle_vf2pf_msg() to reflect its actual purpose and
maintain consistency with the VF side. This function now returns a
boolean indicating to the caller if interrupts need to be re-enabled or
not.

Signed-off-by: default avatarMarco Chiappero <marco.chiappero@intel.com>
Co-developed-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent b7c13ee4

drivers/crypto/qat/qat_common/adf_common_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ void adf_dev_shutdown(struct adf_accel_dev *accel_dev); 


void adf_pf2vf_notify_restarting(struct adf_accel_dev *accel_dev);

int adf_enable_vf2pf_comms(struct adf_accel_dev *accel_dev);

void adf_vf2pf_req_hndl(struct adf_accel_vf_info *vf_info);

void adf_devmgr_update_class_index(struct adf_hw_device_data *hw_data);

void adf_clean_vf_map(bool);
@@ -196,6 +195,7 @@ void adf_disable_vf2pf_interrupts(struct adf_accel_dev *accel_dev, 
void adf_enable_vf2pf_interrupts(struct adf_accel_dev *accel_dev,

				 u32 vf_mask);

bool adf_recv_and_handle_pf2vf_msg(struct adf_accel_dev *accel_dev);

bool adf_recv_and_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr);

int adf_pf2vf_handle_pf_restarting(struct adf_accel_dev *accel_dev);

int adf_enable_pf2vf_comms(struct adf_accel_dev *accel_dev);

void adf_enable_pf2vf_interrupts(struct adf_accel_dev *accel_dev);

drivers/crypto/qat/qat_common/adf_pf2vf_msg.c

+6 −9
Original line number Diff line number Diff line
@@ -178,21 +178,21 @@ static int adf_send_vf2pf_req(struct adf_accel_dev *accel_dev, u32 msg) 
	return 0;

}



void adf_vf2pf_req_hndl(struct adf_accel_vf_info *vf_info)

bool adf_recv_and_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr)

{

	struct adf_accel_dev *accel_dev = vf_info->accel_dev;

	struct adf_accel_vf_info *vf_info = &accel_dev->pf.vf_info[vf_nr];

	struct adf_hw_device_data *hw_data = accel_dev->hw_device;

	int bar_id = hw_data->get_misc_bar_id(hw_data);

	struct adf_bar *pmisc = &GET_BARS(accel_dev)[bar_id];

	void __iomem *pmisc_addr = pmisc->virt_addr;

	u32 msg, resp = 0, vf_nr = vf_info->vf_nr;

	u32 msg, resp = 0;



	/* Read message from the VF */

	msg = ADF_CSR_RD(pmisc_addr, hw_data->get_pf2vf_offset(vf_nr));

	if (!(msg & ADF_VF2PF_INT)) {

		dev_info(&GET_DEV(accel_dev),

			 "Spurious VF2PF interrupt, msg %X. Ignored\n", msg);

		goto out;

		return true;

	}



	/* To ACK, clear the VF2PFINT bit */
@@ -277,14 +277,11 @@ void adf_vf2pf_req_hndl(struct adf_accel_vf_info *vf_info) 
	if (resp && adf_send_pf2vf_msg(accel_dev, vf_nr, resp))

		dev_err(&GET_DEV(accel_dev), "Failed to send response to VF\n");



out:

	/* re-enable interrupt on PF from this VF */

	adf_enable_vf2pf_interrupts(accel_dev, (1 << vf_nr));



	return;

	return true;

err:

	dev_dbg(&GET_DEV(accel_dev), "Unknown message from VF%d (0x%x);\n",

		vf_nr + 1, msg);

	return false;

}



void adf_pf2vf_notify_restarting(struct adf_accel_dev *accel_dev)

drivers/crypto/qat/qat_common/adf_sriov.c

+9 −1
Original line number Diff line number Diff line
@@ -19,8 +19,16 @@ static void adf_iov_send_resp(struct work_struct *work) 
{

	struct adf_pf2vf_resp *pf2vf_resp =

		container_of(work, struct adf_pf2vf_resp, pf2vf_resp_work);

	struct adf_accel_vf_info *vf_info = pf2vf_resp->vf_info;

	struct adf_accel_dev *accel_dev = vf_info->accel_dev;

	u32 vf_nr = vf_info->vf_nr;

	bool ret;



	ret = adf_recv_and_handle_vf2pf_msg(accel_dev, vf_nr);

	if (ret)

		/* re-enable interrupt on PF from this VF */

		adf_enable_vf2pf_interrupts(accel_dev, 1 << vf_nr);



	adf_vf2pf_req_hndl(pf2vf_resp->vf_info);

	kfree(pf2vf_resp);

}