lkml.org 
[lkml]   [2021]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 042/217] crypto: qat - fix naming for init/shutdown VF to PF notifications
    Date
    From: Marco Chiappero <marco.chiappero@intel.com>

    [ 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: Marco Chiappero <marco.chiappero@intel.com>
    Co-developed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
    Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
    Reviewed-by: Fiona Trahe <fiona.trahe@intel.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 4 ++--
    drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c | 4 ++--
    drivers/crypto/qat/qat_common/adf_common_drv.h | 8 ++++----
    drivers/crypto/qat/qat_common/adf_vf2pf_msg.c | 12 ++++++------
    .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 4 ++--
    5 files changed, 16 insertions(+), 16 deletions(-)

    diff --git a/drivers/crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c b/drivers/crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c
    index d2d0ae445fd8..7c7d49a8a403 100644
    --- a/drivers/crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c
    +++ b/drivers/crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c
    @@ -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;
    diff --git a/drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c b/drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c
    index 38e4bc04f407..90e8a7564756 100644
    --- a/drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c
    +++ b/drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c
    @@ -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;
    diff --git a/drivers/crypto/qat/qat_common/adf_common_drv.h b/drivers/crypto/qat/qat_common/adf_common_drv.h
    index d78f8d5c89c3..289dd7e48d4a 100644
    --- a/drivers/crypto/qat/qat_common/adf_common_drv.h
    +++ b/drivers/crypto/qat/qat_common/adf_common_drv.h
    @@ -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)
    {
    }

    diff --git a/drivers/crypto/qat/qat_common/adf_vf2pf_msg.c b/drivers/crypto/qat/qat_common/adf_vf2pf_msg.c
    index cd5f37dffe8a..1830194567e8 100644
    --- a/drivers/crypto/qat/qat_common/adf_vf2pf_msg.c
    +++ b/drivers/crypto/qat/qat_common/adf_vf2pf_msg.c
    @@ -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);
    diff --git a/drivers/crypto/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c b/drivers/crypto/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c
    index a3b4dd8099a7..3a8361c83f0b 100644
    --- a/drivers/crypto/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c
    +++ b/drivers/crypto/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c
    @@ -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;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-20 19:19    [W:4.064 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site