lkml.org 
[lkml]   [2023]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -v2 08/11] crypto: ccp: Get rid of __sev_platform_init_locked()'s local function pointer
    Date
    From: "Borislav Petkov (AMD)" <bp@alien8.de>

    Add a wrapper instead.

    No functional changes.

    Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
    ---
    drivers/crypto/ccp/sev-dev.c | 16 ++++++++++------
    1 file changed, 10 insertions(+), 6 deletions(-)

    diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
    index f60bb73edfda..c54cc8f9a284 100644
    --- a/drivers/crypto/ccp/sev-dev.c
    +++ b/drivers/crypto/ccp/sev-dev.c
    @@ -440,11 +440,18 @@ static int __sev_init_ex_locked(int *error)
    return __sev_do_cmd_locked(SEV_CMD_INIT_EX, &data, error);
    }

    +static inline int __sev_do_init_locked(int *psp_ret)
    +{
    + if (sev_init_ex_buffer)
    + return __sev_init_ex_locked(psp_ret);
    + else
    + return __sev_init_locked(psp_ret);
    +}
    +
    static int __sev_platform_init_locked(int *error)
    {
    int rc = 0, psp_ret = SEV_RET_NO_FW_CALL;
    struct psp_device *psp = psp_master;
    - int (*init_function)(int *error);
    struct sev_device *sev;

    if (!psp || !psp->sev_data)
    @@ -456,15 +463,12 @@ static int __sev_platform_init_locked(int *error)
    return 0;

    if (sev_init_ex_buffer) {
    - init_function = __sev_init_ex_locked;
    rc = sev_read_init_ex_file();
    if (rc)
    return rc;
    - } else {
    - init_function = __sev_init_locked;
    }

    - rc = init_function(&psp_ret);
    + rc = __sev_do_init_locked(&psp_ret);
    if (rc && psp_ret == SEV_RET_SECURE_DATA_INVALID) {
    /*
    * Initialization command returned an integrity check failure
    @@ -475,7 +479,7 @@ static int __sev_platform_init_locked(int *error)
    */
    dev_err(sev->dev,
    "SEV: retrying INIT command because of SECURE_DATA_INVALID error. Retrying once to reset PSP SEV state.");
    - rc = init_function(&psp_ret);
    + rc = __sev_do_init_locked(&psp_ret);
    }

    if (error)
    --
    2.35.1
    \
     
     \ /
      Last update: 2023-03-27 00:30    [W:2.518 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site