From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DCD8E285043; Tue, 16 Sep 2025 08:00:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758009616; cv=none; b=BRqvFiYrwi3SVtfoNHOlYE3OtK0JtCtFFWCkclEQCWZAiNp5Ci/bPqeOUAcortwzKwxquDcqITqI+epoP1SljgWKDwzuCZLf8v0y/7FO31l7ja1eO31C/INPKDYRR0kFbSPZP3Z7SglOIy/ilo2vOvUcx6vXRgJt9ecaWB7yFDM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758009616; c=relaxed/simple; bh=sNxIegpyNfQkNQy6ew2+PYZBthlAuOgsuvUHQhkSy/0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=TU2csSaUiS3PD0iWdcP7h+WkAUXOsu/v/4S5LiAdkHqPLBAuFZoJC/iyjdiA4vxxJab2AIyGccntqy5Kt7h0g0NKOMFcg090tuVJC84/D/JpHd2sDZdL4YGu71//wsqxsmIIggm5lEqXp8OllH7EP/HdEAsYA8AOX3kbBV41JXE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=L7F/p4kA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="L7F/p4kA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF260C4CEEB; Tue, 16 Sep 2025 08:00:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758009615; bh=sNxIegpyNfQkNQy6ew2+PYZBthlAuOgsuvUHQhkSy/0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=L7F/p4kA4VGLF2RSvwxBEHNfRr1ebHow5mDpvYrjjURl4Cdw+Wl7KJJl2Xwe3j+hx gMMfOtcoR8TcVh7YqAvYtYQq5HoPypG3P02VRaeYC9+sanVowNSW/nbqUZ10ebieII UkyP9QF8crNvZvVVUaPyobAdDh9GNO5ZkREo/QN4S1yOVt9hfe8/UqzspQFgP5yWwx WNRdz8L5ODk8XDzfW+do0s7qqJ2AKH+makkaEMxw/fpamRjbRBtKACnHvc/Cl25CAd aASuFhfHsCObS7cv/D8sePYP70ipQXvKpnOzcq+8VKWj4Rrq2B1R/dyygbYODq1Tfg cMzQSsqIRpakg== Date: Tue, 16 Sep 2025 09:00:10 +0100 From: Lee Jones To: Nathan Chancellor Cc: Qunqin Zhao , herbert@gondor.apana.org.au, jarkko@kernel.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, davem@davemloft.net, linux-crypto@vger.kernel.org, peterhuewe@gmx.de, jgg@ziepe.ca, linux-integrity@vger.kernel.org, sgarzare@redhat.com Subject: Re: [GIT PULL] Immutable branch between MFD, Char and Crypto due for the v6.18 merge window Message-ID: <20250916080010.GC1637058@google.com> References: <20250705072045.1067-1-zhaoqunqin@loongson.cn> <20250902124205.GL2163762@google.com> <20250912213256.GA3062565@ax162> <20250916075835.GB1637058@google.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20250916075835.GB1637058@google.com> On Tue, 16 Sep 2025, Lee Jones wrote: > 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") Either that or your proposed change needs to be applied to the tree that changed the .send API. -- Lee Jones [李琼斯]