tpm: Add force device probe option
PATCH 1/1 tpm: Add force device probe option
Some machine manufacturers are not sticking to the TCG specifications and including an ACPI DSDT entry for the TPM which allows PNP discovery of the device. This patch adds a force option that will allow users to load the driver if they know there machine has a chip but it is not being discovered by the normal processes.
Signed-off-by Kylene Hall <[email protected]>
--- drivers/char/tpm/tpm_tis.c | 74 ++++++++++++++++++++++++++--------- 1 files changed, 55 insertions(+), 19 deletions(-)
drivers/char/tpm/tpm_tis.c renamed from tpmdd/drivers/char/tpm/tpm_tis.c +55 -19
@@ -431,23 +431,18 @@ static int interrupts = 1;module_param (interrupts, bool,0444 );MODULE_PARM_DESC (interrupts,"Enable interrupts" ); -static int __devinit tpm_tis_pnp_init (struct pnp_dev *pnp_dev, -const struct pnp_device_id *pnp_id) +static int tpm_tis_init (struct device *dev,unsigned long start,unsigned long len) {u32 vendor, intfcaps, intmask;int rc, i; -unsigned long start, len;struct tpm_chip *chip; - start =pnp_mem_start (pnp_dev,0 ); - len =pnp_mem_len (pnp_dev,0 ); -if (!start) start =TIS_MEM_BASE ;if (!len) len =TIS_MEM_LEN ; -if (!(chip =tpm_register_hardware (&pnp_dev->dev, &tpm_tis))) +if (!(chip =tpm_register_hardware (dev, &tpm_tis)))return -ENODEV ; chip->vendor.iobase =ioremap (start, len);
@@ -464,7 +460,7 @@ static int __devinit tpm_tis_pnp_init(st chip->vendor.timeout_c =msecs_to_jiffies (TIS_SHORT_TIMEOUT ); chip->vendor.timeout_d =msecs_to_jiffies (TIS_SHORT_TIMEOUT ); -dev_info (&pnp_dev->dev, +dev_info (dev,"1.2 TPM (device-id 0x%X, rev-id %d)\n" , vendor >>16 ,ioread8 (chip->vendor.iobase +TPM_RID (0 )));
@@ -472,26 +468,26 @@ static int __devinit tpm_tis_pnp_init(st intfcaps =ioread32 (chip->vendor.iobase +TPM_INTF_CAPS (chip->vendor.locality)); -dev_dbg (&pnp_dev->dev,"TPM interface capabilities (0x%x):\n" , +dev_dbg (dev,"TPM interface capabilities (0x%x):\n" , intfcaps);if (intfcaps &TPM_INTF_BURST_COUNT_STATIC ) -dev_dbg (&pnp_dev->dev,"\tBurst Count Static\n" ); +dev_dbg (dev,"\tBurst Count Static\n" );if (intfcaps &TPM_INTF_CMD_READY_INT ) -dev_dbg (&pnp_dev->dev,"\tCommand Ready Int Support\n" ); +dev_dbg (dev,"\tCommand Ready Int Support\n" );if (intfcaps &TPM_INTF_INT_EDGE_FALLING ) -dev_dbg (&pnp_dev->dev,"\tInterrupt Edge Falling\n" ); +dev_dbg (dev,"\tInterrupt Edge Falling\n" );if (intfcaps &TPM_INTF_INT_EDGE_RISING ) -dev_dbg (&pnp_dev->dev,"\tInterrupt Edge Rising\n" ); +dev_dbg (dev,"\tInterrupt Edge Rising\n" );if (intfcaps &TPM_INTF_INT_LEVEL_LOW ) -dev_dbg (&pnp_dev->dev,"\tInterrupt Level Low\n" ); +dev_dbg (dev,"\tInterrupt Level Low\n" );if (intfcaps &TPM_INTF_INT_LEVEL_HIGH ) -dev_dbg (&pnp_dev->dev,"\tInterrupt Level High\n" ); +dev_dbg (dev,"\tInterrupt Level High\n" );if (intfcaps &TPM_INTF_LOCALITY_CHANGE_INT ) -dev_dbg (&pnp_dev->dev,"\tLocality Change Int Support\n" ); +dev_dbg (dev,"\tLocality Change Int Support\n" );if (intfcaps &TPM_INTF_STS_VALID_INT ) -dev_dbg (&pnp_dev->dev,"\tSts Valid Int Support\n" ); +dev_dbg (dev,"\tSts Valid Int Support\n" );if (intfcaps &TPM_INTF_DATA_AVAIL_INT ) -dev_dbg (&pnp_dev->dev,"\tData Avail Int Support\n" ); +dev_dbg (dev,"\tData Avail Int Support\n" );if (request_locality (chip,0 ) !=0 ) { rc = -ENODEV ;
@@ -594,6 +590,16 @@ out_err:return rc; } +static int __devinit tpm_tis_pnp_init (struct pnp_dev *pnp_dev, +const struct pnp_device_id *pnp_id) +{ +unsigned long start, len; + start =pnp_mem_start (pnp_dev,0 ); + len =pnp_mem_len (pnp_dev,0 ); + +return tpm_tis_init (&pnp_dev->dev, start, len); +} +static int tpm_tis_pnp_suspend (struct pnp_dev *dev,pm_message_t msg) {return tpm_pm_suspend (&dev->dev, msg);
@@ -628,8 +634,34 @@ module_param_string(hid, tpm_pnp_tbl[TIS sizeof(tpm_pnp_tbl[TIS_HID_USR_IDX].id), 0444);MODULE_PARM_DESC (hid,"Set additional specific HID for this driver to probe" ); +static struct device_driver tis_drv = { + .name ="tpm_tis" , + .bus = &platform_bus_type, + .owner =THIS_MODULE , + .suspend = tpm_pm_suspend, + .resume = tpm_pm_resume, +}; + +static struct platform_device *pdev; + +static int force =0 ; +module_param (force, bool,0444 ); +MODULE_PARM_DESC (force,"Force device probe rather than using ACPI entry" );static int __init init_tis (void ) { +int rc; + +if (force) { +driver_register (&tis_drv); +if (IS_ERR (pdev=platform_device_register_simple ("tpm_tis" ,-1 ,NULL ,0 ))) +return PTR_ERR (pdev); +if ((rc=tpm_tis_init (&pdev->dev,0 ,0 )) !=0 ) { +platform_device_unregister (pdev); +driver_unregister (&tis_drv); + } +return rc; + } +return pnp_register_driver (&tis_pnp_driver); }
@@ -654,7 +687,12 @@ static void __exit cleanup_tis(void)tpm_remove_hardware (chip->dev); }spin_unlock (&tis_lock); -pnp_unregister_driver (&tis_pnp_driver); +if (force) { +platform_device_unregister (pdev); +driver_unregister (&tis_drv); + } +else +pnp_unregister_driver (&tis_pnp_driver); }module_init (init_tis);
Quoted 3 lines · On Wed, 12 Jul 2006 14:04:33 -0700 Kylene Jo Hall <[email protected]> wrote:
Some machine manufacturers are not sticking to the TCG specifications and including an ACPI DSDT entry for the TPM which allows PNP discovery of the device.
Well that sucks.
drivers/char/tpm/tpm_tis.c out_err: · line 598
Quoted 12 lines
This patch adds a force option that will allow users to
load the driver if they know there machine has a chip but it is not being discovered by the normal processes.drivers/char/tpm/tpm_tis.c renamed from tpmdd/drivers/char/tpm/tpm_tis.c +6
-0+static int __devinit tpm_tis_pnp_init (struct pnp_dev *pnp_dev, +const struct pnp_device_id *pnp_id) +{ +unsigned long start, len; + start =pnp_mem_start (pnp_dev,0 ); + len =pnp_mem_len (pnp_dev,0 );
All these starts, ends and lens are now wrong - they should be changed to resource_size_t. But there's no rush on that - please add it to the todo list.
Quoted 1 line
+static int force = 0;
The `= 0' here is unneeded. It's also undesirable, since it adds to the size of vmlinux on-disk.
drivers/char/tpm/tpm_tis.c module_param_string(hid, tpm_pnp_tbl[TIS · line 655
Quoted 8 lines
drivers/char/tpm/tpm_tis.c renamed from tpmdd/drivers/char/tpm/tpm_tis.c +6
-0+module_param (force, bool,0444 ); +MODULE_PARM_DESC (force,"Force device probe rather than using ACPI entry" );static int __init init_tis (void ) { +int rc; + +if (force) { +driver_register (&tis_drv);
driver_register() can fail and the driver should check for and handle the failure.
This mistake happens literally thousands of times and we're trying to fix it up at present. An updated patch would be appreciated, please.
drivers/char/tpm/tpm_tis.c static void __exit cleanup_tis(void) · line 694
Quoted 6 lines
drivers/char/tpm/tpm_tis.c renamed from tpmdd/drivers/char/tpm/tpm_tis.c +5
-1-pnp_unregister_driver (&tis_pnp_driver); +if (force) { +platform_device_unregister (pdev); +driver_unregister (&tis_drv); + } +else
} else
Some machine manufacturers are not sticking to the TCG specifications and including an ACPI DSDT entry for the TPM which allows PNP discovery of the device.
Fixed up version removes the force=0 and the lack of error handling for driver_register.
Signed-off-by Kylene Hall <[email protected]>
--- drivers/char/tpm/tpm_tis.c | 76 ++++++++++++++++++++++++++--------- 1 files changed, 57 insertions(+), 19 deletions(-)
drivers/char/tpm/tpm_tis.c +57 -19
@@ -431,23 +431,18 @@ static int interrupts = 1;module_param (interrupts, bool,0444 );MODULE_PARM_DESC (interrupts,"Enable interrupts" ); -static int __devinit tpm_tis_pnp_init (struct pnp_dev *pnp_dev, -const struct pnp_device_id *pnp_id) +static int tpm_tis_init (struct device *dev,unsigned long start,unsigned long len) {u32 vendor, intfcaps, intmask;int rc, i; -unsigned long start, len;struct tpm_chip *chip; - start =pnp_mem_start (pnp_dev,0 ); - len =pnp_mem_len (pnp_dev,0 ); -if (!start) start =TIS_MEM_BASE ;if (!len) len =TIS_MEM_LEN ; -if (!(chip =tpm_register_hardware (&pnp_dev->dev, &tpm_tis))) +if (!(chip =tpm_register_hardware (dev, &tpm_tis)))return -ENODEV ; chip->vendor.iobase =ioremap (start, len);
@@ -464,7 +459,7 @@ static int __devinit tpm_tis_pnp_init(st chip->vendor.timeout_c =msecs_to_jiffies (TIS_SHORT_TIMEOUT ); chip->vendor.timeout_d =msecs_to_jiffies (TIS_SHORT_TIMEOUT ); -dev_info (&pnp_dev->dev, +dev_info (dev,"1.2 TPM (device-id 0x%X, rev-id %d)\n" , vendor >>16 ,ioread8 (chip->vendor.iobase +TPM_RID (0 )));
@@ -472,26 +467,26 @@ static int __devinit tpm_tis_pnp_init(st intfcaps =ioread32 (chip->vendor.iobase +TPM_INTF_CAPS (chip->vendor.locality)); -dev_dbg (&pnp_dev->dev,"TPM interface capabilities (0x%x):\n" , +dev_dbg (dev,"TPM interface capabilities (0x%x):\n" , intfcaps);if (intfcaps &TPM_INTF_BURST_COUNT_STATIC ) -dev_dbg (&pnp_dev->dev,"\tBurst Count Static\n" ); +dev_dbg (dev,"\tBurst Count Static\n" );if (intfcaps &TPM_INTF_CMD_READY_INT ) -dev_dbg (&pnp_dev->dev,"\tCommand Ready Int Support\n" ); +dev_dbg (dev,"\tCommand Ready Int Support\n" );if (intfcaps &TPM_INTF_INT_EDGE_FALLING ) -dev_dbg (&pnp_dev->dev,"\tInterrupt Edge Falling\n" ); +dev_dbg (dev,"\tInterrupt Edge Falling\n" );if (intfcaps &TPM_INTF_INT_EDGE_RISING ) -dev_dbg (&pnp_dev->dev,"\tInterrupt Edge Rising\n" ); +dev_dbg (dev,"\tInterrupt Edge Rising\n" );if (intfcaps &TPM_INTF_INT_LEVEL_LOW ) -dev_dbg (&pnp_dev->dev,"\tInterrupt Level Low\n" ); +dev_dbg (dev,"\tInterrupt Level Low\n" );if (intfcaps &TPM_INTF_INT_LEVEL_HIGH ) -dev_dbg (&pnp_dev->dev,"\tInterrupt Level High\n" ); +dev_dbg (dev,"\tInterrupt Level High\n" );if (intfcaps &TPM_INTF_LOCALITY_CHANGE_INT ) -dev_dbg (&pnp_dev->dev,"\tLocality Change Int Support\n" ); +dev_dbg (dev,"\tLocality Change Int Support\n" );if (intfcaps &TPM_INTF_STS_VALID_INT ) -dev_dbg (&pnp_dev->dev,"\tSts Valid Int Support\n" ); +dev_dbg (dev,"\tSts Valid Int Support\n" );if (intfcaps &TPM_INTF_DATA_AVAIL_INT ) -dev_dbg (&pnp_dev->dev,"\tData Avail Int Support\n" ); +dev_dbg (dev,"\tData Avail Int Support\n" );if (request_locality (chip,0 ) !=0 ) { rc = -ENODEV ;
@@ -594,6 +589,16 @@ out_err:return rc; } +static int __devinit tpm_tis_pnp_init (struct pnp_dev *pnp_dev, +const struct pnp_device_id *pnp_id) +{ +unsigned long start, len; + start =pnp_mem_start (pnp_dev,0 ); + len =pnp_mem_len (pnp_dev,0 ); + +return tpm_tis_init (&pnp_dev->dev, start, len); +} +static int tpm_tis_pnp_suspend (struct pnp_dev *dev,pm_message_t msg) {return tpm_pm_suspend (&dev->dev, msg);
@@ -628,8 +633,36 @@ module_param_string(hid, tpm_pnp_tbl[TIS sizeof(tpm_pnp_tbl[TIS_HID_USR_IDX].id), 0444);MODULE_PARM_DESC (hid,"Set additional specific HID for this driver to probe" ); +static struct device_driver tis_drv = { + .name ="tpm_tis" , + .bus = &platform_bus_type, + .owner =THIS_MODULE , + .suspend = tpm_pm_suspend, + .resume = tpm_pm_resume, +}; + +static struct platform_device *pdev; + +static int force; +module_param (force, bool,0444 ); +MODULE_PARM_DESC (force,"Force device probe rather than using ACPI entry" );static int __init init_tis (void ) { +int rc; + +if (force) { + rc =driver_register (&tis_drv); +if (rc <0 ) +return rc; +if (IS_ERR (pdev=platform_device_register_simple ("tpm_tis" ,-1 ,NULL ,0 ))) +return PTR_ERR (pdev); +if ((rc=tpm_tis_init (&pdev->dev,0 ,0 )) !=0 ) { +platform_device_unregister (pdev); +driver_unregister (&tis_drv); + } +return rc; + } +return pnp_register_driver (&tis_pnp_driver); }
@@ -654,7 +687,12 @@ static void __exit cleanup_tis(void)tpm_remove_hardware (chip->dev); }spin_unlock (&tis_lock); -pnp_unregister_driver (&tis_pnp_driver); +if (force) { +platform_device_unregister (pdev); +driver_unregister (&tis_drv); + } +else +pnp_unregister_driver (&tis_pnp_driver); }module_init (init_tis);