From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933247AbdBQHQi convert rfc822-to-8bit (ORCPT ); Fri, 17 Feb 2017 02:16:38 -0500 Received: from mout.gmx.net ([212.227.15.19]:59496 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755792AbdBQHQg (ORCPT ); Fri, 17 Feb 2017 02:16:36 -0500 Date: Fri, 17 Feb 2017 08:15:53 +0100 User-Agent: K-9 Mail for Android In-Reply-To: <7aee3c3f-ea63-4dcc-1ed5-04c1b954cc7d@gmail.com> References: <1487261306-2494-1-git-send-email-peter.huewe@infineon.com> <1487261306-2494-4-git-send-email-peter.huewe@infineon.com> <7aee3c3f-ea63-4dcc-1ed5-04c1b954cc7d@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Subject: Re: [PATCH 3/5] tpm_tis_spi: Check correct byte for wait state indicator To: Christophe Ricard , Peter Huewe , Jarkko Sakkinen CC: Jason Gunthorpe , tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Christophe Ricard , stable@vger.kernel.org, Alexander Steffen From: Peter Huewe Message-ID: <9E032F7F-15FB-4912-B58A-AFA68D06ADE3@gmx.de> X-Provags-ID: V03:K0:+vY3ApzbF8YIePSfJJNRzQOvWf2jxFWFD/SPo/+0osBn5u2TCH9 pVE2cbqqpPre6IG8l5/4tst0v2Pi7Z5ffNgIsG4H6AkSmy6OYpQ+0igfLygZJh3bgG+DIaK EPtBwEanoPtWX+q3D25lONKh9qa6u2pksKdtUCWDJgumCkzFnGU+a22kGmYSisbwb/3Ctyx nxf9E//U7MKZ6jD+dhg3w== X-UI-Out-Filterresults: notjunk:1;V01:K0:EAn0lyvuRaA=:9ng7sS8Qd6RaqeyMHaSv/+ 6CVHVG3FZslKcTov5I5FqyTbiee3IptVkPmYrrzAZg16g0nhIEAWrYxPribZKAdspCT1vWrP2 d97cPp/up7Z4v8dDWcIwz5xfw+UllYzOKHtQJp3uo3mMpmnIEdx0AHUfHX8WuuHs4BHTXoeJi A5ZYb38mp2l2Q8CXyaAw+IjUmccH7/RvD56HFPRrDhtQZ6mXiL8jbZUeS6gLf0NHLQ/E1wMlQ sJXUH9y0GR+o9TxpqVY8Prjdf0TNG2qAPdXoZvQfqVoTbQc/8iyuO1sJqODls9V7OJMRpswOy Thu1REQ+qaRSrmPQWbZLLsvjRdkD3+G5rS6V3FhOfnTg8FXTyDWLDCdiMiH1rELLww5lhXFOm LcxTph4mpbCwgkrYkl+jgG82+WVATQDocHBvQfgwOR+IU2SY6zNVYOaAL+Tzvzm95ueWXLY7k iPvp0s7UNVfppUGoldoK+u1+ILVppMnhkAGPD3QdvMz77OELCUWME7fcSQZsTe7/MeWa+ZBMS fhx0VT34iVb2DQWJgtIvdkWxLWg2GzlMMFsybHa25Ku9jJyqEXqQFrGN8D2lTxJ+vVpmPVeIX RmIRvsp7+erXRBV1Kjbls9plUD7HyKHxEq1K575zvXxVKK++Es9JSvPVtYYREZzi4BnKXQMXD AKU3A9LBhkyo9aeXT3PD2AAspqxuSK/oKVrrRBbwKBiObkAJo86T+wTZmY8s2vb3KGuV5EOBy uqVzqNZs4eNEU2Jr86QzqumRNQ3uP1QTVFnKWX6vKY2CwTsHoSU+oGOHpMHu3H8A+dKg3K8Na Bgk2GMg Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am 17. Februar 2017 06:09:30 MEZ schrieb Christophe Ricard : >That's is correct, this is a mistake on my side and never saw it :-(. > >I guess it was possibly leading to "waste" at least 1 wait state on >some >TPMs. Unfortunately the 1 for indicating end of waitstates does only appear once so it actually rendered the driver non-functional - atleast with our tpms. > >Wouldn't it be better to merge that with #1 and update the comment >consequently? Yes, that's what I wanted to express in the cover letter, logically it makes sense to squash #1 and #3 - but reviewing it merged with #1 is quite hard since it "obfuscates" the problem - since too much stuff moves around. That's why I decided to split it - for easier review. Peter > > >On 16/02/2017 08:08, Peter Huewe wrote: >> Wait states are signaled in the last byte received from the TPM in >> response to the header, not the first byte. Check rx_buf[3] instead >of >> rx_buf[0]. >> >> Cc: >> Fixes: 0edbfea537d1 ("tpm/tpm_tis_spi: Add support for spi phy") >> Signed-off-by: Alexander Steffen >> Signed-off-by: Peter Huewe >> --- >> drivers/char/tpm/tpm_tis_spi.c | 40 >+++++++++++++++++++++------------------- >> 1 file changed, 21 insertions(+), 19 deletions(-) >> >> diff --git a/drivers/char/tpm/tpm_tis_spi.c >b/drivers/char/tpm/tpm_tis_spi.c >> index d782b9974c14..16938e2253d2 100644 >> --- a/drivers/char/tpm/tpm_tis_spi.c >> +++ b/drivers/char/tpm/tpm_tis_spi.c >> @@ -60,7 +60,7 @@ static int tpm_tis_spi_transfer(struct tpm_tis_data >*data, u32 addr, u8 len, >> u8 *buffer, u8 direction) >> { >> struct tpm_tis_spi_phy *phy = to_tpm_tis_spi_phy(data); >> - int ret, i; >> + int ret; >> struct spi_message m; >> struct spi_transfer spi_xfer = { >> .tx_buf = phy->tx_buf, >> @@ -85,25 +85,27 @@ static int tpm_tis_spi_transfer(struct >tpm_tis_data *data, u32 addr, u8 len, >> if (ret < 0) >> goto exit; >> >> - phy->tx_buf[0] = 0; >> - >> - /* According to TCG PTP specification, if there is no TPM present >at >> - * all, then the design has a weak pull-up on MISO. If a TPM is not >> - * present, a pull-up on MISO means that the SB controller sees a >1, >> - * and will latch in 0xFF on the read. >> - */ >> - for (i = 0; (phy->rx_buf[0] & 0x01) == 0 && i < TPM_RETRY; i++) { >> - spi_xfer.len = 1; >> - spi_message_init(&m); >> - spi_message_add_tail(&spi_xfer, &m); >> - ret = spi_sync_locked(phy->spi_device, &m); >> - if (ret < 0) >> + if ((phy->rx_buf[3] & 0x01) == 0) { >> + // handle SPI wait states >> + int i; >> + >> + phy->tx_buf[0] = 0; >> + >> + for (i = 0; i < TPM_RETRY; i++) { >> + spi_xfer.len = 1; >> + spi_message_init(&m); >> + spi_message_add_tail(&spi_xfer, &m); >> + ret = spi_sync_locked(phy->spi_device, &m); >> + if (ret < 0) >> + goto exit; >> + if (phy->rx_buf[0] & 0x01) >> + break; >> + } >> + >> + if (i == TPM_RETRY) { >> + ret = -ETIMEDOUT; >> goto exit; >> - } >> - >> - if (i == TPM_RETRY) { >> - ret = -ETIMEDOUT; >> - goto exit; >> + } >> } >> >> spi_xfer.cs_change = 0; -- Sent from my mobile