From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DEFB5CCA482 for ; Wed, 6 Jul 2022 08:59:33 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CF96384528; Wed, 6 Jul 2022 10:59:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="nK99lGNU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8044B8450D; Wed, 6 Jul 2022 10:59:30 +0200 (CEST) Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 402858452D for ; Wed, 6 Jul 2022 10:59:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org Received: by mail-ed1-x530.google.com with SMTP id r18so18365102edb.9 for ; Wed, 06 Jul 2022 01:59:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=Tw5O8hArkd6D31yzD0KomZsAjC0Ab18iKfRPD31S7tA=; b=nK99lGNUGYDjsWEx12yb/IktVvm6/WVyRKdYbTmJSv15Nopw/st/HUoqv3CK6op7Ct UBgsdHhl01EQ/gF6hfOikYXDf7kPY1IGY2jfNKqrFEl4LiuOvCg7r3G9BHxMQZZGkCVj /rF0m0gf34ZCEoMzrSo3VAZFoS1XBt+DwAaa3MQGYUZpBsVWGhIIUfw+4TZhHTMMTpWf cMdQx5P9anp+6D4mXfTM4PXHAFlsH7ezc/LQr/5lE5vyohZRGiXAKgkLh4O+SfsbdySa yFn+x6eZHdh9g7Ez8wXtgU0l57Dou0tTRlae/qJfZq7Vz69E6uliztbq8jM+qJ3uiuAh BVPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Tw5O8hArkd6D31yzD0KomZsAjC0Ab18iKfRPD31S7tA=; b=Sl+tx5+iUg2DZMt9gkTxB7VlRJrKO8iL/oVdjeOCwO9Urv4i7tYVlFBPmYUftUaI9e Dd/n4+r92/fvQlkyAjlcCXEoS7hxADt4fGK84D55UIXJSVSb05UfFpHK2ODspWGNxw4l WjbI/jNP13QjMbLlFWzzT7qczM/PIcg63GP3nu2H1nNmJP88D4j/ja5KiU/+rtRtdWnP dHDHFDqI4Z7kYz3ws41i47MINxVnAXlP2DnojcVt/O/SDgqTLTmDnC8zQDz1OQ3oI6ys y8h3Ma3T/G5BWH8xb1Ii4ZtkyVN4pEoL1PfrBUn0yxj9eT49sx0Ussu/l5m53NID3Bbo xL7w== X-Gm-Message-State: AJIora+urJQ56l+68t2k+gkL4/AIgFR9zYB9PDwsBUlPr8uLrS57FU2s HpxAfEvvtL/YdtUo6lSkVRObYA== X-Google-Smtp-Source: AGRyM1ux3rzw1wsDuxXhNzScdAiTKlm7Vnm1eQjfHd9QQrE1T0vQdFL9QDQtsAobN1rHmUqIAiZC2g== X-Received: by 2002:a05:6402:11c7:b0:437:67eb:f144 with SMTP id j7-20020a05640211c700b0043767ebf144mr52323234edw.84.1657097966802; Wed, 06 Jul 2022 01:59:26 -0700 (PDT) Received: from hades ([46.103.15.185]) by smtp.gmail.com with ESMTPSA id r10-20020a1709061baa00b0072a815f569bsm7815106ejg.185.2022.07.06.01.59.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 01:59:26 -0700 (PDT) Date: Wed, 6 Jul 2022 11:59:23 +0300 From: Ilias Apalodimas To: Sughosh Ganu Cc: u-boot@lists.denx.de, Heinrich Schuchardt , Simon Glass , Tom Rini Subject: Re: [PATCH v6 1/7] tpm: Export the TPM-version functions Message-ID: References: <20220704133444.1110715-1-sughosh.ganu@linaro.org> <20220704133444.1110715-2-sughosh.ganu@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220704133444.1110715-2-sughosh.ganu@linaro.org> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean On Mon, Jul 04, 2022 at 07:04:38PM +0530, Sughosh Ganu wrote: > From: Simon Glass > > These functions should really be available outside the TPM code, so that > other callers can find out which version the TPM is. Rename them to have > a tpm_ prefix() and add them to the header file. > > Signed-off-by: Simon Glass > --- > Changes since V5: None > > include/tpm_api.h | 10 ++++++ > lib/tpm_api.c | 92 +++++++++++++++++++++-------------------------- > 2 files changed, 51 insertions(+), 51 deletions(-) > > diff --git a/include/tpm_api.h b/include/tpm_api.h > index ef45b43a8f..11aa14eb79 100644 > --- a/include/tpm_api.h > +++ b/include/tpm_api.h > @@ -319,4 +319,14 @@ u32 tpm_write_lock(struct udevice *dev, u32 index); > */ > u32 tpm_resume(struct udevice *dev); > > +static inline bool tpm_is_v1(struct udevice *dev) > +{ > + return IS_ENABLED(CONFIG_TPM_V1) && tpm_get_version(dev) == TPM_V1; > +} > + > +static inline bool tpm_is_v2(struct udevice *dev) > +{ > + return IS_ENABLED(CONFIG_TPM_V2) && tpm_get_version(dev) == TPM_V2; > +} > + > #endif /* __TPM_API_H */ > diff --git a/lib/tpm_api.c b/lib/tpm_api.c > index 4c662640a9..4ac4612c81 100644 > --- a/lib/tpm_api.c > +++ b/lib/tpm_api.c > @@ -11,21 +11,11 @@ > #include > #include > > -static bool is_tpm1(struct udevice *dev) > -{ > - return IS_ENABLED(CONFIG_TPM_V1) && tpm_get_version(dev) == TPM_V1; > -} > - > -static bool is_tpm2(struct udevice *dev) > -{ > - return IS_ENABLED(CONFIG_TPM_V2) && tpm_get_version(dev) == TPM_V2; > -} > - > u32 tpm_startup(struct udevice *dev, enum tpm_startup_type mode) > { > - if (is_tpm1(dev)) { > + if (tpm_is_v1(dev)) { > return tpm1_startup(dev, mode); > - } else if (is_tpm2(dev)) { > + } else if (tpm_is_v2(dev)) { > enum tpm2_startup_types type; > > switch (mode) { > @@ -47,9 +37,9 @@ u32 tpm_startup(struct udevice *dev, enum tpm_startup_type mode) > > u32 tpm_resume(struct udevice *dev) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_startup(dev, TPM_ST_STATE); > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return tpm2_startup(dev, TPM2_SU_STATE); > else > return -ENOSYS; > @@ -57,9 +47,9 @@ u32 tpm_resume(struct udevice *dev) > > u32 tpm_self_test_full(struct udevice *dev) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_self_test_full(dev); > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return tpm2_self_test(dev, TPMI_YES); > else > return -ENOSYS; > @@ -67,9 +57,9 @@ u32 tpm_self_test_full(struct udevice *dev) > > u32 tpm_continue_self_test(struct udevice *dev) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_continue_self_test(dev); > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return tpm2_self_test(dev, TPMI_NO); > else > return -ENOSYS; > @@ -86,7 +76,7 @@ u32 tpm_clear_and_reenable(struct udevice *dev) > return ret; > } > > - if (is_tpm1(dev)) { > + if (tpm_is_v1(dev)) { > ret = tpm1_physical_enable(dev); > if (ret != TPM_SUCCESS) { > log_err("TPM: Can't set enabled state\n"); > @@ -105,9 +95,9 @@ u32 tpm_clear_and_reenable(struct udevice *dev) > > u32 tpm_nv_enable_locking(struct udevice *dev) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_nv_define_space(dev, TPM_NV_INDEX_LOCK, 0, 0); > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return -ENOSYS; > else > return -ENOSYS; > @@ -115,9 +105,9 @@ u32 tpm_nv_enable_locking(struct udevice *dev) > > u32 tpm_nv_read_value(struct udevice *dev, u32 index, void *data, u32 count) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_nv_read_value(dev, index, data, count); > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return tpm2_nv_read_value(dev, index, data, count); > else > return -ENOSYS; > @@ -126,9 +116,9 @@ u32 tpm_nv_read_value(struct udevice *dev, u32 index, void *data, u32 count) > u32 tpm_nv_write_value(struct udevice *dev, u32 index, const void *data, > u32 count) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_nv_write_value(dev, index, data, count); > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return tpm2_nv_write_value(dev, index, data, count); > else > return -ENOSYS; > @@ -141,9 +131,9 @@ u32 tpm_set_global_lock(struct udevice *dev) > > u32 tpm_write_lock(struct udevice *dev, u32 index) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return -ENOSYS; > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return tpm2_write_lock(dev, index); > else > return -ENOSYS; > @@ -152,9 +142,9 @@ u32 tpm_write_lock(struct udevice *dev, u32 index) > u32 tpm_pcr_extend(struct udevice *dev, u32 index, const void *in_digest, > void *out_digest) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_extend(dev, index, in_digest, out_digest); > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return tpm2_pcr_extend(dev, index, TPM2_ALG_SHA256, in_digest, > TPM2_DIGEST_LEN); > else > @@ -163,9 +153,9 @@ u32 tpm_pcr_extend(struct udevice *dev, u32 index, const void *in_digest, > > u32 tpm_pcr_read(struct udevice *dev, u32 index, void *data, size_t count) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_pcr_read(dev, index, data, count); > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return -ENOSYS; > else > return -ENOSYS; > @@ -173,14 +163,14 @@ u32 tpm_pcr_read(struct udevice *dev, u32 index, void *data, size_t count) > > u32 tpm_tsc_physical_presence(struct udevice *dev, u16 presence) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_tsc_physical_presence(dev, presence); > > /* > * Nothing to do on TPM2 for this; use platform hierarchy availability > * instead. > */ > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return 0; > else > return -ENOSYS; > @@ -188,11 +178,11 @@ u32 tpm_tsc_physical_presence(struct udevice *dev, u16 presence) > > u32 tpm_finalise_physical_presence(struct udevice *dev) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_finalise_physical_presence(dev); > > /* Nothing needs to be done with tpm2 */ > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return 0; > else > return -ENOSYS; > @@ -200,9 +190,9 @@ u32 tpm_finalise_physical_presence(struct udevice *dev) > > u32 tpm_read_pubek(struct udevice *dev, void *data, size_t count) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_read_pubek(dev, data, count); > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return -ENOSYS; /* not implemented yet */ > else > return -ENOSYS; > @@ -210,9 +200,9 @@ u32 tpm_read_pubek(struct udevice *dev, void *data, size_t count) > > u32 tpm_force_clear(struct udevice *dev) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_force_clear(dev); > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return tpm2_clear(dev, TPM2_RH_PLATFORM, NULL, 0); > else > return -ENOSYS; > @@ -220,11 +210,11 @@ u32 tpm_force_clear(struct udevice *dev) > > u32 tpm_physical_enable(struct udevice *dev) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_physical_enable(dev); > > /* Nothing needs to be done with tpm2 */ > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return 0; > else > return -ENOSYS; > @@ -232,11 +222,11 @@ u32 tpm_physical_enable(struct udevice *dev) > > u32 tpm_physical_disable(struct udevice *dev) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_physical_disable(dev); > > /* Nothing needs to be done with tpm2 */ > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return 0; > else > return -ENOSYS; > @@ -244,10 +234,10 @@ u32 tpm_physical_disable(struct udevice *dev) > > u32 tpm_physical_set_deactivated(struct udevice *dev, u8 state) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_physical_set_deactivated(dev, state); > /* Nothing needs to be done with tpm2 */ > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return 0; > else > return -ENOSYS; > @@ -256,9 +246,9 @@ u32 tpm_physical_set_deactivated(struct udevice *dev, u8 state) > u32 tpm_get_capability(struct udevice *dev, u32 cap_area, u32 sub_cap, > void *cap, size_t count) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_get_capability(dev, cap_area, sub_cap, cap, count); > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return tpm2_get_capability(dev, cap_area, sub_cap, cap, count); > else > return -ENOSYS; > @@ -266,9 +256,9 @@ u32 tpm_get_capability(struct udevice *dev, u32 cap_area, u32 sub_cap, > > u32 tpm_get_permissions(struct udevice *dev, u32 index, u32 *perm) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_get_permissions(dev, index, perm); > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return -ENOSYS; /* not implemented yet */ > else > return -ENOSYS; > @@ -276,9 +266,9 @@ u32 tpm_get_permissions(struct udevice *dev, u32 index, u32 *perm) > > u32 tpm_get_random(struct udevice *dev, void *data, u32 count) > { > - if (is_tpm1(dev)) > + if (tpm_is_v1(dev)) > return tpm1_get_random(dev, data, count); > - else if (is_tpm2(dev)) > + else if (tpm_is_v2(dev)) > return -ENOSYS; /* not implemented yet */ > else > return -ENOSYS; > -- > 2.25.1 > Reviewed-by: Ilias Apalodimas