On Fri, 12 Sep 2025, Nathan Chancellor wrote:
> Hi Lee,
>
> On Tue, Sep 02, 2025 at 01:42:05PM +0100, Lee Jones wrote:
> > Enjoy!
> >
> > The following changes since commit 8f5ae30d69d7543eee0d70083daf4de8fe15d585:
> >
> > Linux 6.17-rc1 (2025-08-10 19:41:16 +0300)
> >
> > are available in the Git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
> > ib-mfd-char-crypto-v6.18
> >
> > for you to fetch changes up to 74fddd5fbab879a7d039d9fb49af923927a64811:
> >
> > MAINTAINERS: Add entry for Loongson Security Engine drivers (2025-09-02
> > 12:29:57 +0100)
> >
> > ----------------------------------------------------------------
> > Immutable branch between MFD, Char and Crypto due for the v6.18 merge window
> >
> > ----------------------------------------------------------------
> > Qunqin Zhao (4):
> ...
> > tpm: Add a driver for Loongson TPM device
>
> This one needs a fix up due to commit 07d8004d6fb9 ("tpm: add bufsiz
> parameter in the .send callback") in 6.17-rc1, as I am seeing the
> following error in next-20250912.
>
> drivers/char/tpm/tpm_loongson.c:48:17: error: initialization of 'int
> (*)(struct tpm_chip *, u8 *, size_t, size_t)' {aka 'int (*)(struct tpm_chip
> *, unsigned char *, long unsigned int, long unsigned int)'} from
> incompatible pointer type 'int (*)(struct tpm_chip *, u8 *, size_t)' {aka
> 'int (*)(struct tpm_chip *, unsigned char *, long unsigned int)'}
> [-Wincompatible-pointer-types]
> 48 | .send = tpm_loongson_send,
> | ^~~~~~~~~~~~~~~~~
> drivers/char/tpm/tpm_loongson.c:48:17: note: (near initialization for
> 'tpm_loongson_ops.send')
> drivers/char/tpm/tpm_loongson.c:31:12: note: 'tpm_loongson_send' declared
> here
> 31 | static int tpm_loongson_send(struct tpm_chip *chip, u8 *buf, size_t
> count)
> | ^~~~~~~~~~~~~~~~~
>
> Can you squash it or do you want a separate patch?
>
> Cheers,
> Nathan
>
> diff --git a/drivers/char/tpm/tpm_loongson.c b/drivers/char/tpm/tpm_loongson.c
> index a4ec23639911..9e50250763d1 100644
> --- a/drivers/char/tpm/tpm_loongson.c
> +++ b/drivers/char/tpm/tpm_loongson.c
> @@ -28,7 +28,7 @@ static int tpm_loongson_recv(struct tpm_chip *chip, u8
> *buf, size_t count)
> return cmd_ret->data_len;
> }
>
> -static int tpm_loongson_send(struct tpm_chip *chip, u8 *buf, size_t count)
> +static int tpm_loongson_send(struct tpm_chip *chip, u8 *buf, size_t bufsiz,
> size_t count)
> {
> struct loongson_se_engine *tpm_engine = dev_get_drvdata(&chip->dev);
> struct tpm_loongson_cmd *cmd = tpm_engine->command;
This will break my local branch.
Any chance of an immutable pull-request for:
07d8004d6fb9 ("tpm: add bufsiz parameter in the .send callback")
--
Lee Jones [李琼斯]
