[PATCH] Fix typo in tpmrm class definition

[PATCH] Fix typo in tpmrm class definition

[Justin M. Forbes]

Commit d2e8071bed0be ("tpm: make all 'class' structures const")
unfortunately had a typo for the name on tpmrm.

Fixes: d2e8071bed0b ("tpm: make all 'class' structures const")
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 drivers/char/tpm/tpm-chip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 23f6f2eda84c..42b1062e33cd 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -33,7 +33,7 @@ const struct class tpm_class = {
 	.shutdown_pre = tpm_class_shutdown,
 };
 const struct class tpmrm_class = {
-	.name = "tmprm",
+	.name = "tpmrm",
 };
 dev_t tpm_devt;

-- 
2.41.0

Re: [PATCH] Fix typo in tpmrm class definition

[Ivan Orlov]

On 08.09.2023 18:06, Justin M. Forbes wrote:
> Commit d2e8071bed0be ("tpm: make all 'class' structures const")
> unfortunately had a typo for the name on tpmrm.
> 
> Fixes: d2e8071bed0b ("tpm: make all 'class' structures const")
> Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
> ---
>   drivers/char/tpm/tpm-chip.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index 23f6f2eda84c..42b1062e33cd 100644
> --- a/drivers/char/tpm/tpm-chip.c
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -33,7 +33,7 @@ const struct class tpm_class = {
>   	.shutdown_pre = tpm_class_shutdown,
>   };
>   const struct class tpmrm_class = {
> -	.name = "tmprm",
> +	.name = "tpmrm",
>   };
>   dev_t tpm_devt;
> 

Hi Justin,

Thank you for fixing this mistake, it's my bad :(

I'm not sure if you know this or not, but merge window is still opened, 
so the patch could be accidentally skipped by maintainers as they have a 
huge load during this period... Perhaps resending it in a few days might 
be a good idea.

Also, probably adding 'tpm:' prefix to the commit title could make it 
more noticeable to the maintainers.

Thank you again for doing this.

--
Kind regards,
Ivan Orlov

Re: [PATCH] Fix typo in tpmrm class definition

[Jarkko Sakkinen]

On Fri Sep 8, 2023 at 5:06 PM EEST, Justin M. Forbes wrote:
> Commit d2e8071bed0be ("tpm: make all 'class' structures const")
> unfortunately had a typo for the name on tpmrm.
>
> Fixes: d2e8071bed0b ("tpm: make all 'class' structures const")
> Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
> ---
>  drivers/char/tpm/tpm-chip.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index 23f6f2eda84c..42b1062e33cd 100644
> --- a/drivers/char/tpm/tpm-chip.c
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -33,7 +33,7 @@ const struct class tpm_class = {
>  	.shutdown_pre = tpm_class_shutdown,
>  };
>  const struct class tpmrm_class = {
> -	.name = "tmprm",
> +	.name = "tpmrm",
>  };
>  dev_t tpm_devt;
>
> -- 
> 2.41.0

Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

Thanks, I'll queue this up for rc2.

BR, Jarkko

Re: [PATCH] Fix typo in tpmrm class definition

[Jarkko Sakkinen]

On Fri Sep 8, 2023 at 5:06 PM EEST, Justin M. Forbes wrote:
> Commit d2e8071bed0be ("tpm: make all 'class' structures const")
> unfortunately had a typo for the name on tpmrm.
>
> Fixes: d2e8071bed0b ("tpm: make all 'class' structures const")
> Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
> ---
>  drivers/char/tpm/tpm-chip.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index 23f6f2eda84c..42b1062e33cd 100644
> --- a/drivers/char/tpm/tpm-chip.c
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -33,7 +33,7 @@ const struct class tpm_class = {
>  	.shutdown_pre = tpm_class_shutdown,
>  };
>  const struct class tpmrm_class = {
> -	.name = "tmprm",
> +	.name = "tpmrm",
>  };
>  dev_t tpm_devt;
>
> -- 
> 2.41.0

I have issues applying the patch:

$ git am -3 20230908_jforbes_fix_typo_in_tpmrm_class_definition.mbx
Applying: Fix typo in tpmrm class definition
error: corrupt patch at line 18
error: could not build fake ancestor
Patch failed at 0001 Fix typo in tpmrm class definition
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

