TPM: STMicroelectronics st33 driver SPI
Subsystems (3)
PATCH 1/1 TPM: STMicroelectronics st33 driver SPI
From: Mathias Leblanc <[email protected]>
* STMicroelectronics version 1.2.0, Copyright (C) 2010
* STMicroelectronics comes with ABSOLUTELY NO WARRANTY.
* This is free software, and you are welcome to redistribute it
* under certain conditions.
This is the driver for TPM chip from ST Microelectronics.
If you have a TPM security chip from STMicroelectronics working with an SPI, in menuconfig or .config choose the tpm driver on device --> tpm and activate the protocol of your choice before compiling the kernel.
The driver will be accessible from within Linux.
Tested on linux x86/x64 and beagleboard REV B & XM REV C
--- drivers/char/tpm/Kconfig | 10 + drivers/char/tpm/Makefile | 1 + drivers/char/tpm/tpm_spi_stm_st33.c | 1116 ++++++++++++++++++++++++++++++++++ drivers/char/tpm/tpm_spi_stm_st33.h | 75 +++ include/linux/spi/tpm_spi_stm_st33.h | 44 ++ 7 files changed, 1246 insertions(+), 161 deletions(-) delete mode 100644 .gitignore delete mode 100644 REPORTING-BUGS create mode 100644 drivers/char/tpm/tpm_spi_stm_st33.c create mode 100644 drivers/char/tpm/tpm_spi_stm_st33.h create mode 100644 include/linux/spi/tpm_spi_stm_st33.h
drivers/char/tpm/Kconfig +10 -0
@@ -91,4 +91,14 @@ config TCG_ST33_I2C To compile this driver as a module, choose M here; the module will be called tpm_stm_st33_i2c. +config TCG_ST33_SPI + tristate "STMicroelectronics ST33 SPI" + depends on SPI + depends on GPIOLIB + ---help--- + If you have a TPM security chip from STMicroelectronics working with + an SPI bus say Yes and it will be accessible from within Linux. + To compile this driver as a module, choose M here; the module will be + called tpm_stm_st33_spi. + endif # TCG_TPM
drivers/char/tpm/Makefile +1 -0
@@ -18,3 +18,4 @@ obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o obj-$(CONFIG_TCG_ST33_I2C) += tpm_i2c_stm_st33.o +obj-$(CONFIG_TCG_ST33_SPI) += tpm_spi_stm_st33.o
drivers/char/tpm/tpm_spi_stm_st33.c new file +1116 -0
1,116 lines not on this page · raw message
drivers/char/tpm/tpm_spi_stm_st33.h new file +75 -0
75 lines not on this page · raw message
include/linux/spi/tpm_spi_stm_st33.h new file +44 -0
44 lines not on this page · raw message
Signature · 1 line
1.7.1
Hi Matthias,
Quoted 88 lines · Matthias Leblanc
From: Mathias Leblanc <[email protected]>
* STMicroelectronics version 1.2.0, Copyright (C) 2010
* STMicroelectronics comes with ABSOLUTELY NO WARRANTY.
* This is free software, and you are welcome to redistribute it
* under certain conditions.This is the driver for TPM chip from ST Microelectronics.
If you have a TPM security chip from STMicroelectronics working with an SPI, in menuconfig or .config choose the tpm driver on device --> tpm and activate the protocol of your choice before compiling the kernel.
The driver will be accessible from within Linux.Tested on linux x86/x64 and beagleboard REV B & XM REV C
Signed-off-by Mathias Leblanc <[email protected]>--- drivers/char/tpm/Kconfig | 10 + drivers/char/tpm/Makefile | 1 + drivers/char/tpm/tpm_spi_stm_st33.c | 1116 ++++++++++++++++++++++++++++++++++ drivers/char/tpm/tpm_spi_stm_st33.h | 75 +++ include/linux/spi/tpm_spi_stm_st33.h | 44 ++ 7 files changed, 1246 insertions(+), 161 deletions(-) delete mode 100644 .gitignore delete mode 100644 REPORTING-BUGS create mode 100644 drivers/char/tpm/tpm_spi_stm_st33.c create mode 100644 drivers/char/tpm/tpm_spi_stm_st33.h create mode 100644 include/linux/spi/tpm_spi_stm_st33.hdrivers/char/tpm/Kconfig +10
-0@@ -91,4 +91,14 @@ config TCG_ST33_I2C To compile this driver as a module, choose M here; the module will be called tpm_stm_st33_i2c. +config TCG_ST33_SPI + tristate "STMicroelectronics ST33 SPI" + depends on SPI + depends on GPIOLIB + ---help--- + If you have a TPM security chip from STMicroelectronics working with + an SPI bus say Yes and it will be accessible from within Linux. + To compile this driver as a module, choose M here; the module will be + called tpm_stm_st33_spi. + endif # TCG_TPMdrivers/char/tpm/Makefile +1
-0@@ -18,3 +18,4 @@ obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o obj-$(CONFIG_TCG_ST33_I2C) += tpm_i2c_stm_st33.o +obj-$(CONFIG_TCG_ST33_SPI) += tpm_spi_stm_st33.odrivers/char/tpm/tpm_spi_stm_st33.c new file +23
-0@@ -0,0 +1,1116 @@ +/* +* STMicroelectronics TPM SPI Linux driver for TPM ST33ZP24 +* Copyright (C) 2009, 2010 STMicroelectronics +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +* +* STMicroelectronics version 1.2.0, Copyright (C) 2010 +* STMicroelectronics comes with ABSOLUTELY NO WARRANTY. +* This is free software, and you are welcome to redistribute it +* under certain conditions. +*
drivers/char/tpm/tpm_spi_stm_st33.c line 33
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+* @Author: Christophe RICARD [email protected] +* +* @File: tpm_stm_st33_spi.c +* +* @Synopsis: +* 09/15/2010: First shot driver tpm_tis driver for lpc is +* used as model. +*/ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
This looks unused, please remove.
Quoted 8 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +8
-0+#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/delay.h> +#include <linux/init.h> +#include <linux/spi/spi.h> +#include <linux/wait.h> +#include <linux/string.h> +#include <linux/interrupt.h>
drivers/char/tpm/tpm_spi_stm_st33.c line 52
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+#include <linux/spinlock.h> +#include <linux/sysfs.h> +#include <linux/gpio.h> +#include <linux/sched.h> +#include <linux/uaccess.h> +#include <linux/io.h> +#include <linux/slab.h> +#include <linux/sched.h> + +#include <linux/spi/tpm_spi_stm_st33.h>
Is there a need for this header to live in linux/spi? You should move
it into the local header.
drivers/char/tpm/tpm_spi_stm_st33.c line 62
Quoted 9 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +9
-0+#include "tpm.h" + +#include "tpm_spi_stm_st33.h" + +#ifdef DEBUG +#define FUNC_ENTER () pr_info("%s\n", __func__) +#else +#define FUNC_ENTER () do {} while (0) +#endif
Please remove FUNC_ENTER().
Quoted 35 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +35
-0+enum stm33zp24_access { +TPM_ACCESS_VALID =0x80 , +TPM_ACCESS_ACTIVE_LOCALITY =0x20 , +TPM_ACCESS_REQUEST_PENDING =0x04 , +TPM_ACCESS_REQUEST_USE =0x02 , +}; + +enum stm33zp24_status { +TPM_STS_VALID =0x80 , +TPM_STS_COMMAND_READY =0x40 , +TPM_STS_GO =0x20 , +TPM_STS_DATA_AVAIL =0x10 , +TPM_STS_DATA_EXPECT =0x08 , +}; + +enum stm33zp24_int_flags { +TPM_GLOBAL_INT_ENABLE =0x80 , +TPM_INTF_CMD_READY_INT =0x080 , +TPM_INTF_FIFO_AVALAIBLE_INT =0x040 , +TPM_INTF_WAKE_UP_READY_INT =0x020 , +TPM_INTF_LOC4SOFTRELEASE_INT =0x008 , +TPM_INTF_LOCALITY_CHANGE_INT =0x004 , +TPM_INTF_STS_VALID_INT =0x002 , +TPM_INTF_DATA_AVAIL_INT =0x001 , +}; + +enum tis_defaults { +TIS_SHORT_TIMEOUT =750 ,/* ms */ +TIS_LONG_TIMEOUT =2000 ,/* 2 sec */ +}; + +/* +* write8_reg +* Send byte to the TIS register according to the ST33ZP24 SPI protocol. +* @param: tpm, the chip description
drivers/char/tpm/tpm_spi_stm_st33.c line 108
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+* @param: tpm_register, the tpm tis register where the data should be written +* @param: tpm_data, the tpm_data to write inside the tpm_register +* @param: tpm_size, The length of the data +* @return: number of byte written successfully: should be one if success. +*/ +static int write8_reg (struct tpm_chip *tpm,u8 tpm_register, +u8 *tpm_data,u16 tpm_size) +{ +/* u8 LOC+DIR u8 ADD u16 LENGHT u8* data */ +/* u8 LATENCY u8 LATENCY */
What do these comments mean?
Quoted 19 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +19
-0+ +u8 data; +int i =0 , j; +int value =0 ; +struct spi_device *dev = (struct spi_device *)tpm->vendor.iobase; +struct st33zp24_platform_data *platform_data = dev->dev.platform_data; +u8 *data_buffer = platform_data->tpm_spi_buffer[0 ]; +struct spi_transfer xfer = { + .tx_buf = data_buffer, + .rx_buf = platform_data->tpm_spi_buffer[1 ], + }; +struct spi_message msg; +u8 latency = platform_data->latency + tpm_size +1 ; + + +FUNC_ENTER (); +/* Pre-Header */ + + data =TPM_WRITE_DIRECTION | tpm->vendor.locality;
drivers/char/tpm/tpm_spi_stm_st33.c line 137
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+memcpy (data_buffer + i, &data,sizeof (data)); + i++; + data = tpm_register; +memcpy (data_buffer + i, &data,sizeof (data)); + i++; + +if ( + tpm_size >0 && + (tpm_register ==TPM_DATA_FIFO || + tpm_register ==TPM_HASH_DATA )) {
Well that looks weird. This is more readable:
if (tpm_size > 0 &&
(tpm_register == TPM_DATA_FIFO ||
tpm_register == TPM_HASH_DATA)) { But probably more relevant is that write8_reg is never called withtpm_register == TPM_HASH_DATA. Can you remove it?
drivers/char/tpm/tpm_spi_stm_st33.c line 138
Quoted 1 line
drivers/char/tpm/tpm_spi_stm_st33.c new file +1
-0+ data = tpm_size >>8 &0x00ff ;
I had to google to figure out which operator took precedence here,
please add some parenthesis.
drivers/char/tpm/tpm_spi_stm_st33.c line 143
Quoted 5 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +5
-0+memcpy (data_buffer + i, &data,sizeof (data)); + i++; + data = tpm_size &0x00ff ; +memcpy (data_buffer + i, &data,sizeof (data)); + i++;
IIRC Peter fixed this in the I2C driver -- where you can avoidmemcpy() of a single byte by using an assignment, please do.
drivers/char/tpm/tpm_spi_stm_st33.c line 154
Quoted 11 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +11
-0+ latency -=2 ; + } + +memcpy (data_buffer + i, tpm_data, tpm_size); + i += tpm_size; + +for (j =0 ; j < platform_data->latency +1 ; j++) { + data =TPM_DUMMY_BYTE ; +memcpy (data_buffer + i, &data,sizeof (data)); + i++; + }
Isn't the above loop just this?
memset(&data_buffer[i], TPM_DUMMY_BYTE, platform_data->latency + 1);
drivers/char/tpm/tpm_spi_stm_st33.c line 166
Quoted 12 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +12
-0+ xfer.len = i; +spi_message_init (&msg); +spi_message_add_tail (&xfer, &msg); + value =spi_sync (dev, &msg); + +if (value ==0 ) { + j = i -1 - j; +for (; j < i && ((u8 *)xfer.rx_buf)[j] ==0 ; j++) + ; + +if (((u8 *)xfer.rx_buf)[j] !=0 ) + value = ((u8 *)xfer.rx_buf)[j];
Code like this is where vague variable names make it difficult. Can
you rename i and j here? j is the number of dummy bytes and i is the total length of the transfer, right?
Quoted 56 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +56
-0+ } + +return value; +}/* write8_reg() */ + +/* +* read8_reg +* Recv byte from the TIS register according to the ST33ZP24 SPI protocol. +* @param: tpm, the chip description +* @param: tpm_register, the tpm tis register where the data should be read +* @param: tpm_data, the TPM response +* @param: tpm_size, tpm TPM response size to read. +* @return: number of byte read successfully: should be one if success. +*/ +static u8 read8_reg (struct tpm_chip *tpm,u8 tpm_register, +u8 *tpm_data,u16 tpm_size) +{ +u8 data; +int i =0 , j; +int value =0 ; +struct spi_device *dev = (struct spi_device *)tpm->vendor.iobase; +struct st33zp24_platform_data *platform_data = dev->dev.platform_data; +u8 *data_buffer = platform_data->tpm_spi_buffer[0 ]; +struct spi_transfer xfer = { + .tx_buf = data_buffer, + .rx_buf = platform_data->tpm_spi_buffer[1 ], + }; +struct spi_message msg; + +u8 latency = platform_data->latency + tpm_size +1 ; + +FUNC_ENTER (); +/* Pre-Header */ + + data = tpm->vendor.locality; +memcpy (data_buffer + i, &data,sizeof (data)); + i++; + data = tpm_register; +memcpy (data_buffer + i, &data,sizeof (data)); + i++; + +for (j =0 ; j < latency; j++) { + data =TPM_DUMMY_BYTE ; +memcpy (data_buffer + i, &data,sizeof (data)); + i++; + } + xfer.len = i; + +/* header + status byte + size of the data + status byte */ +spi_message_init (&msg); +spi_message_add_tail (&xfer, &msg); + value =spi_sync (dev, &msg); +if (tpm_size >0 && value ==0 ) { + j =2 ; +for (; j < i && ((u8 *)xfer.rx_buf)[j] ==0 ; j++) + ;
drivers/char/tpm/tpm_spi_stm_st33.c line 232
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+ +if (j +1 < i) { + value = ((u8 *)xfer.rx_buf)[j]; + +if (tpm_size >0 ) +memcpy (tpm_data, xfer.rx_buf + j +1 , tpm_size); + } + } +return value; +}/* read8_reg() */
Same comments as write8_reg -- converge into simpler memcpy/memset's
where you can, rename variables.
drivers/char/tpm/tpm_spi_stm_st33.c line 241
Quoted 9 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +9
-0+ +/* +* SPI_WRITE_DATA +* Send byte to the TIS register according to the ST33ZP24 SPI protocol. +* @param: tpm, the chip description +* @param: tpm_register, the tpm tis register where the data should be written +* @param: tpm_data, the tpm_data to write inside the tpm_register +* @param: tpm_size, The length of the data +* @return: number of byte written successfully: should be one if success.
Why would one be success if it returns the number of bytes written?
drivers/char/tpm/tpm_spi_stm_st33.c line 244
Quoted 3 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +3
-0+*/ +static u32 SPI_WRITE_DATA (struct tpm_chip *tpm,u8 tpm_register, +u8 *tpm_data,u16 tpm_size)
An all caps function name will make me think its a macro, please use
lower case.
Quoted 85 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +85
-0+{ +u8 value =0 ; + +FUNC_ENTER (); + + value =write8_reg (tpm, tpm_register, tpm_data, tpm_size); + +switch (value) { +case TPM_ST_SPI_OK : +return TPM_ST_SPI_OK ; +case 0 : +return 0 ; +default : +return -EBUSY ; + } +}/* SPI_WRITE_DATA() */ + +/* +* SPI_READ_DATA +* Recv byte from the TIS register according to the ST33ZP24 SPI protocol. +* @param: tpm, the chip description +* @param: tpm_register, the tpm tis register where the data should be read +* @param: tpm_data, the TPM response +* @param: tpm_size, tpm TPM response size to read. +* @return: number of byte read successfully: should be one if success. +*/ +static u32 SPI_READ_DATA (struct tpm_chip *tpm,u8 tpm_register, +u8 *tpm_data,u16 tpm_size) +{ +u8 value =0 ; + +FUNC_ENTER (); + + value =read8_reg (tpm, tpm_register, tpm_data, tpm_size); + +switch (value) { +case TPM_ST_SPI_OK : +return TPM_ST_SPI_OK ; +case 0 : +return 0 ; +default : +return -EBUSY ; + } +}/* SPI_READ_DATA () */ + +/* +* clear_interruption +* clear the TPM interrupt register. +* @param: tpm, the chip description +*/ +static void clear_interruption (struct tpm_chip *tpm) +{ +u8 interrupt; +SPI_READ_DATA (tpm,TPM_INT_STATUS , &interrupt,1 ); +/* Clear interrupts handled with TPM_EOI */ +SPI_WRITE_DATA (tpm,TPM_INT_STATUS , &interrupt,1 ); +SPI_READ_DATA (tpm,TPM_INT_STATUS , &interrupt,1 ); +}/* clear_interruption() */ + +/* +* _wait_for_interrupt_serirq_timeout +* @param: tpm, the chip description +* @param: timeout, the timeout of the interrupt +* @return: the status of the interruption. +*/ +static int _wait_for_interrupt_serirq_timeout (struct tpm_chip *chip, +unsigned long timeout) +{ +unsigned long status; +struct spi_device *client; +struct st33zp24_platform_data *pin_infos; + +FUNC_ENTER (); + + client = (struct spi_device *)chip->vendor.iobase; + pin_infos = client->dev.platform_data; + + status =wait_for_completion_interruptible_timeout ( + &pin_infos->irq_detection, timeout); +if (status >0 ) +enable_irq (gpio_to_irq (pin_infos->io_serirq)); +gpio_direction_input (pin_infos->io_serirq); + +return status; +}/* wait_for_interrupt_serirq_timeout() */
drivers/char/tpm/tpm_spi_stm_st33.c line 339
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+ +unsigned long wait_for_serirq_timeout (struct tpm_chip *chip,bool condition, +unsigned long timeout) +{ +unsigned long status =0 ; +struct spi_device *client; +struct st33zp24_platform_data *pin_infos; + + client = (struct spi_device *)chip->vendor.iobase; + pin_infos = client->dev.platform_data;
pin_infos isn't used here, please remove.
Quoted 14 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +14
-0+ status =_wait_for_interrupt_serirq_timeout (chip, timeout); +if (!status) { + status = -EBUSY ; + goto wait_end; + } +clear_interruption (chip); +if (condition) + status =1 ; + +wait_end: +return status; +} + +
drivers/char/tpm/tpm_spi_stm_st33.c line 364
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+/* +* tpm_stm_spi_cancel, cancel is not implemented. +* @param: chip, the tpm chip description as specified in +* driver/char/tpm/tpm.h. +*/ +static void tpm_stm_spi_cancel (struct tpm_chip *chip) +{ +struct spi_device *client; +u8 data =TPM_STS_COMMAND_READY ; + client = (struct spi_device *)chip->vendor.iobase;
client is unused?
Quoted 6 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +6
-0+FUNC_ENTER (); + +/* this causes the current command to be aborted */ +SPI_WRITE_DATA (chip,TPM_STS , &data,1 ); +}/* tpm_stm_spi_cancel() */ +
drivers/char/tpm/tpm_spi_stm_st33.c line 381
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+/* +* tpm_stm_spi_status return the TPM_STS register +* @param: chip, the tpm chip description +* @return: the TPM_STS register value. +*/ +static u8 tpm_stm_spi_status (struct tpm_chip *chip) +{ +struct spi_device *client; +u8 data; + client = (struct spi_device *)chip->vendor.iobase;
client is unused?
Quoted 13 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +13
-0+ +FUNC_ENTER (); + +SPI_READ_DATA (chip,TPM_STS , &data,1 ); +return data; +}/* tpm_stm_spi_status() */ + + + +/* +* check_locality if the locality is active +* @param: chip, the tpm chip description +* @return: the active locality or -EACCESS.
drivers/char/tpm/tpm_spi_stm_st33.c line 404
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+*/ +static int check_locality (struct tpm_chip *chip) +{ +struct spi_device *client; +u8 data; +u8 status; + +FUNC_ENTER (); + + client = (struct spi_device *)chip->vendor.iobase;
client is unused?
Quoted 15 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +15
-0+ + status =SPI_READ_DATA (chip,TPM_ACCESS , &data,1 ); +if (status && (data & + (TPM_ACCESS_ACTIVE_LOCALITY |TPM_ACCESS_VALID )) == + (TPM_ACCESS_ACTIVE_LOCALITY |TPM_ACCESS_VALID )) +return chip->vendor.locality; + +return -EACCES ; +}/* check_locality() */ + +/* +* request_locality request the TPM locality +* @param: chip, the chip description +* @return: the active locality or EACCESS. +*/
drivers/char/tpm/tpm_spi_stm_st33.c line 429
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+static int request_locality (struct tpm_chip *chip) +{ +unsigned long stop; +long rc; +u8 data; +struct spi_device *client; + +FUNC_ENTER (); + + client = (struct spi_device *)chip->vendor.iobase;
client is unused?
Quoted 31 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +31
-0+/* Check locality */ +if (check_locality (chip) == chip->vendor.locality) +return chip->vendor.locality; + +/* Request locality */ + data =TPM_ACCESS_REQUEST_USE ; + rc =SPI_WRITE_DATA (chip,TPM_ACCESS , &data,1 ); +if (rc <0 ) + goto end; + +/* wait for burstcount */ +if (chip->vendor.irq) { + rc =wait_for_serirq_timeout (chip, (check_locality + (chip) >=0 ), + chip->vendor.timeout_a); +if (rc >0 ) +return chip->vendor.locality; + }else { + stop = jiffies + chip->vendor.timeout_a; +do { +if (check_locality (chip) >=0 ) +return chip->vendor.locality; +msleep (TPM_TIMEOUT ); + }while (time_before (jiffies, stop)); + } +end: +return -EACCES ; +}/* request_locality() */ + +/* +* release_locality release the active locality
drivers/char/tpm/tpm_spi_stm_st33.c line 470
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+* @param: chip, the tpm chip description. +*/ +static void release_locality (struct tpm_chip *chip) +{ +struct spi_device *client; +u8 data; + +FUNC_ENTER (); + + client = (struct spi_device *)chip->vendor.iobase;
client is unused?
Quoted 42 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +42
-0+ data =TPM_ACCESS_ACTIVE_LOCALITY ; +SPI_WRITE_DATA (chip,TPM_ACCESS , &data,1 ); +}/* release_locality()*/ + +/* +* get_burstcount return the burstcount address 0x19 0x1A +* @param: chip, the chip description +* return: the burstcount. +*/ +static int get_burstcount (struct tpm_chip *chip) +{ +unsigned long stop; +u32 burstcnt, status; +u8 tpm_reg, temp; + +FUNC_ENTER (); + +/* wait for burstcount */ +/* which timeout value, spec has 2 answers (c & d) */ + stop = jiffies + chip->vendor.timeout_d; +do { + tpm_reg =TPM_STS +1 ; + status =SPI_READ_DATA (chip, tpm_reg, &temp,1 ); +if (status <0 ) + goto end; + + tpm_reg = tpm_reg +1 ; + burstcnt = temp; + status =SPI_READ_DATA (chip, tpm_reg, &temp,1 ); +if (status <0 ) + goto end; + + burstcnt |= temp <<8 ; +if (burstcnt) +return burstcnt; +msleep (TPM_TIMEOUT ); + }while (time_before (jiffies, stop)); + +end: +return -EBUSY ; +}/* get_burstcount() */ +
drivers/char/tpm/tpm_spi_stm_st33.c line 522
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+/* +* wait_for_stat wait for a TPM_STS value +* @param: chip, the tpm chip description +* @param: mask, the value mask to wait +* @param: timeout, the timeout +* @param: queue, the wait queue. +* @return: the tpm status, 0 if success, -ETIME if timeout is reached. +*/ +static int wait_for_stat (struct tpm_chip *chip,u8 mask,unsigned long timeout, +wait_queue_head_t *queue)
queue is unused?
Quoted 35 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +35
-0+{ +unsigned long stop; +long rc; +u8 status; + +FUNC_ENTER (); + +/* check current status */ + status =tpm_stm_spi_status (chip); +if (!chip->vendor.irq && (status & mask) == mask) +return 0 ; + +if (chip->vendor.irq) { + rc =wait_for_serirq_timeout (chip, ((tpm_stm_spi_status + (chip) & mask) == + mask), timeout); +if (rc >0 ) +return 0 ; + }else { + stop = jiffies + timeout; +do { +msleep (TPM_TIMEOUT ); + status =tpm_stm_spi_status (chip); +if ((status & mask) == mask) +return 0 ; + }while (time_before (jiffies, stop)); + } +return -ETIME ; +}/* wait_for_stat() */ + +/* +* recv_data receive data +* @param: chip, the tpm chip description +* @param: buf, the buffer where the data are received +* @param: count, the number of data to receive
drivers/char/tpm/tpm_spi_stm_st33.c line 567
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+* @return: the tpm status, 0 if success, -ETIME if timeout is reached. +*/ +static int recv_data (struct tpm_chip *chip,u8 *buf,size_t count) +{ +u32 size =0 , burstcnt, status, len; +struct spi_device *client; + +FUNC_ENTER (); + + client = (struct spi_device *)chip->vendor.iobase;
client is unused?
Quoted 58 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +58
-0+ +while (size < count && +wait_for_stat (chip, +TPM_STS_DATA_AVAIL |TPM_STS_VALID , + chip->vendor.timeout_c, + &chip->vendor.read_queue) + ==0 ) { + burstcnt =get_burstcount (chip); + len =min_t (int, burstcnt, count - size); + status =SPI_READ_DATA (chip,TPM_DATA_FIFO , buf + size, len); +if (status <0 ) +return status; + + + size += len; + } +return size; +} + +/* +* tpm_ioserirq_handler the serirq irq handler +* @param: irq, the tpm chip description +* @param: dev_id, the description of the chip +* @return: the status of the handler. +*/ +static irqreturn_t tpm_ioserirq_handler (int irq,void *dev_id) +{ +struct tpm_chip *chip = dev_id; +struct spi_device *client; +struct st33zp24_platform_data *pin_infos; + +disable_irq_nosync (irq); +FUNC_ENTER (); + + client = (struct spi_device *)chip->vendor.iobase; + pin_infos = client->dev.platform_data; + +complete (&pin_infos->irq_detection); +return IRQ_HANDLED ; +}/* tpm_ioserirq_handler() */ + +/* +* tpm_stm_spi_send send TPM commands through the SPI bus. +* @param: chip, the tpm chip description +* @param: buf, the tpm command buffer +* @param: len, the tpm command size +* @return: In case of success the number of bytes sent. +* In other case, a < 0 value describing the issue. +*/ +static int tpm_stm_spi_send (struct tpm_chip *chip,unsigned char *buf, +size_t len) +{ +u32 ret =0 , ordinal, + status, burstcnt =0 , i, size =0 ; +u8 data; + +struct spi_device *client; +struct st33zp24_platform_data *pin_infos;
drivers/char/tpm/tpm_spi_stm_st33.c line 635
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+ +FUNC_ENTER (); + +if (chip ==NULL ) +return -EBUSY ; +if (len <TPM_HEADER_SIZE ) +return -EBUSY ; + + client = (struct spi_device *)chip->vendor.iobase; + pin_infos = client->dev.platform_data;
pin_infos and client are unused?
drivers/char/tpm/tpm_spi_stm_st33.c line 637
Quoted 2 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +2
-0+ + ordinal =be32_to_cpu (*((__be32 *)(buf +6 )));
ordinal is unused?
Quoted 9 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +9
-0+ + ret =request_locality (chip); +if (ret <0 ) +return ret; + + status =tpm_stm_spi_status (chip); +if ((status &TPM_STS_COMMAND_READY ) ==0 ) { +tpm_stm_spi_cancel (chip); + if (wait_for_stat
drivers/char/tpm/tpm_spi_stm_st33.c line 656
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+ (chip, TPM_STS_COMMAND_READY, chip->vendor.timeout_b, + &chip->vendor.int_queue) < 0) { + ret = -ETIME ; + goto out_err; + } + } + +for (i =0 ; i < len -1 ;) { + burstcnt =get_burstcount (chip); + size =min_t (int, len - i -1 , burstcnt);
burstcnt can be -EBUSY here, which would cause size to become a large
negative number. Better to check its sane here before using it.
Quoted 46 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +46
-0+ ret =SPI_WRITE_DATA (chip,TPM_DATA_FIFO , buf, size); +if (ret <0 ) + goto out_err; + i += size; + } + + status =tpm_stm_spi_status (chip); +if ((status &TPM_STS_DATA_EXPECT ) ==0 ) { + ret = -EIO ; + goto out_err; + } + +/* write last byte */ +SPI_WRITE_DATA (chip,TPM_DATA_FIFO , buf + len -1 ,1 ); + + status =tpm_stm_spi_status (chip); +if ((status &TPM_STS_DATA_EXPECT ) !=0 ) { + ret = -EIO ; + goto out_err; + } + +/* go and do it */ + data =TPM_STS_GO ; + ret =SPI_WRITE_DATA (chip,TPM_STS , &data,1 ); +if (ret <0 ) + goto out_err; + +return len; +out_err: +tpm_stm_spi_cancel (chip); +release_locality (chip); +return ret; +} + +/* +* tpm_stm_spi_recv received TPM response through the SPI bus. +* @param: chip, the tpm chip description +* @param: buf, the tpm command buffer +* @param: len, the tpm command size +* @return: In case of success the number of bytes received. +* In other case, a < 0 value describing the issue. +*/ +static int tpm_stm_spi_recv (struct tpm_chip *chip,unsigned char *buf, +size_t count) +{ +int size =0 ;
drivers/char/tpm/tpm_spi_stm_st33.c line 712
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+int expected; + +struct spi_device *client; +struct st33zp24_platform_data *pin_infos; + + +FUNC_ENTER (); + + client = (struct spi_device *)chip->vendor.iobase; + pin_infos = client->dev.platform_data;
pin_infos and client are unused?
Quoted 261 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +261
-0+ + +if (chip ==NULL ) +return -EBUSY ; +if (count <TPM_HEADER_SIZE ) { + size = -EIO ; + goto out; + } + + size =recv_data (chip, buf,TPM_HEADER_SIZE ); + +/* read first 10 bytes, including tag, paramsize, and result */ +if (size <TPM_HEADER_SIZE ) { +dev_err (chip->dev,"Unable to read header\n" ); + goto out; + } + + expected =be32_to_cpu (*(__be32 *)(buf +2 )); +if (expected > count) { + size = -EIO ; + goto out; + } + + size +=recv_data (chip, &buf[TPM_HEADER_SIZE ], + expected -TPM_HEADER_SIZE ); +if (size < expected) { +dev_err (chip->dev,"Unable to read remainder of result\n" ); + size = -ETIME ; + goto out; + } + +out: + chip->vendor.cancel (chip); +release_locality (chip); +return size; +} + + +static const struct file_operations tpm_st33_spi_fops = { + .owner =THIS_MODULE , + .llseek = no_llseek, + .read = tpm_read, + .write = tpm_write, + .open = tpm_open, + .release = tpm_release, +}; + +static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); +static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); +static DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); +static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); +static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); +static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, NULL); +static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps_1_2, NULL); +static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); + +static struct attribute *stm_tpm_attrs[] = { + &dev_attr_pubek.attr, + &dev_attr_pcrs.attr, + &dev_attr_enabled.attr, + &dev_attr_active.attr, + &dev_attr_owned.attr, + &dev_attr_temp_deactivated.attr, + &dev_attr_caps.attr, + &dev_attr_cancel.attr,NULL , +}; + +static struct attribute_group stm_tpm_attr_grp = { + .attrs = stm_tpm_attrs +}; + +static struct tpm_vendor_specific st_spi_tpm = { + .send = tpm_stm_spi_send, + .recv = tpm_stm_spi_recv, + .cancel = tpm_stm_spi_cancel, + .status = tpm_stm_spi_status, + .attr_group = &stm_tpm_attr_grp, + .miscdev = {.fops = &tpm_st33_spi_fops,}, +}; + +static int evaluate_latency (struct tpm_chip *chip) +{ +int latency =0 ; +struct spi_device *dev = (struct spi_device *)chip->vendor.iobase; +struct st33zp24_platform_data *platform_data = dev->dev.platform_data; +int status =0 ; +u8 data; + +for (; status ==0x00 && latency <MAX_SPI_LATENCY ; latency++) { + platform_data->latency = latency; + status =SPI_READ_DATA (chip,TPM_INTF_CAPABILITY , &data,1 ); + } +return latency -1 ; +}/* evaluate_latency() */ + +static int interrupts; +module_param (interrupts, int,0444 ); +MODULE_PARM_DESC (interrupts,"Enable interrupts" ); + +static int power_mgt =1 ; +module_param (power_mgt, int,0444 ); +MODULE_PARM_DESC (power_mgt,"Power Management" ); + +/* +* tpm_st33_spi_probe initialize the TPM device +* @param: client, the spi_device drescription (TPM SPI description). +* @param: id, the spi_device_id struct. +* @return: 0 in case of success. +* -1 in other case. +*/ +static int +tpm_st33_spi_probe (struct spi_device *dev) +{ +u32 err; +u8 intmask; +struct tpm_chip *chip; +struct st33zp24_platform_data *platform_data; + +FUNC_ENTER (); + + err =0 ; + +/* Check SPI platform functionnalities */ +if (dev ==NULL ) { +pr_info ("dev is NULL. exiting.\n" ); + err = -ENODEV ; + goto end; + } + + chip =tpm_register_hardware (&dev->dev, &st_spi_tpm); +if (!chip) { + err = -ENODEV ; + goto end; + } + +/* Allocation of SPI buffers MISO and MOSI */ +/* Size is as follow: */ +/* Request burstcount value = 0x800 = 2048 */ +/* + */ +/* Response burstcount value = 0x400 = 1024 */ +/* + */ +/* At least: */ +/* 1 byte for direction/locality */ +/* 1 byte tpm tis register */ +/* 2 bytes spi data length (for request only) */ +/* 2 latency bytes */ +/* 1 status byte */ +/* = 2048 + 1024 + 7 */ +/* We reserved 2048 + 1024 + 20 in case latency byte */ +/* change */ + platform_data = dev->dev.platform_data; + platform_data->tpm_spi_buffer[0 ] = +kmalloc ((TPM_BUFSIZE + (TPM_BUFSIZE /2 ) + +TPM_DIGEST_SIZE ) *sizeof (u8),GFP_KERNEL ); +if (platform_data->tpm_spi_buffer[0 ] ==NULL ) { + err = -ENOMEM ; + goto _tpm_clean_answer; + } + platform_data->tpm_spi_buffer[1 ] = +kmalloc ((TPM_BUFSIZE + (TPM_BUFSIZE /2 ) + +TPM_DIGEST_SIZE ) *sizeof (u8) ,GFP_KERNEL ); +if (platform_data->tpm_spi_buffer[1 ] ==NULL ) { + err = -ENOMEM ; + goto _tpm_clean_response; + } + + chip->vendor.iobase = dev; + +/* Default timeouts */ + chip->vendor.timeout_a =msecs_to_jiffies (TIS_SHORT_TIMEOUT ); + chip->vendor.timeout_b =msecs_to_jiffies (TIS_LONG_TIMEOUT ); + chip->vendor.timeout_c =msecs_to_jiffies (TIS_SHORT_TIMEOUT ); + chip->vendor.timeout_d =msecs_to_jiffies (TIS_SHORT_TIMEOUT ); + chip->vendor.locality =LOCALITY0 ; + +if (power_mgt) { + err =gpio_request (platform_data->io_lpcpd,"TPM IO_LPCPD" ); +if (err) + goto _gpio_init1; +gpio_set_value (platform_data->io_lpcpd,1 ); + } + + platform_data->latency =evaluate_latency (chip); +if (platform_data->latency <=0x00 ) { + err = -ENODEV ; + goto _gpio_init1; + } + +/* Enable interrupt */ +/* Register GPIO pin through generic Linux GPIO API */ +if (interrupts) { +init_completion (&platform_data->irq_detection); +if (request_locality (chip) !=LOCALITY0 ) { + err = -ENODEV ; + goto _tpm_clean_response; + } + err =gpio_request (platform_data->io_serirq,"TPM IO_SERIRQ" ); +if (err) + goto _gpio_init2; + +/* Clear all existing */ +clear_interruption (chip); + err =request_irq (gpio_to_irq (platform_data->io_serirq), + &tpm_ioserirq_handler, +IRQF_TRIGGER_HIGH |IRQF_SHARED , +"TPM SERIRQ management" , chip); +if (err <0 ) { +pr_info ("TPM SERIRQ signals %d not available\n" , +gpio_to_irq ( + platform_data->io_serirq)); + goto _irq_set; + } + err =SPI_READ_DATA (chip,TPM_INT_ENABLE , &intmask,1 ); +if (err <0 ) + goto _irq_set; + + intmask |=TPM_INTF_CMD_READY_INT + |TPM_INTF_FIFO_AVALAIBLE_INT + |TPM_INTF_WAKE_UP_READY_INT + |TPM_INTF_LOC4SOFTRELEASE_INT + |TPM_INTF_LOCALITY_CHANGE_INT + |TPM_INTF_STS_VALID_INT + |TPM_INTF_DATA_AVAIL_INT ; + + err =SPI_WRITE_DATA (chip,TPM_INT_ENABLE , &intmask,1 ); +if (err <0 ) + goto _irq_set; + + intmask =TPM_GLOBAL_INT_ENABLE ; + err =SPI_WRITE_DATA (chip,TPM_INT_ENABLE +3 , &intmask,1 ); +if (err <0 ) + goto _irq_set; + + err =SPI_READ_DATA (chip,TPM_INT_STATUS , &intmask,1 ); +if (err <0 ) + goto _irq_set; + + chip->vendor.irq = interrupts; + +tpm_gen_interrupt (chip); + } + +tpm_get_timeouts (chip); + +/* attach chip datas to client */ +spi_set_drvdata (dev, chip); + platform_data->bchipf = false; + +pr_info ("TPM SPI Initialized\n" ); +return 0 ; +_irq_set: +free_irq (gpio_to_irq (platform_data->io_serirq), chip); +_gpio_init2: +if (platform_data && interrupts) +gpio_free (platform_data->io_serirq); +_gpio_init1: +if (platform_data && power_mgt) +gpio_free (platform_data->io_lpcpd); +_tpm_clean_response: +tpm_remove_hardware (chip->dev); +if (platform_data->tpm_spi_buffer[1 ] !=NULL ) {
drivers/char/tpm/tpm_spi_stm_st33.c line 983
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+kfree (platform_data->tpm_spi_buffer[1 ]); + platform_data->tpm_spi_buffer[1 ] =NULL ; + } +_tpm_clean_answer: +if (platform_data->tpm_spi_buffer[0 ] !=NULL ) { +kfree (platform_data->tpm_spi_buffer[0 ]); + platform_data->tpm_spi_buffer[0 ] =NULL ; + } + + platform_data->bchipf = true;
Please take a look at git commit 3d7a7bd7 and make the same changes. The
way these labels are jumped to can use some cleaning up. I suspect that you can also remove bchipf here like in 1fbc5e95356a4600fab3a04a82dc8bb49591aedd.
Thanks,
Kent
Quoted 278 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +133
-0+end: +pr_info ("TPM SPI initialisation fail\n" ); +return err; +} + +/* +* tpm_st33_spi_remove remove the TPM device +* @param: client, the spi_device drescription (TPM SPI description). +clear_bit(0, &chip->is_open); +* @return: 0 in case of success. +*/ +static int tpm_st33_spi_remove (struct spi_device *client) +{ +struct tpm_chip *chip = (struct tpm_chip *)spi_get_drvdata (client); +struct st33zp24_platform_data *pin_infos = + ((struct spi_device *)chip->vendor.iobase)->dev.platform_data; + +FUNC_ENTER (); + +if (pin_infos !=NULL ) { +gpio_free (pin_infos->io_lpcpd); + +/* Check if chip has been previously clean */ +if (pin_infos->bchipf != true) +tpm_remove_hardware (chip->dev); +if (pin_infos->tpm_spi_buffer[1 ] !=NULL ) { +kfree (pin_infos->tpm_spi_buffer[1 ]); + pin_infos->tpm_spi_buffer[1 ] =NULL ; + } +if (pin_infos->tpm_spi_buffer[0 ] !=NULL ) { +kfree (pin_infos->tpm_spi_buffer[0 ]); + pin_infos->tpm_spi_buffer[0 ] =NULL ; + } + } + +return 0 ; +} + +/* +* tpm_st33_spi_pm_suspend suspend the TPM device +* Added: Work around when suspend and no tpm application is running, suspend +* may fail because chip->data_buffer is not set (only set in tpm_open in Linux +* TPM core) +* @param: client, the spi_device drescription (TPM SPI description). +* @param: mesg, the power management message. +* @return: 0 in case of success. +*/ +static int tpm_st33_spi_pm_suspend (struct spi_device *client, +pm_message_t mesg) +{ +struct tpm_chip *chip = + (struct tpm_chip *)spi_get_drvdata (client); +struct st33zp24_platform_data *pin_infos = + ((struct spi_device *)chip->vendor.iobase)->dev.platform_data; +int ret =0 ; + +if (power_mgt) { +gpio_set_value (pin_infos->io_lpcpd,0 ); + }else { +if (chip->data_buffer ==NULL ) + chip->data_buffer = pin_infos->tpm_spi_buffer[0 ]; + ret =tpm_pm_suspend (&client->dev); + } +return ret; +}/* tpm_st33_spi_suspend() */ + +/* +* tpm_st33_spi_pm_resume resume the TPM device +* @param: spi, the spi_device drescription (TPM SPI description). +* @return: 0 in case of success. +*/ +static int tpm_st33_spi_pm_resume (struct spi_device *spi) +{ +struct tpm_chip *chip = + (struct tpm_chip *)spi_get_drvdata (spi); +struct st33zp24_platform_data *pin_infos = + ((struct spi_device *)chip->vendor.iobase)->dev.platform_data; + +int ret =0 ; +if (power_mgt) { +gpio_set_value (pin_infos->io_lpcpd,1 ); + ret =wait_for_serirq_timeout (chip, + (chip->vendor.status (chip) && +TPM_STS_VALID ) ==TPM_STS_VALID , + chip->vendor.timeout_b); + }else { +if (chip->data_buffer ==NULL ) + chip->data_buffer = pin_infos->tpm_spi_buffer[0 ]; + ret =tpm_pm_resume (&spi->dev); +if (!ret) +tpm_do_selftest (chip); + } +return ret; +}/* tpm_st33_spi_pm_resume() */ + +static struct spi_driver tpm_st33_spi_driver = { + .driver = { + .owner =THIS_MODULE , + .name =TPM_ST33_SPI , + }, + .probe = tpm_st33_spi_probe, + .remove = tpm_st33_spi_remove, + .resume = tpm_st33_spi_pm_resume, + .suspend = tpm_st33_spi_pm_suspend, +}; + +/* +* tpm_st33_spi_init initialize driver +* @return: 0 if successful, else non zero value. +*/ +static int __init tpm_st33_spi_init (void ) +{ +FUNC_ENTER (); +return spi_register_driver (&tpm_st33_spi_driver); +} + +/* +* tpm_st33_spi_exit The kernel calls this function during unloading the +* module or during shut down process +*/ +static void __exit tpm_st33_spi_exit(void) +{ +FUNC_ENTER (); +spi_unregister_driver (&tpm_st33_spi_driver); +} + +module_init (tpm_st33_spi_init); +module_exit (tpm_st33_spi_exit); + +MODULE_AUTHOR ("Christophe Ricard ([email protected])" ); +MODULE_DESCRIPTION ("STM TPM SPI ST33 Driver" ); +MODULE_VERSION ("1.2.0" ); +MODULE_LICENSE ("GPL" );drivers/char/tpm/tpm_spi_stm_st33.h new file +75
-0@@ -0,0 +1,75 @@ +/* +* STMicroelectronics TPM SPI Linux driver for TPM ST33NP18 +* Copyright (C) 2009, 2010 STMicroelectronics +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +* +* STMicroelectronics version 1.2.0, Copyright (C) 2010 +* STMicroelectronics comes with ABSOLUTELY NO WARRANTY. +* This is free software, and you are welcome to redistribute it +* under certain conditions. +* +* @Author: Christophe RICARD [email protected] +* +* @File: tpm_spi_stm_st33.h +* +* @Date: 09/15/2010 +*/ +#ifndef __STM_ST33_TPM_SPI_MAIN_H__ +#define __STM_ST33_TPM_SPI_MAIN_H__ + +#include <linux/pci.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/fs.h> +#include <linux/miscdevice.h> + +#define MINOR_NUM_SPI 224 + +#define TPM_ACCESS (0x0) +#define TPM_STS (0x18) +#define TPM_HASH_END (0x20) +#define TPM_DATA_FIFO (0x24) +#define TPM_HASH_DATA (0x24) +#define TPM_HASH_START (0x28) +#define TPM_INTF_CAPABILITY (0x14) +#define TPM_INT_STATUS (0x10) +#define TPM_INT_ENABLE (0x08) + +#define TPM_DUMMY_BYTE 0x00 +#define TPM_WRITE_DIRECTION 0x80 +#define TPM_HEADER_SIZE 10 +#define TPM_BUFSIZE 2048 + +/* ioctl commands */ +#define TPMIOC_CANCEL _IO('T', 0x00) +#define TPMIOC_TRANSMIT _IO('T', 0x01) +#define TPMIOC_HASH _IO('T', 0x02) +#define TPMIOC_CHANGELOCALITY _IO('T', 0x03) + +#define LOCALITY0 0 +#define LOCALITY4 4 + +#define TPM_ST_SPI_OK 0x5A + + +#define MAX_SPI_LATENCY 15 + +struct st_tpm_hash_t { +int size; +u8 *data; +}; + +#endif /* __STM_ST33_TPM_SPI_MAIN_H__ */ include/linux/spi/tpm_spi_stm_st33.h new file +44
-0@@ -0,0 +1,44 @@ +/* +* STMicroelectronics TPM SPI Linux driver for TPM ST33NP18 +* Copyright (C) 2009, 2010 STMicroelectronics +* Christophe RICARD [email protected] +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +* +* STMicroelectronics version 1.2.0, Copyright (C) 2010 +* STMicroelectronics comes with ABSOLUTELY NO WARRANTY. +* This is free software, and you are welcome to redistribute it +* under certain conditions. +* +* @File: tpm_spi_stm_st33.h +* +* @Date: 06/15/2008 +*/ +#ifndef __STM_ST33_TPM_SPI_H__ +#define __STM_ST33_TPM_SPI_H__ + +#include <linux/spi/spi.h> + +#define TPM_ST33_SPI "st33zp24_spi" + +struct st33zp24_platform_data { +int io_serirq; +int io_lpcpd; +int latency; +bool bchipf; +u8 *tpm_spi_buffer[2 ];/* 0 Request 1 Response */ +struct completion irq_detection; +}; + +#endif /* __STM_ST33_TPM_SPI_H__ */ Signature · 13 lines
1.7.1 ------------------------------------------------------------------------------ Precog is a next-generation analytics platform capable of advanced analytics on semi-structured data. The platform includes APIs for building apps and a phenomenal toolset for data science. Developers can use our toolset for easy data analysis & visualization. Get a free account! http://www2.precog.com/precogplatform/slashdotnewsletter _______________________________________________ tpmdd-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tpmdd-devel
Hi Kent,
drivers/char/tpm/tpm_spi_stm_st33.c line 108
Quoted 2 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +2
-0+/* u8 LOC+DIR u8 ADD u16 LENGHT u8* data */ +/* u8 LATENCY u8 LATENCY */
Kent: What do these comments mean?
Mathias: These comments describe the I2C command protocol.
Regarding the return value of these W/R functions, it's an error of comment, these functions return 0 on success else a negative error code.
Thanks,
Mathias Leblanc
-----Original Message-----
From: Kent Yoder [mailto:[email protected]]
Sent: 17 April, 2013 23:32
To: Mathias LEBLANC
Cc: Kent Yoder; Rajiv Andrade; Marcel Selhorst; Sirrix AG; [email protected]; Jean-Luc BLANC; [email protected]
Subject: Re: [tpmdd-devel] [PATCH 1/1] TPM: STMicroelectronics st33 driver SPI
Hi Matthias,
Quoted 92 lines · Matthias Leblanc
From: Mathias Leblanc <[email protected]>
* STMicroelectronics version 1.2.0, Copyright (C) 2010
* STMicroelectronics comes with ABSOLUTELY NO WARRANTY.
* This is free software, and you are welcome to redistribute it
* under certain conditions.This is the driver for TPM chip from ST Microelectronics.
If you have a TPM security chip from STMicroelectronics working with an SPI, in menuconfig or .config choose the tpm driver on device --> tpm and activate the protocol of your choice before compiling the kernel.
The driver will be accessible from within Linux.Tested on linux x86/x64 and beagleboard REV B & XM REV C
Signed-off-by Mathias Leblanc <[email protected]>--- drivers/char/tpm/Kconfig | 10 + drivers/char/tpm/Makefile | 1 + drivers/char/tpm/tpm_spi_stm_st33.c | 1116 ++++++++++++++++++++++++++++++++++ drivers/char/tpm/tpm_spi_stm_st33.h | 75 +++ include/linux/spi/tpm_spi_stm_st33.h | 44 ++ 7 files changed, 1246 insertions(+), 161 deletions(-) delete mode 100644 .gitignore delete mode 100644 REPORTING-BUGS create mode 100644 drivers/char/tpm/tpm_spi_stm_st33.c create mode 100644 drivers/char/tpm/tpm_spi_stm_st33.h create mode 100644 include/linux/spi/tpm_spi_stm_st33.hdrivers/char/tpm/Kconfig index renamed from drivers/char/tpm/Kconfig +0
-0dbfd564..2fc1254 100644
drivers/char/tpm/Kconfig +10
-0@@ -91,4 +91,14 @@ config TCG_ST33_I2C To compile this driver as a module, choose M here; the module will be called tpm_stm_st33_i2c. +config TCG_ST33_SPI + tristate "STMicroelectronics ST33 SPI" + depends on SPI + depends on GPIOLIB + ---help--- + If you have a TPM security chip from STMicroelectronics working with + an SPI bus say Yes and it will be accessible from within Linux. + To compile this driver as a module, choose M here; the module will be + called tpm_stm_st33_spi. + endif # TCG_TPMdrivers/char/tpm/Makefile +1
-0@@ -18,3 +18,4 @@ obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o obj-$(CONFIG_TCG_ST33_I2C) += tpm_i2c_stm_st33.o +obj-$(CONFIG_TCG_ST33_SPI) += tpm_spi_stm_st33.odrivers/char/tpm/tpm_spi_stm_st33.c new file +27
-0@@ -0,0 +1,1116 @@ +/* +* STMicroelectronics TPM SPI Linux driver for TPM ST33ZP24 +* Copyright (C) 2009, 2010 STMicroelectronics +* +* This program is free software; you can redistribute it and/or +modify +* it under the terms of the GNU General Public License as published +by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +along +* with this program; if not, write to the Free Software Foundation, +Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +* +* STMicroelectronics version 1.2.0, Copyright (C) 2010 +* STMicroelectronics comes with ABSOLUTELY NO WARRANTY. +* This is free software, and you are welcome to redistribute it +* under certain conditions. +*
drivers/char/tpm/tpm_spi_stm_st33.c line 37
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+* @Author: Christophe RICARD [email protected] +* +* @File: tpm_stm_st33_spi.c +* +* @Synopsis: +* 09/15/2010: First shot driver tpm_tis driver for lpc is +* used as model. +*/ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
This looks unused, please remove.
Quoted 8 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +8
-0+#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/delay.h> +#include <linux/init.h> +#include <linux/spi/spi.h> +#include <linux/wait.h> +#include <linux/string.h> +#include <linux/interrupt.h>
drivers/char/tpm/tpm_spi_stm_st33.c line 52
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+#include <linux/spinlock.h> +#include <linux/sysfs.h> +#include <linux/gpio.h> +#include <linux/sched.h> +#include <linux/uaccess.h> +#include <linux/io.h> +#include <linux/slab.h> +#include <linux/sched.h> + +#include <linux/spi/tpm_spi_stm_st33.h>
Is there a need for this header to live in linux/spi? You should move it into the local header.
drivers/char/tpm/tpm_spi_stm_st33.c line 62
Quoted 9 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +9
-0+#include "tpm.h" + +#include "tpm_spi_stm_st33.h" + +#ifdef DEBUG +#define FUNC_ENTER () pr_info("%s\n", __func__) +#else +#define FUNC_ENTER () do {} while (0) +#endif
Please remove FUNC_ENTER().
Quoted 36 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +36
-0+enum stm33zp24_access { +TPM_ACCESS_VALID =0x80 , +TPM_ACCESS_ACTIVE_LOCALITY =0x20 , +TPM_ACCESS_REQUEST_PENDING =0x04 , +TPM_ACCESS_REQUEST_USE =0x02 , +}; + +enum stm33zp24_status { +TPM_STS_VALID =0x80 , +TPM_STS_COMMAND_READY =0x40 , +TPM_STS_GO =0x20 , +TPM_STS_DATA_AVAIL =0x10 , +TPM_STS_DATA_EXPECT =0x08 , +}; + +enum stm33zp24_int_flags { +TPM_GLOBAL_INT_ENABLE =0x80 , +TPM_INTF_CMD_READY_INT =0x080 , +TPM_INTF_FIFO_AVALAIBLE_INT =0x040 , +TPM_INTF_WAKE_UP_READY_INT =0x020 , +TPM_INTF_LOC4SOFTRELEASE_INT =0x008 , +TPM_INTF_LOCALITY_CHANGE_INT =0x004 , +TPM_INTF_STS_VALID_INT =0x002 , +TPM_INTF_DATA_AVAIL_INT =0x001 , +}; + +enum tis_defaults { +TIS_SHORT_TIMEOUT =750 ,/* ms */ +TIS_LONG_TIMEOUT =2000 ,/* 2 sec */ +}; + +/* +* write8_reg +* Send byte to the TIS register according to the ST33ZP24 SPI protocol. +* @param: tpm, the chip description +* @param: tpm_register, the tpm tis register where the data should
drivers/char/tpm/tpm_spi_stm_st33.c line 108
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+be written +* @param: tpm_data, the tpm_data to write inside the tpm_register +* @param: tpm_size, The length of the data +* @return: number of byte written successfully: should be one if success. +*/ +static int write8_reg (struct tpm_chip *tpm,u8 tpm_register, +u8 *tpm_data,u16 tpm_size) +{ +/* u8 LOC+DIR u8 ADD u16 LENGHT u8* data */ +/* u8 LATENCY u8 LATENCY */
What do these comments mean?
Quoted 19 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +19
-0+ +u8 data; +int i =0 , j; +int value =0 ; +struct spi_device *dev = (struct spi_device *)tpm->vendor.iobase; +struct st33zp24_platform_data *platform_data = dev->dev.platform_data; +u8 *data_buffer = platform_data->tpm_spi_buffer[0 ]; +struct spi_transfer xfer = { + .tx_buf = data_buffer, + .rx_buf = platform_data->tpm_spi_buffer[1 ], + }; +struct spi_message msg; +u8 latency = platform_data->latency + tpm_size +1 ; + + +FUNC_ENTER (); +/* Pre-Header */ + + data =TPM_WRITE_DIRECTION | tpm->vendor.locality;
drivers/char/tpm/tpm_spi_stm_st33.c line 137
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+memcpy (data_buffer + i, &data,sizeof (data)); + i++; + data = tpm_register; +memcpy (data_buffer + i, &data,sizeof (data)); + i++; + +if ( + tpm_size >0 && + (tpm_register ==TPM_DATA_FIFO || + tpm_register ==TPM_HASH_DATA )) {
Well that looks weird. This is more readable:
if (tpm_size > 0 &&
(tpm_register == TPM_DATA_FIFO ||
tpm_register == TPM_HASH_DATA)) { But probably more relevant is that write8_reg is never called with tpm_register == TPM_HASH_DATA. Can you remove it?
drivers/char/tpm/tpm_spi_stm_st33.c line 138
Quoted 1 line
drivers/char/tpm/tpm_spi_stm_st33.c new file +1
-0+ data = tpm_size >>8 &0x00ff ;
I had to google to figure out which operator took precedence here, please add some parenthesis.
drivers/char/tpm/tpm_spi_stm_st33.c line 143
Quoted 5 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +5
-0+memcpy (data_buffer + i, &data,sizeof (data)); + i++; + data = tpm_size &0x00ff ; +memcpy (data_buffer + i, &data,sizeof (data)); + i++;
IIRC Peter fixed this in the I2C driver -- where you can avoidmemcpy() of a single byte by using an assignment, please do.
drivers/char/tpm/tpm_spi_stm_st33.c line 154
Quoted 11 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +11
-0+ latency -=2 ; + } + +memcpy (data_buffer + i, tpm_data, tpm_size); + i += tpm_size; + +for (j =0 ; j < platform_data->latency +1 ; j++) { + data =TPM_DUMMY_BYTE ; +memcpy (data_buffer + i, &data,sizeof (data)); + i++; + }
Isn't the above loop just this?
memset(&data_buffer[i], TPM_DUMMY_BYTE, platform_data->latency + 1);
drivers/char/tpm/tpm_spi_stm_st33.c line 166
Quoted 12 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +12
-0+ xfer.len = i; +spi_message_init (&msg); +spi_message_add_tail (&xfer, &msg); + value =spi_sync (dev, &msg); + +if (value ==0 ) { + j = i -1 - j; +for (; j < i && ((u8 *)xfer.rx_buf)[j] ==0 ; j++) + ; + +if (((u8 *)xfer.rx_buf)[j] !=0 ) + value = ((u8 *)xfer.rx_buf)[j];
Code like this is where vague variable names make it difficult. Can you rename i and j here? j is the number of dummy bytes and i is the total length of the transfer, right?
Quoted 57 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +57
-0+ } + +return value; +}/* write8_reg() */ + +/* +* read8_reg +* Recv byte from the TIS register according to the ST33ZP24 SPI protocol. +* @param: tpm, the chip description +* @param: tpm_register, the tpm tis register where the data should +be read +* @param: tpm_data, the TPM response +* @param: tpm_size, tpm TPM response size to read. +* @return: number of byte read successfully: should be one if success. +*/ +static u8 read8_reg (struct tpm_chip *tpm,u8 tpm_register, +u8 *tpm_data,u16 tpm_size) +{ +u8 data; +int i =0 , j; +int value =0 ; +struct spi_device *dev = (struct spi_device *)tpm->vendor.iobase; +struct st33zp24_platform_data *platform_data = dev->dev.platform_data; +u8 *data_buffer = platform_data->tpm_spi_buffer[0 ]; +struct spi_transfer xfer = { + .tx_buf = data_buffer, + .rx_buf = platform_data->tpm_spi_buffer[1 ], + }; +struct spi_message msg; + +u8 latency = platform_data->latency + tpm_size +1 ; + +FUNC_ENTER (); +/* Pre-Header */ + + data = tpm->vendor.locality; +memcpy (data_buffer + i, &data,sizeof (data)); + i++; + data = tpm_register; +memcpy (data_buffer + i, &data,sizeof (data)); + i++; + +for (j =0 ; j < latency; j++) { + data =TPM_DUMMY_BYTE ; +memcpy (data_buffer + i, &data,sizeof (data)); + i++; + } + xfer.len = i; + +/* header + status byte + size of the data + status byte */ +spi_message_init (&msg); +spi_message_add_tail (&xfer, &msg); + value =spi_sync (dev, &msg); +if (tpm_size >0 && value ==0 ) { + j =2 ; +for (; j < i && ((u8 *)xfer.rx_buf)[j] ==0 ; j++) + ;
drivers/char/tpm/tpm_spi_stm_st33.c line 232
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+ +if (j +1 < i) { + value = ((u8 *)xfer.rx_buf)[j]; + +if (tpm_size >0 ) +memcpy (tpm_data, xfer.rx_buf + j +1 , tpm_size); + } + } +return value; +}/* read8_reg() */
Same comments as write8_reg -- converge into simpler memcpy/memset's where you can, rename variables.
drivers/char/tpm/tpm_spi_stm_st33.c line 241
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+ +/* +* SPI_WRITE_DATA +* Send byte to the TIS register according to the ST33ZP24 SPI protocol. +* @param: tpm, the chip description +* @param: tpm_register, the tpm tis register where the data should +be written +* @param: tpm_data, the tpm_data to write inside the tpm_register +* @param: tpm_size, The length of the data +* @return: number of byte written successfully: should be one if success.
Why would one be success if it returns the number of bytes written?
drivers/char/tpm/tpm_spi_stm_st33.c line 244
Quoted 3 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +3
-0+*/ +static u32 SPI_WRITE_DATA (struct tpm_chip *tpm,u8 tpm_register, +u8 *tpm_data,u16 tpm_size)
An all caps function name will make me think its a macro, please use lower case.
Quoted 85 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +85
-0+{ +u8 value =0 ; + +FUNC_ENTER (); + + value =write8_reg (tpm, tpm_register, tpm_data, tpm_size); + +switch (value) { +case TPM_ST_SPI_OK : +return TPM_ST_SPI_OK ; +case 0 : +return 0 ; +default : +return -EBUSY ; + } +}/* SPI_WRITE_DATA() */ + +/* +* SPI_READ_DATA +* Recv byte from the TIS register according to the ST33ZP24 SPI protocol. +* @param: tpm, the chip description +* @param: tpm_register, the tpm tis register where the data should +be read +* @param: tpm_data, the TPM response +* @param: tpm_size, tpm TPM response size to read. +* @return: number of byte read successfully: should be one if success. +*/ +static u32 SPI_READ_DATA (struct tpm_chip *tpm,u8 tpm_register, +u8 *tpm_data,u16 tpm_size) +{ +u8 value =0 ; + +FUNC_ENTER (); + + value =read8_reg (tpm, tpm_register, tpm_data, tpm_size); + +switch (value) { +case TPM_ST_SPI_OK : +return TPM_ST_SPI_OK ; +case 0 : +return 0 ; +default : +return -EBUSY ; + } +}/* SPI_READ_DATA () */ + +/* +* clear_interruption +* clear the TPM interrupt register. +* @param: tpm, the chip description +*/ +static void clear_interruption (struct tpm_chip *tpm) { +u8 interrupt; +SPI_READ_DATA (tpm,TPM_INT_STATUS , &interrupt,1 ); +/* Clear interrupts handled with TPM_EOI */ +SPI_WRITE_DATA (tpm,TPM_INT_STATUS , &interrupt,1 ); +SPI_READ_DATA (tpm,TPM_INT_STATUS , &interrupt,1 ); }/* +clear_interruption() */ + +/* +* _wait_for_interrupt_serirq_timeout +* @param: tpm, the chip description +* @param: timeout, the timeout of the interrupt +* @return: the status of the interruption. +*/ +static int _wait_for_interrupt_serirq_timeout (struct tpm_chip *chip, +unsigned long timeout) +{ +unsigned long status; +struct spi_device *client; +struct st33zp24_platform_data *pin_infos; + +FUNC_ENTER (); + + client = (struct spi_device *)chip->vendor.iobase; + pin_infos = client->dev.platform_data; + + status =wait_for_completion_interruptible_timeout ( + &pin_infos->irq_detection, timeout); +if (status >0 ) +enable_irq (gpio_to_irq (pin_infos->io_serirq)); +gpio_direction_input (pin_infos->io_serirq); + +return status; +}/* wait_for_interrupt_serirq_timeout() */
drivers/char/tpm/tpm_spi_stm_st33.c line 339
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+ +unsigned long wait_for_serirq_timeout (struct tpm_chip *chip,bool condition, +unsigned long timeout) +{ +unsigned long status =0 ; +struct spi_device *client; +struct st33zp24_platform_data *pin_infos; + + client = (struct spi_device *)chip->vendor.iobase; + pin_infos = client->dev.platform_data;
pin_infos isn't used here, please remove.
Quoted 13 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +13
-0+ status =_wait_for_interrupt_serirq_timeout (chip, timeout); +if (!status) { + status = -EBUSY ; + goto wait_end; + } +clear_interruption (chip); +if (condition) + status =1 ; + +wait_end: +return status; +} +
drivers/char/tpm/tpm_spi_stm_st33.c line 364
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+ +/* +* tpm_stm_spi_cancel, cancel is not implemented. +* @param: chip, the tpm chip description as specified in +* driver/char/tpm/tpm.h. +*/ +static void tpm_stm_spi_cancel (struct tpm_chip *chip) { +struct spi_device *client; +u8 data =TPM_STS_COMMAND_READY ; + client = (struct spi_device *)chip->vendor.iobase;
client is unused?
Quoted 5 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +5
-0+FUNC_ENTER (); + +/* this causes the current command to be aborted */ +SPI_WRITE_DATA (chip,TPM_STS , &data,1 ); }/* tpm_stm_spi_cancel() +*/
drivers/char/tpm/tpm_spi_stm_st33.c line 381
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+ +/* +* tpm_stm_spi_status return the TPM_STS register +* @param: chip, the tpm chip description +* @return: the TPM_STS register value. +*/ +static u8 tpm_stm_spi_status (struct tpm_chip *chip) { +struct spi_device *client; +u8 data; + client = (struct spi_device *)chip->vendor.iobase;
client is unused?
Quoted 12 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +12
-0+ +FUNC_ENTER (); + +SPI_READ_DATA (chip,TPM_STS , &data,1 ); +return data; +}/* tpm_stm_spi_status() */ + + + +/* +* check_locality if the locality is active +* @param: chip, the tpm chip description
drivers/char/tpm/tpm_spi_stm_st33.c line 404
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+* @return: the active locality or -EACCESS. +*/ +static int check_locality (struct tpm_chip *chip) { +struct spi_device *client; +u8 data; +u8 status; + +FUNC_ENTER (); + + client = (struct spi_device *)chip->vendor.iobase;
client is unused?
Quoted 14 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +14
-0+ + status =SPI_READ_DATA (chip,TPM_ACCESS , &data,1 ); +if (status && (data & + (TPM_ACCESS_ACTIVE_LOCALITY |TPM_ACCESS_VALID )) == + (TPM_ACCESS_ACTIVE_LOCALITY |TPM_ACCESS_VALID )) +return chip->vendor.locality; + +return -EACCES ; +}/* check_locality() */ + +/* +* request_locality request the TPM locality +* @param: chip, the chip description +* @return: the active locality or EACCESS.
drivers/char/tpm/tpm_spi_stm_st33.c line 429
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+*/ +static int request_locality (struct tpm_chip *chip) { +unsigned long stop; +long rc; +u8 data; +struct spi_device *client; + +FUNC_ENTER (); + + client = (struct spi_device *)chip->vendor.iobase;
client is unused?
Quoted 30 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +30
-0+/* Check locality */ +if (check_locality (chip) == chip->vendor.locality) +return chip->vendor.locality; + +/* Request locality */ + data =TPM_ACCESS_REQUEST_USE ; + rc =SPI_WRITE_DATA (chip,TPM_ACCESS , &data,1 ); +if (rc <0 ) + goto end; + +/* wait for burstcount */ +if (chip->vendor.irq) { + rc =wait_for_serirq_timeout (chip, (check_locality + (chip) >=0 ), + chip->vendor.timeout_a); +if (rc >0 ) +return chip->vendor.locality; + }else { + stop = jiffies + chip->vendor.timeout_a; +do { +if (check_locality (chip) >=0 ) +return chip->vendor.locality; +msleep (TPM_TIMEOUT ); + }while (time_before (jiffies, stop)); + } +end: +return -EACCES ; +}/* request_locality() */ + +/*
drivers/char/tpm/tpm_spi_stm_st33.c line 470
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+* release_locality release the active locality +* @param: chip, the tpm chip description. +*/ +static void release_locality (struct tpm_chip *chip) { +struct spi_device *client; +u8 data; + +FUNC_ENTER (); + + client = (struct spi_device *)chip->vendor.iobase;
client is unused?
Quoted 41 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +41
-0+ data =TPM_ACCESS_ACTIVE_LOCALITY ; +SPI_WRITE_DATA (chip,TPM_ACCESS , &data,1 ); }/* +release_locality()*/ + +/* +* get_burstcount return the burstcount address 0x19 0x1A +* @param: chip, the chip description +* return: the burstcount. +*/ +static int get_burstcount (struct tpm_chip *chip) { +unsigned long stop; +u32 burstcnt, status; +u8 tpm_reg, temp; + +FUNC_ENTER (); + +/* wait for burstcount */ +/* which timeout value, spec has 2 answers (c & d) */ + stop = jiffies + chip->vendor.timeout_d; +do { + tpm_reg =TPM_STS +1 ; + status =SPI_READ_DATA (chip, tpm_reg, &temp,1 ); +if (status <0 ) + goto end; + + tpm_reg = tpm_reg +1 ; + burstcnt = temp; + status =SPI_READ_DATA (chip, tpm_reg, &temp,1 ); +if (status <0 ) + goto end; + + burstcnt |= temp <<8 ; +if (burstcnt) +return burstcnt; +msleep (TPM_TIMEOUT ); + }while (time_before (jiffies, stop)); + +end: +return -EBUSY ; +}/* get_burstcount() */ +
drivers/char/tpm/tpm_spi_stm_st33.c line 522
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+/* +* wait_for_stat wait for a TPM_STS value +* @param: chip, the tpm chip description +* @param: mask, the value mask to wait +* @param: timeout, the timeout +* @param: queue, the wait queue. +* @return: the tpm status, 0 if success, -ETIME if timeout is reached. +*/ +static int wait_for_stat (struct tpm_chip *chip,u8 mask,unsigned long timeout, +wait_queue_head_t *queue)
queue is unused?
Quoted 34 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +34
-0+{ +unsigned long stop; +long rc; +u8 status; + +FUNC_ENTER (); + +/* check current status */ + status =tpm_stm_spi_status (chip); +if (!chip->vendor.irq && (status & mask) == mask) +return 0 ; + +if (chip->vendor.irq) { + rc =wait_for_serirq_timeout (chip, ((tpm_stm_spi_status + (chip) & mask) == + mask), timeout); +if (rc >0 ) +return 0 ; + }else { + stop = jiffies + timeout; +do { +msleep (TPM_TIMEOUT ); + status =tpm_stm_spi_status (chip); +if ((status & mask) == mask) +return 0 ; + }while (time_before (jiffies, stop)); + } +return -ETIME ; +}/* wait_for_stat() */ + +/* +* recv_data receive data +* @param: chip, the tpm chip description +* @param: buf, the buffer where the data are received
drivers/char/tpm/tpm_spi_stm_st33.c line 567
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+* @param: count, the number of data to receive +* @return: the tpm status, 0 if success, -ETIME if timeout is reached. +*/ +static int recv_data (struct tpm_chip *chip,u8 *buf,size_t count) { +u32 size =0 , burstcnt, status, len; +struct spi_device *client; + +FUNC_ENTER (); + + client = (struct spi_device *)chip->vendor.iobase;
client is unused?
Quoted 57 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +57
-0+ +while (size < count && +wait_for_stat (chip, +TPM_STS_DATA_AVAIL |TPM_STS_VALID , + chip->vendor.timeout_c, + &chip->vendor.read_queue) + ==0 ) { + burstcnt =get_burstcount (chip); + len =min_t (int, burstcnt, count - size); + status =SPI_READ_DATA (chip,TPM_DATA_FIFO , buf + size, len); +if (status <0 ) +return status; + + + size += len; + } +return size; +} + +/* +* tpm_ioserirq_handler the serirq irq handler +* @param: irq, the tpm chip description +* @param: dev_id, the description of the chip +* @return: the status of the handler. +*/ +static irqreturn_t tpm_ioserirq_handler (int irq,void *dev_id) { +struct tpm_chip *chip = dev_id; +struct spi_device *client; +struct st33zp24_platform_data *pin_infos; + +disable_irq_nosync (irq); +FUNC_ENTER (); + + client = (struct spi_device *)chip->vendor.iobase; + pin_infos = client->dev.platform_data; + +complete (&pin_infos->irq_detection); +return IRQ_HANDLED ; +}/* tpm_ioserirq_handler() */ + +/* +* tpm_stm_spi_send send TPM commands through the SPI bus. +* @param: chip, the tpm chip description +* @param: buf, the tpm command buffer +* @param: len, the tpm command size +* @return: In case of success the number of bytes sent. +* In other case, a < 0 value describing the issue. +*/ +static int tpm_stm_spi_send (struct tpm_chip *chip,unsigned char *buf, +size_t len) +{ +u32 ret =0 , ordinal, + status, burstcnt =0 , i, size =0 ; +u8 data; + +struct spi_device *client; +struct st33zp24_platform_data *pin_infos;
drivers/char/tpm/tpm_spi_stm_st33.c line 635
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+ +FUNC_ENTER (); + +if (chip ==NULL ) +return -EBUSY ; +if (len <TPM_HEADER_SIZE ) +return -EBUSY ; + + client = (struct spi_device *)chip->vendor.iobase; + pin_infos = client->dev.platform_data;
pin_infos and client are unused?
drivers/char/tpm/tpm_spi_stm_st33.c line 637
Quoted 2 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +2
-0+ + ordinal =be32_to_cpu (*((__be32 *)(buf +6 )));
ordinal is unused?
Quoted 9 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +9
-0+ + ret =request_locality (chip); +if (ret <0 ) +return ret; + + status =tpm_stm_spi_status (chip); +if ((status &TPM_STS_COMMAND_READY ) ==0 ) { +tpm_stm_spi_cancel (chip); + if (wait_for_stat
drivers/char/tpm/tpm_spi_stm_st33.c line 656
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+ (chip, TPM_STS_COMMAND_READY, chip->vendor.timeout_b, + &chip->vendor.int_queue) < 0) { + ret = -ETIME ; + goto out_err; + } + } + +for (i =0 ; i < len -1 ;) { + burstcnt =get_burstcount (chip); + size =min_t (int, len - i -1 , burstcnt);
burstcnt can be -EBUSY here, which would cause size to become a large negative number. Better to check its sane here before using it.
Quoted 46 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +46
-0+ ret =SPI_WRITE_DATA (chip,TPM_DATA_FIFO , buf, size); +if (ret <0 ) + goto out_err; + i += size; + } + + status =tpm_stm_spi_status (chip); +if ((status &TPM_STS_DATA_EXPECT ) ==0 ) { + ret = -EIO ; + goto out_err; + } + +/* write last byte */ +SPI_WRITE_DATA (chip,TPM_DATA_FIFO , buf + len -1 ,1 ); + + status =tpm_stm_spi_status (chip); +if ((status &TPM_STS_DATA_EXPECT ) !=0 ) { + ret = -EIO ; + goto out_err; + } + +/* go and do it */ + data =TPM_STS_GO ; + ret =SPI_WRITE_DATA (chip,TPM_STS , &data,1 ); +if (ret <0 ) + goto out_err; + +return len; +out_err: +tpm_stm_spi_cancel (chip); +release_locality (chip); +return ret; +} + +/* +* tpm_stm_spi_recv received TPM response through the SPI bus. +* @param: chip, the tpm chip description +* @param: buf, the tpm command buffer +* @param: len, the tpm command size +* @return: In case of success the number of bytes received. +* In other case, a < 0 value describing the issue. +*/ +static int tpm_stm_spi_recv (struct tpm_chip *chip,unsigned char *buf, +size_t count) +{ +int size =0 ;
drivers/char/tpm/tpm_spi_stm_st33.c line 712
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+int expected; + +struct spi_device *client; +struct st33zp24_platform_data *pin_infos; + + +FUNC_ENTER (); + + client = (struct spi_device *)chip->vendor.iobase; + pin_infos = client->dev.platform_data;
pin_infos and client are unused?
Quoted 259 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +259
-0+ + +if (chip ==NULL ) +return -EBUSY ; +if (count <TPM_HEADER_SIZE ) { + size = -EIO ; + goto out; + } + + size =recv_data (chip, buf,TPM_HEADER_SIZE ); + +/* read first 10 bytes, including tag, paramsize, and result */ +if (size <TPM_HEADER_SIZE ) { +dev_err (chip->dev,"Unable to read header\n" ); + goto out; + } + + expected =be32_to_cpu (*(__be32 *)(buf +2 )); +if (expected > count) { + size = -EIO ; + goto out; + } + + size +=recv_data (chip, &buf[TPM_HEADER_SIZE ], + expected -TPM_HEADER_SIZE ); +if (size < expected) { +dev_err (chip->dev,"Unable to read remainder of result\n" ); + size = -ETIME ; + goto out; + } + +out: + chip->vendor.cancel (chip); +release_locality (chip); +return size; +} + + +static const struct file_operations tpm_st33_spi_fops = { + .owner =THIS_MODULE , + .llseek = no_llseek, + .read = tpm_read, + .write = tpm_write, + .open = tpm_open, + .release = tpm_release, +}; + +static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); static +DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); static +DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); static +DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); static +DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); static +DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, +NULL); static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps_1_2, NULL); +static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, +tpm_store_cancel); + +static struct attribute *stm_tpm_attrs[] = { + &dev_attr_pubek.attr, + &dev_attr_pcrs.attr, + &dev_attr_enabled.attr, + &dev_attr_active.attr, + &dev_attr_owned.attr, + &dev_attr_temp_deactivated.attr, + &dev_attr_caps.attr, + &dev_attr_cancel.attr,NULL , +}; + +static struct attribute_group stm_tpm_attr_grp = { + .attrs = stm_tpm_attrs +}; + +static struct tpm_vendor_specific st_spi_tpm = { + .send = tpm_stm_spi_send, + .recv = tpm_stm_spi_recv, + .cancel = tpm_stm_spi_cancel, + .status = tpm_stm_spi_status, + .attr_group = &stm_tpm_attr_grp, + .miscdev = {.fops = &tpm_st33_spi_fops,}, }; + +static int evaluate_latency (struct tpm_chip *chip) { +int latency =0 ; +struct spi_device *dev = (struct spi_device *)chip->vendor.iobase; +struct st33zp24_platform_data *platform_data = dev->dev.platform_data; +int status =0 ; +u8 data; + +for (; status ==0x00 && latency <MAX_SPI_LATENCY ; latency++) { + platform_data->latency = latency; + status =SPI_READ_DATA (chip,TPM_INTF_CAPABILITY , &data,1 ); + } +return latency -1 ; +}/* evaluate_latency() */ + +static int interrupts; +module_param (interrupts, int,0444 ); +MODULE_PARM_DESC (interrupts,"Enable interrupts" ); + +static int power_mgt =1 ; +module_param (power_mgt, int,0444 ); +MODULE_PARM_DESC (power_mgt,"Power Management" ); + +/* +* tpm_st33_spi_probe initialize the TPM device +* @param: client, the spi_device drescription (TPM SPI description). +* @param: id, the spi_device_id struct. +* @return: 0 in case of success. +* -1 in other case. +*/ +static int +tpm_st33_spi_probe (struct spi_device *dev) { +u32 err; +u8 intmask; +struct tpm_chip *chip; +struct st33zp24_platform_data *platform_data; + +FUNC_ENTER (); + + err =0 ; + +/* Check SPI platform functionnalities */ +if (dev ==NULL ) { +pr_info ("dev is NULL. exiting.\n" ); + err = -ENODEV ; + goto end; + } + + chip =tpm_register_hardware (&dev->dev, &st_spi_tpm); +if (!chip) { + err = -ENODEV ; + goto end; + } + +/* Allocation of SPI buffers MISO and MOSI */ +/* Size is as follow: */ +/* Request burstcount value = 0x800 = 2048 */ +/* + */ +/* Response burstcount value = 0x400 = 1024 */ +/* + */ +/* At least: */ +/* 1 byte for direction/locality */ +/* 1 byte tpm tis register */ +/* 2 bytes spi data length (for request only) */ +/* 2 latency bytes */ +/* 1 status byte */ +/* = 2048 + 1024 + 7 */ +/* We reserved 2048 + 1024 + 20 in case latency byte */ +/* change */ + platform_data = dev->dev.platform_data; + platform_data->tpm_spi_buffer[0 ] = +kmalloc ((TPM_BUFSIZE + (TPM_BUFSIZE /2 ) + +TPM_DIGEST_SIZE ) *sizeof (u8),GFP_KERNEL ); +if (platform_data->tpm_spi_buffer[0 ] ==NULL ) { + err = -ENOMEM ; + goto _tpm_clean_answer; + } + platform_data->tpm_spi_buffer[1 ] = +kmalloc ((TPM_BUFSIZE + (TPM_BUFSIZE /2 ) + +TPM_DIGEST_SIZE ) *sizeof (u8) ,GFP_KERNEL ); +if (platform_data->tpm_spi_buffer[1 ] ==NULL ) { + err = -ENOMEM ; + goto _tpm_clean_response; + } + + chip->vendor.iobase = dev; + +/* Default timeouts */ + chip->vendor.timeout_a =msecs_to_jiffies (TIS_SHORT_TIMEOUT ); + chip->vendor.timeout_b =msecs_to_jiffies (TIS_LONG_TIMEOUT ); + chip->vendor.timeout_c =msecs_to_jiffies (TIS_SHORT_TIMEOUT ); + chip->vendor.timeout_d =msecs_to_jiffies (TIS_SHORT_TIMEOUT ); + chip->vendor.locality =LOCALITY0 ; + +if (power_mgt) { + err =gpio_request (platform_data->io_lpcpd,"TPM IO_LPCPD" ); +if (err) + goto _gpio_init1; +gpio_set_value (platform_data->io_lpcpd,1 ); + } + + platform_data->latency =evaluate_latency (chip); +if (platform_data->latency <=0x00 ) { + err = -ENODEV ; + goto _gpio_init1; + } + +/* Enable interrupt */ +/* Register GPIO pin through generic Linux GPIO API */ +if (interrupts) { +init_completion (&platform_data->irq_detection); +if (request_locality (chip) !=LOCALITY0 ) { + err = -ENODEV ; + goto _tpm_clean_response; + } + err =gpio_request (platform_data->io_serirq,"TPM IO_SERIRQ" ); +if (err) + goto _gpio_init2; + +/* Clear all existing */ +clear_interruption (chip); + err =request_irq (gpio_to_irq (platform_data->io_serirq), + &tpm_ioserirq_handler, +IRQF_TRIGGER_HIGH |IRQF_SHARED , +"TPM SERIRQ management" , chip); +if (err <0 ) { +pr_info ("TPM SERIRQ signals %d not available\n" , +gpio_to_irq ( + platform_data->io_serirq)); + goto _irq_set; + } + err =SPI_READ_DATA (chip,TPM_INT_ENABLE , &intmask,1 ); +if (err <0 ) + goto _irq_set; + + intmask |=TPM_INTF_CMD_READY_INT + |TPM_INTF_FIFO_AVALAIBLE_INT + |TPM_INTF_WAKE_UP_READY_INT + |TPM_INTF_LOC4SOFTRELEASE_INT + |TPM_INTF_LOCALITY_CHANGE_INT + |TPM_INTF_STS_VALID_INT + |TPM_INTF_DATA_AVAIL_INT ; + + err =SPI_WRITE_DATA (chip,TPM_INT_ENABLE , &intmask,1 ); +if (err <0 ) + goto _irq_set; + + intmask =TPM_GLOBAL_INT_ENABLE ; + err =SPI_WRITE_DATA (chip,TPM_INT_ENABLE +3 , &intmask,1 ); +if (err <0 ) + goto _irq_set; + + err =SPI_READ_DATA (chip,TPM_INT_STATUS , &intmask,1 ); +if (err <0 ) + goto _irq_set; + + chip->vendor.irq = interrupts; + +tpm_gen_interrupt (chip); + } + +tpm_get_timeouts (chip); + +/* attach chip datas to client */ +spi_set_drvdata (dev, chip); + platform_data->bchipf = false; + +pr_info ("TPM SPI Initialized\n" ); +return 0 ; +_irq_set: +free_irq (gpio_to_irq (platform_data->io_serirq), chip); +_gpio_init2: +if (platform_data && interrupts) +gpio_free (platform_data->io_serirq); +_gpio_init1: +if (platform_data && power_mgt) +gpio_free (platform_data->io_lpcpd); +_tpm_clean_response: +tpm_remove_hardware (chip->dev); +if (platform_data->tpm_spi_buffer[1 ] !=NULL ) {
drivers/char/tpm/tpm_spi_stm_st33.c line 983
Quoted 10 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +10
-0+kfree (platform_data->tpm_spi_buffer[1 ]); + platform_data->tpm_spi_buffer[1 ] =NULL ; + } +_tpm_clean_answer: +if (platform_data->tpm_spi_buffer[0 ] !=NULL ) { +kfree (platform_data->tpm_spi_buffer[0 ]); + platform_data->tpm_spi_buffer[0 ] =NULL ; + } + + platform_data->bchipf = true;
Please take a look at git commit 3d7a7bd7 and make the same changes. The way these labels are jumped to can use some cleaning up. I suspect that you can also remove bchipf here like in 1fbc5e95356a4600fab3a04a82dc8bb49591aedd.
Thanks,
Kent
Quoted 286 lines
drivers/char/tpm/tpm_spi_stm_st33.c new file +130
-0+end: +pr_info ("TPM SPI initialisation fail\n" ); +return err; +} + +/* +* tpm_st33_spi_remove remove the TPM device +* @param: client, the spi_device drescription (TPM SPI description). +clear_bit(0, &chip->is_open); +* @return: 0 in case of success. +*/ +static int tpm_st33_spi_remove (struct spi_device *client) { +struct tpm_chip *chip = (struct tpm_chip *)spi_get_drvdata (client); +struct st33zp24_platform_data *pin_infos = + ((struct spi_device *)chip->vendor.iobase)->dev.platform_data; + +FUNC_ENTER (); + +if (pin_infos !=NULL ) { +gpio_free (pin_infos->io_lpcpd); + +/* Check if chip has been previously clean */ +if (pin_infos->bchipf != true) +tpm_remove_hardware (chip->dev); +if (pin_infos->tpm_spi_buffer[1 ] !=NULL ) { +kfree (pin_infos->tpm_spi_buffer[1 ]); + pin_infos->tpm_spi_buffer[1 ] =NULL ; + } +if (pin_infos->tpm_spi_buffer[0 ] !=NULL ) { +kfree (pin_infos->tpm_spi_buffer[0 ]); + pin_infos->tpm_spi_buffer[0 ] =NULL ; + } + } + +return 0 ; +} + +/* +* tpm_st33_spi_pm_suspend suspend the TPM device +* Added: Work around when suspend and no tpm application is running, +suspend +* may fail because chip->data_buffer is not set (only set in +tpm_open in Linux +* TPM core) +* @param: client, the spi_device drescription (TPM SPI description). +* @param: mesg, the power management message. +* @return: 0 in case of success. +*/ +static int tpm_st33_spi_pm_suspend (struct spi_device *client, +pm_message_t mesg) +{ +struct tpm_chip *chip = + (struct tpm_chip *)spi_get_drvdata (client); +struct st33zp24_platform_data *pin_infos = + ((struct spi_device *)chip->vendor.iobase)->dev.platform_data; +int ret =0 ; + +if (power_mgt) { +gpio_set_value (pin_infos->io_lpcpd,0 ); + }else { +if (chip->data_buffer ==NULL ) + chip->data_buffer = pin_infos->tpm_spi_buffer[0 ]; + ret =tpm_pm_suspend (&client->dev); + } +return ret; +}/* tpm_st33_spi_suspend() */ + +/* +* tpm_st33_spi_pm_resume resume the TPM device +* @param: spi, the spi_device drescription (TPM SPI description). +* @return: 0 in case of success. +*/ +static int tpm_st33_spi_pm_resume (struct spi_device *spi) { +struct tpm_chip *chip = + (struct tpm_chip *)spi_get_drvdata (spi); +struct st33zp24_platform_data *pin_infos = + ((struct spi_device *)chip->vendor.iobase)->dev.platform_data; + +int ret =0 ; +if (power_mgt) { +gpio_set_value (pin_infos->io_lpcpd,1 ); + ret =wait_for_serirq_timeout (chip, + (chip->vendor.status (chip) && +TPM_STS_VALID ) ==TPM_STS_VALID , + chip->vendor.timeout_b); + }else { +if (chip->data_buffer ==NULL ) + chip->data_buffer = pin_infos->tpm_spi_buffer[0 ]; + ret =tpm_pm_resume (&spi->dev); +if (!ret) +tpm_do_selftest (chip); + } +return ret; +}/* tpm_st33_spi_pm_resume() */ + +static struct spi_driver tpm_st33_spi_driver = { + .driver = { + .owner =THIS_MODULE , + .name =TPM_ST33_SPI , + }, + .probe = tpm_st33_spi_probe, + .remove = tpm_st33_spi_remove, + .resume = tpm_st33_spi_pm_resume, + .suspend = tpm_st33_spi_pm_suspend, +}; + +/* +* tpm_st33_spi_init initialize driver +* @return: 0 if successful, else non zero value. +*/ +static int __init tpm_st33_spi_init (void ) { +FUNC_ENTER (); +return spi_register_driver (&tpm_st33_spi_driver); +} + +/* +* tpm_st33_spi_exit The kernel calls this function during unloading +the + * module or during shut down process */ static void __exit +tpm_st33_spi_exit (void ) { +FUNC_ENTER (); +spi_unregister_driver (&tpm_st33_spi_driver); +} + +module_init (tpm_st33_spi_init); +module_exit (tpm_st33_spi_exit); + +MODULE_AUTHOR ("Christophe Ricard ([email protected])" ); +MODULE_DESCRIPTION ("STM TPM SPI ST33 Driver" ); +MODULE_VERSION ("1.2.0" );MODULE_LICENSE ("GPL" );drivers/char/tpm/tpm_spi_stm_st33.h new file +79
-0@@ -0,0 +1,75 @@ +/* +* STMicroelectronics TPM SPI Linux driver for TPM ST33NP18 +* Copyright (C) 2009, 2010 STMicroelectronics +* +* This program is free software; you can redistribute it and/or +modify +* it under the terms of the GNU General Public License as published +by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +along +* with this program; if not, write to the Free Software Foundation, +Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +* +* STMicroelectronics version 1.2.0, Copyright (C) 2010 +* STMicroelectronics comes with ABSOLUTELY NO WARRANTY. +* This is free software, and you are welcome to redistribute it +* under certain conditions. +* +* @Author: Christophe RICARD [email protected] +* +* @File: tpm_spi_stm_st33.h +* +* @Date: 09/15/2010 +*/ +#ifndef __STM_ST33_TPM_SPI_MAIN_H__ +#define __STM_ST33_TPM_SPI_MAIN_H__ + +#include <linux/pci.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/fs.h> +#include <linux/miscdevice.h> + +#define MINOR_NUM_SPI 224 + +#define TPM_ACCESS (0x0) +#define TPM_STS (0x18) +#define TPM_HASH_END (0x20) +#define TPM_DATA_FIFO (0x24) +#define TPM_HASH_DATA (0x24) +#define TPM_HASH_START (0x28) +#define TPM_INTF_CAPABILITY (0x14) +#define TPM_INT_STATUS (0x10) +#define TPM_INT_ENABLE (0x08) + +#define TPM_DUMMY_BYTE 0x00 +#define TPM_WRITE_DIRECTION 0x80 +#define TPM_HEADER_SIZE 10 +#define TPM_BUFSIZE 2048 + +/* ioctl commands */ +#define TPMIOC_CANCEL _IO('T', 0x00) +#define TPMIOC_TRANSMIT _IO('T', 0x01) +#define TPMIOC_HASH _IO('T', 0x02) +#define TPMIOC_CHANGELOCALITY _IO('T', 0x03) + +#define LOCALITY0 0 +#define LOCALITY4 4 + +#define TPM_ST_SPI_OK 0x5A + + +#define MAX_SPI_LATENCY 15 + +struct st_tpm_hash_t { +int size; +u8 *data; +}; + +#endif /* __STM_ST33_TPM_SPI_MAIN_H__ */ include/linux/spi/tpm_spi_stm_st33.h new file +48
-1@@ -0,0 +1,44 @@ +/* +* STMicroelectronics TPM SPI Linux driver for TPM ST33NP18 +* Copyright (C) 2009, 2010 STMicroelectronics +* Christophe RICARD [email protected] +* This program is free software; you can redistribute it and/or +modify +* it under the terms of the GNU General Public License as published +by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +along +* with this program; if not, write to the Free Software Foundation, +Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +* +* STMicroelectronics version 1.2.0, Copyright (C) 2010 +* STMicroelectronics comes with ABSOLUTELY NO WARRANTY. +* This is free software, and you are welcome to redistribute it +* under certain conditions. +* +* @File: tpm_spi_stm_st33.h +* +* @Date: 06/15/2008 +*/ +#ifndef __STM_ST33_TPM_SPI_H__ +#define __STM_ST33_TPM_SPI_H__ + +#include <linux/spi/spi.h> + +#define TPM_ST33_SPI "st33zp24_spi" + +struct st33zp24_platform_data { +int io_serirq; +int io_lpcpd; +int latency; +bool bchipf; +u8 *tpm_spi_buffer[2 ];/* 0 Request 1 Response */ +struct completion irq_detection; +}; + +#endif /* __STM_ST33_TPM_SPI_H__ */ --1.7.1
----------------------------------------------------------------------
-------- Precog is a next-generation analytics platform capable of advanced analytics on semi-structured data. The platform includes APIs for building apps and a phenomenal toolset for data science. Developers can use our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
tpmdd-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel