UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

driver/char/tpm: fix regression causesd by ppi 

This patch try to fix the S3 regression https://lkml.org/lkml/2012/10/5/433,
which includes below line:
[ 1554.684638] sysfs: cannot create duplicate filename '/devices/pnp0/00:0c/ppi'

The root cause is that ppi sysfs teardown code is MIA, so while S3 resume,
the ppi kobject will be created again upon existing one.

To make the tear down code simple, change the ppi subfolder creation from
using kobject_create_and_add to just using a named ppi attribute_group. Then
ppi sysfs teardown could be done with a simple sysfs_remove_group call.

Adjusted the name & return type for ppi sysfs init function.

Reported-by: Ben Guthro <ben@guthro.net>
Signed-off-by: Gang Wei <gang.wei@intel.com>
Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>
This commit is contained in:
Gang Wei 2012-10-09 17:35:22 +08:00 committed by Kent Yoder
parent ecefbd94b8
commit 1631cfb7ce
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/char/tpm/tpm.c
View File

@ -1259,6 +1259,7 @@ void tpm_remove_hardware(struct device *dev)
misc_deregister(&chip->vendor.miscdev); misc_deregister(&chip->vendor.miscdev);
sysfs_remove_group(&dev->kobj, chip->vendor.attr_group); sysfs_remove_group(&dev->kobj, chip->vendor.attr_group);
tpm_remove_ppi(&dev->kobj);
tpm_bios_log_teardown(chip->bios_dir); tpm_bios_log_teardown(chip->bios_dir);
/* write it this way to be explicit (chip->dev == dev) */ /* write it this way to be explicit (chip->dev == dev) */
@ -1476,7 +1477,7 @@ struct tpm_chip *tpm_register_hardware(struct device *dev,
goto put_device; goto put_device;
} }
if (sys_add_ppi(&dev->kobj)) { if (tpm_add_ppi(&dev->kobj)) {
misc_deregister(&chip->vendor.miscdev); misc_deregister(&chip->vendor.miscdev);
goto put_device; goto put_device;
} }

9
drivers/char/tpm/tpm.h
View File

@ -329,10 +329,15 @@ extern int wait_for_tpm_stat(struct tpm_chip *, u8, unsigned long,
wait_queue_head_t *); wait_queue_head_t *);
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
extern ssize_t sys_add_ppi(struct kobject *parent); extern int tpm_add_ppi(struct kobject *);
extern void tpm_remove_ppi(struct kobject *);
#else #else
static inline ssize_t sys_add_ppi(struct kobject *parent) static inline int tpm_add_ppi(struct kobject *parent)
{ {
return 0; return 0;
} }
static inline void tpm_remove_ppi(struct kobject *parent)
{
}
#endif #endif

18
drivers/char/tpm/tpm_ppi.c
View File

@ -444,18 +444,20 @@ static struct attribute *ppi_attrs[] = {
&dev_attr_vs_operations.attr, NULL, &dev_attr_vs_operations.attr, NULL,
}; };
static struct attribute_group ppi_attr_grp = { static struct attribute_group ppi_attr_grp = {
.name = "ppi",
.attrs = ppi_attrs .attrs = ppi_attrs
}; };
ssize_t sys_add_ppi(struct kobject *parent) int tpm_add_ppi(struct kobject *parent)
{ {
struct kobject *ppi; return sysfs_create_group(parent, &ppi_attr_grp);
ppi = kobject_create_and_add("ppi", parent);
if (sysfs_create_group(ppi, &ppi_attr_grp))
return -EFAULT;
else
return 0;
} }
EXPORT_SYMBOL_GPL(sys_add_ppi); EXPORT_SYMBOL_GPL(tpm_add_ppi);
void tpm_remove_ppi(struct kobject *parent)
{
sysfs_remove_group(parent, &ppi_attr_grp);
}
EXPORT_SYMBOL_GPL(tpm_remove_ppi);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");