$ git log -2
commit ba46245183940de39e42c8456b85ceaf3519b764 (HEAD -> master, origin/master, origin/HEAD)
Author: Sumit Garg <sumit.garg@linaro.org>
Date:   Tue Aug 22 16:59:33 2023 +0530

    KEYS: trusted: tee: Refactor register SHM usage

    The OP-TEE driver using the old SMC based ABI permits overlapping shared
    buffers, but with the new FF-A based ABI each physical page may only
    be registered once.

    As the key and blob buffer are allocated adjancently, there is no need
    for redundant register shared memory invocation. Also, it is incompatibile
    with FF-A based ABI limitation. So refactor register shared memory
    implementation to use only single invocation to register both key and blob
    buffers.

    [jarkko: Added cc to stable.]
    Cc: stable@vger.kernel.org # v5.16+
    Fixes: 4615e5a34b95 ("optee: add FF-A support")
    Reported-by: Jens Wiklander <jens.wiklander@linaro.org>
    Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
    Tested-by: Jens Wiklander <jens.wiklander@linaro.org>
    Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
    Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>

commit 0bb80ecc33a8fb5a682236443c1e740d5c917d1d (tag: v6.6-rc1, upstream/master, origin/next, next)
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Sep 10 16:28:41 2023 -0700

    Linux 6.6-rc1

BR, Jarkko

Re: [PATCH] Fix typo in tpmrm class definition

[Justin Forbes]

On Mon, Sep 11, 2023 at 5:09 PM Jarkko Sakkinen <jarkko@kernel.org> wrote:
>
> On Fri Sep 8, 2023 at 5:06 PM EEST, Justin M. Forbes wrote:
> > Commit d2e8071bed0be ("tpm: make all 'class' structures const")
> > unfortunately had a typo for the name on tpmrm.
> >
> > Fixes: d2e8071bed0b ("tpm: make all 'class' structures const")
> > Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
> > ---
> >  drivers/char/tpm/tpm-chip.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> > index 23f6f2eda84c..42b1062e33cd 100644
> > --- a/drivers/char/tpm/tpm-chip.c
> > +++ b/drivers/char/tpm/tpm-chip.c
> > @@ -33,7 +33,7 @@ const struct class tpm_class = {
> >       .shutdown_pre = tpm_class_shutdown,
> >  };
> >  const struct class tpmrm_class = {
> > -     .name = "tmprm",
> > +     .name = "tpmrm",
> >  };
> >  dev_t tpm_devt;
> >
> > --
> > 2.41.0
>
> I have issues applying the patch:

Sorry, not sure what the issue is, but I did a git am of it myself to
a fresh checkout of linus' tree and just recreated and sent it. So,
new thread, but hopefully the patch will apply

Justin

>
> $ git am -3 20230908_jforbes_fix_typo_in_tpmrm_class_definition.mbx
> Applying: Fix typo in tpmrm class definition
> error: corrupt patch at line 18
> error: could not build fake ancestor
> Patch failed at 0001 Fix typo in tpmrm class definition
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
> $ git log -2
> commit ba46245183940de39e42c8456b85ceaf3519b764 (HEAD -> master, origin/master, origin/HEAD)
> Author: Sumit Garg <sumit.garg@linaro.org>
> Date:   Tue Aug 22 16:59:33 2023 +0530
>
>     KEYS: trusted: tee: Refactor register SHM usage
>
>     The OP-TEE driver using the old SMC based ABI permits overlapping shared
>     buffers, but with the new FF-A based ABI each physical page may only
>     be registered once.
>
>     As the key and blob buffer are allocated adjancently, there is no need
>     for redundant register shared memory invocation. Also, it is incompatibile
>     with FF-A based ABI limitation. So refactor register shared memory
>     implementation to use only single invocation to register both key and blob
>     buffers.
>
>     [jarkko: Added cc to stable.]
>     Cc: stable@vger.kernel.org # v5.16+
>     Fixes: 4615e5a34b95 ("optee: add FF-A support")
>     Reported-by: Jens Wiklander <jens.wiklander@linaro.org>
>     Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
>     Tested-by: Jens Wiklander <jens.wiklander@linaro.org>
>     Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
>     Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
>
> commit 0bb80ecc33a8fb5a682236443c1e740d5c917d1d (tag: v6.6-rc1, upstream/master, origin/next, next)
> Author: Linus Torvalds <torvalds@linux-foundation.org>
> Date:   Sun Sep 10 16:28:41 2023 -0700
>
>     Linux 6.6-rc1
>
> BR, Jarkko
>