TPM 2.0 support
Subsystems (5)
v9 cover TPM 2.0 support
This patch set enables TPM2 protocol and provides drivers for FIFO and CRB interfaces. This patch set does not export any sysfs attributes for TPM 2.0 because existing sysfs attributes have three non-trivial issues:
- They are associated with the platform device instead of character device.
- They are are not trivial key-value pairs but contain text that is not easily parsed by a computer.
- Raciness as described in
http://kroah.com/log/blog/2013/06/26/how-to-create-a-sysfs-file-correctly/
This is too big effort to be included into this patch set and requires more discussion.
v2:
- Improved struct tpm_chip life-cycle by taking advantage of devres API.
- Refined sysfs attributes as simple key-values thereby not repeating mistakes in TPM1 sysfs attributes.
- Documented functions in tpm-chip.c and tpm2-cmd.c.
- Documented sysfs attributes.
v3:
- Lots of fixes in calling order in device drivers (thanks to Jason Gunthorpe for pointing these out!).
- Attach sysfs attributes to the misc device because it represents TPM device to the user space.
v4:
- Disable sysfs attibutes for TPM 2.0 for until we can sort out the best approach for them.
- Fixed all the style issues found with checkpatch.pl.
v5:
- missing EXPORT_SYMBOL_GPL()
- own class for TPM devices used for TPM 2.0 devices and onwards.
v6:
- Non-racy initialization for sysfs attributes using struct device's groups field.
- The class 'tpm' is used now for all TPM devices. For the first device node major MISC_MAJOR and minor TPM_MINOR is used in order to retain backwards compatability.
v7:
- Release device number and free struct tpm_chip memory inside tpm_dev_release callback.
- Moved code from tpm-interface.c and tpm_dev.c to tpm-chip.c.
v8:
- Cleaned up unneeded cast from tpm_transmit_cmd().
- Cleaned up redundant PPI_VERSION_LEN constant from tpm_ppi.c.
- Fixed tpm_tis to use tpm2_calc_ordinal_duration() for TPM2 devices.
- tpm_crb: in crb_recv, check that count can hold the TPM header at minimum.
- tpm_crb: add enumerations for bit flags in start and cancel fields of the control area.
- tpm_crb: use ioremap() for command and response buffer because they might be anywhere.
- tpm_crb: use IO access functions for reading ioremapped buffers because using direct pointers is not portable.
- tpm_crb: only apply ACPI start if start method reported by the TPM2 ACPI table allows it.
- In tpm2_pcr_read() just calculate index and bit and get rid of hacky loop.
- Do not add sysfs attributes for TPM 2.0 devices.
v9:
- Fixed compilation issues in v8 (sorry for not using the correct tree).
- Just do "return tpm_chip_register();" instead of copying return value to a variable.
- Removed unused tpm2_startup().
- In the CRB driver ACPI TPM2 table could contain platform specific and therefore inequality test does not work. Fixed in this patch set.
Jarkko Sakkinen (7):
tpm: merge duplicate transmit_cmd() functions
tpm: two-phase chip management functions
tpm: fix raciness of PPI interface lookup
tpm: rename chip->dev to chip->pdev
tpm: device class for tpm
tpm: TPM 2.0 baseline support
tpm: TPM 2.0 CRB Interface
Will Arthur (1):
tpm: TPM 2.0 FIFO Interface
drivers/char/tpm/Kconfig | 9 + drivers/char/tpm/Makefile | 3 +- drivers/char/tpm/tpm-chip.c | 251 +++++++++++++++++ drivers/char/tpm/tpm-dev.c | 42 +-- drivers/char/tpm/tpm-interface.c | 261 ++++++----------- drivers/char/tpm/tpm-sysfs.c | 29 +- drivers/char/tpm/tpm.h | 107 +++++-- drivers/char/tpm/tpm2-cmd.c | 542 ++++++++++++++++++++++++++++++++++++ drivers/char/tpm/tpm_atmel.c | 25 +- drivers/char/tpm/tpm_crb.c | 356 +++++++++++++++++++++++ drivers/char/tpm/tpm_i2c_atmel.c | 55 ++-- drivers/char/tpm/tpm_i2c_infineon.c | 43 +-- drivers/char/tpm/tpm_i2c_nuvoton.c | 71 ++--- drivers/char/tpm/tpm_i2c_stm_st33.c | 28 +- drivers/char/tpm/tpm_ibmvtpm.c | 17 +- drivers/char/tpm/tpm_infineon.c | 51 ++-- drivers/char/tpm/tpm_nsc.c | 34 ++- drivers/char/tpm/tpm_ppi.c | 137 +++++---- drivers/char/tpm/tpm_tis.c | 192 ++++++++----- drivers/char/tpm/xen-tpmfront.c | 14 +- 20 files changed, 1689 insertions(+), 578 deletions(-) create mode 100644 drivers/char/tpm/tpm-chip.c create mode 100644 drivers/char/tpm/tpm2-cmd.c create mode 100644 drivers/char/tpm/tpm_crb.c
Signature · 1 line
2.1.0
PATCH v9 1/8 tpm: merge duplicate transmit_cmd() functions
Merged transmit_cmd() functions in tpm-interface.c and tpm-sysfs.c. Added "tpm_" prefix for consistency sake. Changed cmd parameter as opaque. This enables to use separate command structures for TPM1 and TPM2 commands in future. Loose coupling works fine here.
--- drivers/char/tpm/tpm-interface.c | 49 +++++++++++++++++++++------------------- drivers/char/tpm/tpm-sysfs.c | 23 ++----------------- drivers/char/tpm/tpm.h | 3 ++- 3 files changed, 30 insertions(+), 45 deletions(-)
drivers/char/tpm/tpm-interface.c +26 -23
@@ -398,9 +398,10 @@ out:#define TPM_DIGEST_SIZE 20#define TPM_RET_CODE_IDX 6 -static ssize_t transmit_cmd (struct tpm_chip *chip,struct tpm_cmd_t *cmd, -int len,const char *desc) +ssize_t tpm_transmit_cmd (struct tpm_chip *chip,void *cmd, +int len,const char *desc) { +struct tpm_output_header *header;int err; len =tpm_transmit (chip, (u8 *) cmd, len);
@@ -409,7 +410,9 @@ static ssize_t transmit_cmd(struct tpm_chip *chip, struct tpm_cmd_t *cmd,else if (len <TPM_HEADER_SIZE )return -EFAULT ; - err =be32_to_cpu (cmd->header.out.return_code); + header = cmd; + + err =be32_to_cpu (header->return_code);if (err !=0 && desc)dev_err (chip->dev,"A TPM error (%d) occurred %s\n" , err, desc);
@@ -448,7 +451,7 @@ ssize_t tpm_getcap(struct device *dev, __be32 subcap_id, cap_t *cap, tpm_cmd.params.getcap_in.subcap_size =cpu_to_be32 (4 ); tpm_cmd.params.getcap_in.subcap = subcap_id; } - rc =transmit_cmd (chip, &tpm_cmd,TPM_INTERNAL_RESULT_SIZE , desc); + rc =tpm_transmit_cmd (chip, &tpm_cmd,TPM_INTERNAL_RESULT_SIZE , desc);if (!rc) *cap = tpm_cmd.params.getcap_out.cap;return rc;
@@ -464,8 +467,8 @@ void tpm_gen_interrupt(struct tpm_chip *chip) tpm_cmd.params.getcap_in.subcap_size =cpu_to_be32 (4 ); tpm_cmd.params.getcap_in.subcap =TPM_CAP_PROP_TIS_TIMEOUT ; - rc =transmit_cmd (chip, &tpm_cmd,TPM_INTERNAL_RESULT_SIZE , -"attempting to determine the timeouts" ); + rc =tpm_transmit_cmd (chip, &tpm_cmd,TPM_INTERNAL_RESULT_SIZE , +"attempting to determine the timeouts" ); }EXPORT_SYMBOL_GPL (tpm_gen_interrupt);
@@ -484,8 +487,8 @@ static int tpm_startup(struct tpm_chip *chip, __be16 startup_type)struct tpm_cmd_t start_cmd; start_cmd.header.in = tpm_startup_header; start_cmd.params.startup_in.startup_type = startup_type; -return transmit_cmd (chip, &start_cmd,TPM_INTERNAL_RESULT_SIZE , -"attempting to start the TPM" ); +return tpm_transmit_cmd (chip, &start_cmd,TPM_INTERNAL_RESULT_SIZE , +"attempting to start the TPM" ); }int tpm_get_timeouts (struct tpm_chip *chip)
@@ -500,7 +503,7 @@ int tpm_get_timeouts(struct tpm_chip *chip) tpm_cmd.params.getcap_in.cap =TPM_CAP_PROP ; tpm_cmd.params.getcap_in.subcap_size =cpu_to_be32 (4 ); tpm_cmd.params.getcap_in.subcap =TPM_CAP_PROP_TIS_TIMEOUT ; - rc =transmit_cmd (chip, &tpm_cmd,TPM_INTERNAL_RESULT_SIZE ,NULL ); + rc =tpm_transmit_cmd (chip, &tpm_cmd,TPM_INTERNAL_RESULT_SIZE ,NULL );if (rc ==TPM_ERR_INVALID_POSTINIT ) {/* The TPM is not started, we are the first to talk to it.
@@ -513,7 +516,7 @@ int tpm_get_timeouts(struct tpm_chip *chip) tpm_cmd.params.getcap_in.cap =TPM_CAP_PROP ; tpm_cmd.params.getcap_in.subcap_size =cpu_to_be32 (4 ); tpm_cmd.params.getcap_in.subcap =TPM_CAP_PROP_TIS_TIMEOUT ; - rc =transmit_cmd (chip, &tpm_cmd,TPM_INTERNAL_RESULT_SIZE , + rc =tpm_transmit_cmd (chip, &tpm_cmd,TPM_INTERNAL_RESULT_SIZE ,NULL ); }if (rc) {
@@ -575,8 +578,8 @@ duration: tpm_cmd.params.getcap_in.subcap_size =cpu_to_be32 (4 ); tpm_cmd.params.getcap_in.subcap =TPM_CAP_PROP_TIS_DURATION ; - rc =transmit_cmd (chip, &tpm_cmd,TPM_INTERNAL_RESULT_SIZE , -"attempting to determine the durations" ); + rc =tpm_transmit_cmd (chip, &tpm_cmd,TPM_INTERNAL_RESULT_SIZE , +"attempting to determine the durations" );if (rc)return rc;
@@ -631,8 +634,8 @@ static int tpm_continue_selftest(struct tpm_chip *chip)struct tpm_cmd_t cmd; cmd.header.in = continue_selftest_header; - rc =transmit_cmd (chip, &cmd,CONTINUE_SELFTEST_RESULT_SIZE , -"continue selftest" ); + rc =tpm_transmit_cmd (chip, &cmd,CONTINUE_SELFTEST_RESULT_SIZE , +"continue selftest" );return rc; }
@@ -672,8 +675,8 @@ int tpm_pcr_read_dev(struct tpm_chip *chip, int pcr_idx, u8 *res_buf) cmd.header.in = pcrread_header; cmd.params.pcrread_in.pcr_idx =cpu_to_be32 (pcr_idx); - rc =transmit_cmd (chip, &cmd,READ_PCR_RESULT_SIZE , -"attempting to read a pcr value" ); + rc =tpm_transmit_cmd (chip, &cmd,READ_PCR_RESULT_SIZE , +"attempting to read a pcr value" );if (rc ==0 ) memcpy(res_buf, cmd.params.pcrread_out.pcr_result,
@@ -737,8 +740,8 @@ int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash) cmd.header.in = pcrextend_header; cmd.params.pcrextend_in.pcr_idx =cpu_to_be32 (pcr_idx);memcpy (cmd.params.pcrextend_in.hash, hash,TPM_DIGEST_SIZE ); - rc =transmit_cmd (chip, &cmd,EXTEND_PCR_RESULT_SIZE , -"attempting extend a PCR value" ); + rc =tpm_transmit_cmd (chip, &cmd,EXTEND_PCR_RESULT_SIZE , +"attempting extend a PCR value" );tpm_chip_put (chip);return rc;
@@ -817,7 +820,7 @@ int tpm_send(u32 chip_num, void *cmd, size_t buflen)if (chip ==NULL )return -ENODEV ; - rc =transmit_cmd (chip, cmd, buflen,"attempting tpm_cmd" ); + rc =tpm_transmit_cmd (chip, cmd, buflen,"attempting tpm_cmd" );tpm_chip_put (chip);return rc;
@@ -938,14 +941,14 @@ int tpm_pm_suspend(struct device *dev) cmd.params.pcrextend_in.pcr_idx =cpu_to_be32 (tpm_suspend_pcr);memcpy (cmd.params.pcrextend_in.hash, dummy_hash,TPM_DIGEST_SIZE ); - rc =transmit_cmd (chip, &cmd,EXTEND_PCR_RESULT_SIZE , -"extending dummy pcr before suspend" ); + rc =tpm_transmit_cmd (chip, &cmd,EXTEND_PCR_RESULT_SIZE , +"extending dummy pcr before suspend" ); }/* now do the actual savestate */ for (try =0 ; try <TPM_RETRY ; try++) { cmd.header.in = savestate_header; - rc =transmit_cmd (chip, &cmd,SAVESTATE_RESULT_SIZE ,NULL ); + rc =tpm_transmit_cmd (chip, &cmd,SAVESTATE_RESULT_SIZE ,NULL );/* * If the TPM indicates that it is too busy to respond to
@@ -1022,7 +1025,7 @@ int tpm_get_random(u32 chip_num, u8 *out, size_t max) tpm_cmd.header.in = tpm_getrandom_header; tpm_cmd.params.getrandom_in.num_bytes =cpu_to_be32 (num_bytes); - err =transmit_cmd (chip, &tpm_cmd, + err =tpm_transmit_cmd (chip, &tpm_cmd,TPM_GETRANDOM_RESULT_SIZE + num_bytes,"attempting get random" );if (err)
drivers/char/tpm/tpm-sysfs.c +2 -21
@@ -20,25 +20,6 @@#include <linux/device.h> #include "tpm.h" -/* XXX for now this helper is duplicated in tpm-interface.c */ -static ssize_t transmit_cmd (struct tpm_chip *chip,struct tpm_cmd_t *cmd, -int len,const char *desc) -{ -int err; - - len =tpm_transmit (chip, (u8 *) cmd, len); -if (len <0 ) -return len; -else if (len <TPM_HEADER_SIZE ) -return -EFAULT ; - - err =be32_to_cpu (cmd->header.out.return_code); -if (err !=0 && desc) -dev_err (chip->dev,"A TPM error (%d) occurred %s\n" , err, desc); - -return err; -} -#define READ_PUBEK_RESULT_SIZE 314#define TPM_ORD_READPUBEK cpu_to_be32(124)static struct tpm_input_header tpm_readpubek_header = {
@@ -58,8 +39,8 @@ static ssize_t pubek_show(struct device *dev, struct device_attribute *attr,struct tpm_chip *chip =dev_get_drvdata (dev); tpm_cmd.header.in = tpm_readpubek_header; - err =transmit_cmd (chip, &tpm_cmd,READ_PUBEK_RESULT_SIZE , -"attempting to read the PUBEK" ); + err =tpm_transmit_cmd (chip, &tpm_cmd,READ_PUBEK_RESULT_SIZE , +"attempting to read the PUBEK" );if (err) goto out;
drivers/char/tpm/tpm.h +2 -1
@@ -314,9 +314,10 @@ struct tpm_cmd_t { } __packed;ssize_t tpm_getcap (struct device *,__be32 ,cap_t *,const char *); -ssize_t tpm_transmit (struct tpm_chip *chip,const char *buf,size_t bufsiz); +ssize_t tpm_transmit_cmd (struct tpm_chip *chip,void *cmd,int len, +const char *desc);extern int tpm_get_timeouts (struct tpm_chip *);extern void tpm_gen_interrupt (struct tpm_chip *);extern int tpm_do_selftest (struct tpm_chip *);
Signature · 1 line
2.1.0
PATCH v9 2/8 tpm: two-phase chip management functions
In reply to Jarkko Sakkinentpm_register_hardware() and tpm_remove_hardware() are called often before initializing the device. The problem is that the device might not be fully initialized when it comes visible to the user space.
This patch resolves the issue by diving initialization into two parts:
- tpmm_chip_alloc() creates struct tpm_chip.
- tpm_chip_register() sets up the character device and sysfs attributes.
The framework takes care of freeing struct tpm_chip by using the devres API. The broken release callback has been wiped. ACPI drivers do not ever get this callback.
Regards to Jason Gunthorpe for carefully reviewing this part of the code.
--- drivers/char/tpm/Makefile | 2 +- drivers/char/tpm/tpm-chip.c | 194 ++++++++++++++++++++++++++++++++++++ drivers/char/tpm/tpm-interface.c | 148 +-------------------------- drivers/char/tpm/tpm.h | 11 +- drivers/char/tpm/tpm_atmel.c | 11 +- drivers/char/tpm/tpm_i2c_atmel.c | 39 ++------ drivers/char/tpm/tpm_i2c_infineon.c | 37 ++----- drivers/char/tpm/tpm_i2c_nuvoton.c | 47 +++------ drivers/char/tpm/tpm_i2c_stm_st33.c | 14 +-- drivers/char/tpm/tpm_ibmvtpm.c | 17 ++-- drivers/char/tpm/tpm_infineon.c | 29 +++--- drivers/char/tpm/tpm_nsc.c | 14 ++- drivers/char/tpm/tpm_tis.c | 80 ++++++--------- drivers/char/tpm/xen-tpmfront.c | 14 +-- 14 files changed, 319 insertions(+), 338 deletions(-) create mode 100644 drivers/char/tpm/tpm-chip.c
drivers/char/tpm/Makefile +1 -1
@@ -2,7 +2,7 @@ # Makefile for the kernel tpm device drivers. # obj-$(CONFIG_TCG_TPM) += tpm.o -tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o +tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm-$(CONFIG_ACPI) += tpm_ppi.o ifdef CONFIG_ACPI
drivers/char/tpm/tpm-chip.c new file +194 -0
194 lines not on this page · raw message
drivers/char/tpm/tpm-interface.c +1 -147
177 lines not on this page · raw message
drivers/char/tpm/tpm.h +6 -5
@@ -110,7 +110,6 @@ struct tpm_chip {struct dentry **bios_dir;struct list_head list; -void (*release) (struct device *); };#define to_tpm_chip (n) container_of(n, struct tpm_chip, vendor)
@@ -322,15 +321,17 @@ extern int tpm_get_timeouts(struct tpm_chip *);extern void tpm_gen_interrupt (struct tpm_chip *);extern int tpm_do_selftest (struct tpm_chip *);extern unsigned long tpm_calc_ordinal_duration (struct tpm_chip *,u32 ); -extern struct tpm_chip *tpm_register_hardware (struct device *, -const struct tpm_class_ops *ops); -extern void tpm_dev_vendor_release (struct tpm_chip *); -extern void tpm_remove_hardware (struct device *);extern int tpm_pm_suspend (struct device *);extern int tpm_pm_resume (struct device *);extern int wait_for_tpm_stat (struct tpm_chip *,u8 ,unsigned long ,wait_queue_head_t *,bool ); +struct tpm_chip *tpm_chip_find_get (int chip_num); +extern struct tpm_chip *tpmm_chip_alloc (struct device *dev, +const struct tpm_class_ops *ops); +extern int tpm_chip_register (struct tpm_chip *chip); +extern void tpm_chip_unregister (struct tpm_chip *chip); +int tpm_dev_add_device (struct tpm_chip *chip);void tpm_dev_del_device (struct tpm_chip *chip);int tpm_sysfs_add_device (struct tpm_chip *chip);
drivers/char/tpm/tpm_atmel.c +8 -3
@@ -138,11 +138,11 @@ static void atml_plat_remove(void)struct tpm_chip *chip =dev_get_drvdata (&pdev->dev);if (chip) { +tpm_chip_unregister (chip);if (chip->vendor.have_region)atmel_release_region (chip->vendor.base, chip->vendor.region_size);atmel_put_base_addr (chip->vendor.iobase); -tpm_remove_hardware (chip->dev);platform_device_unregister (pdev); } }
@@ -184,8 +184,9 @@ static int __init init_atmel(void) goto err_rel_reg; } -if (!(chip =tpm_register_hardware (&pdev->dev, &tpm_atmel))) { - rc = -ENODEV ; + chip =tpmm_chip_alloc (&pdev->dev, &tpm_atmel); +if (IS_ERR (chip)) { + rc =PTR_ERR (chip); goto err_unreg_dev; }
@@ -194,6 +195,10 @@ static int __init init_atmel(void) chip->vendor.have_region = have_region; chip->vendor.region_size = region_size; + rc =tpm_chip_register (chip); +if (rc) + goto err_unreg_dev; +return 0 ; err_unreg_dev:
drivers/char/tpm/tpm_i2c_atmel.c +11 -28
@@ -153,25 +153,20 @@ static const struct tpm_class_ops i2c_atmel = {static int i2c_atmel_probe (struct i2c_client *client,const struct i2c_device_id *id) { -int rc;struct tpm_chip *chip;struct device *dev = &client->dev;if (!i2c_check_functionality (client->adapter,I2C_FUNC_I2C ))return -ENODEV ; - chip =tpm_register_hardware (dev, &i2c_atmel); -if (!chip) { -dev_err (dev,"%s() error in tpm_register_hardware\n" , __func__); -return -ENODEV ; - } + chip =tpmm_chip_alloc (dev, &i2c_atmel); +if (IS_ERR (chip)) +return PTR_ERR (chip); chip->vendor.priv =devm_kzalloc (dev,sizeof (struct priv_data ),GFP_KERNEL ); -if (!chip->vendor.priv) { - rc = -ENOMEM ; - goto out_err; - } +if (!chip->vendor.priv) +return -ENOMEM ;/* Default timeouts */ chip->vendor.timeout_a =msecs_to_jiffies (TPM_I2C_SHORT_TIMEOUT );
@@ -183,32 +178,20 @@ static int i2c_atmel_probe(struct i2c_client *client,/* There is no known way to probe for this device, and all version * information seems to be read via TPM commands. Thus we rely on the * TPM startup process in the common code to detect the device. */ -if (tpm_get_timeouts (chip)) { - rc = -ENODEV ; - goto out_err; - } - -if (tpm_do_selftest (chip)) { - rc = -ENODEV ; - goto out_err; - } +if (tpm_get_timeouts (chip)) +return -ENODEV ; -return 0 ; +if (tpm_do_selftest (chip)) +return -ENODEV ; -out_err: -tpm_dev_vendor_release (chip); -tpm_remove_hardware (chip->dev); -return rc; +return tpm_chip_register (chip); }static int i2c_atmel_remove (struct i2c_client *client) {struct device *dev = &(client->dev);struct tpm_chip *chip =dev_get_drvdata (dev); - -tpm_dev_vendor_release (chip); -tpm_remove_hardware (dev); -kfree (chip); +tpm_chip_unregister (chip);return 0 ; }
drivers/char/tpm/tpm_i2c_infineon.c +7 -30
@@ -581,12 +581,9 @@ static int tpm_tis_i2c_init(struct device *dev)int rc =0 ;struct tpm_chip *chip; - chip =tpm_register_hardware (dev, &tpm_tis_i2c); -if (!chip) { -dev_err (dev,"could not register hardware\n" ); - rc = -ENODEV ; - goto out_err; - } + chip =tpmm_chip_alloc (dev, &tpm_tis_i2c); +if (IS_ERR (chip)) +return PTR_ERR (chip);/* Disable interrupts */ chip->vendor.irq =0 ;
@@ -600,7 +597,7 @@ static int tpm_tis_i2c_init(struct device *dev)if (request_locality (chip,0 ) !=0 ) {dev_err (dev,"could not request locality\n" ); rc = -ENODEV ; - goto out_vendor; + goto out_err; }/* read four bytes from DID_VID register */
@@ -628,21 +625,9 @@ static int tpm_tis_i2c_init(struct device *dev)tpm_get_timeouts (chip);tpm_do_selftest (chip); -return 0 ; - +return tpm_chip_register (chip); out_release:release_locality (chip, chip->vendor.locality,1 ); - -out_vendor: -/* close file handles */ -tpm_dev_vendor_release (chip); - -/* remove hardware */ -tpm_remove_hardware (chip->dev); - -/* reset these pointers, otherwise we oops */ - chip->dev->release =NULL ; - chip->release =NULL ; tpm_dev.client =NULL ; out_err:return rc;
@@ -712,17 +697,9 @@ static int tpm_tis_i2c_probe(struct i2c_client *client,static int tpm_tis_i2c_remove (struct i2c_client *client) {struct tpm_chip *chip = tpm_dev.chip; -release_locality (chip, chip->vendor.locality,1 ); -/* close file handles */ -tpm_dev_vendor_release (chip); - -/* remove hardware */ -tpm_remove_hardware (chip->dev); - -/* reset these pointers, otherwise we oops */ - chip->dev->release =NULL ; - chip->release =NULL ; +tpm_chip_unregister (chip); +release_locality (chip, chip->vendor.locality,1 ); tpm_dev.client =NULL ;return 0 ;
drivers/char/tpm/tpm_i2c_nuvoton.c +14 -33
83 lines not on this page · raw message
drivers/char/tpm/tpm_i2c_stm_st33.c +5 -9
@@ -735,11 +735,9 @@ tpm_stm_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)if (!tpm_dev)return -ENOMEM ; - chip =tpm_register_hardware (&client->dev, &st_i2c_tpm); -if (!chip) { -dev_info (&client->dev,"fail chip\n" ); -return -ENODEV ; - } + chip =tpmm_chip_alloc (&client->dev, &st_i2c_tpm); +if (IS_ERR (chip)) +return PTR_ERR (chip);TPM_VPRIV (chip) = tpm_dev; tpm_dev->client = client;
@@ -807,10 +805,8 @@ tpm_stm_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)tpm_get_timeouts (chip);tpm_do_selftest (chip); -dev_info (chip->dev,"TPM I2C Initialized\n" ); -return 0 ; +return tpm_chip_register (chip); _tpm_clean_answer: -tpm_remove_hardware (chip->dev);dev_info (chip->dev,"TPM I2C initialisation fail\n" );return ret; }
@@ -827,7 +823,7 @@ static int tpm_stm_i2c_remove(struct i2c_client *client) (struct tpm_chip *)i2c_get_clientdata (client);if (chip) -tpm_remove_hardware (chip->dev); +tpm_chip_unregister (chip);return 0 ; }
drivers/char/tpm/tpm_ibmvtpm.c +7 -10
@@ -270,8 +270,11 @@ static int ibmvtpm_crq_send_init(struct ibmvtpm_dev *ibmvtpm)static int tpm_ibmvtpm_remove (struct vio_dev *vdev) {struct ibmvtpm_dev *ibmvtpm =ibmvtpm_get_data (&vdev->dev); +struct tpm_chip *chip =dev_get_drvdata (ibmvtpm->dev);int rc =0 ; +tpm_chip_unregister (chip); +free_irq (vdev->irq, ibmvtpm); do {
@@ -290,8 +293,6 @@ static int tpm_ibmvtpm_remove(struct vio_dev *vdev)kfree (ibmvtpm->rtce_buf); } -tpm_remove_hardware (ibmvtpm->dev); -kfree (ibmvtpm);return 0 ;
@@ -563,11 +564,9 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,struct tpm_chip *chip;int rc = -ENOMEM , rc1; - chip =tpm_register_hardware (dev, &tpm_ibmvtpm); -if (!chip) { -dev_err (dev,"tpm_register_hardware failed\n" ); -return -ENODEV ; - } + chip =tpmm_chip_alloc (dev, &tpm_ibmvtpm); +if (IS_ERR (chip)) +return PTR_ERR (chip); ibmvtpm =kzalloc (sizeof (struct ibmvtpm_dev ),GFP_KERNEL );if (!ibmvtpm) {
@@ -637,7 +636,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,if (rc) goto init_irq_cleanup; -return rc; +return tpm_chip_register (chip); init_irq_cleanup: do { rc1 = plpar_hcall_norets(H_FREE_CRQ, vio_dev->unit_address);
@@ -652,8 +651,6 @@ cleanup:kfree (ibmvtpm); } -tpm_remove_hardware (dev); -return rc; }
drivers/char/tpm/tpm_infineon.c +17 -12
@@ -546,7 +546,14 @@ static int tpm_inf_pnp_probe(struct pnp_dev *dev, vendorid[0 ], vendorid[1 ], productid[0], productid[1], chipname); -if (!(chip =tpm_register_hardware (&dev->dev, &tpm_inf))) + chip =tpmm_chip_alloc (&dev->dev, &tpm_inf); +if (IS_ERR (chip)) { + rc =PTR_ERR (chip); + goto err_release_region; + } + + rc =tpm_chip_register (chip); +if (rc) goto err_release_region;return 0 ;
@@ -572,17 +579,15 @@ static void tpm_inf_pnp_remove(struct pnp_dev *dev) {struct tpm_chip *chip =pnp_get_drvdata (dev); -if (chip) { -if (tpm_dev.iotype ==TPM_INF_IO_PORT ) { -release_region (tpm_dev.data_regs, tpm_dev.data_size); -release_region (tpm_dev.config_port, - tpm_dev.config_size); - }else { -iounmap (tpm_dev.mem_base); -release_mem_region (tpm_dev.map_base, tpm_dev.map_size); - } -tpm_dev_vendor_release (chip); -tpm_remove_hardware (chip->dev); +tpm_chip_unregister (chip); + +if (tpm_dev.iotype ==TPM_INF_IO_PORT ) { +release_region (tpm_dev.data_regs, tpm_dev.data_size); +release_region (tpm_dev.config_port, + tpm_dev.config_size); + }else { +iounmap (tpm_dev.mem_base); +release_mem_region (tpm_dev.map_base, tpm_dev.map_size); } }
drivers/char/tpm/tpm_nsc.c +9 -5
@@ -247,10 +247,9 @@ static struct platform_device *pdev = NULL;static void tpm_nsc_remove (struct device *dev) {struct tpm_chip *chip =dev_get_drvdata (dev); -if ( chip ) { -release_region (chip->vendor.base,2 ); -tpm_remove_hardware (chip->dev); - } + +tpm_chip_unregister (chip); +release_region (chip->vendor.base,2 ); } static SIMPLE_DEV_PM_OPS(tpm_nsc_pm, tpm_pm_suspend, tpm_pm_resume);
@@ -308,11 +307,16 @@ static int __init init_nsc(void) goto err_del_dev; } -if (!(chip =tpm_register_hardware (&pdev->dev, &tpm_nsc))) { + chip =tpmm_chip_alloc (&pdev->dev, &tpm_nsc); +if (IS_ERR (chip)) { rc = -ENODEV ; goto err_rel_reg; } + rc =tpm_chip_register (chip); +if (rc) + goto err_rel_reg; +dev_dbg (&pdev->dev,"NSC TPM detected\n" ); dev_dbg(&pdev->dev, "NSC LDN 0x%x, SID 0x%x, SRID 0x%x\n",
drivers/char/tpm/tpm_tis.c +31 -49
152 lines not on this page · raw message
drivers/char/tpm/xen-tpmfront.c +8 -6
@@ -175,9 +175,9 @@ static int setup_chip(struct device *dev, struct tpm_private *priv) {struct tpm_chip *chip; - chip =tpm_register_hardware (dev, &tpm_vtpm); -if (!chip) -return -ENODEV ; + chip =tpmm_chip_alloc (dev, &tpm_vtpm); +if (IS_ERR (chip)) +return PTR_ERR (chip);init_waitqueue_head (&chip->vendor.read_queue);
@@ -286,6 +286,7 @@ static int tpmfront_probe(struct xenbus_device *dev, const struct xenbus_device_id *id) {struct tpm_private *priv; +struct tpm_chip *chip;int rv; priv =kzalloc (sizeof (*priv),GFP_KERNEL );
@@ -302,21 +303,22 @@ static int tpmfront_probe(struct xenbus_device *dev, rv =setup_ring (dev, priv);if (rv) { -tpm_remove_hardware (&dev->dev); + chip =dev_get_drvdata (&dev->dev); +tpm_chip_unregister (chip);ring_free (priv);return rv; }tpm_get_timeouts (priv->chip); -return rv; +return tpm_chip_register (priv->chip); }static int tpmfront_remove (struct xenbus_device *dev) {struct tpm_chip *chip =dev_get_drvdata (&dev->dev);struct tpm_private *priv =TPM_VPRIV (chip); -tpm_remove_hardware (&dev->dev); +tpm_chip_unregister (chip);ring_free (priv);TPM_VPRIV (chip) =NULL ;return 0 ;
Signature · 1 line
2.1.0
PATCH v9 3/8 tpm: fix raciness of PPI interface lookup
In reply to Jarkko SakkinenTraversal of the ACPI device tree was not done right. PPI interface should be looked up only from the ACPI device that is the platform device for the TPM. This could cause problems with systems with two TPM chips such as 4th gen Intel systems.
In addition, added the missing license and copyright platter to the tpm_ppi.c.
--- drivers/char/tpm/tpm-chip.c | 2 +- drivers/char/tpm/tpm.h | 16 ++++-- drivers/char/tpm/tpm_ppi.c | 137 +++++++++++++++++++++++++++----------------- drivers/char/tpm/tpm_tis.c | 14 +++-- 4 files changed, 106 insertions(+), 63 deletions(-)
drivers/char/tpm/tpm-chip.c +1 -1
@@ -147,7 +147,7 @@ int tpm_chip_register(struct tpm_chip *chip)if (rc) goto del_misc; - rc =tpm_add_ppi (&chip->dev->kobj); + rc =tpm_add_ppi (chip);if (rc) goto del_sysfs;
drivers/char/tpm/tpm.h +12 -4
@@ -27,6 +27,7 @@#include <linux/platform_device.h> #include <linux/io.h> #include <linux/tpm.h> +#include <linux/acpi.h> enum tpm_const {TPM_MINOR =224 ,/* officially assigned */
@@ -94,6 +95,8 @@ struct tpm_vendor_specific {#define TPM_VID_WINBOND 0x1050#define TPM_VID_STM 0x104A +#define TPM_PPI_VERSION_LEN 3 +struct tpm_chip {struct device *dev;/* Device stuff */ const struct tpm_class_ops *ops;
@@ -109,6 +112,11 @@ struct tpm_chip {struct dentry **bios_dir; +#ifdef CONFIG_ACPI +acpi_handle acpi_dev_handle; +char ppi_version[TPM_PPI_VERSION_LEN +1 ]; +#endif /* CONFIG_ACPI */ +struct list_head list; };
@@ -340,15 +348,15 @@ void tpm_sysfs_del_device(struct tpm_chip *chip);int tpm_pcr_read_dev (struct tpm_chip *chip,int pcr_idx,u8 *res_buf);#ifdef CONFIG_ACPI -extern int tpm_add_ppi (struct kobject *); -extern void tpm_remove_ppi (struct kobject *); +extern int tpm_add_ppi (struct tpm_chip *chip); +extern void tpm_remove_ppi (struct tpm_chip *chip);#else -static inline int tpm_add_ppi (struct kobject *parent) +static inline int tpm_add_ppi (struct tpm_chip *chip) {return 0 ; } -static inline void tpm_remove_ppi (struct kobject *parent) +static inline void tpm_remove_ppi (struct tpm_chip *chip) { }#endif
drivers/char/tpm/tpm_ppi.c +83 -54
248 lines not on this page · raw message
drivers/char/tpm/tpm_tis.c +10 -4
@@ -580,8 +580,9 @@ static void tpm_tis_remove(struct tpm_chip *chip)release_locality (chip, chip->vendor.locality,1 ); } -static int tpm_tis_init (struct device *dev,resource_size_t start, -resource_size_t len,unsigned int irq) +static int tpm_tis_init (struct device *dev,acpi_handle acpi_dev_handle, +resource_size_t start,resource_size_t len, +unsigned int irq) {u32 vendor, intfcaps, intmask;int rc, i, irq_s, irq_e, probe;
@@ -597,6 +598,7 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,return PTR_ERR (chip); chip->vendor.priv = priv; + chip->acpi_dev_handle = acpi_dev_handle; chip->vendor.iobase =devm_ioremap (dev, start, len);if (!chip->vendor.iobase)
@@ -827,6 +829,7 @@ static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev, {resource_size_t start, len;unsigned int irq =0 ; +acpi_handle acpi_dev_handle =NULL ; start =pnp_mem_start (pnp_dev,0 ); len =pnp_mem_len (pnp_dev,0 );
@@ -839,7 +842,10 @@ static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev,if (is_itpm (pnp_dev)) itpm = true; -return tpm_tis_init (&pnp_dev->dev, start, len, irq); +if (pnp_acpi_device (pnp_dev)) + acpi_dev_handle =pnp_acpi_device (pnp_dev)->handle; + +return tpm_tis_init (&pnp_dev->dev, acpi_dev_handle, start, len, irq); }static struct pnp_device_id tpm_pnp_tbl[] = {
@@ -908,7 +914,7 @@ static int __init init_tis(void) rc =PTR_ERR (pdev); goto err_dev; } - rc =tpm_tis_init (&pdev->dev,TIS_MEM_BASE ,TIS_MEM_LEN ,0 ); + rc =tpm_tis_init (&pdev->dev,NULL ,TIS_MEM_BASE ,TIS_MEM_LEN ,0 );if (rc) goto err_init;return 0 ;
Signature · 1 line
2.1.0
Peter Hüwe
maintainerRe: [PATCH v9 3/8] tpm: fix raciness of PPI interface lookup
Am Donnerstag, 4. Dezember 2014, 06:55:13 schrieb Jarkko Sakkinen:
Quoted 9 lines
Traversal of the ACPI device tree was not done right. PPI interface should be looked up only from the ACPI device that is the platform device for the TPM. This could cause problems with systems with two TPM chips such as 4th gen Intel systems.
In addition, added the missing license and copyright platter to the
tpm_ppi.c.Signed-off-by Jarkko Sakkinen <[email protected]>
:(
Quoted 31 lines
drivers/char/tpm/tpm_tis.c +5
-2@@ -580,8 +580,9 @@ static void tpm_tis_remove(struct tpm_chip *chip)release_locality (chip, chip->vendor.locality,1 ); } -static int tpm_tis_init (struct device *dev,resource_size_t start, -resource_size_t len,unsigned int irq) +static int tpm_tis_init (struct device *dev,acpi_handle acpi_dev_handle, +resource_size_t start,resource_size_t len, +unsigned int irq) {u32 vendor, intfcaps, intmask;int rc, i, irq_s, irq_e, probe;@@ -597,6 +598,7 @@ static int tpm_tis_init(struct device *dev, resource_size_t start, return PTR_ERR(chip); chip->vendor.priv = priv; + chip->acpi_dev_handle = acpi_dev_handle; chip->vendor.iobase =devm_ioremap (dev, start, len);if (!chip->vendor.iobase)@@ -827,6 +829,7 @@ static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev, {resource_size_t start, len;unsigned int irq =0 ; +acpi_handle acpi_dev_handle =NULL ; start =pnp_mem_start (pnp_dev,0 ); len =pnp_mem_len (pnp_dev,0 );
drivers/char/tpm/tpm_tis.c static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev, · line 849
Quoted 9 lines
drivers/char/tpm/tpm_tis.c +4
-1@@ -839,7 +842,10 @@ static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev,if (is_itpm (pnp_dev)) itpm = true; -return tpm_tis_init (&pnp_dev->dev, start, len, irq); +if (pnp_acpi_device (pnp_dev)) + acpi_dev_handle =pnp_acpi_device (pnp_dev)->handle; + +return tpm_tis_init (&pnp_dev->dev, acpi_dev_handle, start, len, irq); }
With CONFIG_ACPI not set I get a build error :(
CC [M] drivers/char/tpm/tpm_tis.odrivers/char/tpm/tpm_tis.c: In function 'tpm_tis_init':drivers/char/tpm/tpm_tis.c:614:6: error: 'struct tpm_chip' has no member named 'acpi_dev_handle'scripts/Makefile.build:263: recipe for target 'drivers/char/tpm/tpm_tis.o' failed
make[3]: *** [drivers/char/tpm/tpm_tis.o] Error 1 scripts/Makefile.build:404: recipe for target 'drivers/char/tpm' failed make[2]: *** [drivers/char/tpm] Error 2 scripts/Makefile.build:404: recipe for target 'drivers/char' failed make[1]: *** [drivers/char] Error 2
Makefile:929: recipe for target 'drivers' failed
make: *** [drivers] Error 2
Please fix.
Peter
PATCH v9 4/8 tpm: rename chip->dev to chip->pdev
In reply to Jarkko SakkinenRename chip->dev to chip->pdev to make it explicit that this not the character device but actually represents the platform device.
--- drivers/char/tpm/tpm-chip.c | 4 ++-- drivers/char/tpm/tpm-dev.c | 10 +++++----- drivers/char/tpm/tpm-interface.c | 29 +++++++++++++++-------------- drivers/char/tpm/tpm-sysfs.c | 6 +++--- drivers/char/tpm/tpm.h | 4 ++-- drivers/char/tpm/tpm_atmel.c | 14 +++++++------- drivers/char/tpm/tpm_i2c_atmel.c | 16 ++++++++-------- drivers/char/tpm/tpm_i2c_infineon.c | 6 +++--- drivers/char/tpm/tpm_i2c_nuvoton.c | 22 +++++++++++----------- drivers/char/tpm/tpm_i2c_stm_st33.c | 14 +++++++------- drivers/char/tpm/tpm_infineon.c | 22 +++++++++++----------- drivers/char/tpm/tpm_nsc.c | 20 ++++++++++---------- drivers/char/tpm/tpm_ppi.c | 4 ++-- drivers/char/tpm/tpm_tis.c | 14 +++++++------- 14 files changed, 93 insertions(+), 92 deletions(-)
drivers/char/tpm/tpm-chip.c +2 -2
@@ -45,7 +45,7 @@ struct tpm_chip *tpm_chip_find_get(int chip_num)if (chip_num !=TPM_ANY_NUM && chip_num != pos->dev_num)continue ; -if (try_module_get (pos->dev->driver->owner)) { +if (try_module_get (pos->pdev->driver->owner)) { chip = pos;break ; }
@@ -110,7 +110,7 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev,scnprintf (chip->devname,sizeof (chip->devname),"tpm%d" , chip->dev_num); - chip->dev = dev; + chip->pdev = dev;devm_add_action (dev, tpmm_chip_remove, chip);dev_set_drvdata (dev, chip);
drivers/char/tpm/tpm-dev.c +5 -5
@@ -63,7 +63,7 @@ static int tpm_open(struct inode *inode, struct file *file)* by the check of is_open variable, which is protected * by driver_lock. */ if (test_and_set_bit (0 , &chip->is_open)) { -dev_dbg (chip->dev,"Another process owns this TPM\n" ); +dev_dbg (chip->pdev,"Another process owns this TPM\n" );return -EBUSY ; }
@@ -81,7 +81,7 @@ static int tpm_open(struct inode *inode, struct file *file)INIT_WORK (&priv->work, timeout_work); file->private_data = priv; -get_device (chip->dev); +get_device (chip->pdev);return 0 ; }
@@ -168,7 +168,7 @@ static int tpm_release(struct inode *inode, struct file *file) file->private_data =NULL ;atomic_set (&priv->data_pending,0 );clear_bit (0 , &priv->chip->is_open); -put_device (priv->chip->dev); +put_device (priv->chip->pdev);kfree (priv);return 0 ; }
@@ -193,12 +193,12 @@ int tpm_dev_add_device(struct tpm_chip *chip) chip->vendor.miscdev.minor =MISC_DYNAMIC_MINOR ; chip->vendor.miscdev.name = chip->devname; - chip->vendor.miscdev.parent = chip->dev; + chip->vendor.miscdev.parent = chip->pdev; rc =misc_register (&chip->vendor.miscdev);if (rc) { chip->vendor.miscdev.name =NULL ; -dev_err (chip->dev, +dev_err (chip->pdev,"unable to misc_register %s, minor %d err=%d\n" , chip->vendor.miscdev.name, chip->vendor.miscdev.minor, rc);
drivers/char/tpm/tpm-interface.c +15 -14
@@ -343,7 +343,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,if (count ==0 )return -ENODATA ;if (count > bufsiz) { -dev_err (chip->dev, +dev_err (chip->pdev,"invalid count value %x %zx\n" , count, bufsiz);return -E2BIG ; }
@@ -352,7 +352,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf, rc = chip->ops->send (chip, (u8 *) buf, count);if (rc <0 ) { -dev_err (chip->dev, +dev_err (chip->pdev,"tpm_transmit: tpm_send: error %zd\n" , rc); goto out; }
@@ -368,7 +368,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf, goto out_recv;if (chip->ops->req_canceled (chip, status)) { -dev_err (chip->dev,"Operation Canceled\n" ); +dev_err (chip->pdev,"Operation Canceled\n" ); rc = -ECANCELED ; goto out; }
@@ -378,14 +378,14 @@ ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf, }while (time_before (jiffies, stop)); chip->ops->cancel (chip); -dev_err (chip->dev,"Operation Timed out\n" ); +dev_err (chip->pdev,"Operation Timed out\n" ); rc = -ETIME ; goto out; out_recv: rc = chip->ops->recv (chip, (u8 *) buf, bufsiz);if (rc <0 ) -dev_err (chip->dev, +dev_err (chip->pdev,"tpm_transmit: tpm_recv: error %zd\n" , rc); out:mutex_unlock (&chip->tpm_mutex);
@@ -411,7 +411,8 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, void *cmd, err =be32_to_cpu (header->return_code);if (err !=0 && desc) -dev_err (chip->dev,"A TPM error (%d) occurred %s\n" , err, desc); +dev_err (chip->pdev,"A TPM error (%d) occurred %s\n" , err, + desc);return err; }
@@ -505,7 +506,7 @@ int tpm_get_timeouts(struct tpm_chip *chip)if (rc ==TPM_ERR_INVALID_POSTINIT ) {/* The TPM is not started, we are the first to talk to it. Execute a startup command. */ -dev_info (chip->dev,"Issuing TPM_STARTUP" ); +dev_info (chip->pdev,"Issuing TPM_STARTUP" );if (tpm_startup (chip,TPM_ST_CLEAR ))return rc;
@@ -517,7 +518,7 @@ int tpm_get_timeouts(struct tpm_chip *chip) NULL); }if (rc) { -dev_err (chip->dev, +dev_err (chip->pdev,"A TPM error (%zd) occurred attempting to determine the timeouts\n" , rc); goto duration;
@@ -556,7 +557,7 @@ int tpm_get_timeouts(struct tpm_chip *chip)/* Report adjusted timeouts */ if (chip->vendor.timeout_adjusted) { - dev_info(chip->dev, + dev_info(chip->pdev, HW_ERR "Adjusting reported timeouts: A %lu->%luus B %lu->%luus C %lu->%luus D %lu->%luus\n", old_timeout[0], new_timeout[0], old_timeout[1], new_timeout[1],
@@ -603,7 +604,7 @@ duration: chip->vendor.duration[TPM_MEDIUM ] *=1000 ; chip->vendor.duration[TPM_LONG ] *=1000 ; chip->vendor.duration_adjusted = true; -dev_info (chip->dev,"Adjusting TPM timeout parameters." ); +dev_info (chip->pdev,"Adjusting TPM timeout parameters." ); }return 0 ; }
@@ -760,7 +761,7 @@ int tpm_do_selftest(struct tpm_chip *chip)* around 300ms while the self test is ongoing, keep trying * until the self test duration expires. */ if (rc == -ETIME ) { -dev_info (chip->dev,HW_ERR "TPM command timed out during continue self test" ); +dev_info (chip->pdev,HW_ERR "TPM command timed out during continue self test" );msleep (delay_msec);continue ; }
@@ -770,7 +771,7 @@ int tpm_do_selftest(struct tpm_chip *chip) rc =be32_to_cpu (cmd.header.out.return_code);if (rc ==TPM_ERR_DISABLED || rc ==TPM_ERR_DEACTIVATED ) { -dev_info (chip->dev, +dev_info (chip->pdev,"TPM is disabled/deactivated (0x%X)\n" , rc);/* TPM is disabled and/or deactivated; driver can * proceed and TPM does handle commands for
@@ -918,10 +919,10 @@ int tpm_pm_suspend(struct device *dev) }if (rc) -dev_err (chip->dev, +dev_err (chip->pdev,"Error (%d) sending savestate before suspend\n" , rc);else if (try >0 ) -dev_warn (chip->dev,"TPM savestate took %dms\n" , +dev_warn (chip->pdev,"TPM savestate took %dms\n" , try *TPM_TIMEOUT_RETRY );return rc;
drivers/char/tpm/tpm-sysfs.c +3 -3
@@ -284,16 +284,16 @@ static const struct attribute_group tpm_dev_group = {int tpm_sysfs_add_device (struct tpm_chip *chip) {int err; - err =sysfs_create_group (&chip->dev->kobj, + err =sysfs_create_group (&chip->pdev->kobj, &tpm_dev_group);if (err) -dev_err (chip->dev, +dev_err (chip->pdev,"failed to create sysfs attributes, %d\n" , err);return err; }void tpm_sysfs_del_device (struct tpm_chip *chip) { -sysfs_remove_group (&chip->dev->kobj, &tpm_dev_group); +sysfs_remove_group (&chip->pdev->kobj, &tpm_dev_group); }
drivers/char/tpm/tpm.h +2 -2
@@ -98,7 +98,7 @@ struct tpm_vendor_specific {#define TPM_PPI_VERSION_LEN 3struct tpm_chip { -struct device *dev;/* Device stuff */ +struct device *pdev;/* Device stuff */ const struct tpm_class_ops *ops;int dev_num;/* /dev/tpm# */
@@ -124,7 +124,7 @@ struct tpm_chip {static inline void tpm_chip_put (struct tpm_chip *chip) { -module_put (chip->dev->driver->owner); +module_put (chip->pdev->driver->owner); }static inline int tpm_read_index (int base,int index)
drivers/char/tpm/tpm_atmel.c +7 -7
@@ -49,7 +49,7 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 *buf, size_t count)for (i =0 ; i <6 ; i++) { status =ioread8 (chip->vendor.iobase +1 );if ((status &ATML_STATUS_DATA_AVAIL ) ==0 ) { -dev_err (chip->dev,"error reading header\n" ); +dev_err (chip->pdev,"error reading header\n" );return -EIO ; } *buf++ =ioread8 (chip->vendor.iobase);
@@ -60,12 +60,12 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 *buf, size_t count) size =be32_to_cpu (*native_size);if (count < size) { -dev_err (chip->dev, +dev_err (chip->pdev,"Recv size(%d) less than available space\n" , size);for (; i < size; i++) {/* clear the waiting data anyway */ status =ioread8 (chip->vendor.iobase +1 );if ((status &ATML_STATUS_DATA_AVAIL ) ==0 ) { -dev_err (chip->dev,"error reading data\n" ); +dev_err (chip->pdev,"error reading data\n" );return -EIO ; } }
@@ -76,7 +76,7 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 *buf, size_t count)for (; i < size; i++) { status =ioread8 (chip->vendor.iobase +1 );if ((status &ATML_STATUS_DATA_AVAIL ) ==0 ) { -dev_err (chip->dev,"error reading data\n" ); +dev_err (chip->pdev,"error reading data\n" );return -EIO ; } *buf++ =ioread8 (chip->vendor.iobase);
@@ -86,7 +86,7 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 *buf, size_t count) status =ioread8 (chip->vendor.iobase +1 );if (status &ATML_STATUS_DATA_AVAIL ) { -dev_err (chip->dev,"data available is stuck\n" ); +dev_err (chip->pdev,"data available is stuck\n" );return -EIO ; }
@@ -97,9 +97,9 @@ static int tpm_atml_send(struct tpm_chip *chip, u8 *buf, size_t count) {int i; -dev_dbg (chip->dev,"tpm_atml_send:\n" ); +dev_dbg (chip->pdev,"tpm_atml_send:\n" );for (i =0 ; i < count; i++) { -dev_dbg (chip->dev,"%d 0x%x(%d)\n" , i, buf[i], buf[i]); +dev_dbg (chip->pdev,"%d 0x%x(%d)\n" , i, buf[i], buf[i]);iowrite8 (buf[i], chip->vendor.iobase); }
drivers/char/tpm/tpm_i2c_atmel.c +8 -8
@@ -52,7 +52,7 @@ struct priv_data {static int i2c_atmel_send (struct tpm_chip *chip,u8 *buf,size_t len) {struct priv_data *priv = chip->vendor.priv; -struct i2c_client *client =to_i2c_client (chip->dev); +struct i2c_client *client =to_i2c_client (chip->pdev);s32 status; priv->len =0 ;
@@ -62,7 +62,7 @@ static int i2c_atmel_send(struct tpm_chip *chip, u8 *buf, size_t len) status =i2c_master_send (client, buf, len); -dev_dbg (chip->dev, +dev_dbg (chip->pdev,"%s(buf=%*ph len=%0zx) -> sts=%d\n" , __func__, (int )min_t (size_t,64 , len), buf, len, status);return status;
@@ -71,7 +71,7 @@ static int i2c_atmel_send(struct tpm_chip *chip, u8 *buf, size_t len)static int i2c_atmel_recv (struct tpm_chip *chip,u8 *buf,size_t count) {struct priv_data *priv = chip->vendor.priv; -struct i2c_client *client =to_i2c_client (chip->dev); +struct i2c_client *client =to_i2c_client (chip->pdev);struct tpm_output_header *hdr = (struct tpm_output_header *)priv->buffer;u32 expected_len;
@@ -88,7 +88,7 @@ static int i2c_atmel_recv(struct tpm_chip *chip, u8 *buf, size_t count)return -ENOMEM ;if (priv->len >= expected_len) { -dev_dbg (chip->dev, +dev_dbg (chip->pdev,"%s early(buf=%*ph count=%0zx) -> ret=%d\n" , __func__, (int )min_t (size_t,64 , expected_len), buf, count, expected_len);
@@ -97,7 +97,7 @@ static int i2c_atmel_recv(struct tpm_chip *chip, u8 *buf, size_t count) } rc =i2c_master_recv (client, buf, expected_len); -dev_dbg (chip->dev, +dev_dbg (chip->pdev,"%s reread(buf=%*ph count=%0zx) -> ret=%d\n" , __func__, (int )min_t (size_t,64 , expected_len), buf, count, expected_len);
@@ -106,13 +106,13 @@ static int i2c_atmel_recv(struct tpm_chip *chip, u8 *buf, size_t count)static void i2c_atmel_cancel (struct tpm_chip *chip) { -dev_err (chip->dev,"TPM operation cancellation was requested, but is not supported" ); +dev_err (chip->pdev,"TPM operation cancellation was requested, but is not supported" ); }static u8 i2c_atmel_read_status (struct tpm_chip *chip) {struct priv_data *priv = chip->vendor.priv; -struct i2c_client *client =to_i2c_client (chip->dev); +struct i2c_client *client =to_i2c_client (chip->pdev);int rc;/* The TPM fails the I2C read until it is ready, so we do the entire
@@ -125,7 +125,7 @@ static u8 i2c_atmel_read_status(struct tpm_chip *chip)/* Once the TPM has completed the command the command remains readable * until another command is issued. */ rc =i2c_master_recv (client, priv->buffer,sizeof (priv->buffer)); -dev_dbg (chip->dev, +dev_dbg (chip->pdev,"%s: sts=%d" , __func__, rc);if (rc <=0 )return 0 ;
drivers/char/tpm/tpm_i2c_infineon.c +3 -3
@@ -446,7 +446,7 @@ static int tpm_tis_i2c_recv(struct tpm_chip *chip, u8 *buf, size_t count)/* read first 10 bytes, including tag, paramsize, and result */ size =recv_data (chip, buf,TPM_HEADER_SIZE );if (size <TPM_HEADER_SIZE ) { -dev_err (chip->dev,"Unable to read header\n" ); +dev_err (chip->pdev,"Unable to read header\n" ); goto out; }
@@ -459,14 +459,14 @@ static int tpm_tis_i2c_recv(struct tpm_chip *chip, u8 *buf, size_t count) 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" ); +dev_err (chip->pdev,"Unable to read remainder of result\n" ); size = -ETIME ; goto out; }wait_for_stat (chip,TPM_STS_VALID , chip->vendor.timeout_c, &status);if (status &TPM_STS_DATA_AVAIL ) {/* retry? */ -dev_err (chip->dev,"Error left over data\n" ); +dev_err (chip->pdev,"Error left over data\n" ); size = -EIO ; goto out; }
drivers/char/tpm/tpm_i2c_nuvoton.c +11 -11
@@ -96,13 +96,13 @@ static s32 i2c_nuvoton_write_buf(struct i2c_client *client, u8 offset, u8 size,/* read TPM_STS register */ static u8 i2c_nuvoton_read_status (struct tpm_chip *chip) { -struct i2c_client *client =to_i2c_client (chip->dev); +struct i2c_client *client =to_i2c_client (chip->pdev);s32 status;u8 data; status =i2c_nuvoton_read_buf (client,TPM_STS ,1 , &data);if (status <=0 ) { -dev_err (chip->dev,"%s() error return %d\n" , __func__, +dev_err (chip->pdev,"%s() error return %d\n" , __func__, status); data =TPM_STS_ERR_VAL ; }
@@ -127,13 +127,13 @@ static s32 i2c_nuvoton_write_status(struct i2c_client *client, u8 data)/* write commandReady to TPM_STS register */ static void i2c_nuvoton_ready (struct tpm_chip *chip) { -struct i2c_client *client =to_i2c_client (chip->dev); +struct i2c_client *client =to_i2c_client (chip->pdev);s32 status;/* this causes the current command to be aborted */ status =i2c_nuvoton_write_status (client,TPM_STS_COMMAND_READY );if (status <0 ) -dev_err (chip->dev, +dev_err (chip->pdev,"%s() fail to write TPM_STS.commandReady\n" , __func__); }
@@ -212,7 +212,7 @@ static int i2c_nuvoton_wait_for_stat(struct tpm_chip *chip, u8 mask, u8 value,return 0 ; }while (time_before (jiffies, stop)); } -dev_err (chip->dev,"%s(%02x, %02x) -> timeout\n" , __func__, mask, +dev_err (chip->pdev,"%s(%02x, %02x) -> timeout\n" , __func__, mask, value);return -ETIMEDOUT ; }
@@ -240,7 +240,7 @@ static int i2c_nuvoton_recv_data(struct i2c_client *client, &chip->vendor.read_queue) == 0) { burst_count =i2c_nuvoton_get_burstcount (client, chip);if (burst_count <0 ) { -dev_err (chip->dev, +dev_err (chip->pdev,"%s() fail to read burstCount=%d\n" , __func__, burst_count);return -EIO ;
@@ -249,12 +249,12 @@ static int i2c_nuvoton_recv_data(struct i2c_client *client, rc =i2c_nuvoton_read_buf (client,TPM_DATA_FIFO_R , bytes2read, &buf[size]);if (rc <0 ) { -dev_err (chip->dev, +dev_err (chip->pdev,"%s() fail on i2c_nuvoton_read_buf()=%d\n" , __func__, rc);return -EIO ; } -dev_dbg (chip->dev,"%s(%d):" , __func__, bytes2read); +dev_dbg (chip->pdev,"%s(%d):" , __func__, bytes2read); size += bytes2read; }
@@ -264,7 +264,7 @@ static int i2c_nuvoton_recv_data(struct i2c_client *client,/* Read TPM command results */ static int i2c_nuvoton_recv (struct tpm_chip *chip,u8 *buf,size_t count) { -struct device *dev = chip->dev; +struct device *dev = chip->pdev;struct i2c_client *client =to_i2c_client (dev);s32 rc;int expected, status, burst_count, retries, size =0 ;
@@ -334,7 +334,7 @@ static int i2c_nuvoton_recv(struct tpm_chip *chip, u8 *buf, size_t count)break ; }i2c_nuvoton_ready (chip); -dev_dbg (chip->dev,"%s() -> %d\n" , __func__, size); +dev_dbg (chip->pdev,"%s() -> %d\n" , __func__, size);return size; }
@@ -347,7 +347,7 @@ static int i2c_nuvoton_recv(struct tpm_chip *chip, u8 *buf, size_t count)*/ static int i2c_nuvoton_send (struct tpm_chip *chip,u8 *buf,size_t len) { -struct device *dev = chip->dev; +struct device *dev = chip->pdev;struct i2c_client *client =to_i2c_client (dev);u32 ordinal;size_t count =0 ;
drivers/char/tpm/tpm_i2c_stm_st33.c +7 -7
@@ -588,7 +588,7 @@ static int tpm_stm_i2c_recv(struct tpm_chip *chip, unsigned char *buf, size =recv_data (chip, buf,TPM_HEADER_SIZE );if (size <TPM_HEADER_SIZE ) { -dev_err (chip->dev,"Unable to read header\n" ); +dev_err (chip->pdev,"Unable to read header\n" ); goto out; }
@@ -601,7 +601,7 @@ static int tpm_stm_i2c_recv(struct tpm_chip *chip, unsigned char *buf, 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" ); +dev_err (chip->pdev,"Unable to read remainder of result\n" ); size = -ETIME ; goto out; }
@@ -639,7 +639,7 @@ static int tpm_stm_i2c_of_request_resources(struct tpm_chip *chip) pp = client->dev.of_node;if (!pp) { -dev_err (chip->dev,"No platform data\n" ); +dev_err (chip->pdev,"No platform data\n" );return -ENODEV ; }
@@ -682,7 +682,7 @@ static int tpm_stm_i2c_request_resources(struct i2c_client *client, pdata = client->dev.platform_data;if (!pdata) { -dev_err (chip->dev,"No platform data\n" ); +dev_err (chip->pdev,"No platform data\n" );return -ENODEV ; }
@@ -694,7 +694,7 @@ static int tpm_stm_i2c_request_resources(struct i2c_client *client, pdata->io_lpcpd,GPIOF_OUT_INIT_HIGH , "TPM IO_LPCPD");if (ret) { -dev_err (chip->dev,"%s : reset gpio_request failed\n" , +dev_err (chip->pdev,"%s : reset gpio_request failed\n" , __FILE__);return ret; }
@@ -776,7 +776,7 @@ tpm_stm_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)IRQF_TRIGGER_HIGH , "TPM SERIRQ management", chip);if (ret <0 ) { -dev_err (chip->dev ,"TPM SERIRQ signals %d not available\n" , +dev_err (chip->pdev ,"TPM SERIRQ signals %d not available\n" , client->irq); goto _tpm_clean_answer; }
@@ -807,7 +807,7 @@ tpm_stm_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)return tpm_chip_register (chip); _tpm_clean_answer: -dev_info (chip->dev,"TPM I2C initialisation fail\n" ); +dev_info (chip->pdev,"TPM I2C initialisation fail\n" );return ret; }
drivers/char/tpm/tpm_infineon.c +11 -11
@@ -195,9 +195,9 @@ static int wait(struct tpm_chip *chip, int wait_for_bit) }if (i ==TPM_MAX_TRIES ) {/* timeout occurs */ if (wait_for_bit ==STAT_XFE ) -dev_err (chip->dev,"Timeout in wait(STAT_XFE)\n" ); +dev_err (chip->pdev,"Timeout in wait(STAT_XFE)\n" );if (wait_for_bit ==STAT_RDA ) -dev_err (chip->dev,"Timeout in wait(STAT_RDA)\n" ); +dev_err (chip->pdev,"Timeout in wait(STAT_RDA)\n" );return -EIO ; }return 0 ;
@@ -220,7 +220,7 @@ static void wait_and_send(struct tpm_chip *chip, u8 sendbyte)static void tpm_wtx (struct tpm_chip *chip) { number_of_wtx++; -dev_info (chip->dev,"Granting WTX (%02d / %02d)\n" , +dev_info (chip->pdev,"Granting WTX (%02d / %02d)\n" , number_of_wtx,TPM_MAX_WTX_PACKAGES );wait_and_send (chip,TPM_VL_VER );wait_and_send (chip,TPM_CTRL_WTX );
@@ -231,7 +231,7 @@ static void tpm_wtx(struct tpm_chip *chip)static void tpm_wtx_abort (struct tpm_chip *chip) { -dev_info (chip->dev,"Aborting WTX\n" ); +dev_info (chip->pdev,"Aborting WTX\n" );wait_and_send (chip,TPM_VL_VER );wait_and_send (chip,TPM_CTRL_WTX_ABORT );wait_and_send (chip,0x00 );
@@ -257,7 +257,7 @@ recv_begin: }if (buf[0 ] !=TPM_VL_VER ) { -dev_err (chip->dev, +dev_err (chip->pdev,"Wrong transport protocol implementation!\n" );return -EIO ; }
@@ -272,7 +272,7 @@ recv_begin: }if ((size ==0x6D00 ) && (buf[1 ] ==0x80 )) { -dev_err (chip->dev,"Error handling on vendor layer!\n" ); +dev_err (chip->pdev,"Error handling on vendor layer!\n" );return -EIO ; }
@@ -284,7 +284,7 @@ recv_begin: }if (buf[1 ] ==TPM_CTRL_WTX ) { -dev_info (chip->dev,"WTX-package received\n" ); +dev_info (chip->pdev,"WTX-package received\n" );if (number_of_wtx <TPM_MAX_WTX_PACKAGES ) {tpm_wtx (chip); goto recv_begin;
@@ -295,14 +295,14 @@ recv_begin: }if (buf[1 ] ==TPM_CTRL_WTX_ABORT_ACK ) { -dev_info (chip->dev,"WTX-abort acknowledged\n" ); +dev_info (chip->pdev,"WTX-abort acknowledged\n" );return size; }if (buf[1 ] ==TPM_CTRL_ERROR ) { -dev_err (chip->dev,"ERROR-package received:\n" ); +dev_err (chip->pdev,"ERROR-package received:\n" );if (buf[4 ] ==TPM_INF_NAK ) -dev_err (chip->dev, +dev_err (chip->pdev,"-> Negative acknowledgement" " - retransmit command!\n" );return -EIO ;
@@ -321,7 +321,7 @@ static int tpm_inf_send(struct tpm_chip *chip, u8 * buf, size_t count) ret =empty_fifo (chip,1 );if (ret) { -dev_err (chip->dev,"Timeout while clearing FIFO\n" ); +dev_err (chip->pdev,"Timeout while clearing FIFO\n" );return -EIO ; }
drivers/char/tpm/tpm_nsc.c +10 -10
@@ -113,7 +113,7 @@ static int nsc_wait_for_ready(struct tpm_chip *chip) }while (time_before (jiffies, stop)); -dev_info (chip->dev,"wait for ready failed\n" ); +dev_info (chip->pdev,"wait for ready failed\n" );return -EBUSY ; }
@@ -129,12 +129,12 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count)return -EIO ;if (wait_for_stat (chip,NSC_STATUS_F0 ,NSC_STATUS_F0 , &data) <0 ) { -dev_err (chip->dev,"F0 timeout\n" ); +dev_err (chip->pdev,"F0 timeout\n" );return -EIO ; }if ((data =inb (chip->vendor.base +NSC_DATA )) !=NSC_COMMAND_NORMAL ) { -dev_err (chip->dev,"not in normal mode (0x%x)\n" , +dev_err (chip->pdev,"not in normal mode (0x%x)\n" , data);return -EIO ; }
@@ -143,7 +143,7 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count)for (p = buffer; p < &buffer[count]; p++) {if (wait_for_stat (chip,NSC_STATUS_OBF ,NSC_STATUS_OBF , &data) <0 ) { -dev_err (chip->dev, +dev_err (chip->pdev,"OBF timeout (while reading data)\n" );return -EIO ; }
@@ -154,11 +154,11 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count)if ((data &NSC_STATUS_F0 ) ==0 && (wait_for_stat (chip,NSC_STATUS_F0 ,NSC_STATUS_F0 , &data) <0 )) { -dev_err (chip->dev,"F0 not set\n" ); +dev_err (chip->pdev,"F0 not set\n" );return -EIO ; }if ((data =inb (chip->vendor.base +NSC_DATA )) !=NSC_COMMAND_EOC ) { -dev_err (chip->dev, +dev_err (chip->pdev,"expected end of command(0x%x)\n" , data);return -EIO ; }
@@ -189,19 +189,19 @@ static int tpm_nsc_send(struct tpm_chip *chip, u8 * buf, size_t count)return -EIO ;if (wait_for_stat (chip,NSC_STATUS_IBF ,0 , &data) <0 ) { -dev_err (chip->dev,"IBF timeout\n" ); +dev_err (chip->pdev,"IBF timeout\n" );return -EIO ; }outb (NSC_COMMAND_NORMAL , chip->vendor.base +NSC_COMMAND );if (wait_for_stat (chip,NSC_STATUS_IBR ,NSC_STATUS_IBR , &data) <0 ) { -dev_err (chip->dev,"IBR timeout\n" ); +dev_err (chip->pdev,"IBR timeout\n" );return -EIO ; }for (i =0 ; i < count; i++) {if (wait_for_stat (chip,NSC_STATUS_IBF ,0 , &data) <0 ) { -dev_err (chip->dev, +dev_err (chip->pdev,"IBF timeout (while writing data)\n" );return -EIO ; }
@@ -209,7 +209,7 @@ static int tpm_nsc_send(struct tpm_chip *chip, u8 * buf, size_t count) }if (wait_for_stat (chip,NSC_STATUS_IBF ,0 , &data) <0 ) { -dev_err (chip->dev,"IBF timeout\n" ); +dev_err (chip->pdev,"IBF timeout\n" );return -EIO ; }outb (NSC_COMMAND_EOC , chip->vendor.base +NSC_COMMAND );
drivers/char/tpm/tpm_ppi.c +2 -2
@@ -357,11 +357,11 @@ int tpm_add_ppi(struct tpm_chip *chip)ACPI_FREE (obj); -return sysfs_create_group (&chip->dev->kobj, &ppi_attr_grp); +return sysfs_create_group (&chip->pdev->kobj, &ppi_attr_grp); }void tpm_remove_ppi (struct tpm_chip *chip) {if (chip->ppi_version[0 ] !='\0' ) -sysfs_remove_group (&chip->dev->kobj, &ppi_attr_grp); +sysfs_remove_group (&chip->pdev->kobj, &ppi_attr_grp); }
drivers/char/tpm/tpm_tis.c +7 -7
@@ -242,7 +242,7 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)/* read first 10 bytes, including tag, paramsize, and result */ if ((size =recv_data (chip, buf,TPM_HEADER_SIZE )) <TPM_HEADER_SIZE ) { -dev_err (chip->dev,"Unable to read header\n" ); +dev_err (chip->pdev,"Unable to read header\n" ); goto out; }
@@ -255,7 +255,7 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)if ((size +=recv_data (chip, &buf[TPM_HEADER_SIZE ], expected -TPM_HEADER_SIZE )) < expected) { -dev_err (chip->dev,"Unable to read remainder of result\n" ); +dev_err (chip->pdev,"Unable to read remainder of result\n" ); size = -ETIME ; goto out; }
@@ -264,7 +264,7 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count) &chip->vendor.int_queue, false); status =tpm_tis_status (chip);if (status &TPM_STS_DATA_AVAIL ) {/* retry? */ -dev_err (chip->dev,"Error left over data\n" ); +dev_err (chip->pdev,"Error left over data\n" ); size = -EIO ; goto out; }
@@ -406,7 +406,7 @@ static int tpm_tis_send(struct tpm_chip *chip, u8 *buf, size_t len)msleep (1 );if (!priv->irq_tested) {disable_interrupts (chip); -dev_err (chip->dev, +dev_err (chip->pdev,FW_BUG "TPM interrupt not working, polling instead\n" ); } priv->irq_tested = true;
@@ -476,7 +476,7 @@ static int probe_itpm(struct tpm_chip *chip) rc =tpm_tis_send_data (chip, cmd_getticks, len);if (rc ==0 ) { -dev_info (chip->dev,"Detected an iTPM.\n" ); +dev_info (chip->pdev,"Detected an iTPM.\n" ); rc =1 ; }else rc = -EFAULT ;
@@ -699,7 +699,7 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle,if (devm_request_irq (dev, i, tis_int_probe,IRQF_SHARED , chip->vendor.miscdev.name, chip) !=0 ) { -dev_info (chip->dev, +dev_info (chip->pdev,"Unable to request irq: %d for probe\n" , i);continue ;
@@ -746,7 +746,7 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle,if (devm_request_irq (dev, chip->vendor.irq, tis_int_handler,IRQF_SHARED , chip->vendor.miscdev.name, chip) !=0 ) { -dev_info (chip->dev, +dev_info (chip->pdev,"Unable to request irq: %d for use\n" , chip->vendor.irq); chip->vendor.irq =0 ;
Signature · 1 line
2.1.0
Peter Hüwe
maintainerRe: [PATCH v9 4/8] tpm: rename chip->dev to chip->pdev
Am Donnerstag, 4. Dezember 2014, 06:55:14 schrieb Jarkko Sakkinen:
Quoted 4 lines
Rename
chip->devtochip->pdevto make it explicit that this not the character device but actually represents the platform device.Signed-off-by Jarkko Sakkinen <[email protected]>
Quoted 17 lines
--- drivers/char/tpm/tpm-chip.c | 4 ++-- drivers/char/tpm/tpm-dev.c | 10 +++++----- drivers/char/tpm/tpm-interface.c | 29 +++++++++++++++-------------- drivers/char/tpm/tpm-sysfs.c | 6 +++--- drivers/char/tpm/tpm.h | 4 ++-- drivers/char/tpm/tpm_atmel.c | 14 +++++++------- drivers/char/tpm/tpm_i2c_atmel.c | 16 ++++++++-------- drivers/char/tpm/tpm_i2c_infineon.c | 6 +++--- drivers/char/tpm/tpm_i2c_nuvoton.c | 22 +++++++++++----------- drivers/char/tpm/tpm_i2c_stm_st33.c | 14 +++++++------- drivers/char/tpm/tpm_infineon.c | 22 +++++++++++----------- drivers/char/tpm/tpm_nsc.c | 20 ++++++++++---------- drivers/char/tpm/tpm_ppi.c | 4 ++-- drivers/char/tpm/tpm_tis.c | 14 +++++++------- 14 files changed, 93 insertions(+), 92 deletions(-)
:(
With CONFIG_OF set I get a compile error.
drivers/char/tpm/tpm_i2c_stm_st33.c: In Funktion »tpm_stm_i2c_of_request_resources«:drivers/char/tpm/tpm_i2c_stm_st33.c:649:3: Fehler: Inkompatibler Typ für Argument 1 von »dev_err« In file included from include/linux/pci.h:30:0,
from drivers/char/tpm/tpm_i2c_stm_st33.c:32:
include/linux/device.h:1044:5: Anmerkung: »const struct device *« erwartet, aber Argument hat Typ »struct device«
drivers/char/tpm/tpm_i2c_stm_st33.c:662:3: Fehler: Inkompatibler Typ für Argument 1 von »dev_err«
In file included from include/linux/pci.h:30:0,
from drivers/char/tpm/tpm_i2c_stm_st33.c:32:include/linux/device.h:1044:5: Anmerkung: »const struct device *« erwartet, aber Argument hat Typ »struct device« scripts/Makefile.build:263: recipe for target 'drivers/char/tpm/tpm_i2c_stm_st33.o' failed make[3]: *** [drivers/char/tpm/tpm_i2c_stm_st33.o] Error 1scripts/Makefile.build:404: recipe for target 'drivers/char/tpm' failed
make[2]: *** [drivers/char/tpm] Error 2scripts/Makefile.build:404: recipe for target 'drivers/char' failed
make[1]: *** [drivers/char] Error 2
Makefile:929: recipe for target 'drivers' failed
make: *** [drivers] Error 2
Sorry,
Peter
PATCH v9 5/8 tpm: device class for tpm
In reply to Jarkko SakkinenAdded own device class for TPM. Uses MISC_MAJOR:TPM_MINOR for the first character device in order to retain backwards compatibility. Added tpm_dev_release() back attached to the character device.
--- drivers/char/tpm/tpm-chip.c | 72 ++++++++++++++++++++++++++++++++------ drivers/char/tpm/tpm-dev.c | 36 ++----------------- drivers/char/tpm/tpm-interface.c | 29 +++++++++++++++ drivers/char/tpm/tpm.h | 12 ++++--- drivers/char/tpm/tpm_i2c_nuvoton.c | 2 +- drivers/char/tpm/tpm_tis.c | 4 +-- 6 files changed, 105 insertions(+), 50 deletions(-)
drivers/char/tpm/tpm-chip.c +62 -10
@@ -25,6 +25,7 @@#include <linux/mutex.h> #include <linux/spinlock.h> #include <linux/freezer.h> +#include <linux/major.h> #include "tpm.h" #include "tpm_eventlog.h"
@@ -32,6 +33,9 @@ static DECLARE_BITMAP(dev_mask, TPM_NUM_DEVICES);static LIST_HEAD (tpm_chip_list);static DEFINE_SPINLOCK (driver_lock); +struct class *tpm_class; +dev_t tpm_devt; +/* * tpm_chip_find_get - return tpm_chip for a given chip number * @chip_num the device number for the chip
@@ -55,16 +59,14 @@ struct tpm_chip *tpm_chip_find_get(int chip_num) }/** -* tpmm_chip_remove() - free chip memory and device number -* @data: points to struct tpm_chip instance +* tpm_dev_release() - free chip memory and the device number +* @dev: the character device for the TPM chip * -* This is used internally by tpmm_chip_alloc() and called by devres -* when the device is released. This function does the opposite of -* tpmm_chip_alloc() freeing memory and the device number. +* This is used as the release function for the character device. */ -static void tpmm_chip_remove (void *data) +static void tpm_dev_release (struct device *dev) { -struct tpm_chip *chip = (struct tpm_chip *) data; + struct tpm_chip *chip = container_of(dev, struct tpm_chip, dev);spin_lock (&driver_lock);clear_bit (chip->dev_num, dev_mask);
@@ -111,18 +113,68 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev,scnprintf (chip->devname,sizeof (chip->devname),"tpm%d" , chip->dev_num); chip->pdev = dev; -devm_add_action (dev, tpmm_chip_remove, chip); +dev_set_drvdata (dev, chip); + chip->dev.class = tpm_class; + chip->dev.release = tpm_dev_release; + chip->dev.parent = chip->pdev; + +if (chip->dev_num ==0 ) + chip->dev.devt =MKDEV (MISC_MAJOR ,TPM_MINOR ); +else + chip->dev.devt =MKDEV (MAJOR (tpm_devt), chip->dev_num); + +dev_set_name (&chip->dev, chip->devname); + +device_initialize (&chip->dev); + + chip->cdev.owner = chip->pdev->driver->owner; +cdev_init (&chip->cdev, &tpm_fops); +return chip; }EXPORT_SYMBOL_GPL (tpmm_chip_alloc); +static int tpm_dev_add_device (struct tpm_chip *chip) +{ +int rc; + + rc =device_add (&chip->dev); +if (rc) { +dev_err (&chip->dev, +"unable to device_register() %s, major %d, minor %d, err=%d\n" , + chip->devname,MAJOR (chip->dev.devt), +MINOR (chip->dev.devt), rc); + +return rc; + } + + rc =cdev_add (&chip->cdev, chip->dev.devt,1 ); +if (rc) { +dev_err (&chip->dev, +"unable to cdev_add() %s, major %d, minor %d, err=%d\n" , + chip->devname,MAJOR (chip->dev.devt), +MINOR (chip->dev.devt), rc); + +device_unregister (&chip->dev); +return rc; + } + +return rc; +} + +static void tpm_dev_del_device (struct tpm_chip *chip) +{ +cdev_del (&chip->cdev); +device_unregister (&chip->dev); +} +/* -* tpm_chip_register() - create a misc driver for the TPM chip +* tpm_chip_register() - create a character device for the TPM chip * @chip: TPM chip to use. * -* Creates a misc driver for the TPM chip and adds sysfs interfaces for +* Creates a character device for the TPM chip and adds sysfs interfaces for * the device, PPI and TCPA. As the last step this function adds the * chip to the list of TPM chips available for use. *
drivers/char/tpm/tpm-dev.c +3 -33
@@ -17,7 +17,6 @@* License. * */ -#include <linux/miscdevice.h> #include <linux/slab.h> #include <linux/uaccess.h> #include "tpm.h"
@@ -54,9 +53,8 @@ static void timeout_work(struct work_struct *work)static int tpm_open (struct inode *inode,struct file *file) { -struct miscdevice *misc = file->private_data; - struct tpm_chip *chip = container_of(misc, struct tpm_chip, - vendor.miscdev); +struct tpm_chip *chip = + container_of(inode->i_cdev, struct tpm_chip, cdev);struct file_priv *priv;/* It's assured that the chip will be opened just once,
@@ -173,7 +171,7 @@ static int tpm_release(struct inode *inode, struct file *file)return 0 ; } -static const struct file_operations tpm_fops = { +const struct file_operations tpm_fops = { .owner =THIS_MODULE , .llseek = no_llseek, .open = tpm_open,
@@ -182,32 +180,4 @@ static const struct file_operations tpm_fops = { .release = tpm_release, }; -int tpm_dev_add_device (struct tpm_chip *chip) -{ -int rc; - chip->vendor.miscdev.fops = &tpm_fops; -if (chip->dev_num ==0 ) - chip->vendor.miscdev.minor =TPM_MINOR ; -else - chip->vendor.miscdev.minor =MISC_DYNAMIC_MINOR ; - - chip->vendor.miscdev.name = chip->devname; - chip->vendor.miscdev.parent = chip->pdev; - - rc =misc_register (&chip->vendor.miscdev); -if (rc) { - chip->vendor.miscdev.name =NULL ; -dev_err (chip->pdev, -"unable to misc_register %s, minor %d err=%d\n" , - chip->vendor.miscdev.name, - chip->vendor.miscdev.minor, rc); - } -return rc; -} - -void tpm_dev_del_device (struct tpm_chip *chip) -{ -if (chip->vendor.miscdev.name) -misc_deregister (&chip->vendor.miscdev); -}
drivers/char/tpm/tpm-interface.c +29 -0
@@ -997,6 +997,35 @@ int tpm_get_random(u32 chip_num, u8 *out, size_t max) }EXPORT_SYMBOL_GPL (tpm_get_random); +static int __init tpm_init (void ) +{ +int rc; + + tpm_class =class_create (THIS_MODULE ,"tpm" ); +if (IS_ERR (tpm_class)) { +pr_err ("couldn't create tpm class\n" ); +return PTR_ERR (tpm_class); + } + + rc =alloc_chrdev_region (&tpm_devt,0 ,TPM_NUM_DEVICES ,"tpm" ); +if (rc <0 ) { +pr_err ("tpm: failed to allocate char dev region\n" ); +class_destroy (tpm_class); +return rc; + } + +return 0 ; +} + +static void __exit tpm_exit(void) +{ +class_destroy (tpm_class); +unregister_chrdev_region (tpm_devt,TPM_NUM_DEVICES ); +} + +subsys_initcall (tpm_init); +module_exit (tpm_exit); +MODULE_AUTHOR ("Leendert van Doorn ([email protected])" );MODULE_DESCRIPTION ("TPM Driver" );MODULE_VERSION ("2.0" );
drivers/char/tpm/tpm.h +8 -4
@@ -23,11 +23,11 @@#include <linux/fs.h> #include <linux/mutex.h> #include <linux/sched.h> -#include <linux/miscdevice.h> #include <linux/platform_device.h> #include <linux/io.h> #include <linux/tpm.h> #include <linux/acpi.h> +#include <linux/cdev.h> enum tpm_const {TPM_MINOR =224 ,/* officially assigned */
@@ -74,7 +74,6 @@ struct tpm_vendor_specific {int region_size;int have_region; -struct miscdevice miscdev;struct list_head list;int locality;unsigned long timeout_a, timeout_b, timeout_c, timeout_d;/* jiffies */
@@ -99,6 +98,9 @@ struct tpm_vendor_specific {struct tpm_chip {struct device *pdev;/* Device stuff */ +struct device dev; +struct cdev cdev; +const struct tpm_class_ops *ops;int dev_num;/* /dev/tpm# */
@@ -320,6 +322,10 @@ struct tpm_cmd_t {tpm_cmd_params params; } __packed; +extern struct class *tpm_class; +extern dev_t tpm_devt; +extern const struct file_operations tpm_fops; +ssize_t tpm_getcap (struct device *,__be32 ,cap_t *,const char *);ssize_t tpm_transmit (struct tpm_chip *chip,const char *buf,size_t bufsiz);
@@ -340,8 +346,6 @@ extern struct tpm_chip *tpmm_chip_alloc(struct device *dev,extern int tpm_chip_register (struct tpm_chip *chip);extern void tpm_chip_unregister (struct tpm_chip *chip); -int tpm_dev_add_device (struct tpm_chip *chip); -void tpm_dev_del_device (struct tpm_chip *chip);int tpm_sysfs_add_device (struct tpm_chip *chip);void tpm_sysfs_del_device (struct tpm_chip *chip);
drivers/char/tpm/tpm_i2c_nuvoton.c +1 -1
@@ -560,7 +560,7 @@ static int i2c_nuvoton_probe(struct i2c_client *client, rc =devm_request_irq (dev, chip->vendor.irq, i2c_nuvoton_int_handler,IRQF_TRIGGER_LOW , - chip->vendor.miscdev.name, + chip->devname, chip);if (rc) { dev_err(dev, "%s() Unable to request irq: %d for use\n",
drivers/char/tpm/tpm_tis.c +2 -2
@@ -698,7 +698,7 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle, TPM_INT_VECTOR(chip->vendor.locality));if (devm_request_irq (dev, i, tis_int_probe,IRQF_SHARED , - chip->vendor.miscdev.name, chip) !=0 ) { + chip->devname, chip) !=0 ) {dev_info (chip->pdev,"Unable to request irq: %d for probe\n" , i);
@@ -745,7 +745,7 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle, TPM_INT_VECTOR(chip->vendor.locality));if (devm_request_irq (dev, chip->vendor.irq, tis_int_handler,IRQF_SHARED , - chip->vendor.miscdev.name, chip) !=0 ) { + chip->devname, chip) !=0 ) {dev_info (chip->pdev,"Unable to request irq: %d for use\n" , chip->vendor.irq);
Signature · 1 line
2.1.0
PATCH v9 6/8 tpm: TPM 2.0 baseline support
In reply to Jarkko SakkinenTPM 2.0 devices are separated by adding a field 'flags' to struct tpm_chip and defining a flag TPM_CHIP_FLAG_TPM2 for tagging them.
This patch adds the following internal functions:
- tpm2_get_random()
- tpm2_get_tpm_pt()
- tpm2_pcr_extend()
- tpm2_pcr_read()
- tpm2_startup()
Additionally, the following exported functions are implemented for implementing TPM 2.0 device drivers:
- tpm2_do_selftest()
- tpm2_calc_ordinal_durations()
- tpm2_gen_interrupt()
The existing functions that are exported for the use for existing subsystems have been changed to check the flags field in struct tpm_chip and use appropriate TPM 2.0 counterpart if TPM_CHIP_FLAG_TPM2 is est.
The code for tpm2_calc_ordinal_duration() and tpm2_startup() were originally written by Will Arthur.
--- drivers/char/tpm/Makefile | 2 +- drivers/char/tpm/tpm-chip.c | 27 +- drivers/char/tpm/tpm-interface.c | 24 +- drivers/char/tpm/tpm.h | 61 +++++ drivers/char/tpm/tpm2-cmd.c | 542 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 641 insertions(+), 15 deletions(-) create mode 100644 drivers/char/tpm/tpm2-cmd.c
drivers/char/tpm/Makefile +1 -1
@@ -2,7 +2,7 @@ # Makefile for the kernel tpm device drivers. # obj-$(CONFIG_TCG_TPM) += tpm.o -tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o +tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o tpm-$(CONFIG_ACPI) += tpm_ppi.o ifdef CONFIG_ACPI
drivers/char/tpm/tpm-chip.c +16 -11
@@ -195,15 +195,18 @@ int tpm_chip_register(struct tpm_chip *chip)if (rc)return rc; - rc =tpm_sysfs_add_device (chip); -if (rc) - goto del_misc; +/* Populate sysfs for TPM1 devices. */ +if (!(chip->flags &TPM_CHIP_FLAG_TPM2 )) { + rc =tpm_sysfs_add_device (chip); +if (rc) + goto del_misc; - rc =tpm_add_ppi (chip); -if (rc) - goto del_sysfs; + rc =tpm_add_ppi (chip); +if (rc) + goto del_sysfs; - chip->bios_dir =tpm_bios_log_setup (chip->devname); + chip->bios_dir =tpm_bios_log_setup (chip->devname); + }/* Make the chip available. */ spin_lock (&driver_lock);
@@ -236,10 +239,12 @@ void tpm_chip_unregister(struct tpm_chip *chip)spin_unlock (&driver_lock);synchronize_rcu (); -if (chip->bios_dir) -tpm_bios_log_teardown (chip->bios_dir); -tpm_remove_ppi (chip); -tpm_sysfs_del_device (chip); +if (!(chip->flags &TPM_CHIP_FLAG_TPM2 )) { +if (chip->bios_dir) +tpm_bios_log_teardown (chip->bios_dir); +tpm_remove_ppi (chip); +tpm_sysfs_del_device (chip); + }tpm_dev_del_device (chip); }
drivers/char/tpm/tpm-interface.c +21 -3
@@ -360,7 +360,10 @@ ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,if (chip->vendor.irq) goto out_recv; - stop = jiffies +tpm_calc_ordinal_duration (chip, ordinal); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) + stop = jiffies +tpm2_calc_ordinal_duration (chip, ordinal); +else + stop = jiffies +tpm_calc_ordinal_duration (chip, ordinal); do { u8 status = chip->ops->status(chip); if ((status & chip->ops->req_complete_mask) ==
@@ -483,7 +486,7 @@ static const struct tpm_input_header tpm_startup_header = {static int tpm_startup (struct tpm_chip *chip,__be16 startup_type) {struct tpm_cmd_t start_cmd; - start_cmd.header.in = tpm_startup_header; + start_cmd.params.startup_in.startup_type = startup_type;return tpm_transmit_cmd (chip, &start_cmd,TPM_INTERNAL_RESULT_SIZE ,"attempting to start the TPM" );
@@ -680,7 +683,10 @@ int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf) chip =tpm_chip_find_get (chip_num);if (chip ==NULL )return -ENODEV ; - rc =tpm_pcr_read_dev (chip, pcr_idx, res_buf); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) + rc =tpm2_pcr_read (chip, pcr_idx, res_buf); +else + rc =tpm_pcr_read_dev (chip, pcr_idx, res_buf);tpm_chip_put (chip);return rc; }
@@ -714,6 +720,12 @@ int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash)if (chip ==NULL )return -ENODEV ; +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) { + rc =tpm2_pcr_extend (chip, pcr_idx, hash); +tpm_chip_put (chip); +return rc; + } + cmd.header.in = pcrextend_header; cmd.params.pcrextend_in.pcr_idx =cpu_to_be32 (pcr_idx);memcpy (cmd.params.pcrextend_in.hash, hash,TPM_DIGEST_SIZE );
@@ -974,6 +986,12 @@ int tpm_get_random(u32 chip_num, u8 *out, size_t max)if (chip ==NULL )return -ENODEV ; +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) { + err =tpm2_get_random (chip, out, max); +tpm_chip_put (chip); +return err; + } + do { tpm_cmd.header.in = tpm_getrandom_header; tpm_cmd.params.getrandom_in.num_bytes = cpu_to_be32(num_bytes);
drivers/char/tpm/tpm.h +61 -0
82 lines not on this page · raw message
drivers/char/tpm/tpm2-cmd.c new file +542 -0
542 lines not on this page · raw message
Signature · 1 line
2.1.0
Peter Hüwe
maintainerRe: [PATCH v9 6/8] tpm: TPM 2.0 baseline support
Am Donnerstag, 4. Dezember 2014, 06:55:16 schrieb Jarkko Sakkinen:
Quoted 115 lines
TPM 2.0 devices are separated by adding a field 'flags' to struct
tpm_chipand defining a flagTPM_CHIP_FLAG_TPM2for tagging them.This patch adds the following internal functions:
-
tpm2_get_random()
-tpm2_get_tpm_pt()
-tpm2_pcr_extend()
-tpm2_pcr_read()
-tpm2_startup()Additionally, the following exported functions are implemented for implementing TPM 2.0 device drivers:
-
tpm2_do_selftest()
-tpm2_calc_ordinal_durations()
-tpm2_gen_interrupt()The existing functions that are exported for the use for existing subsystems have been changed to check the flags field in struct
tpm_chipand use appropriate TPM 2.0 counterpart ifTPM_CHIP_FLAG_TPM2is est.The code for
tpm2_calc_ordinal_duration()andtpm2_startup()were originally written by Will Arthur.Signed-off-by Jarkko Sakkinen <[email protected]>Signed-off-by Will Arthur <[email protected]>--- drivers/char/tpm/Makefile | 2 +- drivers/char/tpm/tpm-chip.c | 27 +- drivers/char/tpm/tpm-interface.c | 24 +- drivers/char/tpm/tpm.h | 61 +++++ drivers/char/tpm/tpm2-cmd.c | 542 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 641 insertions(+), 15 deletions(-) create mode 100644 drivers/char/tpm/tpm2-cmd.cdrivers/char/tpm/Makefile +1
-1@@ -2,7 +2,7 @@ # Makefile for the kernel tpm device drivers. # obj-$(CONFIG_TCG_TPM) += tpm.o -tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o +tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o tpm-$(CONFIG_ACPI) += tpm_ppi.o ifdef CONFIG_ACPIdrivers/char/tpm/tpm-chip.c +16
-11@@ -195,15 +195,18 @@ int tpm_chip_register(struct tpm_chip *chip)if (rc)return rc; - rc =tpm_sysfs_add_device (chip); -if (rc) - goto del_misc; +/* Populate sysfs for TPM1 devices. */ +if (!(chip->flags &TPM_CHIP_FLAG_TPM2 )) { + rc =tpm_sysfs_add_device (chip); +if (rc) + goto del_misc; - rc =tpm_add_ppi (chip); -if (rc) - goto del_sysfs; + rc =tpm_add_ppi (chip); +if (rc) + goto del_sysfs; - chip->bios_dir =tpm_bios_log_setup (chip->devname); + chip->bios_dir =tpm_bios_log_setup (chip->devname); + }/* Make the chip available. */ spin_lock (&driver_lock);@@ -236,10 +239,12 @@ void tpm_chip_unregister(struct tpm_chip *chip)spin_unlock (&driver_lock);synchronize_rcu (); -if (chip->bios_dir) -tpm_bios_log_teardown (chip->bios_dir); -tpm_remove_ppi (chip); -tpm_sysfs_del_device (chip); +if (!(chip->flags &TPM_CHIP_FLAG_TPM2 )) { +if (chip->bios_dir) +tpm_bios_log_teardown (chip->bios_dir); +tpm_remove_ppi (chip); +tpm_sysfs_del_device (chip); + }tpm_dev_del_device (chip); }(quoted diff) +0
-0
b/drivers/char/tpm/tpm-interface.cindex b6f6b17..8a14887 100644drivers/char/tpm/tpm-interface.c +4
-1@@ -360,7 +360,10 @@ ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf, if (chip->vendor.irq) goto out_recv; - stop = jiffies +tpm_calc_ordinal_duration (chip, ordinal); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) + stop = jiffies +tpm2_calc_ordinal_duration (chip, ordinal); +else + stop = jiffies +tpm_calc_ordinal_duration (chip, ordinal); do { u8 status = chip->ops->status(chip); if ((status & chip->ops->req_complete_mask) ==
drivers/char/tpm/tpm-interface.c static const struct tpm_input_header tpm_startup_header · line 488
Quoted 4 lines
drivers/char/tpm/tpm-interface.c +1
-1@@ -483,7 +486,7 @@ static const struct tpm_input_header tpm_startup_header = { static int tpm_startup(struct tpm_chip *chip, __be16 startup_type) {struct tpm_cmd_t start_cmd; - start_cmd.header.in = tpm_startup_header; +
WHY?!? This renders tpm_startup useless.
So NACK for this part.
drivers/char/tpm/tpm-interface.c static const struct tpm_input_header tpm_startup_header = { · line 492
Quoted 3 lines
drivers/char/tpm/tpm-interface.c +0
-0start_cmd.params.startup_in.startup_type = startup_type;return tpm_transmit_cmd (chip, &start_cmd,TPM_INTERNAL_RESULT_SIZE ,"attempting to start the TPM" );
I'll get you an TPM1.2 :)
Thanks
Peter
Re: [PATCH v9 6/8] tpm: TPM 2.0 baseline support
Hey
is it cool if I prepare a separate set of fixes for all issues in v9? I do not see any problem that could not be fixed without major structural changes.
/Jarkko
Quoted 131 lines · Peter Hüwe
Am Donnerstag, 4. Dezember 2014, 06:55:16 schrieb Jarkko Sakkinen:
Quoted 115 lines
TPM 2.0 devices are separated by adding a field 'flags' to struct
tpm_chipand defining a flagTPM_CHIP_FLAG_TPM2for tagging them.This patch adds the following internal functions:
-
tpm2_get_random()
-tpm2_get_tpm_pt()
-tpm2_pcr_extend()
-tpm2_pcr_read()
-tpm2_startup()Additionally, the following exported functions are implemented for implementing TPM 2.0 device drivers:
-
tpm2_do_selftest()
-tpm2_calc_ordinal_durations()
-tpm2_gen_interrupt()The existing functions that are exported for the use for existing subsystems have been changed to check the flags field in struct
tpm_chipand use appropriate TPM 2.0 counterpart ifTPM_CHIP_FLAG_TPM2is est.The code for
tpm2_calc_ordinal_duration()andtpm2_startup()were originally written by Will Arthur.Signed-off-by Will Arthur <[email protected]>--- drivers/char/tpm/Makefile | 2 +- drivers/char/tpm/tpm-chip.c | 27 +- drivers/char/tpm/tpm-interface.c | 24 +- drivers/char/tpm/tpm.h | 61 +++++ drivers/char/tpm/tpm2-cmd.c | 542 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 641 insertions(+), 15 deletions(-) create mode 100644 drivers/char/tpm/tpm2-cmd.cdrivers/char/tpm/Makefile +1
-1@@ -2,7 +2,7 @@ # Makefile for the kernel tpm device drivers. # obj-$(CONFIG_TCG_TPM) += tpm.o -tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o +tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o tpm-$(CONFIG_ACPI) += tpm_ppi.o ifdef CONFIG_ACPIdrivers/char/tpm/tpm-chip.c +16
-11@@ -195,15 +195,18 @@ int tpm_chip_register(struct tpm_chip *chip)if (rc)return rc; - rc =tpm_sysfs_add_device (chip); -if (rc) - goto del_misc; +/* Populate sysfs for TPM1 devices. */ +if (!(chip->flags &TPM_CHIP_FLAG_TPM2 )) { + rc =tpm_sysfs_add_device (chip); +if (rc) + goto del_misc; - rc =tpm_add_ppi (chip); -if (rc) - goto del_sysfs; + rc =tpm_add_ppi (chip); +if (rc) + goto del_sysfs; - chip->bios_dir =tpm_bios_log_setup (chip->devname); + chip->bios_dir =tpm_bios_log_setup (chip->devname); + }/* Make the chip available. */ spin_lock (&driver_lock);@@ -236,10 +239,12 @@ void tpm_chip_unregister(struct tpm_chip *chip)spin_unlock (&driver_lock);synchronize_rcu (); -if (chip->bios_dir) -tpm_bios_log_teardown (chip->bios_dir); -tpm_remove_ppi (chip); -tpm_sysfs_del_device (chip); +if (!(chip->flags &TPM_CHIP_FLAG_TPM2 )) { +if (chip->bios_dir) +tpm_bios_log_teardown (chip->bios_dir); +tpm_remove_ppi (chip); +tpm_sysfs_del_device (chip); + }tpm_dev_del_device (chip); }(quoted diff) +0
-0
b/drivers/char/tpm/tpm-interface.cindex b6f6b17..8a14887 100644drivers/char/tpm/tpm-interface.c +4
-1@@ -360,7 +360,10 @@ ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf, if (chip->vendor.irq) goto out_recv; - stop = jiffies +tpm_calc_ordinal_duration (chip, ordinal); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) + stop = jiffies +tpm2_calc_ordinal_duration (chip, ordinal); +else + stop = jiffies +tpm_calc_ordinal_duration (chip, ordinal); do { u8 status = chip->ops->status(chip); if ((status & chip->ops->req_complete_mask) ==drivers/char/tpm/tpm-interface.c static const struct tpm_input_header tpm_startup_header · line 488
Quoted 4 lines
drivers/char/tpm/tpm-interface.c +1
-1@@ -483,7 +486,7 @@ static const struct tpm_input_header tpm_startup_header = { static int tpm_startup(struct tpm_chip *chip, __be16 startup_type) {struct tpm_cmd_t start_cmd; - start_cmd.header.in = tpm_startup_header; +WHY?!? This renders
tpm_startupuseless.So NACK for this part.
drivers/char/tpm/tpm-interface.c static const struct tpm_input_header tpm_startup_header = { · line 492
Quoted 3 lines
drivers/char/tpm/tpm-interface.c +0
-0start_cmd.params.startup_in.startup_type = startup_type;return tpm_transmit_cmd (chip, &start_cmd,TPM_INTERNAL_RESULT_SIZE ,"attempting to start the TPM" );I'll get you an TPM1.2 :)
Thanks
Peter
Peter Huewe
maintainerAw: Re: [PATCH v9 6/8] tpm: TPM 2.0 baseline support
Hi Jarkko,
Quoted 3 lines
is it cool if I prepare a separate set of fixes for all issues in v9? I do not see any problem that could not be fixed without major structural changes.
to be honest - I would prefer a v10 with the fixes included, especially since there were quite a few issues/remarks. If you already have fixes post them as patches on top of v9 so we can test, and then squash them in.
I think we are still in schedule if you do fixes over the weekend - so we hopefully have a _great_ v10 on monday/tuesday
I'll send out the first pull request without TPM2.0 support later this evening,
and then send out another one by next week - this should be fine.
The next testing slot is Sunday evening since I'm travelling myself (and don't have TPM hardware with me).
Thanks,
Peter
Re: Re: [PATCH v9 6/8] tpm: TPM 2.0 baseline support
Quoted 7 lines · Peter Huewe
Hi Jarkko,
Quoted 3 lines
is it cool if I prepare a separate set of fixes for all issues in v9? I do not see any problem that could not be fixed without major structural changes.
Quoted 6 lines
to be honest - I would prefer a v10 with the fixes included, especially since there were quite a few issues/remarks. If you already have fixes post them as patches on top of v9 so we can test, and then squash them in.
It's as easy for me to just prepare a new patch set.
Quoted 2 lines
I think we are still in schedule if you do fixes over the weekend
- so we hopefully have a _great_ v10 on monday/tuesday
Yeah, I apologize for the state of v9. I admit that I rushed with it a bit. I'll prepare a new patch set over the weekend.
Quoted 3 lines
I'll send out the first pull request without TPM2.0 support later this evening,
and then send out another one by next week - this should be fine.
Great!
Quoted 6 lines
The next testing slot is Sunday evening since I'm travelling myself (and don't have TPM hardware with me).
Thanks,
Peter
/Jarkko
PATCH v9 7/8 tpm: TPM 2.0 CRB Interface
In reply to Jarkko Sakkinentpm_crb is a driver for TPM 2.0 Command Response Buffer (CRB) Interface as defined in PC Client Platform TPM Profile (PTP) Specification.
Only polling and single locality is supported as these are the limitations of the available hardware, Platform Trust Techonlogy (PTT) in Haswell CPUs.
The driver always applies CRB with ACPI start because PTT reports using only ACPI start as start method but as a result of my testing it requires also CRB start.
--- drivers/char/tpm/Kconfig | 9 ++ drivers/char/tpm/Makefile | 1 + drivers/char/tpm/tpm_crb.c | 356 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 366 insertions(+) create mode 100644 drivers/char/tpm/tpm_crb.c
drivers/char/tpm/Kconfig +9 -0
@@ -122,4 +122,13 @@ config TCG_XEN To compile this driver as a module, choose M here; the module will be called xen-tpmfront. +config TCG_CRB + tristate "TPM 2.0 CRB Interface" + depends on X86 && ACPI + ---help--- + If you have a TPM security chip that is compliant with the + TCG CRB 2.0 TPM specification 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_crb. + endif # TCG_TPM
drivers/char/tpm/Makefile +1 -0
@@ -22,3 +22,4 @@ obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o obj-$(CONFIG_TCG_TIS_I2C_ST33) += tpm_i2c_stm_st33.o obj-$(CONFIG_TCG_XEN) += xen-tpmfront.o +obj-$(CONFIG_TCG_CRB) += tpm_crb.o
drivers/char/tpm/tpm_crb.c new file +356 -0
356 lines not on this page · raw message
Signature · 1 line
2.1.0
Peter Hüwe
maintainerRe: [PATCH v9 7/8] tpm: TPM 2.0 CRB Interface
Am Donnerstag, 4. Dezember 2014, 06:55:17 schrieb Jarkko Sakkinen:
Quoted 7 lines
tpm_crbis a driver for TPM 2.0 Command Response Buffer (CRB) Interface as defined in PC Client Platform TPM Profile (PTP) Specification.Only polling and single locality is supported as these are the limitations of the available hardware, Platform Trust Techonlogy (PTT) in Haswell CPUs.
Quoted 5 lines
The driver always applies CRB with ACPI start because PTT reports using only ACPI start as start method but as a result of my testing it requires also CRB start.
Signed-off-by Jarkko Sakkinen <[email protected]>
:(
make -C /data/data-old/linux-2.6/ M=$(pwd) modules C=1 CHECK=sparse
make: Entering directory '/data/data-old/linux-2.6'
CHECK /data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:99:5: warning: symbol 'crb_suspend' was not declared. Should it be static? /data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:121:14: warning: incorrect type in argument 1 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:121:14: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:121:14: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:137:13: warning: incorrect type in argument 1 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:137:13: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:137:13: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:173:19: warning: incorrect type in argument 1 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:173:19: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:173:19: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:177:34: warning: incorrect type in argument 1 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:177:34: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:177:34: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:187:63: warning: incorrect type in argument 2 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:187:63: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:187:63: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:199:56: warning: incorrect type in argument 2 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:199:56: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:199:56: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:207:27: warning: incorrect type in argument 2 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:207:27: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:207:27: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:277:22: warning: cast removes address space of expression /data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:284:33: warning: incorrect type in argument 2 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:284:33: expected void const volatile [noderef] <asn:2>*src
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:284:33: got unsigned long long *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:287:56: warning: incorrect type in argument 1 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:287:56: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:287:56: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:286:19: warning: incorrect type in assignment (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:286:19: expected unsigned char [usertype] *cmd
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:286:19: got void [noderef] <asn:2>*
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:293:33: warning: incorrect type in argument 2 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:293:33: expected void const volatile [noderef] <asn:2>*src
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:293:33: got unsigned long long *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:296:56: warning: incorrect type in argument 1 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:296:56: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:296:56: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:295:19: warning: incorrect type in assignment (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:295:19: expected unsigned char [usertype] *rsp
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:295:19: got void [noderef] <asn:2>*
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:325:5: warning: symbol 'crb_acpi_remove' was not declared. Should it be static?
CC [M] /data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.o
:(
Peter
Re: [PATCH v9 7/8] tpm: TPM 2.0 CRB Interface
I'll fix these (an run sparse).
/Jarkko
Quoted 65 lines · Peter Hüwe
Am Donnerstag, 4. Dezember 2014, 06:55:17 schrieb Jarkko Sakkinen:
Quoted 7 lines
tpm_crbis a driver for TPM 2.0 Command Response Buffer (CRB) Interface as defined in PC Client Platform TPM Profile (PTP) Specification.Only polling and single locality is supported as these are the limitations of the available hardware, Platform Trust Techonlogy (PTT) in Haswell CPUs.
Quoted 5 lines
The driver always applies CRB with ACPI start because PTT reports using only ACPI start as start method but as a result of my testing it requires also CRB start.
:(
make -C /data/data-old/linux-2.6/ M=$(pwd) modules C=1 CHECK=sparse
make: Entering directory '/data/data-old/linux-2.6'
CHECK /data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:99:5: warning: symbol 'crb_suspend' was not declared. Should it be static? /data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:121:14: warning: incorrect type in argument 1 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:121:14: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:121:14: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:137:13: warning: incorrect type in argument 1 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:137:13: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:137:13: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:173:19: warning: incorrect type in argument 1 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:173:19: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:173:19: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:177:34: warning: incorrect type in argument 1 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:177:34: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:177:34: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:187:63: warning: incorrect type in argument 2 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:187:63: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:187:63: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:199:56: warning: incorrect type in argument 2 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:199:56: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:199:56: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:207:27: warning: incorrect type in argument 2 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:207:27: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:207:27: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:277:22: warning: cast removes address space of expression /data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:284:33: warning: incorrect type in argument 2 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:284:33: expected void const volatile [noderef] <asn:2>*src
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:284:33: got unsigned long long *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:287:56: warning: incorrect type in argument 1 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:287:56: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:287:56: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:286:19: warning: incorrect type in assignment (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:286:19: expected unsigned char [usertype] *cmd
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:286:19: got void [noderef] <asn:2>*
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:293:33: warning: incorrect type in argument 2 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:293:33: expected void const volatile [noderef] <asn:2>*src
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:293:33: got unsigned long long *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:296:56: warning: incorrect type in argument 1 (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:296:56: expected void [noderef] <asn:2>*<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:296:56: got unsigned int *<noident>
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:295:19: warning: incorrect type in assignment (different address spaces)
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:295:19: expected unsigned char [usertype] *rsp
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:295:19: got void [noderef] <asn:2>*
/data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.c:325:5: warning: symbol 'crb_acpi_remove' was not declared. Should it be static?
CC [M] /data/data-old/linux-2.6/drivers/char/tpm/tpm_crb.o:(
Peter
Peter Hüwe
maintainerRe: [PATCH v9 7/8] tpm: TPM 2.0 CRB Interface
In reply to Jarkko SakkinenAm Donnerstag, 4. Dezember 2014, 06:55:17 schrieb Jarkko Sakkinen:
Quoted 151 lines
tpm_crbis a driver for TPM 2.0 Command Response Buffer (CRB) Interface as defined in PC Client Platform TPM Profile (PTP) Specification.Only polling and single locality is supported as these are the limitations of the available hardware, Platform Trust Techonlogy (PTT) in Haswell CPUs.
The driver always applies CRB with ACPI start because PTT reports using only ACPI start as start method but as a result of my testing it requires also CRB start.
Signed-off-by Jarkko Sakkinen <[email protected]>--- drivers/char/tpm/Kconfig | 9 ++ drivers/char/tpm/Makefile | 1 + drivers/char/tpm/tpm_crb.c | 356 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 366 insertions(+) create mode 100644 drivers/char/tpm/tpm_crb.cdrivers/char/tpm/Kconfig +9
-0@@ -122,4 +122,13 @@ config TCG_XEN To compile this driver as a module, choose M here; the module will be called xen-tpmfront. +config TCG_CRB + tristate "TPM 2.0 CRB Interface" + depends on X86 && ACPI + ---help--- + If you have a TPM security chip that is compliant with the + TCG CRB 2.0 TPM specification 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_crb. + endif # TCG_TPMdrivers/char/tpm/Makefile +1
-0@@ -22,3 +22,4 @@ obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o obj-$(CONFIG_TCG_TIS_I2C_ST33) += tpm_i2c_stm_st33.o obj-$(CONFIG_TCG_XEN) += xen-tpmfront.o +obj-$(CONFIG_TCG_CRB) += tpm_crb.odrivers/char/tpm/tpm_crb.c new file +98
-0@@ -0,0 +1,356 @@ +/* +* Copyright (C) 2014 Intel Corporation +* +* Authors: +* Jarkko Sakkinen <[email protected]> +* +* Maintained by: <[email protected]> +* +* This device driver implements the TPM interface as defined in +* the TCG CRB 2.0 TPM specification. +* +* 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; version 2 +* of the License. +*/ + +#include <linux/acpi.h> +#include <linux/highmem.h> +#include <linux/rculist.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include "tpm.h" + +#define ACPI_SIG_TPM2 "TPM2" + +static const u8 CRB_ACPI_START_UUID [] = { +/* 0000 */ 0xAB ,0x6C ,0xBF ,0x6B ,0x63 ,0x54 ,0x14 ,0x47 , +/* 0008 */ 0xB7 ,0xCD ,0xF0 ,0x20 ,0x3C ,0x03 ,0x68 ,0xD4 +}; + +enum crb_defaults { +CRB_ACPI_START_REVISION_ID =1 , +CRB_ACPI_START_INDEX =1 , +}; + +enum crb_start_method { +CRB_SM_ACPI_START =2 , +CRB_SM_CRB =7 , +CRB_SM_CRB_WITH_ACPI_START =8 , +}; + +struct acpi_tpm2 { +struct acpi_table_header hdr; +u16 platform_class; +u16 reserved; +u64 control_area_pa; +u32 start_method; +} __packed; + +enum crb_ca_request { +CRB_CA_REQ_GO_IDLE =BIT (0 ), +CRB_CA_REQ_CMD_READY =BIT (1 ), +}; + +enum crb_ca_status { +CRB_CA_STS_ERROR =BIT (0 ), +CRB_CA_STS_TPM_IDLE =BIT (1 ), +}; + +enum crb_start { +CRB_START_INVOKE =BIT (0 ), +}; + +enum crb_cancel { +CRB_CANCEL_INVOKE =BIT (0 ), +}; + +struct crb_control_area { +u32 req; +u32 sts; +u32 cancel; +u32 start; +u32 int_enable; +u32 int_sts; +u32 cmd_size; +u64 cmd_pa; +u32 rsp_size; +u64 rsp_pa; +} __packed; + +enum crb_status { +CRB_STS_COMPLETE =BIT (0 ), +}; + +enum crb_flags { +CRB_FL_ACPI_START =BIT (0 ), +CRB_FL_CRB_START =BIT (1 ), +}; + +struct crb_priv { +unsigned int flags; +struct crb_control_area *cca; +u8 *cmd; +u8 *rsp; +}; + +#ifdef CONFIG_PM_SLEEP
drivers/char/tpm/tpm_crb.c line 108
Quoted 10 lines
drivers/char/tpm/tpm_crb.c new file +10
-0+int crb_suspend (struct device *dev) +{ +return 0 ; +} + +static int crb_resume (struct device *dev) +{ +struct tpm_chip *chip =dev_get_drvdata (dev); + + (void )tpm2_do_selftest (chip);
^^^^^ ??????? What's this?
drivers/char/tpm/tpm_crb.c line 112
Quoted 4 lines
drivers/char/tpm/tpm_crb.c new file +4
-0+ + return 0; +} +#endif
Peter
PATCH v9 8/8 tpm: TPM 2.0 FIFO Interface
In reply to Jarkko SakkinenFrom: Will Arthur <[email protected]>
Detect TPM 2.0 by using the extended STS (STS3) register. For TPM 2.0, instead of calling tpm_get_timeouts(), assign duration and timeout values defined in the TPM 2.0 PTP specification.
--- drivers/char/tpm/tpm_tis.c | 80 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 13 deletions(-)
drivers/char/tpm/tpm_tis.c +67 -13
@@ -1,5 +1,6 @@/* * Copyright (C) 2005, 2006 IBM Corporation +* Copyright (C) 2014 Intel Corporation * * Authors: * Leendert van Doorn <[email protected]>
@@ -44,6 +45,10 @@ enum tis_status { TPM_STS_DATA_EXPECT = 0x08, }; +enum tis_status3 { +TPM_STS3_TPM2_FAM =0x04 , +}; +enum tis_int_flags {TPM_GLOBAL_INT_ENABLE =0x80000000 ,TPM_INTF_BURST_COUNT_STATIC =0x100 ,
@@ -70,6 +75,7 @@ enum tis_defaults {#define TPM_INT_STATUS (l) (0x0010 | ((l) << 12))#define TPM_INTF_CAPS (l) (0x0014 | ((l) << 12))#define TPM_STS (l) (0x0018 | ((l) << 12)) +#define TPM_STS3 (l) (0x001b | ((l) << 12))#define TPM_DATA_FIFO (l) (0x0024 | ((l) << 12))#define TPM_DID_VID (l) (0x0F00 | ((l) << 12))
@@ -363,6 +369,7 @@ static int tpm_tis_send_main(struct tpm_chip *chip, u8 *buf, size_t len) {int rc;u32 ordinal; +unsigned long dur; rc =tpm_tis_send_data (chip, buf, len);if (rc <0 )
@@ -374,9 +381,14 @@ static int tpm_tis_send_main(struct tpm_chip *chip, u8 *buf, size_t len)if (chip->vendor.irq) { ordinal =be32_to_cpu (*((__be32 *) (buf +6 ))); + +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) + dur =tpm2_calc_ordinal_duration (chip, ordinal); +else + dur =tpm_calc_ordinal_duration (chip, ordinal); +if (wait_for_tpm_stat - (chip,TPM_STS_DATA_AVAIL |TPM_STS_VALID , -tpm_calc_ordinal_duration (chip, ordinal), + (chip,TPM_STS_DATA_AVAIL |TPM_STS_VALID , dur, &chip->vendor.read_queue, false) <0 ) { rc = -ETIME ; goto out_err;
@@ -588,6 +600,7 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle,int rc, i, irq_s, irq_e, probe;struct tpm_chip *chip;struct priv_data *priv; +u8 sts3; priv =devm_kzalloc (dev,sizeof (struct priv_data ),GFP_KERNEL );if (priv ==NULL )
@@ -604,11 +617,28 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle,if (!chip->vendor.iobase)return -EIO ; + sts3 =ioread8 (chip->vendor.iobase +TPM_STS3 (1 )); +if ((sts3 &TPM_STS3_TPM2_FAM ) ==TPM_STS3_TPM2_FAM ) + chip->flags =TPM_CHIP_FLAG_TPM2 ; +/* 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 ); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) { + chip->vendor.timeout_a =usecs_to_jiffies (TPM2_TIMEOUT_A ); + chip->vendor.timeout_b =usecs_to_jiffies (TPM2_TIMEOUT_B ); + chip->vendor.timeout_c =usecs_to_jiffies (TPM2_TIMEOUT_C ); + chip->vendor.timeout_d =usecs_to_jiffies (TPM2_TIMEOUT_D ); + chip->vendor.duration[TPM_SHORT ] = +usecs_to_jiffies (TPM2_DURATION_SHORT ); + chip->vendor.duration[TPM_MEDIUM ] = +usecs_to_jiffies (TPM2_DURATION_MEDIUM ); + chip->vendor.duration[TPM_LONG ] = +usecs_to_jiffies (TPM2_DURATION_LONG ); + }else { + 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 ); + }if (wait_startup (chip,0 ) !=0 ) { rc = -ENODEV ;
@@ -623,8 +653,8 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle, vendor =ioread32 (chip->vendor.iobase +TPM_DID_VID (0 )); chip->vendor.manufacturer_id = vendor; -dev_info (dev, -"1.2 TPM (device-id 0x%X, rev-id %d)\n" , +dev_info (dev,"%s TPM (device-id 0x%X, rev-id %d)\n" , + (chip->flags &TPM_CHIP_FLAG_TPM2 ) ?"2.0" :"1.2" , vendor >>16 ,ioread8 (chip->vendor.iobase +TPM_RID (0 )));if (!itpm) {
@@ -665,6 +695,23 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle,if (intfcaps &TPM_INTF_DATA_AVAIL_INT )dev_dbg (dev,"\tData Avail Int Support\n" ); +/* get the timeouts before testing for irqs */ +if (!(chip->flags &TPM_CHIP_FLAG_TPM2 ) &&tpm_get_timeouts (chip)) { +dev_err (dev,"Could not get TPM timeouts and durations\n" ); + rc = -ENODEV ; + goto out_err; + } + +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) + rc =tpm2_do_selftest (chip); +else + rc =tpm_do_selftest (chip); +if (rc) { +dev_err (dev,"TPM self test failed\n" ); + rc = -ENODEV ; + goto out_err; + } +/* INTERRUPT Setup */ init_waitqueue_head (&chip->vendor.read_queue);init_waitqueue_head (&chip->vendor.int_queue);
@@ -720,7 +767,10 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle, chip->vendor.probed_irq =0 ;/* Generate Interrupts */ -tpm_gen_interrupt (chip); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) +tpm2_gen_interrupt (chip); +else +tpm_gen_interrupt (chip); chip->vendor.irq = chip->vendor.probed_irq;
@@ -808,14 +858,18 @@ static void tpm_tis_reenable_interrupts(struct tpm_chip *chip)static int tpm_tis_resume (struct device *dev) {struct tpm_chip *chip =dev_get_drvdata (dev); -int ret; +int ret =0 ;if (chip->vendor.irq)tpm_tis_reenable_interrupts (chip); - ret =tpm_pm_resume (dev); -if (!ret) -tpm_do_selftest (chip); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) +tpm2_do_selftest (chip); +else { + ret =tpm_pm_resume (dev); +if (!ret) +tpm_do_selftest (chip); + }return ret; }
Signature · 1 line
2.1.0
Re: [tpmdd-devel] [PATCH v9 8/8] tpm: TPM 2.0 FIFO Interface
Hi Jarkko,
Quoted 133 lines · Jarkko Sakkinen
From: Will Arthur <[email protected]>
Detect TPM 2.0 by using the extended STS (STS3) register. For TPM 2.0, instead of calling
tpm_get_timeouts(), assign duration and timeout values defined in the TPM 2.0 PTP specification.Signed-off-by Will Arthur <[email protected]>--- drivers/char/tpm/tpm_tis.c | 80 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 13 deletions(-)drivers/char/tpm/tpm_tis.c +48
-8@@ -1,5 +1,6 @@/* * Copyright (C) 2005, 2006 IBM Corporation +* Copyright (C) 2014 Intel Corporation * * Authors: * Leendert van Doorn <[email protected]> @@ -44,6 +45,10 @@ enum tis_status { TPM_STS_DATA_EXPECT = 0x08, }; +enum tis_status3 { +TPM_STS3_TPM2_FAM =0x04 , +}; +enum tis_int_flags {TPM_GLOBAL_INT_ENABLE =0x80000000 ,TPM_INTF_BURST_COUNT_STATIC =0x100 ,@@ -70,6 +75,7 @@ enum tis_defaults {#define TPM_INT_STATUS (l) (0x0010 | ((l) << 12))#define TPM_INTF_CAPS (l) (0x0014 | ((l) << 12))#define TPM_STS (l) (0x0018 | ((l) << 12)) +#define TPM_STS3 (l) (0x001b | ((l) << 12))#define TPM_DATA_FIFO (l) (0x0024 | ((l) << 12))#define TPM_DID_VID (l) (0x0F00 | ((l) << 12))@@ -363,6 +369,7 @@ static int tpm_tis_send_main(struct tpm_chip *chip, u8 *buf, size_t len) {int rc;u32 ordinal; +unsigned long dur; rc =tpm_tis_send_data (chip, buf, len);if (rc <0 )@@ -374,9 +381,14 @@ static int tpm_tis_send_main(struct tpm_chip *chip, u8 *buf, size_t len)if (chip->vendor.irq) { ordinal =be32_to_cpu (*((__be32 *) (buf +6 ))); + +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) + dur =tpm2_calc_ordinal_duration (chip, ordinal); +else + dur =tpm_calc_ordinal_duration (chip, ordinal); +if (wait_for_tpm_stat - (chip,TPM_STS_DATA_AVAIL |TPM_STS_VALID , -tpm_calc_ordinal_duration (chip, ordinal), + (chip,TPM_STS_DATA_AVAIL |TPM_STS_VALID , dur, &chip->vendor.read_queue, false) <0 ) { rc = -ETIME ; goto out_err;@@ -588,6 +600,7 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle,int rc, i, irq_s, irq_e, probe;struct tpm_chip *chip;struct priv_data *priv; +u8 sts3; priv =devm_kzalloc (dev,sizeof (struct priv_data ),GFP_KERNEL );if (priv ==NULL )@@ -604,11 +617,28 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle,if (!chip->vendor.iobase)return -EIO ; + sts3 =ioread8 (chip->vendor.iobase +TPM_STS3 (1 )); +if ((sts3 &TPM_STS3_TPM2_FAM ) ==TPM_STS3_TPM2_FAM ) + chip->flags =TPM_CHIP_FLAG_TPM2 ; +/* 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 ); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) { + chip->vendor.timeout_a =usecs_to_jiffies (TPM2_TIMEOUT_A ); + chip->vendor.timeout_b =usecs_to_jiffies (TPM2_TIMEOUT_B ); + chip->vendor.timeout_c =usecs_to_jiffies (TPM2_TIMEOUT_C ); + chip->vendor.timeout_d =usecs_to_jiffies (TPM2_TIMEOUT_D ); + chip->vendor.duration[TPM_SHORT ] = +usecs_to_jiffies (TPM2_DURATION_SHORT ); + chip->vendor.duration[TPM_MEDIUM ] = +usecs_to_jiffies (TPM2_DURATION_MEDIUM ); + chip->vendor.duration[TPM_LONG ] = +usecs_to_jiffies (TPM2_DURATION_LONG ); + }else { + 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 ); + }if (wait_startup (chip,0 ) !=0 ) { rc = -ENODEV ;@@ -623,8 +653,8 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle, vendor =ioread32 (chip->vendor.iobase +TPM_DID_VID (0 )); chip->vendor.manufacturer_id = vendor; -dev_info (dev, -"1.2 TPM (device-id 0x%X, rev-id %d)\n" , +dev_info (dev,"%s TPM (device-id 0x%X, rev-id %d)\n" , + (chip->flags &TPM_CHIP_FLAG_TPM2 ) ?"2.0" :"1.2" , vendor >>16 ,ioread8 (chip->vendor.iobase +TPM_RID (0 )));if (!itpm) {@@ -665,6 +695,23 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle,if (intfcaps &TPM_INTF_DATA_AVAIL_INT )dev_dbg (dev,"\tData Avail Int Support\n" ); +/* get the timeouts before testing for irqs */ +if (!(chip->flags &TPM_CHIP_FLAG_TPM2 ) &&tpm_get_timeouts (chip)) { +dev_err (dev,"Could not get TPM timeouts and durations\n" ); + rc = -ENODEV ; + goto out_err; + } + +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) + rc =tpm2_do_selftest (chip); +else
drivers/char/tpm/tpm_tis.c static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle, · line 717
Quoted 10 lines
drivers/char/tpm/tpm_tis.c +7
-0+ rc =tpm_do_selftest (chip); +if (rc) { +dev_err (dev,"TPM self test failed\n" ); + rc = -ENODEV ; + goto out_err; + } +/* INTERRUPT Setup */ init_waitqueue_head (&chip->vendor.read_queue);init_waitqueue_head (&chip->vendor.int_queue);
In Peter's for-james branch, commit 0e6cb01, the v1.2 calls to tpm_get_timeouts and tpm_do_selftest were moved toward the end of tpm_tis_init.
Quoted 38 lines
drivers/char/tpm/tpm_tis.c +12
-5@@ -720,7 +767,10 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle, chip->vendor.probed_irq =0 ;/* Generate Interrupts */ -tpm_gen_interrupt (chip); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) +tpm2_gen_interrupt (chip); +else +tpm_gen_interrupt (chip); chip->vendor.irq = chip->vendor.probed_irq;@@ -808,14 +858,18 @@ static void tpm_tis_reenable_interrupts(struct tpm_chip *chip)static int tpm_tis_resume (struct device *dev) {struct tpm_chip *chip =dev_get_drvdata (dev); -int ret; +int ret =0 ;if (chip->vendor.irq)tpm_tis_reenable_interrupts (chip); - ret =tpm_pm_resume (dev); -if (!ret) -tpm_do_selftest (chip); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) +tpm2_do_selftest (chip); +else { + ret =tpm_pm_resume (dev); +if (!ret) +tpm_do_selftest (chip); + }return ret; }Signature · 1 line
2.1.0
Re: [tpmdd-devel] [PATCH v9 8/8] tpm: TPM 2.0 FIFO Interface
Quoted 142 lines · Scot Doyle
Hi Jarkko,
Quoted 139 lines · Jarkko Sakkinen
From: Will Arthur <[email protected]>
Detect TPM 2.0 by using the extended STS (STS3) register. For TPM 2.0, instead of calling
tpm_get_timeouts(), assign duration and timeout values defined in the TPM 2.0 PTP specification.Signed-off-by Will Arthur <[email protected]>--- drivers/char/tpm/tpm_tis.c | 80 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 13 deletions(-)drivers/char/tpm/tpm_tis.c +54
-8@@ -1,5 +1,6 @@/* * Copyright (C) 2005, 2006 IBM Corporation +* Copyright (C) 2014 Intel Corporation * * Authors: * Leendert van Doorn <[email protected]> @@ -44,6 +45,10 @@ enum tis_status { TPM_STS_DATA_EXPECT = 0x08, }; +enum tis_status3 { +TPM_STS3_TPM2_FAM =0x04 , +}; +enum tis_int_flags {TPM_GLOBAL_INT_ENABLE =0x80000000 ,TPM_INTF_BURST_COUNT_STATIC =0x100 ,@@ -70,6 +75,7 @@ enum tis_defaults {#define TPM_INT_STATUS (l) (0x0010 | ((l) << 12))#define TPM_INTF_CAPS (l) (0x0014 | ((l) << 12))#define TPM_STS (l) (0x0018 | ((l) << 12)) +#define TPM_STS3 (l) (0x001b | ((l) << 12))#define TPM_DATA_FIFO (l) (0x0024 | ((l) << 12))#define TPM_DID_VID (l) (0x0F00 | ((l) << 12))@@ -363,6 +369,7 @@ static int tpm_tis_send_main(struct tpm_chip *chip, u8 *buf, size_t len) {int rc;u32 ordinal; +unsigned long dur; rc =tpm_tis_send_data (chip, buf, len);if (rc <0 )@@ -374,9 +381,14 @@ static int tpm_tis_send_main(struct tpm_chip *chip, u8 *buf, size_t len)if (chip->vendor.irq) { ordinal =be32_to_cpu (*((__be32 *) (buf +6 ))); + +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) + dur =tpm2_calc_ordinal_duration (chip, ordinal); +else + dur =tpm_calc_ordinal_duration (chip, ordinal); +if (wait_for_tpm_stat - (chip,TPM_STS_DATA_AVAIL |TPM_STS_VALID , -tpm_calc_ordinal_duration (chip, ordinal), + (chip,TPM_STS_DATA_AVAIL |TPM_STS_VALID , dur, &chip->vendor.read_queue, false) <0 ) { rc = -ETIME ; goto out_err;@@ -588,6 +600,7 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle,int rc, i, irq_s, irq_e, probe;struct tpm_chip *chip;struct priv_data *priv; +u8 sts3; priv =devm_kzalloc (dev,sizeof (struct priv_data ),GFP_KERNEL );if (priv ==NULL )@@ -604,11 +617,28 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle,if (!chip->vendor.iobase)return -EIO ; + sts3 =ioread8 (chip->vendor.iobase +TPM_STS3 (1 )); +if ((sts3 &TPM_STS3_TPM2_FAM ) ==TPM_STS3_TPM2_FAM ) + chip->flags =TPM_CHIP_FLAG_TPM2 ; +/* 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 ); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) { + chip->vendor.timeout_a =usecs_to_jiffies (TPM2_TIMEOUT_A ); + chip->vendor.timeout_b =usecs_to_jiffies (TPM2_TIMEOUT_B ); + chip->vendor.timeout_c =usecs_to_jiffies (TPM2_TIMEOUT_C ); + chip->vendor.timeout_d =usecs_to_jiffies (TPM2_TIMEOUT_D ); + chip->vendor.duration[TPM_SHORT ] = +usecs_to_jiffies (TPM2_DURATION_SHORT ); + chip->vendor.duration[TPM_MEDIUM ] = +usecs_to_jiffies (TPM2_DURATION_MEDIUM ); + chip->vendor.duration[TPM_LONG ] = +usecs_to_jiffies (TPM2_DURATION_LONG ); + }else { + 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 ); + }if (wait_startup (chip,0 ) !=0 ) { rc = -ENODEV ;@@ -623,8 +653,8 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle, vendor =ioread32 (chip->vendor.iobase +TPM_DID_VID (0 )); chip->vendor.manufacturer_id = vendor; -dev_info (dev, -"1.2 TPM (device-id 0x%X, rev-id %d)\n" , +dev_info (dev,"%s TPM (device-id 0x%X, rev-id %d)\n" , + (chip->flags &TPM_CHIP_FLAG_TPM2 ) ?"2.0" :"1.2" , vendor >>16 ,ioread8 (chip->vendor.iobase +TPM_RID (0 )));if (!itpm) {@@ -665,6 +695,23 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle,if (intfcaps &TPM_INTF_DATA_AVAIL_INT )dev_dbg (dev,"\tData Avail Int Support\n" ); +/* get the timeouts before testing for irqs */ +if (!(chip->flags &TPM_CHIP_FLAG_TPM2 ) &&tpm_get_timeouts (chip)) { +dev_err (dev,"Could not get TPM timeouts and durations\n" ); + rc = -ENODEV ; + goto out_err; + } + +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) + rc =tpm2_do_selftest (chip); +else + rc =tpm_do_selftest (chip); +if (rc) { +dev_err (dev,"TPM self test failed\n" ); + rc = -ENODEV ; + goto out_err; + }
Quoted 8 lines
drivers/char/tpm/tpm_tis.c static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle, · line 717
Quoted 4 lines
drivers/char/tpm/tpm_tis.c +1
-0+/* INTERRUPT Setup */ init_waitqueue_head (&chip->vendor.read_queue);init_waitqueue_head (&chip->vendor.int_queue);In Peter's for-james branch, commit 0e6cb01, the v1.2 calls to
tpm_get_timeoutsandtpm_do_selftestwere moved toward the end oftpm_tis_init.
Right. My bad. Could this be reverted with a separate fix or do I prepare a new patch set? I would propose the former...
Quoted 33 lines
Quoted 33 lines
drivers/char/tpm/tpm_tis.c +12
-5@@ -720,7 +767,10 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle, chip->vendor.probed_irq =0 ;/* Generate Interrupts */ -tpm_gen_interrupt (chip); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) +tpm2_gen_interrupt (chip); +else +tpm_gen_interrupt (chip); chip->vendor.irq = chip->vendor.probed_irq;@@ -808,14 +858,18 @@ static void tpm_tis_reenable_interrupts(struct tpm_chip *chip)static int tpm_tis_resume (struct device *dev) {struct tpm_chip *chip =dev_get_drvdata (dev); -int ret; +int ret =0 ;if (chip->vendor.irq)tpm_tis_reenable_interrupts (chip); - ret =tpm_pm_resume (dev); -if (!ret) -tpm_do_selftest (chip); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) +tpm2_do_selftest (chip); +else { + ret =tpm_pm_resume (dev); +if (!ret) +tpm_do_selftest (chip); + }
Quoted 5 lines
Quoted 5 lines
drivers/char/tpm/tpm_tis.c +0
-0return ret; }Signature · 1 line
2.1.0
/Jarkko
Peter Hüwe
maintainerRe: [PATCH v9 8/8] tpm: TPM 2.0 FIFO Interface
In reply to Jarkko SakkinenAm Donnerstag, 4. Dezember 2014, 06:55:18 schrieb Jarkko Sakkinen:
Quoted 9 lines
From: Will Arthur <[email protected]>
Detect TPM 2.0 by using the extended STS (STS3) register. For TPM 2.0, instead of calling
tpm_get_timeouts(), assign duration and timeout values defined in the TPM 2.0 PTP specification.Signed-off-by Will Arthur <[email protected]>Signed-off-by Jarkko Sakkinen <[email protected]>---
Should we change the KConfig string?
TPM Interface Specification 1.2 Interface
is not quite accurate anymore after applying this patch.
Thanks,
Peter
Re: [PATCH v9 8/8] tpm: TPM 2.0 FIFO Interface
Quoted 7 lines · Peter Hüwe
Am Donnerstag, 4. Dezember 2014, 06:55:18 schrieb Jarkko Sakkinen:
Quoted 6 lines
From: Will Arthur <[email protected]>
Detect TPM 2.0 by using the extended STS (STS3) register. For TPM 2.0, instead of calling
tpm_get_timeouts(), assign duration and timeout values defined in the TPM 2.0 PTP specification.
Quoted 6 lines
Quoted 3 lines
Signed-off-by Will Arthur <[email protected]>---
Should we change the KConfig string?
TPM Interface Specification 1.2 Interface
is not quite accurate anymore after applying this patch.
Would make sense. Does this require a new patch set?
Quoted 2 lines
Thanks,
Peter
/Jarkko
Peter Hüwe
maintainerRe: [PATCH v9 8/8] tpm: TPM 2.0 FIFO Interface
In reply to Jarkko SakkinenHi Jarkko,
Am Donnerstag, 4. Dezember 2014, 06:55:18 schrieb Jarkko Sakkinen:
Quoted 111 lines
From: Will Arthur <[email protected]>
Detect TPM 2.0 by using the extended STS (STS3) register. For TPM 2.0, instead of calling
tpm_get_timeouts(), assign duration and timeout values defined in the TPM 2.0 PTP specification.Signed-off-by Will Arthur <[email protected]>Signed-off-by Jarkko Sakkinen <[email protected]>--- drivers/char/tpm/tpm_tis.c | 80++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 13 deletions(-)
drivers/char/tpm/tpm_tis.c +14
-2@@ -1,5 +1,6 @@/* * Copyright (C) 2005, 2006 IBM Corporation +* Copyright (C) 2014 Intel Corporation * * Authors: * Leendert van Doorn <[email protected]> @@ -44,6 +45,10 @@ enum tis_status { TPM_STS_DATA_EXPECT = 0x08, }; +enum tis_status3 { +TPM_STS3_TPM2_FAM =0x04 , +}; +enum tis_int_flags {TPM_GLOBAL_INT_ENABLE =0x80000000 ,TPM_INTF_BURST_COUNT_STATIC =0x100 ,@@ -70,6 +75,7 @@ enum tis_defaults {#define TPM_INT_STATUS (l) (0x0010 | ((l) << 12))#define TPM_INTF_CAPS (l) (0x0014 | ((l) << 12))#define TPM_STS (l) (0x0018 | ((l) << 12)) +#define TPM_STS3 (l) (0x001b | ((l) << 12))#define TPM_DATA_FIFO (l) (0x0024 | ((l) << 12))#define TPM_DID_VID (l) (0x0F00 | ((l) << 12))@@ -363,6 +369,7 @@ static int tpm_tis_send_main(struct tpm_chip *chip, u8 *buf, size_t len) {int rc;u32 ordinal; +unsigned long dur; rc =tpm_tis_send_data (chip, buf, len);if (rc <0 )@@ -374,9 +381,14 @@ static int tpm_tis_send_main(struct tpm_chip *chip, u8 *buf, size_t len)if (chip->vendor.irq) { ordinal =be32_to_cpu (*((__be32 *) (buf +6 ))); + +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) + dur =tpm2_calc_ordinal_duration (chip, ordinal); +else + dur =tpm_calc_ordinal_duration (chip, ordinal); +if (wait_for_tpm_stat - (chip,TPM_STS_DATA_AVAIL |TPM_STS_VALID , -tpm_calc_ordinal_duration (chip, ordinal), + (chip,TPM_STS_DATA_AVAIL |TPM_STS_VALID , dur, &chip->vendor.read_queue, false) <0 ) { rc = -ETIME ;drivers/char/tpm/tpm_tis.c +22
-4goto out_err;@@ -588,6 +600,7 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle, int rc, i, irq_s, irq_e, probe;struct tpm_chip *chip;struct priv_data *priv; +u8 sts3; priv =devm_kzalloc (dev,sizeof (struct priv_data ),GFP_KERNEL );if (priv ==NULL )@@ -604,11 +617,28 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle, if (!chip->vendor.iobase)return -EIO ; + sts3 =ioread8 (chip->vendor.iobase +TPM_STS3 (1 )); +if ((sts3 &TPM_STS3_TPM2_FAM ) ==TPM_STS3_TPM2_FAM ) + chip->flags =TPM_CHIP_FLAG_TPM2 ; +/* 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 ); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) { + chip->vendor.timeout_a =usecs_to_jiffies (TPM2_TIMEOUT_A ); + chip->vendor.timeout_b =usecs_to_jiffies (TPM2_TIMEOUT_B ); + chip->vendor.timeout_c =usecs_to_jiffies (TPM2_TIMEOUT_C ); + chip->vendor.timeout_d =usecs_to_jiffies (TPM2_TIMEOUT_D ); + chip->vendor.duration[TPM_SHORT ] = +usecs_to_jiffies (TPM2_DURATION_SHORT ); + chip->vendor.duration[TPM_MEDIUM ] = +usecs_to_jiffies (TPM2_DURATION_MEDIUM ); + chip->vendor.duration[TPM_LONG ] = +usecs_to_jiffies (TPM2_DURATION_LONG ); + }else { + 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 ); + }if (wait_startup (chip,0 ) !=0 ) { rc = -ENODEV ;
drivers/char/tpm/tpm_tis.c static int tpm_tis_init(struct device *dev, acpi_handle · line 659
Quoted 9 lines
drivers/char/tpm/tpm_tis.c +2
-2@@ -623,8 +653,8 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle, vendor =ioread32 (chip->vendor.iobase +TPM_DID_VID (0 )); chip->vendor.manufacturer_id = vendor; -dev_info (dev, -"1.2 TPM (device-id 0x%X, rev-id %d)\n" , +dev_info (dev,"%s TPM (device-id 0x%X, rev-id %d)\n" , + (chip->flags &TPM_CHIP_FLAG_TPM2 ) ?"2.0" :"1.2" , vendor >>16 ,ioread8 (chip->vendor.iobase +TPM_RID (0 )));
When loading tpm_tis force=1 with my tpm1.2 chip on a machine without bios integration, it fets detected as a TPM2.0 chip :/
sudo rmmod tpm_tis
# modprobe tpm_tis force=1 modprobe: ERROR: could not insert 'tpm_tis': No such device # dmesg [ 263.903828] tpm_tis tpm_tis: 2.0 TPM (device-id 0xB, rev-id 16) [ 263.948049] tpm_tis tpm_tis: A TPM error (10) occurred continue selftest [ 263.948120] tpm_tis tpm_tis: TPM self test failed
sts3 is reported as 0xff from my TPM1.2
Thanks,
Peter
Peter Hüwe
maintainerRe: [tpmdd-devel] [PATCH v9 8/8] tpm: TPM 2.0 FIFO Interface
Am Donnerstag, 4. Dezember 2014, 23:18:33 schrieb Peter Hüwe:
Quoted 172 lines
Hi Jarkko,
Am Donnerstag, 4. Dezember 2014, 06:55:18 schrieb Jarkko Sakkinen:
Quoted 148 lines
From: Will Arthur <[email protected]>
Detect TPM 2.0 by using the extended STS (STS3) register. For TPM 2.0, instead of calling
tpm_get_timeouts(), assign duration and timeout values defined in the TPM 2.0 PTP specification.Signed-off-by Will Arthur <[email protected]>Signed-off-by Jarkko Sakkinen <[email protected]>---
drivers/char/tpm/tpm_tis.c | 80++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 13 deletions(-)
drivers/char/tpm/tpm_tis.c +1
-0@@ -1,5 +1,6 @@/* * Copyright (C) 2005, 2006 IBM Corporation +* Copyright (C) 2014 Intel Corporation *
* Authors:
* Leendert van Doorn <[email protected]>drivers/char/tpm/tpm_tis.c +4
-0@@ -44,6 +45,10 @@ enum tis_status { TPM_STS_DATA_EXPECT = 0x08, }; +enum tis_status3 { +TPM_STS3_TPM2_FAM =0x04 , +}; +enum
tis_int_flags{drivers/char/tpm/tpm_tis.c +1
-0TPM_GLOBAL_INT_ENABLE =0x80000000 , TPM_INTF_BURST_COUNT_STATIC = 0x100,@@ -70,6 +75,7 @@ enum tis_defaults {#define TPM_INT_STATUS (l) (0x0010 | ((l) << 12))#define TPM_INTF_CAPS (l) (0x0014 | ((l) << 12))#define TPM_STS (l) (0x0018 | ((l) << 12)) +#define TPM_STS3 (l) (0x001b | ((l) << 12))#define
TPM_DATA_FIFO(l)(0x0024| ((l) << 12))#define
TPM_DID_VID(l)(0x0F00| ((l) << 12))drivers/char/tpm/tpm_tis.c +1
-0@@ -363,6 +369,7 @@ static int tpm_tis_send_main(struct tpm_chip *chip, u8 *buf, size_t len) {int rc;u32 ordinal; +unsigned long dur;drivers/char/tpm/tpm_tis.c +8
-2rc =tpm_tis_send_data (chip, buf, len);if (rc <0 )@@ -374,9 +381,14 @@ static int tpm_tis_send_main(struct tpm_chip *chip, u8 *buf, size_t len)if (chip->vendor.irq) { ordinal =be32_to_cpu (*((__be32 *) (buf +6 ))); + +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) + dur =tpm2_calc_ordinal_duration (chip, ordinal); +else + dur =tpm_calc_ordinal_duration (chip, ordinal); +if (wait_for_tpm_stat - (chip,TPM_STS_DATA_AVAIL |TPM_STS_VALID , -tpm_calc_ordinal_duration (chip, ordinal), + (chip,TPM_STS_DATA_AVAIL |TPM_STS_VALID , dur, &chip->vendor.read_queue, false) <0 ) { rc = -ETIME ; goto out_err;@@ -588,6 +600,7 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle, int rc, i, irq_s, irq_e, probe;struct tpm_chip *chip;struct priv_data *priv; +u8 sts3;drivers/char/tpm/tpm_tis.c +21
-4priv =devm_kzalloc (dev,sizeof (struct priv_data ),GFP_KERNEL );if (priv ==NULL )@@ -604,11 +617,28 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle, if (!chip->vendor.iobase)return -EIO ; + sts3 =ioread8 (chip->vendor.iobase +TPM_STS3 (1 )); +if ((sts3 &TPM_STS3_TPM2_FAM ) ==TPM_STS3_TPM2_FAM ) + chip->flags =TPM_CHIP_FLAG_TPM2 ; +/* 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 ); +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) { + chip->vendor.timeout_a =usecs_to_jiffies (TPM2_TIMEOUT_A ); + chip->vendor.timeout_b =usecs_to_jiffies (TPM2_TIMEOUT_B ); + chip->vendor.timeout_c =usecs_to_jiffies (TPM2_TIMEOUT_C ); + chip->vendor.timeout_d =usecs_to_jiffies (TPM2_TIMEOUT_D ); + chip->vendor.duration[TPM_SHORT ] = +usecs_to_jiffies (TPM2_DURATION_SHORT ); + chip->vendor.duration[TPM_MEDIUM ] = +usecs_to_jiffies (TPM2_DURATION_MEDIUM ); + chip->vendor.duration[TPM_LONG ] = +usecs_to_jiffies (TPM2_DURATION_LONG ); + }else { + 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 ); + }drivers/char/tpm/tpm_tis.c +0
-0if (wait_startup (chip,0 ) !=0 ) { rc = -ENODEV ;@@ -623,8 +653,8 @@ static int tpm_tis_init(struct device *dev,
acpi_handleacpi_dev_handle, vendor =ioread32(chip->vendor.iobase + TPM_DID_VID(0));drivers/char/tpm/tpm_tis.c static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle,
Quoted 8 lines
drivers/char/tpm/tpm_tis.c +2
-2chip->vendor.manufacturer_id = vendor; -dev_info (dev, -"1.2 TPM (device-id 0x%X, rev-id %d)\n" , +dev_info (dev,"%s TPM (device-id 0x%X, rev-id %d)\n" , + (chip->flags &TPM_CHIP_FLAG_TPM2 ) ?"2.0" :"1.2" , vendor >>16 ,ioread8 (chip->vendor.iobase +TPM_RID (0 )));When loading
tpm_tisforce=1 with my tpm1.2 chip on a machine without bios integration, it fets detected as a TPM2.0 chip :/sudo rmmod
tpm_tis# modprobe tpm_tis force=1 modprobe: ERROR: could not insert 'tpm_tis': No such device # dmesg [ 263.903828] tpm_tis tpm_tis: 2.0 TPM (device-id 0xB, rev-id 16) [ 263.948049] tpm_tis tpm_tis: A TPM error (10) occurred continue selftest [ 263.948120] tpm_tis tpm_tis: TPM self test failed
Quoted 2 lines
sts3 is reported as
0xfffrom my TPM1.2
Hmm,
my TPM2.0 chip also reports sts3 as 0xff (when loading with force=1 on a machine without bios integration)
[ 307.095344] sts3 ff [ 307.095366] tpm_tis tpm_tis: 2.0 TPM (device-id 0x1A, rev-id 16) [ 307.140047] tpm_tis tpm_tis: A TPM error (256) occurred continue selftest [ 307.140056] tpm_tis tpm_tis: TPM self test failed
Peter
Peter Huewe
maintainerAw: Re: [tpmdd-devel] [PATCH v9 8/8] tpm: TPM 2.0 FIFO Interface
Quoted 35 lines
Quoted 31 lines
Am Donnerstag, 4. Dezember 2014, 06:55:18 schrieb Jarkko Sakkinen:
Quoted 6 lines
From: Will Arthur <[email protected]>
Detect TPM 2.0 by using the extended STS (STS3) register. For TPM 2.0, instead of calling
tpm_get_timeouts(), assign duration and timeout values defined in the TPM 2.0 PTP specification.Quoted 9 lines
Signed-off-by Will Arthur <[email protected]>+ sts3 =
ioread8(chip->vendor.iobase + TPM_STS3(1));
+ if ((sts3 &TPM_STS3_TPM2_FAM) ==TPM_STS3_TPM2_FAM)
+chip->flags=TPM_CHIP_FLAG_TPM2;
+When loading
tpm_tisforce=1 with my tpm1.2 chip on a machine without bios integration, it fets detected as a TPM2.0 chip :/sudo rmmod
tpm_tis# modprobe tpm_tis force=1 modprobe: ERROR: could not insert 'tpm_tis': No such device # dmesg [ 263.903828] tpm_tis tpm_tis: 2.0 TPM (device-id 0xB, rev-id 16) [ 263.948049] tpm_tis tpm_tis: A TPM error (10) occurred continue selftest [ 263.948120] tpm_tis tpm_tis: TPM self test failedQuoted 2 lines
sts3 is reported as
0xfffrom my TPM1.2
Quoted 8 lines
Hmm,
my TPM2.0 chip also reports sts3 as0xff(when loading with force=1 on a machine without bios integration)[ 307.095344] sts3 ff [ 307.095366] tpm_tis tpm_tis: 2.0 TPM (device-id 0x1A, rev-id 16) [ 307.140047] tpm_tis tpm_tis: A TPM error (256) occurred continue selftest [ 307.140056] tpm_tis tpm_tis: TPM self test failed
You are reading "sts3" - before requesting the locality and thus it returns 0xff for a TPM20 chip as well. --> You have to have an active locality first.
For a TPM2.0 0xFF is not a valid value (if active locality is set), since reading commandCancel and resetEstablishment bit always return 0 on reads (according to spec).
--> 0xFF should be treated as a TPM1.2 (older tpms with TIS 1.2) --> 0x04 should be treated as TPM 2.0
--> 0x08 should be treated as TPM1.2 (newer tpms with TIS1.3 enhanced)
Thanks,
Peter
Re: [tpmdd-devel] [PATCH v9 8/8] tpm: TPM 2.0 FIFO Interface
Quoted 44 lines · Peter Huewe
Quoted 29 lines
Quoted 26 lines
Am Donnerstag, 4. Dezember 2014, 06:55:18 schrieb Jarkko Sakkinen:
Quoted 6 lines
From: Will Arthur <[email protected]>
Detect TPM 2.0 by using the extended STS (STS3) register. For TPM 2.0, instead of calling
tpm_get_timeouts(), assign duration and timeout values defined in the TPM 2.0 PTP specification.Quoted 7 lines
Signed-off-by Will Arthur <[email protected]>+ sts3 =
ioread8(chip->vendor.iobase + TPM_STS3(1));
+ if ((sts3 &TPM_STS3_TPM2_FAM) ==TPM_STS3_TPM2_FAM)
+chip->flags=TPM_CHIP_FLAG_TPM2;
+When loading
tpm_tisforce=1 with my tpm1.2 chip on a machine without bios integration, it fets detected as a TPM2.0 chip :/sudo rmmod
tpm_tis# modprobe tpm_tis force=1 modprobe: ERROR: could not insert 'tpm_tis': No such device # dmesg [ 263.903828] tpm_tis tpm_tis: 2.0 TPM (device-id 0xB, rev-id 16) [ 263.948049] tpm_tis tpm_tis: A TPM error (10) occurred continue selftest [ 263.948120] tpm_tis tpm_tis: TPM self test failedQuoted 2 lines
sts3 is reported as
0xfffrom my TPM1.2Quoted 8 lines
Hmm,
my TPM2.0 chip also reports sts3 as0xff(when loading with force=1 on a machine without bios integration)[ 307.095344] sts3 ff [ 307.095366] tpm_tis tpm_tis: 2.0 TPM (device-id 0x1A, rev-id 16) [ 307.140047] tpm_tis tpm_tis: A TPM error (256) occurred continue selftest [ 307.140056] tpm_tis tpm_tis: TPM self test failedYou are reading "sts3" - before requesting the locality and thus it returns
0xfffor a TPM20 chip as well. --> You have to have an active locality first.For a TPM2.0
0xFFis not a valid value (if active locality is set), since reading commandCancel and resetEstablishment bit always return 0 on reads (according to spec).
Quoted 7 lines
-->
0xFFshould be treated as a TPM1.2 (older tpms with TIS 1.2) -->0x04should be treated as TPM 2.0
-->0x08should be treated as TPM1.2 (newer tpms with TIS1.3 enhanced)+ sts3 =
ioread8(chip->vendor.iobase + TPM_STS3(1));
+ if ((sts3 &TPM_STS3_TPM2_FAM) ==TPM_STS3_TPM2_FAM)
+chip->flags=TPM_CHIP_FLAG_TPM2;
#define TPM_STS3_TPM2_FAM_MASK = 0x0c
then:
if ((sts3 & TPM_STS3_TPM2_FAM_MASK) == TPM_STS3_TPM2_FAM) ...
[see my previous review on this]
Stefan
Quoted 17 lines
Thanks,
Peter------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________
tpmdd-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel
Re: [tpmdd-devel] [PATCH v9 8/8] tpm: TPM 2.0 FIFO Interface
In reply to Peter HueweQuoted 50 lines · Peter Huewe
Quoted 35 lines
Quoted 31 lines
Am Donnerstag, 4. Dezember 2014, 06:55:18 schrieb Jarkko Sakkinen:
Quoted 6 lines
From: Will Arthur <[email protected]>
Detect TPM 2.0 by using the extended STS (STS3) register. For TPM 2.0, instead of calling
tpm_get_timeouts(), assign duration and timeout values defined in the TPM 2.0 PTP specification.Quoted 9 lines
Signed-off-by Will Arthur <[email protected]>+ sts3 =
ioread8(chip->vendor.iobase + TPM_STS3(1));
+ if ((sts3 &TPM_STS3_TPM2_FAM) ==TPM_STS3_TPM2_FAM)
+chip->flags=TPM_CHIP_FLAG_TPM2;
+When loading
tpm_tisforce=1 with my tpm1.2 chip on a machine without bios integration, it fets detected as a TPM2.0 chip :/sudo rmmod
tpm_tis# modprobe tpm_tis force=1 modprobe: ERROR: could not insert 'tpm_tis': No such device # dmesg [ 263.903828] tpm_tis tpm_tis: 2.0 TPM (device-id 0xB, rev-id 16) [ 263.948049] tpm_tis tpm_tis: A TPM error (10) occurred continue selftest [ 263.948120] tpm_tis tpm_tis: TPM self test failedQuoted 2 lines
sts3 is reported as
0xfffrom my TPM1.2Quoted 8 lines
Hmm,
my TPM2.0 chip also reports sts3 as0xff(when loading with force=1 on a machine without bios integration)[ 307.095344] sts3 ff [ 307.095366] tpm_tis tpm_tis: 2.0 TPM (device-id 0x1A, rev-id 16) [ 307.140047] tpm_tis tpm_tis: A TPM error (256) occurred continue selftest [ 307.140056] tpm_tis tpm_tis: TPM self test failedYou are reading "sts3" - before requesting the locality and thus it returns
0xfffor a TPM20 chip as well.
--> You have to have an active locality first.
Quoted 7 lines
For a TPM2.0
0xFFis not a valid value (if active locality is set), since reading commandCancel and resetEstablishment bit always return 0 on reads (according to spec).-->
0xFFshould be treated as a TPM1.2 (older tpms with TIS 1.2) -->0x04should be treated as TPM 2.0
-->0x08should be treated as TPM1.2 (newer tpms with TIS1.3 enhanced)
Correct. I discussed with some people and verified the reason to be such that if firmware does nothing, the locality is unopened. I have access today to similar setup and can fix this regression and verify my fix.
Thanks for pointing this out!
Quoted 2 lines
Thanks,
Peter
/Jarkko