TPM 2.0 support
Subsystems (4)
v6 cover TPM 2.0 support
This patch set enables TPM2 protocol and provides drivers for FIFO and CRB interfaces.
Major changes since v1:
- 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.
Major changes since v2:
- 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.
Major changes since v3:
- 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.
Major changes since v4:
- missing EXPORT_SYMBOL_GPL()
- own class for TPM devices used for TPM 2.0 devices and onwards.
Major changes since v5:
- 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.
Jarkko Sakkinen (9):
tpm: merge duplicate transmit_cmd() functions
tpm: two-phase chip management functions
tpm: fix multiple race conditions in tpm_ppi.c
tpm: rename chip->dev to chip->pdev
tpm: device class for tpm
tpm: fix race condition with sysfs attributes
tpm: TPM 2.0 baseline support
tpm: TPM 2.0 CRB Interface
tpm: TPM 2.0 sysfs attributes
Will Arthur (1):
tpm: TPM 2.0 FIFO Interface
Documentation/ABI/stable/sysfs-class-tpm2 | 57 +++ drivers/char/tpm/Kconfig | 9 + drivers/char/tpm/Makefile | 3 +- drivers/char/tpm/tpm-chip.c | 193 ++++++++++ drivers/char/tpm/tpm-dev.c | 72 ++-- drivers/char/tpm/tpm-interface.c | 264 +++++--------- drivers/char/tpm/tpm-sysfs.c | 46 +-- drivers/char/tpm/tpm.h | 132 ++++++- drivers/char/tpm/tpm2-cmd.c | 566 ++++++++++++++++++++++++++++++ drivers/char/tpm/tpm2-sysfs.c | 152 ++++++++ drivers/char/tpm/tpm_atmel.c | 25 +- drivers/char/tpm/tpm_crb.c | 327 +++++++++++++++++ drivers/char/tpm/tpm_i2c_atmel.c | 49 +-- drivers/char/tpm/tpm_i2c_infineon.c | 43 +-- drivers/char/tpm/tpm_i2c_nuvoton.c | 68 ++-- drivers/char/tpm/tpm_i2c_stm_st33.c | 44 +-- 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 | 136 ++++--- drivers/char/tpm/tpm_tis.c | 180 ++++++---- drivers/char/tpm/xen-tpmfront.c | 14 +- 22 files changed, 1900 insertions(+), 582 deletions(-) create mode 100644 Documentation/ABI/stable/sysfs-class-tpm2 create mode 100644 drivers/char/tpm/tpm-chip.c create mode 100644 drivers/char/tpm/tpm2-cmd.c create mode 100644 drivers/char/tpm/tpm2-sysfs.c create mode 100644 drivers/char/tpm/tpm_crb.c
Signature · 1 line
2.1.0
PATCH v6 1/10 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 = (struct tpm_output_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 v6 2/10 tpm: two-phase chip management functions
In reply to Jarkko Sakkinentpm_register_hardware() and tpm_remove_hardware() are called often before initializing the device. This is wrong order since it could be that main TPM driver needs a fully initialized chip to be able to do its job. For example, now it is impossible to move common startup functions such as tpm_do_selftest() to tpm_register_hardware().
Added tpmm_chip_alloc() and tpm_chip_register() where tpm_chip_alloc() reserves memory resources and tpm_chip_register() initializes the device driver. This way it is possible to alter struct tpm_chip attributes and initialize the device driver before passing it to tpm_chip_register().
The framework takes care of freeing struct tpm_chip by using devres API. The broken release callback has been wiped. For example, ACPI drivers do not ever get this callback.
This is a interm step to get proper life-cycle for TPM device drivers. The next steps are adding proper ref counting and locking to tpm_chip that is used in every place in the TPM driver.
Big thank you to Jason Gunthorpe for carefully reviewing this part of the code. Without his contribution reaching the best quality would not have been possible.
--- drivers/char/tpm/Makefile | 2 +- drivers/char/tpm/tpm-chip.c | 196 ++++++++++++++++++++++++++++++++++++ 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 | 33 ++---- drivers/char/tpm/tpm_i2c_infineon.c | 37 ++----- drivers/char/tpm/tpm_i2c_nuvoton.c | 44 +++----- drivers/char/tpm/tpm_i2c_stm_st33.c | 38 +++---- 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 | 78 ++++++-------- drivers/char/tpm/xen-tpmfront.c | 14 +-- 14 files changed, 329 insertions(+), 343 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 +196 -0
196 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 -22
@@ -160,11 +160,9 @@ static int i2c_atmel_probe(struct i2c_client *client,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 );
@@ -179,21 +177,16 @@ 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_get_timeouts (chip)) +return -ENODEV ; -if (tpm_do_selftest (chip)) { - rc = -ENODEV ; - goto out_err; - } +if (tpm_do_selftest (chip)) +return -ENODEV ; -return 0 ; + rc =tpm_chip_register (chip); +if (rc) +return rc; -out_err: -tpm_dev_vendor_release (chip); -tpm_remove_hardware (chip->dev);return rc; }
@@ -201,11 +194,7 @@ static int i2c_atmel_remove(struct i2c_client *client) {struct device *dev = &(client->dev);struct tpm_chip *chip =dev_get_drvdata (dev); - -if (chip) -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 +15 -29
78 lines not on this page · raw message
drivers/char/tpm/tpm_i2c_stm_st33.c +14 -24
@@ -609,37 +609,29 @@ tpm_st33_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)if (client ==NULL ) {pr_info ("%s: i2c client is NULL. Device not accessible.\n" , __func__); - err = -ENODEV ; - goto end; +return -ENODEV ; }if (!i2c_check_functionality (client->adapter,I2C_FUNC_I2C )) {dev_info (&client->dev,"client not i2c capable\n" ); - err = -ENODEV ; - goto end; +return -ENODEV ; } - chip =tpm_register_hardware (&client->dev, &st_i2c_tpm); -if (!chip) { -dev_info (&client->dev,"fail chip\n" ); - err = -ENODEV ; - goto end; - } + chip =tpmm_chip_alloc (&client->dev, &st_i2c_tpm); +if (IS_ERR (chip)) +return PTR_ERR (chip); platform_data = client->dev.platform_data;if (!platform_data) {dev_info (&client->dev,"chip not available\n" ); - err = -ENODEV ; - goto _tpm_clean_answer; +return -ENODEV ; } platform_data->tpm_i2c_buffer[0 ] =kmalloc (TPM_BUFSIZE *sizeof (u8),GFP_KERNEL ); -if (platform_data->tpm_i2c_buffer[0 ] ==NULL ) { - err = -ENOMEM ; - goto _tpm_clean_answer; - } +if (platform_data->tpm_i2c_buffer[0 ] ==NULL ) +return -ENOMEM ; platform_data->tpm_i2c_buffer[1 ] =kmalloc (TPM_BUFSIZE *sizeof (u8),GFP_KERNEL );if (platform_data->tpm_i2c_buffer[1 ] ==NULL ) {
@@ -716,8 +708,10 @@ tpm_st33_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 ; + err =tpm_chip_register (chip); +if (!err) +return 0 ; + _irq_set:free_irq (gpio_to_irq (platform_data->io_serirq), (void *)chip); _gpio_init2:
@@ -732,10 +726,6 @@ _tpm_clean_response2: _tpm_clean_response1:kzfree (platform_data->tpm_i2c_buffer[0 ]); platform_data->tpm_i2c_buffer[0 ] =NULL ; -_tpm_clean_answer: -tpm_remove_hardware (chip->dev); -end: -pr_info ("TPM I2C initialisation fail\n" );return err; }
@@ -752,13 +742,13 @@ static int tpm_st33_i2c_remove(struct i2c_client *client) ((struct i2c_client *)TPM_VPRIV (chip))->dev.platform_data;if (pin_infos !=NULL ) { +tpm_chip_unregister (chip); +free_irq (pin_infos->io_serirq, chip);gpio_free (pin_infos->io_serirq);gpio_free (pin_infos->io_lpcpd); -tpm_remove_hardware (chip->dev); -if (pin_infos->tpm_i2c_buffer[1 ] !=NULL ) {kzfree (pin_infos->tpm_i2c_buffer[1 ]); pin_infos->tpm_i2c_buffer[1 ] =NULL ;
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 ;
@@ -555,11 +556,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) {
@@ -629,7 +628,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);
@@ -644,8 +643,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 +29 -49
149 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 v6 3/10 tpm: fix multiple race conditions in tpm_ppi.c
In reply to Jarkko SakkinenTraversal of the ACPI device tree was not done right. It should lookup PPI only under the ACPI device that it is associated. Otherwise, it could match to a wrong PPI interface if there are two TPM devices in the device tree.
Removed global ACPI handle and version string from tpm_ppi.c as this is racy. Instead they should be associated with the chip.
Additionally, added the missing copyright platter to tpm_ppi.c.
--- drivers/char/tpm/tpm-chip.c | 4 +- drivers/char/tpm/tpm.h | 16 ++++-- drivers/char/tpm/tpm_ppi.c | 136 +++++++++++++++++++++++++++----------------- drivers/char/tpm/tpm_tis.c | 15 +++-- 4 files changed, 108 insertions(+), 63 deletions(-)
drivers/char/tpm/tpm-chip.c +2 -2
@@ -148,7 +148,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;
@@ -186,7 +186,7 @@ void tpm_chip_unregister(struct tpm_chip *chip)synchronize_rcu ();tpm_sysfs_del_device (chip); -tpm_remove_ppi (&chip->dev->kobj); +tpm_remove_ppi (chip);if (chip->bios_dir)tpm_bios_log_teardown (chip->bios_dir);
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 -53
241 lines not on this page · raw message
drivers/char/tpm/tpm_tis.c +11 -4
@@ -536,8 +536,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;
@@ -547,6 +548,8 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,if (IS_ERR (chip))return PTR_ERR (chip); + chip->acpi_dev_handle = acpi_dev_handle; + chip->vendor.iobase =devm_ioremap (dev, start, len);if (!chip->vendor.iobase)return -EIO ;
@@ -777,6 +780,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 );
@@ -789,7 +793,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[] = {
@@ -858,7 +865,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
PATCH v6 4/10 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 | 6 +++--- 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 | 12 ++++++------ 14 files changed, 88 insertions(+), 87 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 ; }
@@ -111,7 +111,7 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev,scnprintf (chip->devname,sizeof (chip->devname),"%s%d" ,"tpm" , 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 +3 -3
@@ -544,7 +544,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; }
@@ -557,7 +557,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; }
@@ -671,7 +671,7 @@ tpm_st33_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)IRQF_TRIGGER_HIGH , "TPM SERIRQ management", chip);if (err <0 ) { -dev_err (chip->dev ,"TPM SERIRQ signals %d not available\n" , +dev_err (chip->pdev ,"TPM SERIRQ signals %d not available\n" ,gpio_to_irq (platform_data->io_serirq)); goto _irq_set; }
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
@@ -358,11 +358,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 +6 -6
@@ -238,7 +238,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; }
@@ -251,7 +251,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; }
@@ -260,7 +260,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; }
@@ -433,7 +433,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 ;
@@ -662,7 +662,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 ;
@@ -709,7 +709,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
Re: [PATCH v6 04/10] tpm: rename chip->dev to chip->pdev
Quoted 2 lines · Jarkko Sakkinen
Rename
chip->devtochip->pdevto make it explicit that this not the character device but actually represents the platform device.
I don't really have time to take a detailed look at this for a few weeks, but I like this entire patch set.
drivers/char/tpm/tpm-chip.c struct tpm_chip *tpm_chip_find_get(int chip_num) · line 50
Quoted 4 lines
drivers/char/tpm/tpm-chip.c +1
-1-if (try_module_get (pos->dev->driver->owner)) { +if (try_module_get (pos->pdev->driver->owner)) { chip = pos;break ;
Yes, this needs to be pdev
drivers/char/tpm/tpm-dev.c static int tpm_open(struct inode *inode, struct file *file) · line 67
Quoted 4 lines
drivers/char/tpm/tpm-dev.c +1
-1if (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 ;
This should be moved to the class dev, ie it should ultimately say dev_dbg(&chip->dev,..
Similar comments all over the place.
Jason
Re: [PATCH v6 04/10] tpm: rename chip->dev to chip->pdev
Quoted 6 lines · Jason Gunthorpe
Quoted 2 lines · Jarkko Sakkinen
Rename
chip->devtochip->pdevto make it explicit that this not the character device but actually represents the platform device.I don't really have time to take a detailed look at this for a few weeks, but I like this entire patch set.
Excellent, thank you.
Quoted 7 lines
drivers/char/tpm/tpm-chip.c struct tpm_chip *tpm_chip_find_get(int chip_num) · line 50
Quoted 4 lines
drivers/char/tpm/tpm-chip.c +1
-1-if (try_module_get (pos->dev->driver->owner)) { +if (try_module_get (pos->pdev->driver->owner)) { chip = pos;break ;Yes, this needs to be pdev
Quoted 7 lines
drivers/char/tpm/tpm-dev.c static int tpm_open(struct inode *inode, struct file *file) · line 67
Quoted 4 lines
drivers/char/tpm/tpm-dev.c +1
-1if (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 ;This should be moved to the class dev, ie it should ultimately say dev_dbg(&chip->dev,..
Peter, I'll try to minimize the delta between the patch set revisions so that this could be pulled in the near future (maybe having odds to make into 3.19) and do only fixes to those issues that are blockers.
Would you mind if I fixed dev logging stuff after the patch set has been pulled?
Writing this down anyway to my backlog.
Quoted 3 lines
Similar comments all over the place.
Jason
/Jarkko
PATCH v6 5/10 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 compatability.
--- drivers/char/tpm/tpm-dev.c | 56 +++++++++++++++++++++++++++----------- drivers/char/tpm/tpm-interface.c | 32 ++++++++++++++++++++++ drivers/char/tpm/tpm.h | 9 ++++-- drivers/char/tpm/tpm_i2c_nuvoton.c | 2 +- drivers/char/tpm/tpm_tis.c | 4 +-- 5 files changed, 82 insertions(+), 21 deletions(-)
drivers/char/tpm/tpm-dev.c +40 -16
@@ -17,9 +17,9 @@* License. * */ -#include <linux/miscdevice.h> #include <linux/slab.h> #include <linux/uaccess.h> +#include <linux/major.h> #include "tpm.h" struct file_priv {
@@ -54,9 +54,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,
@@ -182,32 +181,57 @@ static const struct file_operations tpm_fops = { .release = tpm_release, }; +static void tpm_dev_release (struct device *dev) +{ +} +int tpm_dev_add_device (struct tpm_chip *chip) {int rc; - chip->vendor.miscdev.fops = &tpm_fops; + chip->dev.class = tpm_class; + chip->dev.release = tpm_dev_release; + chip->dev.parent = chip->pdev; + chip->cdev.owner = chip->pdev->driver->owner; +if (chip->dev_num ==0 ) - chip->vendor.miscdev.minor =TPM_MINOR ; + chip->dev.devt =MKDEV (MISC_MAJOR ,TPM_MINOR );else - chip->vendor.miscdev.minor =MISC_DYNAMIC_MINOR ; + chip->dev.devt =MKDEV (MAJOR (tpm_devt), chip->dev_num); - chip->vendor.miscdev.name = chip->devname; - chip->vendor.miscdev.parent = chip->pdev; +dev_set_name (&chip->dev, chip->devname); - rc =misc_register (&chip->vendor.miscdev); + rc =device_register (&chip->dev);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); +"unable to device_register %s, major %d, minor %d " \ +"err=%d\n" , + chip->devname,MAJOR (chip->dev.devt), +MINOR (chip->dev.devt), rc); } + +cdev_init (&chip->cdev, &tpm_fops); + + rc =cdev_add (&chip->cdev, chip->dev.devt,1 ); +if (rc) { +dev_err (chip->pdev, +"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); +put_device (&chip->dev); +return rc; + } +return rc; }void tpm_dev_del_device (struct tpm_chip *chip) { -if (chip->vendor.miscdev.name) -misc_deregister (&chip->vendor.miscdev); +if (get_device (&chip->dev) !=NULL ) { +cdev_del (&chip->cdev); +device_unregister (&chip->dev); +put_device (&chip->dev); + } }
drivers/char/tpm/tpm-interface.c +32 -0
@@ -38,6 +38,9 @@#define TPM_PROTECTED_COMMAND 0x00#define TPM_CONNECTION_COMMAND 0x40 +struct class *tpm_class; +dev_t tpm_devt; +/* * Bug workaround - some TPM's don't flush the most * recently changed pcr on suspend, so force the flush
@@ -997,6 +1000,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 +7 -2
@@ -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,9 @@ struct tpm_cmd_t {tpm_cmd_params params; } __packed; +extern struct class *tpm_class; +extern dev_t tpm_devt; +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);
drivers/char/tpm/tpm_i2c_nuvoton.c +1 -1
@@ -557,7 +557,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
@@ -661,7 +661,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);
@@ -708,7 +708,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
Re: [PATCH v6 05/10] tpm: device class for tpm
drivers/char/tpm/tpm-dev.c static const struct file_operations tpm_fops = { · line 187
Quoted 4 lines · Jarkko Sakkinen
drivers/char/tpm/tpm-dev.c +4
-0+static void tpm_dev_release (struct device *dev) +{ +} +
These patches are so close to actually fixing many of the use-after-free problems too :)
drivers/char/tpm/tpm-dev.c static const struct file_operations tpm_fops = { · line 204
Quoted 10 lines
int
tpm_dev_add_device(struct tpm_chip *chip)
{drivers/char/tpm/tpm-dev.c +5
-1int rc; - chip->vendor.miscdev.fops = &tpm_fops; + chip->dev.class = tpm_class; + chip->dev.release = tpm_dev_release; + chip->dev.parent = chip->pdev; +dev_set_name (&chip->dev, chip->devname); + rc =device_register (&chip->dev);
I think all of this should live in tpm-chip.c
I would also suggest using device_initialize during tpmm_alloc_chip and device_add + cdev_add during tpm_register. That way the dev member is always valid and we can immediately use put_device to do the free and devm just does put_device.
drivers/char/tpm/tpm-dev.c static const struct file_operations tpm_fops = { · line 236
Quoted 9 lines
void
tpm_dev_del_device(struct tpm_chip *chip)
{drivers/char/tpm/tpm-dev.c +5
-2-if (chip->vendor.miscdev.name) -misc_deregister (&chip->vendor.miscdev); +if (get_device (&chip->dev) !=NULL ) { +cdev_del (&chip->cdev); +device_unregister (&chip->dev); +put_device (&chip->dev); + }
The get/put seems oddly placed - really the caller of del_device must be holding the ref I don't see that del_device needs it..
Ultimately we want things so that when the ref count goes to 0 then the chip will be freed - this means that get_device can never fail since chip->dev will be deallocated memory.
drivers/char/tpm/tpm-interface.c line 42
Quoted 2 lines
drivers/char/tpm/tpm-interface.c +2
-0+struct class *tpm_class; +dev_t tpm_devt;
Also makes more sense to me in chip-chip
Jason
Re: [PATCH v6 05/10] tpm: device class for tpm
Quoted 9 lines · Jason Gunthorpe
drivers/char/tpm/tpm-dev.c static const struct file_operations tpm_fops = { · line 187
Quoted 4 lines · Jarkko Sakkinen
drivers/char/tpm/tpm-dev.c +4
-0+static void tpm_dev_release (struct device *dev) +{ +} +These patches are so close to actually fixing many of the use-after-free problems too :)
Excellent!
Quoted 13 lines
drivers/char/tpm/tpm-dev.c static const struct file_operations tpm_fops = { · line 204
Quoted 10 lines
int
tpm_dev_add_device(struct tpm_chip *chip)
{drivers/char/tpm/tpm-dev.c +5
-1int rc; - chip->vendor.miscdev.fops = &tpm_fops; + chip->dev.class = tpm_class; + chip->dev.release = tpm_dev_release; + chip->dev.parent = chip->pdev; +dev_set_name (&chip->dev, chip->devname); + rc =device_register (&chip->dev);I think all of this should live in
tpm-chip.c
Quoted 4 lines
I would also suggest using
device_initializeduringtpmm_alloc_chipanddevice_add+cdev_addduringtpm_register. That way the dev member is always valid and we can immediately useput_deviceto do the free and devm just doesput_device.
Right. Makes sense. I'll do this change.
Quoted 4 lines
Quoted 4 lines
void
tpm_dev_del_device(struct tpm_chip *chip)
{drivers/char/tpm/tpm-dev.c +0
-2-if (chip->vendor.miscdev.name) -misc_deregister (&chip->vendor.miscdev);
Quoted 8 lines
drivers/char/tpm/tpm-dev.c static const struct file_operations tpm_fops = { · line 236
Quoted 5 lines
drivers/char/tpm/tpm-dev.c +5
-0+if (get_device (&chip->dev) !=NULL ) { +cdev_del (&chip->cdev); +device_unregister (&chip->dev); +put_device (&chip->dev); + }The get/put seems oddly placed - really the caller of
del_devicemust be holding the ref I don't see thatdel_deviceneeds it..
I checked from the source code and what you say is corrrect.
Quoted 3 lines
Ultimately we want things so that when the ref count goes to 0 then the chip will be freed - this means that
get_devicecan never fail sincechip->devwill be deallocated memory.
This is again something that I acknowledge but did not want to bake into patch set.
Quoted 4 lines
drivers/char/tpm/tpm-interface.c line 42
Quoted 2 lines
drivers/char/tpm/tpm-interface.c +2
-0+struct class *tpm_class; +dev_t tpm_devt;Also makes more sense to me in chip-chip
Ack.
Quoted 1 line
Jason
/Jarkko
PATCH v6 6/10 tpm: fix race condition with sysfs attributes
In reply to Jarkko Sakkinensysfs attributes were created into wrong place (platform device directory) and they had a race condition where user space might get announced about the device before sysfs were created. This patch uses the groups field in struct device to resolve this issue.
BIOS log and PPI are still kept racy in order to not break up backwards compatibility. Moving device sysfs attributes to a different place should not be a problem because they are not machine consumable anyway (which is of course wrong but what can you do since they already exist).
--- drivers/char/tpm/tpm-chip.c | 11 ++--------- drivers/char/tpm/tpm-dev.c | 4 ++++ drivers/char/tpm/tpm-sysfs.c | 23 +---------------------- drivers/char/tpm/tpm.h | 3 +-- 4 files changed, 8 insertions(+), 33 deletions(-)
drivers/char/tpm/tpm-chip.c +2 -9
@@ -144,13 +144,9 @@ int tpm_chip_register(struct tpm_chip *chip)if (rc)return rc; - rc =tpm_sysfs_add_device (chip); -if (rc) - goto del_misc; - rc =tpm_add_ppi (chip);if (rc) - goto del_sysfs; + goto out_err; chip->bios_dir =tpm_bios_log_setup (chip->devname);
@@ -160,9 +156,7 @@ int tpm_chip_register(struct tpm_chip *chip)spin_unlock (&driver_lock);return 0 ; -del_sysfs: -tpm_sysfs_del_device (chip); -del_misc: +out_err:tpm_dev_del_device (chip);return rc; }
@@ -185,7 +179,6 @@ void tpm_chip_unregister(struct tpm_chip *chip)spin_unlock (&driver_lock);synchronize_rcu (); -tpm_sysfs_del_device (chip);tpm_remove_ppi (chip);if (chip->bios_dir)
drivers/char/tpm/tpm-dev.c +4 -0
@@ -22,6 +22,8 @@#include <linux/major.h> #include "tpm.h" +ATTRIBUTE_GROUPS (tpm_dev); +struct file_priv {struct tpm_chip *chip;
@@ -199,6 +201,8 @@ int tpm_dev_add_device(struct tpm_chip *chip)else chip->dev.devt =MKDEV (MAJOR (tpm_devt), chip->dev_num); + chip->dev.groups = tpm_dev_groups; +dev_set_name (&chip->dev, chip->devname); rc =device_register (&chip->dev);
drivers/char/tpm/tpm-sysfs.c +1 -22
@@ -263,7 +263,7 @@ static ssize_t timeouts_show(struct device *dev, struct device_attribute *attr, }static DEVICE_ATTR_RO (timeouts); -static struct attribute *tpm_dev_attrs[] = { +struct attribute *tpm_dev_attrs[] = { &dev_attr_pubek.attr, &dev_attr_pcrs.attr, &dev_attr_enabled.attr,
@@ -276,24 +276,3 @@ static struct attribute *tpm_dev_attrs[] = { &dev_attr_timeouts.attr, NULL, }; - -static const struct attribute_group tpm_dev_group = { - .attrs = tpm_dev_attrs, -}; - -int tpm_sysfs_add_device (struct tpm_chip *chip) -{ -int err; - err =sysfs_create_group (&chip->pdev->kobj, - &tpm_dev_group); - -if (err) -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->pdev->kobj, &tpm_dev_group); -}
drivers/char/tpm/tpm.h +1 -2
@@ -324,6 +324,7 @@ struct tpm_cmd_t {extern struct class *tpm_class;extern dev_t tpm_devt; +extern struct attribute *tpm_dev_attrs[];ssize_t tpm_getcap (struct device *,__be32 ,cap_t *,const char *); ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
@@ -347,8 +348,6 @@ 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);int tpm_pcr_read_dev (struct tpm_chip *chip,int pcr_idx,u8 *res_buf);
Signature · 1 line
2.1.0
PATCH v6 7/10 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 | 21 +- drivers/char/tpm/tpm-interface.c | 24 +- drivers/char/tpm/tpm.h | 67 +++++ drivers/char/tpm/tpm2-cmd.c | 566 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 668 insertions(+), 12 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 +13 -8
@@ -144,11 +144,14 @@ int tpm_chip_register(struct tpm_chip *chip)if (rc)return rc; - rc =tpm_add_ppi (chip); -if (rc) - goto out_err; +/* Populate sysfs for TPM1 devices. */ +if (!(chip->flags &TPM_CHIP_FLAG_TPM2 )) { + rc =tpm_add_ppi (chip); +if (rc) + goto out_err; - 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);
@@ -179,10 +182,12 @@ void tpm_chip_unregister(struct tpm_chip *chip)spin_unlock (&driver_lock);synchronize_rcu (); -tpm_remove_ppi (chip); - -if (chip->bios_dir) -tpm_bios_log_teardown (chip->bios_dir); +/* Clean up sysfs for TPM1 devices. */ +if (!(chip->flags &TPM_CHIP_FLAG_TPM2 )) { +if (chip->bios_dir) +tpm_bios_log_teardown (chip->bios_dir); +tpm_remove_ppi (chip); + }tpm_dev_del_device (chip); }
drivers/char/tpm/tpm-interface.c +21 -3
@@ -363,7 +363,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) ==
@@ -486,7 +489,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" );
@@ -683,7 +686,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; }
@@ -717,6 +723,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 );
@@ -977,6 +989,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 +67 -0
88 lines not on this page · raw message
drivers/char/tpm/tpm2-cmd.c new file +566 -0
566 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH v6 8/10 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 | 333 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 343 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_ST33_I2C) += 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 +333 -0
333 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH v6 9/10 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 | 71 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 15 deletions(-)
drivers/char/tpm/tpm_tis.c +56 -15
@@ -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))
@@ -344,6 +350,7 @@ static int tpm_tis_send(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 )
@@ -355,9 +362,14 @@ static int tpm_tis_send(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 =tpm_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;
@@ -543,6 +555,7 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle,u32 vendor, intfcaps, intmask;int rc, i, irq_s, irq_e, probe;struct tpm_chip *chip; +u8 sts3; chip =tpmm_chip_alloc (dev, &tpm_tis);if (IS_ERR (chip))
@@ -554,11 +567,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 ) + 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 ;
@@ -573,8 +603,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) {
@@ -616,13 +646,17 @@ static int tpm_tis_init(struct device *dev, acpi_handle acpi_dev_handle,dev_dbg (dev,"\tData Avail Int Support\n" );/* get the timeouts before testing for irqs */ -if (tpm_get_timeouts (chip)) { +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 (tpm_do_selftest (chip)) { +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;
@@ -683,7 +717,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;
@@ -759,14 +796,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
PATCH v6 10/10 tpm: TPM 2.0 sysfs attributes
In reply to Jarkko SakkinenManadatory sysfs attributes for TPM 2.0 devices so that it is easy to check whether storage hierarchies are enabled.
--- Documentation/ABI/stable/sysfs-class-tpm2 | 57 +++++++++++ drivers/char/tpm/Makefile | 2 +- drivers/char/tpm/tpm-chip.c | 15 ++- drivers/char/tpm/tpm-dev.c | 6 +- drivers/char/tpm/tpm.h | 19 ++++ drivers/char/tpm/tpm2-sysfs.c | 152 ++++++++++++++++++++++++++++++ drivers/char/tpm/tpm_crb.c | 20 ++-- 7 files changed, 248 insertions(+), 23 deletions(-) create mode 100644 Documentation/ABI/stable/sysfs-class-tpm2 create mode 100644 drivers/char/tpm/tpm2-sysfs.c
Documentation/ABI/stable/sysfs-class-tpm2 new file +57 -0
@@ -0,0 +1,57 @@ +What: /sys/class/misc/tpmX/device/ +Date: October 2014 +KernelVersion: 3.19 +Contact: [email protected] +Description: The device/ directory under a specific TPM instance exposes + the properties of that TPM chip. + +What: /sys/class/misc/tpmX/device/family +Date: October 2014 +KernelVersion: 3.19 +Contact: [email protected] +Description: The protocol family in the major.minor format. + +What: /sys/class/misc/tpmX/device/sh_enabled +Date: October 2014 +KernelVersion: 3.19 +Contact: [email protected] +Description: The "sh_enabled" property prints a '1' if the Storage Hierarchy + is enabled, i.e. if PM_PT_STARTUP_CLEAR.shEnable is set. + +What: /sys/class/misc/tpmX/device/sh_owned +Date: October 2014 +KernelVersion: 3.19 +Contact: [email protected] +Description: The "sh_owned" property prints a '1' if the ownership of the + Storage Hierarchy has been taken, i.e. if + TPM_PT_PERMANENT.ownerAuthSet is set. + +What: /sys/class/misc/tpmX/device/eh_enabled +Date: October 2014 +KernelVersion: 3.19 +Contact: [email protected] +Description: The "eh_enabled" property prints a '1' if the Endorsement + Hierarchy is enabled, i.e if PM_PT_STARTUP_CLEAR.ehEnable is + set. + +What: /sys/class/misc/tpmX/device/eh_owned +Date: October 2014 +KernelVersion: 3.19 +Contact: [email protected] +Description: The "eh_owned" property prints a '1' if the ownership of the + Endrosoment Hierarchy has been taken, i.e if + TPM_PT_PERMANENT.endorsementAuthSet is set. + +What: /sys/class/misc/tpmX/device/manufacturer +Date: October 2014 +KernelVersion: 3.19 +Contact: [email protected] +Description: The "manufacturer" property prints the vendor ID of the TPM + manufacturer. + +What: /sys/class/misc/tpmX/device/firmware +Date: October 2014 +KernelVersion: 3.19 +Contact: [email protected] +Description: The property prints the vendor-specific value indicating the + version of the firmware.
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 tpm2-cmd.o +tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o tpm2-sysfs.o tpm-$(CONFIG_ACPI) += tpm_ppi.o ifdef CONFIG_ACPI
drivers/char/tpm/tpm-chip.c +7 -8
@@ -144,14 +144,12 @@ int tpm_chip_register(struct tpm_chip *chip)if (rc)return rc; -/* Populate sysfs for TPM1 devices. */ -if (!(chip->flags &TPM_CHIP_FLAG_TPM2 )) { - rc =tpm_add_ppi (chip); -if (rc) - goto out_err; + rc =tpm_add_ppi (chip); +if (rc) + goto out_err; +if (!(chip->flags &TPM_CHIP_FLAG_TPM2 )) chip->bios_dir =tpm_bios_log_setup (chip->devname); - }/* Make the chip available. */ spin_lock (&driver_lock);
@@ -182,8 +180,9 @@ void tpm_chip_unregister(struct tpm_chip *chip)spin_unlock (&driver_lock);synchronize_rcu (); -/* Clean up sysfs for TPM1 devices. */ -if (!(chip->flags &TPM_CHIP_FLAG_TPM2 )) { +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) { +tpm_remove_ppi (chip); + }else {if (chip->bios_dir)tpm_bios_log_teardown (chip->bios_dir);tpm_remove_ppi (chip);
drivers/char/tpm/tpm-dev.c +5 -1
@@ -23,6 +23,7 @@#include "tpm.h" ATTRIBUTE_GROUPS (tpm_dev); +ATTRIBUTE_GROUPS (tpm2_dev);struct file_priv {struct tpm_chip *chip;
@@ -201,7 +202,10 @@ int tpm_dev_add_device(struct tpm_chip *chip)else chip->dev.devt =MKDEV (MAJOR (tpm_devt), chip->dev_num); - chip->dev.groups = tpm_dev_groups; +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) + chip->dev.groups = tpm2_dev_groups; +else + chip->dev.groups = tpm_dev_groups;dev_set_name (&chip->dev, chip->devname);
drivers/char/tpm/tpm.h +19 -0
@@ -108,6 +108,24 @@ enum tpm2_capabilities { TPM2_CAP_TPM_PROPERTIES = 6, }; +enum tpm2_tpm_properties { +TPM2_PT_MANUFACTURER =0x00000105 , +TPM2_PT_FIRMWARE_VERSION_1 =0x0000010C , +TPM2_PT_FIRMWARE_VERSION_2 =0x0000010D , +TPM2_PT_PERMANENT =0x00000200 , +TPM2_PT_STARTUP_CLEAR =0x00000201 , +}; + +enum tpm2_pt_startup_clear { +TPM2_PT_SC_SH_ENABLE =BIT (1 ), +TPM2_PT_SC_EH_ENABLE =BIT (2 ), +}; + +enum tpm2_pt_permanent { +TPM2_PT_PM_OWNER_AUTH_SET =BIT (0 ), +TPM2_PT_PM_ENDORSEMENT_AUTH_SET =BIT (1 ), +}; +enum tpm2_startup_types {TPM2_SU_CLEAR =0x0000 ,TPM2_SU_STATE =0x0001 ,
@@ -381,6 +399,7 @@ struct tpm_cmd_t {extern struct class *tpm_class;extern dev_t tpm_devt;extern struct attribute *tpm_dev_attrs[]; +extern struct attribute *tpm2_dev_attrs[];ssize_t tpm_getcap (struct device *,__be32 ,cap_t *,const char *); ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
drivers/char/tpm/tpm2-sysfs.c new file +152 -0
152 lines not on this page · raw message
drivers/char/tpm/tpm_crb.c +7 -13
@@ -167,7 +167,7 @@ static int crb_send(struct tpm_chip *chip, u8 *buf, size_t len) cca = priv->cca;if (len >le32_to_cpu (cca->cmd_size)) { -dev_err (chip->dev, +dev_err (&chip->dev,"invalid command count value %x %zx\n" , (unsigned int ) len, (size_t )le32_to_cpu (cca->cmd_size));
@@ -198,7 +198,7 @@ static void crb_cancel(struct tpm_chip *chip)wmb ();if (crb_do_acpi_start (chip)) -dev_err (chip->dev,"ACPI Start failed\n" ); +dev_err (&chip->dev,"ACPI Start failed\n" ); cca->cancel =0 ; }
@@ -231,24 +231,22 @@ static int crb_acpi_add(struct acpi_device *device)int rc; chip =tpmm_chip_alloc (dev, &tpm_crb); -if (IS_ERR (chip)) { -dev_err (dev,"allocating chip failed\n" ); +if (IS_ERR (chip))return PTR_ERR (chip); - } chip->flags =TPM_CHIP_FLAG_TPM2 ; status =acpi_get_table (ACPI_SIG_TPM2 ,1 , (struct acpi_table_header **) &buf);if (ACPI_FAILURE (status)) { -dev_err (dev,"could not get TPM2 ACPI table\n" ); +dev_err (dev,"failed to get TPM2 ACPI table\n" );return -ENODEV ; } priv = (struct crb_priv *)devm_kzalloc (dev,sizeof (struct crb_priv ),GFP_KERNEL );if (!priv) { -dev_err (dev,"allocating memory failed\n" ); +dev_err (dev,"failed to devm_kzalloc for private data\n" );return -ENOMEM ; }
@@ -285,16 +283,12 @@ static int crb_acpi_add(struct acpi_device *device) chip->acpi_dev_handle = device->handle; rc =tpm2_do_selftest (chip); -if (rc) { -dev_err (dev,"self-test failed\n" ); +if (rc)return rc; - } rc =tpm_chip_register (chip); -if (rc) { -dev_err (dev,"registering the chip failed\n" ); +if (rc)return rc; - }return 0 ; }
Signature · 1 line
2.1.0
Re: [PATCH v6 10/10] tpm: TPM 2.0 sysfs attributes
drivers/char/tpm/tpm_crb.c static int crb_send(struct tpm_chip *chip, u8 *buf, size_t len) · line 170
Quoted 3 lines · Jarkko Sakkinen
drivers/char/tpm/tpm_crb.c +1
-1if (len >le32_to_cpu (cca->cmd_size)) { - dev_err(chip->dev, + dev_err(&chip->dev,
Is this out of sequence in the patch series?
Quoted 4 lines
drivers/char/tpm/tpm_crb.c +0
-2rc =tpm2_do_selftest (chip); -if (rc) { -dev_err (dev,"self-test failed\n" );
drivers/char/tpm/tpm_crb.c static int crb_acpi_add(struct acpi_device *device) · line 297
Quoted 10 lines
drivers/char/tpm/tpm_crb.c +2
-4+if (rc)return rc; - } rc =tpm_chip_register (chip); -if (rc) { -dev_err (dev,"registering the chip failed\n" ); +if (rc)return rc; - }
Ditto.
Also, just:
return tpm_chip_register(chip);
Jason
Re: [PATCH v6 10/10] tpm: TPM 2.0 sysfs attributes
Quoted 7 lines · Jason Gunthorpe
drivers/char/tpm/tpm_crb.c static int crb_send(struct tpm_chip *chip, u8 *buf, size_t len) · line 170
Quoted 3 lines · Jarkko Sakkinen
drivers/char/tpm/tpm_crb.c +1
-1if (len >le32_to_cpu (cca->cmd_size)) { - dev_err(chip->dev, + dev_err(&chip->dev,Is this out of sequence in the patch series?
It is, must have rebased the fixup into wrong commit.
Quoted 16 lines
drivers/char/tpm/tpm_crb.c static int crb_acpi_add(struct acpi_device *device) · line 297
Quoted 13 lines
drivers/char/tpm/tpm_crb.c +2
-6rc =tpm2_do_selftest (chip); -if (rc) { -dev_err (dev,"self-test failed\n" ); +if (rc)return rc; - } rc =tpm_chip_register (chip); -if (rc) { -dev_err (dev,"registering the chip failed\n" ); +if (rc)return rc; - }Ditto.
Quoted 5 lines
Also, just:
return tpm_chip_register(chip);Jason
/Jarkko