From patchwork Tue Mar 7 19:24:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 65826 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2631477wrd; Tue, 7 Mar 2023 11:58:54 -0800 (PST) X-Google-Smtp-Source: AK7set/XZdob5Y2ubOfxpaycyEhFV9l0fDYg/40w6fYHeuHJmf1IpW10Q5SpEFj6WXk+WVdnxV+q X-Received: by 2002:a17:907:97d3:b0:883:b1b4:e798 with SMTP id js19-20020a17090797d300b00883b1b4e798mr19081382ejc.10.1678219133872; Tue, 07 Mar 2023 11:58:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678219133; cv=none; d=google.com; s=arc-20160816; b=tLPuKsyymCoyVvgJs4tjnlVpefjoS0bob6+gT11uzIkVXrZe9bGRrOoWaU5gkriPXQ rn9s5Ii8DVGnL+VY7gTkzhlTgEKJ8IT7mFdew2bc3pnxzSM2NGwJoR0+e0zEy3CiRvnh Py+v7Qym9vTJrU3mHFlfzWiAeVnrWk4ZQpvhj/f4DZsC3z0ukimcA2tZvwYrALyTi92V p9LGck1I5wZ1YJHFOZ99HNhQIH14BuwFbKV9IXo1ndvU7nvl4j87piAbEokYLqBxZZFW NGDl7iLYeLlPtRJSYiZ9KZ08/3IteNZZ++kXMFn68CfTc2aGRQifLDRe8eGDAI+O9i/W Nh4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=soKezYnhw5pTtt4MplxefN2gCrw0tw5YIT2mULQOOCY=; b=PkU1JkaK8EcHEeXVff1RptYO6uwP0qNSPV7XQdEzd1hyhpfT4SUMWJds5CzYbhf+K+ le9Xlf5PGjfSa/J0Y14dusLQQmdgOOp1voVq2MUyAl2jY15ZYgPKOws4xnoSVQmjUdI7 QkqYgzVzdeHvMvqCtWHgKV/UZi7cWVbH1cHzFCKtZBtBtSbb7BjDf+mwTo2NnCga2QPw Njy+ExTVc5B+UkKRCCOV9cJYCgYeePPZOLWRI1MaO01B6fLcOBBfY8tAqQqCs9O/7een 0QABql1C/agkfUO/HfpaUjZk6n80z1A4RbUEIzp9ERb/YAWdw+FWguY3+4pFtssiF7T0 Yo2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=lPE90LFE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j14-20020a170906278e00b008f8929efcf4si1543561ejc.108.2023.03.07.11.58.28; Tue, 07 Mar 2023 11:58:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=lPE90LFE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234187AbjCGTie (ORCPT + 99 others); Tue, 7 Mar 2023 14:38:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234178AbjCGThl (ORCPT ); Tue, 7 Mar 2023 14:37:41 -0500 Received: from mail.skyhub.de (mail.skyhub.de [5.9.137.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F305E9E308 for ; Tue, 7 Mar 2023 11:25:01 -0800 (PST) Received: from zn.tnic (p5de8e9fe.dip0.t-ipconnect.de [93.232.233.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 38F531EC06A9; Tue, 7 Mar 2023 20:25:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1678217100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=soKezYnhw5pTtt4MplxefN2gCrw0tw5YIT2mULQOOCY=; b=lPE90LFEnso6TYhFHvYrMt0vmOu84pt745Ja5CZmEea4mDKaDdR90wZC382VZdZkHRNwyN zaIG9zni7MIWC0yJdfTOafMq8Q0AS97Jr9uBlhn3D7UNl5KkPbF+rWwsYhWqL50mGoHnqi nS/r4ELrrys8Vq1VYSLlUlx7aZpEZ2A= From: Borislav Petkov To: LKML Cc: Dionna Glaze , Joerg Roedel , Michael Roth , Nikunj A Dadhania , Peter Gonda , Tom Lendacky , linux-coco@lists.linux.dev, x86@kernel.org Subject: [PATCH -v3 08/11] crypto: ccp: Get rid of __sev_platform_init_locked()'s local function pointer Date: Tue, 7 Mar 2023 20:24:46 +0100 Message-Id: <20230307192449.24732-9-bp@alien8.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307192449.24732-1-bp@alien8.de> References: <20230307192449.24732-1-bp@alien8.de> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759740306300327380?= X-GMAIL-MSGID: =?utf-8?q?1759740306300327380?= From: "Borislav Petkov (AMD)" Add a wrapper instead. No functional changes. Signed-off-by: Borislav Petkov (AMD) --- 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 823c67a43c38..e346c00b132a 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -442,11 +442,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) @@ -458,15 +465,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 @@ -477,7 +481,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)