Commit 93e1b7d4 authored by Kylene Jo Hall's avatar Kylene Jo Hall Committed by Linus Torvalds

[PATCH] tpm: add HID module parameter

I recently found that not all BIOS manufacturers are using the specified
generic PNP id in their TPM ACPI table entry.  I have added the vendor
specific IDs that I know about and added a module parameter that a user can
specify another HID to the probe list if their device isn't being found by the
default list.
Signed-off-by: default avatarKylene Hall <kjhall@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 57135568
...@@ -610,7 +610,13 @@ static int tpm_tis_pnp_resume(struct pnp_dev *dev) ...@@ -610,7 +610,13 @@ static int tpm_tis_pnp_resume(struct pnp_dev *dev)
static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = { static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = {
{"PNP0C31", 0}, /* TPM */ {"PNP0C31", 0}, /* TPM */
{"", 0} {"ATM1200", 0}, /* Atmel */
{"IFX0102", 0}, /* Infineon */
{"BCM0101", 0}, /* Broadcom */
{"NSC1200", 0}, /* National */
/* Add new here */
{"", 0}, /* User Specified */
{"", 0} /* Terminator */
}; };
static struct pnp_driver tis_pnp_driver = { static struct pnp_driver tis_pnp_driver = {
...@@ -621,6 +627,11 @@ static struct pnp_driver tis_pnp_driver = { ...@@ -621,6 +627,11 @@ static struct pnp_driver tis_pnp_driver = {
.resume = tpm_tis_pnp_resume, .resume = tpm_tis_pnp_resume,
}; };
#define TIS_HID_USR_IDX sizeof(tpm_pnp_tbl)/sizeof(struct pnp_device_id) -2
module_param_string(hid, tpm_pnp_tbl[TIS_HID_USR_IDX].id,
sizeof(tpm_pnp_tbl[TIS_HID_USR_IDX].id), 0444);
MODULE_PARM_DESC(hid, "Set additional specific HID for this driver to probe");
static int __init init_tis(void) static int __init init_tis(void)
{ {
return pnp_register_driver(&tis_pnp_driver); return pnp_register_driver(&tis_pnp_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment