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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CD42C25B0F for ; Sun, 14 Aug 2022 19:17:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231960AbiHNTQ6 (ORCPT ); Sun, 14 Aug 2022 15:16:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229558AbiHNTQ6 (ORCPT ); Sun, 14 Aug 2022 15:16:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 541E0205D5; Sun, 14 Aug 2022 12:16:57 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B12D960DB6; Sun, 14 Aug 2022 19:16:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9520AC433C1; Sun, 14 Aug 2022 19:16:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660504616; bh=jXGXWUSCHco+uG0TEBKUEdSh9Q2Y7oyb8AgXQgtxY9U=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=nylAgkXuJ5wjCLoC0NnGX6CK8RHio2kFy7s8xCrHsg4coWe00B0eRSWThqc2FeoAX HdExUUxrGLXqt2Dbe+4IvCGCAVCr6d0ox2aFHDjSYJR7QuiQyvDsl4WSBk5yxz8DOI Q66TqlTcZe7/fSdvZobOEwsJ5v/MrXV4f1pyG+jIkjttNCguC8kH1nS3EK3Z10VYum DqHQYOFbOD9YRnqvqpsmj7TVEn2HPNsWHDz+RkDBw9+ZKuK1nbqaQSuNtKNXEw9v/7 RCavVhknwXamQj+NQSwSazcgtqgdZMHUyo8rWIjAMU+0UoAOx/KL146RcnoizklXGz fevWSwoppTVqg== Date: Sun, 14 Aug 2022 22:16:53 +0300 From: Jarkko Sakkinen To: Stefan Berger Cc: kexec@lists.infradead.org, devicetree@vger.kernel.org, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, nayna@linux.ibm.com, nasastry@in.ibm.com, mpe@ellerman.id.au, Jason Gunthorpe , Rob Herring , Frank Rowand , Mimi Zohar , Nageswara R Sastry Subject: Re: [PATCH v7 4/6] tpm: of: Make of-tree specific function commonly available Message-ID: References: <20220812164305.2056641-1-stefanb@linux.ibm.com> <20220812164305.2056641-5-stefanb@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Sun, Aug 14, 2022 at 10:16:09PM +0300, Jarkko Sakkinen wrote: > On Fri, Aug 12, 2022 at 12:43:03PM -0400, Stefan Berger wrote: > > Simplify tpm_read_log_of() by moving reusable parts of the code into > > an inline function that makes it commonly available so it can be > > used also for kexec support. Call the new of_tpm_get_sml_parameters() > > function from the TPM Open Firmware driver. > > > > Signed-off-by: Stefan Berger > > Cc: Jarkko Sakkinen > > Cc: Jason Gunthorpe > > Cc: Rob Herring > > Cc: Frank Rowand > > Reviewed-by: Mimi Zohar > > Tested-by: Nageswara R Sastry > > > > --- > > v7: > > - Added original comment back into inlined function > > > > v4: > > - converted to inline function > > --- > > drivers/char/tpm/eventlog/of.c | 31 +++++------------------------ > > include/linux/tpm.h | 36 ++++++++++++++++++++++++++++++++++ > > 2 files changed, 41 insertions(+), 26 deletions(-) > > > > diff --git a/drivers/char/tpm/eventlog/of.c b/drivers/char/tpm/eventlog/of.c > > index a9ce66d09a75..f9462d19632e 100644 > > --- a/drivers/char/tpm/eventlog/of.c > > +++ b/drivers/char/tpm/eventlog/of.c > > @@ -12,6 +12,7 @@ > > > > #include > > #include > > +#include > > #include > > > > #include "../tpm.h" > > @@ -20,11 +21,10 @@ > > int tpm_read_log_of(struct tpm_chip *chip) > > { > > struct device_node *np; > > - const u32 *sizep; > > - const u64 *basep; > > struct tpm_bios_log *log; > > u32 size; > > u64 base; > > + int ret; > > > > log = &chip->log; > > if (chip->dev.parent && chip->dev.parent->of_node) > > @@ -35,30 +35,9 @@ int tpm_read_log_of(struct tpm_chip *chip) > > if (of_property_read_bool(np, "powered-while-suspended")) > > chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED; > > > > - sizep = of_get_property(np, "linux,sml-size", NULL); > > - basep = of_get_property(np, "linux,sml-base", NULL); > > - if (sizep == NULL && basep == NULL) > > - return -ENODEV; > > - if (sizep == NULL || basep == NULL) > > - return -EIO; > > - > > - /* > > - * For both vtpm/tpm, firmware has log addr and log size in big > > - * endian format. But in case of vtpm, there is a method called > > - * sml-handover which is run during kernel init even before > > - * device tree is setup. This sml-handover function takes care > > - * of endianness and writes to sml-base and sml-size in little > > - * endian format. For this reason, vtpm doesn't need conversion > > - * but physical tpm needs the conversion. > > - */ > > - if (of_property_match_string(np, "compatible", "IBM,vtpm") < 0 && > > - of_property_match_string(np, "compatible", "IBM,vtpm20") < 0) { > > - size = be32_to_cpup((__force __be32 *)sizep); > > - base = be64_to_cpup((__force __be64 *)basep); > > - } else { > > - size = *sizep; > > - base = *basep; > > - } > > + ret = of_tpm_get_sml_parameters(np, &base, &size); > > + if (ret < 0) > > + return ret; > > > > if (size == 0) { > > dev_warn(&chip->dev, "%s: Event log area empty\n", __func__); > > diff --git a/include/linux/tpm.h b/include/linux/tpm.h > > index dfeb25a0362d..6356baaa1393 100644 > > --- a/include/linux/tpm.h > > +++ b/include/linux/tpm.h > > @@ -460,4 +460,40 @@ static inline struct tpm_chip *tpm_default_chip(void) > > return NULL; > > } > > #endif > > + > > +#ifdef CONFIG_OF > > +static inline int of_tpm_get_sml_parameters(struct device_node *np, > > + u64 *base, u32 *size) > > +{ > > + const u32 *sizep; > > + const u64 *basep; > > + > > + sizep = of_get_property(np, "linux,sml-size", NULL); > > + basep = of_get_property(np, "linux,sml-base", NULL); > > + if (sizep == NULL && basep == NULL) > > + return -ENODEV; > > + if (sizep == NULL || basep == NULL) > > + return -EIO; > > + > > + /* > > + * For both vtpm/tpm, firmware has log addr and log size in big > > + * endian format. But in case of vtpm, there is a method called > > + * sml-handover which is run during kernel init even before > > + * device tree is setup. This sml-handover function takes care > > + * of endianness and writes to sml-base and sml-size in little > > + * endian format. For this reason, vtpm doesn't need conversion > > + * but physical tpm needs the conversion. > > + */ > > + if (of_property_match_string(np, "compatible", "IBM,vtpm") < 0 && > > + of_property_match_string(np, "compatible", "IBM,vtpm20") < 0) { > > + *size = be32_to_cpup((__force __be32 *)sizep); > > + *base = be64_to_cpup((__force __be64 *)basep); > > + } else { > > + *size = *sizep; > > + *base = *basep; > > + } > > + return 0; > > +} > > +#endif > > + > > #endif > > -- > > 2.35.1 > > > > Reviewed-by: Jarkko Sakkinen > > BR, Jarkkko Should I pick this or will the full patch set be picked by someone? BR, Jarkko