Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dfa7bb6 authored by Marco Chiappero's avatar Marco Chiappero Committed by Greg Kroah-Hartman
Browse files

crypto: qat - fix naming for init/shutdown VF to PF notifications 



[ Upstream commit b90c1c4d3fa8cd90f4e8245b13564380fd0bfad1 ]

At start and shutdown, VFs notify the PF about their state. These
notifications are carried out through a message exchange using the PFVF
protocol.

Function names lead to believe they do perform init or shutdown logic.
This is to fix the naming to better reflect their purpose.

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>
Reviewed-by: default avatarFiona Trahe <fiona.trahe@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 843b4e71

drivers/crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c

+2 −2
Original line number Diff line number Diff line
@@ -123,10 +123,10 @@ void adf_init_hw_data_c3xxxiov(struct adf_hw_device_data *hw_data) 
	hw_data->enable_error_correction = adf_vf_void_noop;

	hw_data->init_admin_comms = adf_vf_int_noop;

	hw_data->exit_admin_comms = adf_vf_void_noop;

	hw_data->send_admin_init = adf_vf2pf_init;

	hw_data->send_admin_init = adf_vf2pf_notify_init;

	hw_data->init_arb = adf_vf_int_noop;

	hw_data->exit_arb = adf_vf_void_noop;

	hw_data->disable_iov = adf_vf2pf_shutdown;

	hw_data->disable_iov = adf_vf2pf_notify_shutdown;

	hw_data->get_accel_mask = get_accel_mask;

	hw_data->get_ae_mask = get_ae_mask;

	hw_data->get_num_accels = get_num_accels;

drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c

+2 −2
Original line number Diff line number Diff line
@@ -123,10 +123,10 @@ void adf_init_hw_data_c62xiov(struct adf_hw_device_data *hw_data) 
	hw_data->enable_error_correction = adf_vf_void_noop;

	hw_data->init_admin_comms = adf_vf_int_noop;

	hw_data->exit_admin_comms = adf_vf_void_noop;

	hw_data->send_admin_init = adf_vf2pf_init;

	hw_data->send_admin_init = adf_vf2pf_notify_init;

	hw_data->init_arb = adf_vf_int_noop;

	hw_data->exit_arb = adf_vf_void_noop;

	hw_data->disable_iov = adf_vf2pf_shutdown;

	hw_data->disable_iov = adf_vf2pf_notify_shutdown;

	hw_data->get_accel_mask = get_accel_mask;

	hw_data->get_ae_mask = get_ae_mask;

	hw_data->get_num_accels = get_num_accels;

drivers/crypto/qat/qat_common/adf_common_drv.h

+4 −4
Original line number Diff line number Diff line
@@ -239,8 +239,8 @@ void adf_enable_vf2pf_interrupts(struct adf_accel_dev *accel_dev, 
void adf_enable_pf2vf_interrupts(struct adf_accel_dev *accel_dev);

void adf_disable_pf2vf_interrupts(struct adf_accel_dev *accel_dev);



int adf_vf2pf_init(struct adf_accel_dev *accel_dev);

void adf_vf2pf_shutdown(struct adf_accel_dev *accel_dev);

int adf_vf2pf_notify_init(struct adf_accel_dev *accel_dev);

void adf_vf2pf_notify_shutdown(struct adf_accel_dev *accel_dev);

int adf_init_pf_wq(void);

void adf_exit_pf_wq(void);

int adf_init_vf_wq(void);
@@ -263,12 +263,12 @@ static inline void adf_disable_pf2vf_interrupts(struct adf_accel_dev *accel_dev) 
{

}



static inline int adf_vf2pf_init(struct adf_accel_dev *accel_dev)

static inline int adf_vf2pf_notify_init(struct adf_accel_dev *accel_dev)

{

	return 0;

}



static inline void adf_vf2pf_shutdown(struct adf_accel_dev *accel_dev)

static inline void adf_vf2pf_notify_shutdown(struct adf_accel_dev *accel_dev)

{

}

drivers/crypto/qat/qat_common/adf_vf2pf_msg.c

+6 −6
Original line number Diff line number Diff line
@@ -49,14 +49,14 @@ 
#include "adf_pf2vf_msg.h"



/**

 * adf_vf2pf_init() - send init msg to PF

 * adf_vf2pf_notify_init() - send init msg to PF

 * @accel_dev:  Pointer to acceleration VF device.

 *

 * Function sends an init messge from the VF to a PF

 *

 * Return: 0 on success, error code otherwise.

 */

int adf_vf2pf_init(struct adf_accel_dev *accel_dev)

int adf_vf2pf_notify_init(struct adf_accel_dev *accel_dev)

{

	u32 msg = (ADF_VF2PF_MSGORIGIN_SYSTEM |

		(ADF_VF2PF_MSGTYPE_INIT << ADF_VF2PF_MSGTYPE_SHIFT));
@@ -69,17 +69,17 @@ int adf_vf2pf_init(struct adf_accel_dev *accel_dev) 
	set_bit(ADF_STATUS_PF_RUNNING, &accel_dev->status);

	return 0;

}

EXPORT_SYMBOL_GPL(adf_vf2pf_init);

EXPORT_SYMBOL_GPL(adf_vf2pf_notify_init);



/**

 * adf_vf2pf_shutdown() - send shutdown msg to PF

 * adf_vf2pf_notify_shutdown() - send shutdown msg to PF

 * @accel_dev:  Pointer to acceleration VF device.

 *

 * Function sends a shutdown messge from the VF to a PF

 *

 * Return: void

 */

void adf_vf2pf_shutdown(struct adf_accel_dev *accel_dev)

void adf_vf2pf_notify_shutdown(struct adf_accel_dev *accel_dev)

{

	u32 msg = (ADF_VF2PF_MSGORIGIN_SYSTEM |

	    (ADF_VF2PF_MSGTYPE_SHUTDOWN << ADF_VF2PF_MSGTYPE_SHIFT));
@@ -89,4 +89,4 @@ void adf_vf2pf_shutdown(struct adf_accel_dev *accel_dev) 
			dev_err(&GET_DEV(accel_dev),

				"Failed to send Shutdown event to PF\n");

}

EXPORT_SYMBOL_GPL(adf_vf2pf_shutdown);
 
EXPORT_SYMBOL_GPL(adf_vf2pf_notify_shutdown);

drivers/crypto/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c

+2 −2
Original line number Diff line number Diff line
@@ -123,10 +123,10 @@ void adf_init_hw_data_dh895xcciov(struct adf_hw_device_data *hw_data) 
	hw_data->enable_error_correction = adf_vf_void_noop;

	hw_data->init_admin_comms = adf_vf_int_noop;

	hw_data->exit_admin_comms = adf_vf_void_noop;

	hw_data->send_admin_init = adf_vf2pf_init;

	hw_data->send_admin_init = adf_vf2pf_notify_init;

	hw_data->init_arb = adf_vf_int_noop;

	hw_data->exit_arb = adf_vf_void_noop;

	hw_data->disable_iov = adf_vf2pf_shutdown;

	hw_data->disable_iov = adf_vf2pf_notify_shutdown;

	hw_data->get_accel_mask = get_accel_mask;

	hw_data->get_ae_mask = get_ae_mask;

	hw_data->get_num_accels = get_num_accels;