Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 1 Feb 2021 13:30:07 +0200
From:   Jarkko Sakkinen <jarkko@kernel.org>
To:     James Bottomley <James.Bottomley@hansenpartnership.com>
Cc:     Linus Torvalds <torvalds@linux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        linux-integrity <linux-integrity@vger.kernel.org>,
        James Morris James Morris <jmorris@namei.org>,
        David Howells <dhowells@redhat.com>,
        Peter Huewe <peterhuewe@gmx.de>
Subject: Re: [GIT PULL] tpmdd updates for v5.12-rc1
Message-ID: <YBfmP2qKmsFg4Tfj@kernel.org>
References: <YBNcv8jLEDE8C/IW@kernel.org>
 <CAHk-=wjk7zEOFEjGWZmGF8_dcitBQ_dPUMSkr-g7B7cYcXGvSQ@mail.gmail.com>
 <YBWUHkbNt6OLoeUq@kernel.org>
 <e9e8a184f482d7f826659427764a7612ab775c3e.camel@HansenPartnership.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <e9e8a184f482d7f826659427764a7612ab775c3e.camel@HansenPartnership.com>
Precedence: bulk

On Sat, Jan 30, 2021 at 09:33:47AM -0800, James Bottomley wrote:
> On Sat, 2021-01-30 at 19:15 +0200, Jarkko Sakkinen wrote:
> > On Thu, Jan 28, 2021 at 07:38:21PM -0800, Linus Torvalds wrote:
> > > On Thu, Jan 28, 2021 at 4:54 PM Jarkko Sakkinen <jarkko@kernel.org>
> > > wrote:
> > > > This contains bug fixes for tpm_tis driver, which had a racy wait
> > > > for hardware state change to be ready to send a command to the
> > > > TPM chip. The bug has existed already since 2006, but has only
> > > > made itself known in recent past.
> > > 
> > > Hmm. Is this for the next merge window? The subject line implies
> > > that, as does the addition of the cr50 driver.
> > > 
> > > But the commentary about fixes implies that at least part of it
> > > should be in 5.11?
> > 
> > This was meant for 5.12 but the timing was *way* too early. I'll take
> > this one back. Just to unambiguity reasons I'll use tpmdd-next-v5.12-
> > rc1-v2 tag for my final v5.12 PR, once I send it.
> > 
> > I considered a bit, and I really think that it would make a lot of
> > sense to do a late 5.11 just containing the two commits from James,
> > namely:
> > 
> > 1. tpm_tis: Fix check_locality for correct locality acquisition
> > 2. tpm_tis: Clean up locality release 
> > 
> > James: Does this make sense to you? 
> 
> Yes, that's fine with me.  It will quiet the warning we've had several
> bug reports about, so it's definitely a bug fix.

Thanks, this is exactly what I wanted to sanity check. I figured that
those should be enough, but unfortunately I do not have any hardware
triggering the issue in my possession.

> James

/Jarkko