[PATCH v5 0/2] Enable PPI sysfs interface for TPM 2.0

[PATCH v5 0/2] Enable PPI sysfs interface for TPM 2.0

[Jarkko Sakkinen]

Changes since v4:
* Removed dangling export of kernfs_remove_by_name_ns() from the first
  patch.

Changes since v3:
* Use sysfs_remove_link()

Changes since v2:
* Fixed to_tpm_chip() macro.
* Split into two patches.
* Renamed sysfs_link_group_to_kobj to sysfs_link_entry_to_kobj
* Only create the "backwards compatibility" symlink for TPM 1.x devices.

Jarkko Sakkinen (2):
  sysfs: added sysfs_link_entry_to_kobj()
  tpm: move the PPI attributes to character device directory.

 drivers/char/tpm/tpm-chip.c | 24 ++++++++++++++++--------
 drivers/char/tpm/tpm.h      | 17 ++++++-----------
 drivers/char/tpm/tpm_ppi.c  | 34 +++++++++++-----------------------
 fs/sysfs/group.c            | 42 ++++++++++++++++++++++++++++++++++++++++++
 include/linux/sysfs.h       |  8 ++++++++
 5 files changed, 83 insertions(+), 42 deletions(-)

-- 
2.1.4

[PATCH v5 1/2] sysfs: added sysfs_link_entry_to_kobj()

[Jarkko Sakkinen]

Added a new function sysfs_link_group_to_kobj() that adds a symlink
from attribute or group to a kobject. Exported kernfs_remove_by_name_ns
in order to provide a way to remove such symlinks.

Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
 fs/sysfs/group.c      | 42 ++++++++++++++++++++++++++++++++++++++++++
 include/linux/sysfs.h |  8 ++++++++
 2 files changed, 50 insertions(+)

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index b400c04..5c72996 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -352,3 +352,45 @@ void sysfs_remove_link_from_group(struct kobject *kobj, const char *group_name,
 	}
 }
 EXPORT_SYMBOL_GPL(sysfs_remove_link_from_group);
+
+/**
+ * sysfs_link_entry_to_kobj - add a symlink to a kobject pointing to a group or an attribute
+ * @kobj:		The kobject containing the group.
+ * @target_kobj:	The target kobject.
+ * @target_name:	The name of the target group or attribute.
+ */
+int sysfs_link_entry_to_kobj(struct kobject *kobj, struct kobject *target_kobj,
+			     const char *target_name)
+{
+	struct kernfs_node *target;
+	struct kernfs_node *entry;
+	struct kernfs_node *link;
+
+	/*
+	 * We don't own @target_kobj and it may be removed at any time.
+	 * Synchronize using sysfs_symlink_target_lock. See sysfs_remove_dir()
+	 * for details.
+	 */
+	spin_lock(&sysfs_symlink_target_lock);
+	target = target_kobj->sd;
+	if (target)
+		kernfs_get(target);
+	spin_unlock(&sysfs_symlink_target_lock);
+	if (!target)
+		return -ENOENT;
+
+	entry = kernfs_find_and_get(target_kobj->sd, target_name);
+	if (!entry) {
+		kernfs_put(target);
+		return -ENOENT;
+	}
+
+	link = kernfs_create_link(kobj->sd, target_name, entry);
+	if (IS_ERR(link) && PTR_ERR(link) == -EEXIST)
+		sysfs_warn_dup(kobj->sd, target_name);
+
+	kernfs_put(entry);
+	kernfs_put(target);
+	return IS_ERR(link) ? PTR_ERR(link) : 0;
+}
+EXPORT_SYMBOL_GPL(sysfs_link_entry_to_kobj);
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 99382c0..f2be044 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -264,6 +264,8 @@ int sysfs_add_link_to_group(struct kobject *kobj, const char *group_name,
 			    struct kobject *target, const char *link_name);
 void sysfs_remove_link_from_group(struct kobject *kobj, const char *group_name,
 				  const char *link_name);
+int sysfs_link_entry_to_kobj(struct kobject *kobj, struct kobject *target_kobj,
+			     const char *target_name);
 
 void sysfs_notify(struct kobject *kobj, const char *dir, const char *attr);
 
@@ -436,6 +438,12 @@ static inline void sysfs_remove_link_from_group(struct kobject *kobj,
 {
 }
 
+int sysfs_link_entry_to_kobj(struct kobject *kobj, struct kobject *target_kobj,
+			     const char *target_name)
+{
+	return 0;
+}
+
 static inline void sysfs_notify(struct kobject *kobj, const char *dir,
 				const char *attr)
 {
-- 
2.1.4

Re: [PATCH v5 1/2] sysfs: added sysfs_link_entry_to_kobj()

[Greg Kroah-Hartman]

On Sat, May 02, 2015 at 09:10:52PM +0300, Jarkko Sakkinen wrote:
> Added a new function sysfs_link_group_to_kobj() that adds a symlink
> from attribute or group to a kobject. Exported kernfs_remove_by_name_ns
> in order to provide a way to remove such symlinks.
> 
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> ---
>  fs/sysfs/group.c      | 42 ++++++++++++++++++++++++++++++++++++++++++
>  include/linux/sysfs.h |  8 ++++++++
>  2 files changed, 50 insertions(+)

What changed from v4?  Why keep resending this?

confused,

greg k-h

Re: [PATCH v5 1/2] sysfs: added sysfs_link_entry_to_kobj()

[Jarkko Sakkinen]

On Sun, 2015-05-03 at 20:00 +0200, Greg Kroah-Hartman wrote:
> On Sat, May 02, 2015 at 09:10:52PM +0300, Jarkko Sakkinen wrote:
> > Added a new function sysfs_link_group_to_kobj() that adds a symlink
> > from attribute or group to a kobject. Exported kernfs_remove_by_name_ns
> > in order to provide a way to remove such symlinks.
> > 
> > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > ---
> >  fs/sysfs/group.c      | 42 ++++++++++++++++++++++++++++++++++++++++++
> >  include/linux/sysfs.h |  8 ++++++++
> >  2 files changed, 50 insertions(+)
> 
> What changed from v4?  Why keep resending this?

Yesterday, I had by mistake --subject-prefix="PATCH v4". From
original v4 changes are enumerated in the cover letter. Sorry.

> confused,
> 
> greg k-h

/Jarkko

Re: [PATCH v5 1/2] sysfs: added sysfs_link_entry_to_kobj()

[Greg Kroah-Hartman]

On Mon, May 04, 2015 at 09:57:13AM +0300, Jarkko Sakkinen wrote:
> On Sun, 2015-05-03 at 20:00 +0200, Greg Kroah-Hartman wrote:
> > On Sat, May 02, 2015 at 09:10:52PM +0300, Jarkko Sakkinen wrote:
> > > Added a new function sysfs_link_group_to_kobj() that adds a symlink
> > > from attribute or group to a kobject. Exported kernfs_remove_by_name_ns
> > > in order to provide a way to remove such symlinks.
> > > 
> > > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > > ---
> > >  fs/sysfs/group.c      | 42 ++++++++++++++++++++++++++++++++++++++++++
> > >  include/linux/sysfs.h |  8 ++++++++
> > >  2 files changed, 50 insertions(+)
> > 
> > What changed from v4?  Why keep resending this?
> 
> Yesterday, I had by mistake --subject-prefix="PATCH v4". From
> original v4 changes are enumerated in the cover letter. Sorry.

What cover letter?  All I got was this patch, and nothing else, no 2/2
or 0/2.

Re: [PATCH v5 1/2] sysfs: added sysfs_link_entry_to_kobj()

[Jarkko Sakkinen]

On Mon, May 04, 2015 at 09:42:25AM +0200, Greg Kroah-Hartman wrote:
> On Mon, May 04, 2015 at 09:57:13AM +0300, Jarkko Sakkinen wrote:
> > On Sun, 2015-05-03 at 20:00 +0200, Greg Kroah-Hartman wrote:
> > > On Sat, May 02, 2015 at 09:10:52PM +0300, Jarkko Sakkinen wrote:
> > > > Added a new function sysfs_link_group_to_kobj() that adds a symlink
> > > > from attribute or group to a kobject. Exported kernfs_remove_by_name_ns
> > > > in order to provide a way to remove such symlinks.
> > > > 
> > > > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > > > ---
> > > >  fs/sysfs/group.c      | 42 ++++++++++++++++++++++++++++++++++++++++++
> > > >  include/linux/sysfs.h |  8 ++++++++
> > > >  2 files changed, 50 insertions(+)
> > > 
> > > What changed from v4?  Why keep resending this?
> > 
> > Yesterday, I had by mistake --subject-prefix="PATCH v4". From
> > original v4 changes are enumerated in the cover letter. Sorry.
> 
> What cover letter?  All I got was this patch, and nothing else, no 2/2
> or 0/2.

Changes since v4:
* Removed dangling export of kernfs_remove_by_name_ns() from the first
  patch.

Changes since v3:
* Use sysfs_remove_link()

Changes since v2:
* Fixed to_tpm_chip() macro.
* Split into two patches.
* Renamed sysfs_link_group_to_kobj to sysfs_link_entry_to_kobj
* Only create the "backwards compatibility" symlink for TPM 1.x devices.

[1] https://lkml.org/lkml/2015/5/2/139

/Jarkko

Re: [PATCH v5 1/2] sysfs: added sysfs_link_entry_to_kobj()

[Greg Kroah-Hartman]

On Wed, May 06, 2015 at 09:00:19AM +0300, Jarkko Sakkinen wrote:
> On Mon, May 04, 2015 at 09:42:25AM +0200, Greg Kroah-Hartman wrote:
> > On Mon, May 04, 2015 at 09:57:13AM +0300, Jarkko Sakkinen wrote:
> > > On Sun, 2015-05-03 at 20:00 +0200, Greg Kroah-Hartman wrote:
> > > > On Sat, May 02, 2015 at 09:10:52PM +0300, Jarkko Sakkinen wrote:
> > > > > Added a new function sysfs_link_group_to_kobj() that adds a symlink
> > > > > from attribute or group to a kobject. Exported kernfs_remove_by_name_ns
> > > > > in order to provide a way to remove such symlinks.
> > > > > 
> > > > > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > > > > ---
> > > > >  fs/sysfs/group.c      | 42 ++++++++++++++++++++++++++++++++++++++++++
> > > > >  include/linux/sysfs.h |  8 ++++++++
> > > > >  2 files changed, 50 insertions(+)
> > > > 
> > > > What changed from v4?  Why keep resending this?
> > > 
> > > Yesterday, I had by mistake --subject-prefix="PATCH v4". From
> > > original v4 changes are enumerated in the cover letter. Sorry.
> > 
> > What cover letter?  All I got was this patch, and nothing else, no 2/2
> > or 0/2.
> 
> Changes since v4:
> * Removed dangling export of kernfs_remove_by_name_ns() from the first
>   patch.
> 
> Changes since v3:
> * Use sysfs_remove_link()
> 
> Changes since v2:
> * Fixed to_tpm_chip() macro.
> * Split into two patches.
> * Renamed sysfs_link_group_to_kobj to sysfs_link_entry_to_kobj
> * Only create the "backwards compatibility" symlink for TPM 1.x devices.
> 
> [1] https://lkml.org/lkml/2015/5/2/139

I only see one patch here, please resend this whole thing correctly...

Re: [PATCH v5 1/2] sysfs: added sysfs_link_entry_to_kobj()

[Jarkko Sakkinen]

On Sun, May 10, 2015 at 04:11:54PM +0200, Greg Kroah-Hartman wrote:
> On Wed, May 06, 2015 at 09:00:19AM +0300, Jarkko Sakkinen wrote:
> > On Mon, May 04, 2015 at 09:42:25AM +0200, Greg Kroah-Hartman wrote:
> > > On Mon, May 04, 2015 at 09:57:13AM +0300, Jarkko Sakkinen wrote:
> > > > On Sun, 2015-05-03 at 20:00 +0200, Greg Kroah-Hartman wrote:
> > > > > On Sat, May 02, 2015 at 09:10:52PM +0300, Jarkko Sakkinen wrote:
> > > > > > Added a new function sysfs_link_group_to_kobj() that adds a symlink
> > > > > > from attribute or group to a kobject. Exported kernfs_remove_by_name_ns
> > > > > > in order to provide a way to remove such symlinks.
> > > > > > 
> > > > > > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > > > > > ---
> > > > > >  fs/sysfs/group.c      | 42 ++++++++++++++++++++++++++++++++++++++++++
> > > > > >  include/linux/sysfs.h |  8 ++++++++
> > > > > >  2 files changed, 50 insertions(+)
> > > > > 
> > > > > What changed from v4?  Why keep resending this?
> > > > 
> > > > Yesterday, I had by mistake --subject-prefix="PATCH v4". From
> > > > original v4 changes are enumerated in the cover letter. Sorry.
> > > 
> > > What cover letter?  All I got was this patch, and nothing else, no 2/2
> > > or 0/2.
> > 
> > Changes since v4:
> > * Removed dangling export of kernfs_remove_by_name_ns() from the first
> >   patch.
> > 
> > Changes since v3:
> > * Use sysfs_remove_link()
> > 
> > Changes since v2:
> > * Fixed to_tpm_chip() macro.
> > * Split into two patches.
> > * Renamed sysfs_link_group_to_kobj to sysfs_link_entry_to_kobj
> > * Only create the "backwards compatibility" symlink for TPM 1.x devices.
> > 
> > [1] https://lkml.org/lkml/2015/5/2/139
> 
> I only see one patch here, please resend this whole thing correctly...

OK, now that I looked at my command history I think I messed with my
send-email command-line :( Sorry for the caused confusion. I'll resend
the patch set.

/Jarkko

[PATCH v5 2/2] tpm: move the PPI attributes to character device directory.

[Jarkko Sakkinen]

Moved PPI attributes to the character device directory. This aligns with
the sysfs guidelines and makes them race free because they are created
atomically with the character device as part of device_register().The
character device and the sysfs attributes appear at the same time to the
user space.

As part of this change we enable PPI attributes also for TPM 2.0
devices. In order to retain backwards compatibility with TPM 1.x
devices, a symlink is created to the platform device directory.

Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: Jason Gunthorpe <jason.gunthorpe@obsidianresearch.com>
---
 drivers/char/tpm/tpm-chip.c | 24 ++++++++++++++++--------
 drivers/char/tpm/tpm.h      | 17 ++++++-----------
 drivers/char/tpm/tpm_ppi.c  | 34 +++++++++++-----------------------
 3 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 283f00a..cc1f8f8 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -119,6 +119,9 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev,
 	chip->dev.class = tpm_class;
 	chip->dev.release = tpm_dev_release;
 	chip->dev.parent = chip->pdev;
+#ifdef CONFIG_ACPI
+	chip->dev.groups = chip->groups;
+#endif
 
 	if (chip->dev_num == 0)
 		chip->dev.devt = MKDEV(MISC_MAJOR, TPM_MINOR);
@@ -181,12 +184,6 @@ static int tpm1_chip_register(struct tpm_chip *chip)
 	if (rc)
 		return rc;
 
-	rc = tpm_add_ppi(chip);
-	if (rc) {
-		tpm_sysfs_del_device(chip);
-		return rc;
-	}
-
 	chip->bios_dir = tpm_bios_log_setup(chip->devname);
 
 	return 0;
@@ -200,8 +197,6 @@ static void tpm1_chip_unregister(struct tpm_chip *chip)
 	if (chip->bios_dir)
 		tpm_bios_log_teardown(chip->bios_dir);
 
-	tpm_remove_ppi(chip);
-
 	tpm_sysfs_del_device(chip);
 }
 
@@ -224,10 +219,20 @@ int tpm_chip_register(struct tpm_chip *chip)
 	if (rc)
 		return rc;
 
+	tpm_add_ppi(chip);
+
 	rc = tpm_dev_add_device(chip);
 	if (rc)
 		goto out_err;
 
+	if (!(chip->flags & TPM_CHIP_FLAG_TPM2)) {
+		rc = sysfs_link_entry_to_kobj(&chip->pdev->kobj,
+					      &chip->dev.kobj,
+					      "ppi");
+		if (rc)
+			goto out_err;
+	}
+
 	/* Make the chip available. */
 	spin_lock(&driver_lock);
 	list_add_rcu(&chip->list, &tpm_chip_list);
@@ -262,6 +267,9 @@ void tpm_chip_unregister(struct tpm_chip *chip)
 	spin_unlock(&driver_lock);
 	synchronize_rcu();
 
+	if (!(chip->flags & TPM_CHIP_FLAG_TPM2))
+		sysfs_remove_link(&chip->pdev->kobj, "ppi");
+
 	tpm1_chip_unregister(chip);
 	tpm_dev_del_device(chip);
 }
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index f8319a0..5e7231a 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -151,8 +151,7 @@ struct tpm_vendor_specific {
 
 enum tpm_chip_flags {
 	TPM_CHIP_FLAG_REGISTERED	= BIT(0),
-	TPM_CHIP_FLAG_PPI		= BIT(1),
-	TPM_CHIP_FLAG_TPM2		= BIT(2),
+	TPM_CHIP_FLAG_TPM2		= BIT(1),
 };
 
 struct tpm_chip {
@@ -175,6 +174,8 @@ struct tpm_chip {
 	struct dentry **bios_dir;
 
 #ifdef CONFIG_ACPI
+	const struct attribute_group *groups[2];
+	unsigned int groups_cnt;
 	acpi_handle acpi_dev_handle;
 	char ppi_version[TPM_PPI_VERSION_LEN + 1];
 #endif /* CONFIG_ACPI */
@@ -182,7 +183,7 @@ struct tpm_chip {
 	struct list_head list;
 };
 
-#define to_tpm_chip(n) container_of(n, struct tpm_chip, vendor)
+#define to_tpm_chip(d) container_of(d, struct tpm_chip, dev)
 
 static inline void tpm_chip_put(struct tpm_chip *chip)
 {
@@ -412,15 +413,9 @@ 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 tpm_chip *chip);
-extern void tpm_remove_ppi(struct tpm_chip *chip);
+extern void tpm_add_ppi(struct tpm_chip *chip);
 #else
-static inline int tpm_add_ppi(struct tpm_chip *chip)
-{
-	return 0;
-}
-
-static inline void tpm_remove_ppi(struct tpm_chip *chip)
+static inline void tpm_add_ppi(struct tpm_chip *chip)
 {
 }
 #endif
diff --git a/drivers/char/tpm/tpm_ppi.c b/drivers/char/tpm/tpm_ppi.c
index 6ca9b5d..692a2c6 100644
--- a/drivers/char/tpm/tpm_ppi.c
+++ b/drivers/char/tpm/tpm_ppi.c
@@ -53,7 +53,7 @@ tpm_eval_dsm(acpi_handle ppi_handle, int func, acpi_object_type type,
 static ssize_t tpm_show_ppi_version(struct device *dev,
 				    struct device_attribute *attr, char *buf)
 {
-	struct tpm_chip *chip = dev_get_drvdata(dev);
+	struct tpm_chip *chip = to_tpm_chip(dev);
 
 	return scnprintf(buf, PAGE_SIZE, "%s\n", chip->ppi_version);
 }
@@ -63,7 +63,7 @@ static ssize_t tpm_show_ppi_request(struct device *dev,
 {
 	ssize_t size = -EINVAL;
 	union acpi_object *obj;
-	struct tpm_chip *chip = dev_get_drvdata(dev);
+	struct tpm_chip *chip = to_tpm_chip(dev);
 
 	obj = tpm_eval_dsm(chip->acpi_dev_handle, TPM_PPI_FN_GETREQ,
 			   ACPI_TYPE_PACKAGE, NULL);
@@ -100,7 +100,7 @@ static ssize_t tpm_store_ppi_request(struct device *dev,
 	int func = TPM_PPI_FN_SUBREQ;
 	union acpi_object *obj, tmp;
 	union acpi_object argv4 = ACPI_INIT_DSM_ARGV4(1, &tmp);
-	struct tpm_chip *chip = dev_get_drvdata(dev);
+	struct tpm_chip *chip = to_tpm_chip(dev);
 
 	/*
 	 * the function to submit TPM operation request to pre-os environment
@@ -156,7 +156,7 @@ static ssize_t tpm_show_ppi_transition_action(struct device *dev,
 		.buffer.length = 0,
 		.buffer.pointer = NULL
 	};
-	struct tpm_chip *chip = dev_get_drvdata(dev);
+	struct tpm_chip *chip = to_tpm_chip(dev);
 
 	static char *info[] = {
 		"None",
@@ -197,7 +197,7 @@ static ssize_t tpm_show_ppi_response(struct device *dev,
 	acpi_status status = -EINVAL;
 	union acpi_object *obj, *ret_obj;
 	u64 req, res;
-	struct tpm_chip *chip = dev_get_drvdata(dev);
+	struct tpm_chip *chip = to_tpm_chip(dev);
 
 	obj = tpm_eval_dsm(chip->acpi_dev_handle, TPM_PPI_FN_GETRSP,
 			   ACPI_TYPE_PACKAGE, NULL);
@@ -296,7 +296,7 @@ static ssize_t tpm_show_ppi_tcg_operations(struct device *dev,
 					   struct device_attribute *attr,
 					   char *buf)
 {
-	struct tpm_chip *chip = dev_get_drvdata(dev);
+	struct tpm_chip *chip = to_tpm_chip(dev);
 
 	return show_ppi_operations(chip->acpi_dev_handle, buf, 0,
 				   PPI_TPM_REQ_MAX);
@@ -306,7 +306,7 @@ static ssize_t tpm_show_ppi_vs_operations(struct device *dev,
 					  struct device_attribute *attr,
 					  char *buf)
 {
-	struct tpm_chip *chip = dev_get_drvdata(dev);
+	struct tpm_chip *chip = to_tpm_chip(dev);
 
 	return show_ppi_operations(chip->acpi_dev_handle, buf, PPI_VS_REQ_START,
 				   PPI_VS_REQ_END);
@@ -334,17 +334,16 @@ static struct attribute_group ppi_attr_grp = {
 	.attrs = ppi_attrs
 };
 
-int tpm_add_ppi(struct tpm_chip *chip)
+void tpm_add_ppi(struct tpm_chip *chip)
 {
 	union acpi_object *obj;
-	int rc;
 
 	if (!chip->acpi_dev_handle)
-		return 0;
+		return;
 
 	if (!acpi_check_dsm(chip->acpi_dev_handle, tpm_ppi_uuid,
 			    TPM_PPI_REVISION_ID, 1 << TPM_PPI_FN_VERSION))
-		return 0;
+		return;
 
 	/* Cache PPI version string. */
 	obj = acpi_evaluate_dsm_typed(chip->acpi_dev_handle, tpm_ppi_uuid,
@@ -356,16 +355,5 @@ int tpm_add_ppi(struct tpm_chip *chip)
 		ACPI_FREE(obj);
 	}
 
-	rc = sysfs_create_group(&chip->pdev->kobj, &ppi_attr_grp);
-
-	if (!rc)
-		chip->flags |= TPM_CHIP_FLAG_PPI;
-
-	return rc;
-}
-
-void tpm_remove_ppi(struct tpm_chip *chip)
-{
-	if (chip->flags & TPM_CHIP_FLAG_PPI)
-		sysfs_remove_group(&chip->pdev->kobj, &ppi_attr_grp);
+	chip->groups[chip->groups_cnt++] = &ppi_attr_grp;
 }
-- 
2.1.4

[PATCH v5 0/2] Enable PPI sysfs interface for TPM 2.0

[Jarkko Sakkinen]

Changes since v4:
* Removed dangling export of kernfs_remove_by_name_ns() from the sysfs
  patch.

Changes since v3:
* Use sysfs_remove_link()

Changes since v2:
* Fixed to_tpm_chip() macro.
* Split into two patches.
* Renamed sysfs_link_group_to_kobj to sysfs_link_entry_to_kobj
* Only create the "backwards compatibility" symlink for TPM 1.x devices.

Jarkko Sakkinen (2):
  sysfs: added sysfs_link_entry_to_kobj()
  tpm: move the PPI attributes to character device directory.

 drivers/char/tpm/tpm-chip.c | 24 ++++++++++++++++--------
 drivers/char/tpm/tpm.h      | 17 ++++++-----------
 drivers/char/tpm/tpm_ppi.c  | 34 +++++++++++-----------------------
 fs/sysfs/group.c            | 42 ++++++++++++++++++++++++++++++++++++++++++
 include/linux/sysfs.h       |  8 ++++++++
 5 files changed, 83 insertions(+), 42 deletions(-)

-- 
2.1.4

[PATCH v5 1/2] sysfs: added sysfs_link_entry_to_kobj()

[Jarkko Sakkinen]

Added a new function sysfs_link_group_to_kobj() that adds a symlink
from attribute or group to a kobject. Exported kernfs_remove_by_name_ns
in order to provide a way to remove such symlinks.

Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
 fs/sysfs/group.c      | 42 ++++++++++++++++++++++++++++++++++++++++++
 include/linux/sysfs.h |  8 ++++++++
 2 files changed, 50 insertions(+)

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index b400c04..5c72996 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -352,3 +352,45 @@ void sysfs_remove_link_from_group(struct kobject *kobj, const char *group_name,
 	}
 }
 EXPORT_SYMBOL_GPL(sysfs_remove_link_from_group);
+
+/**
+ * sysfs_link_entry_to_kobj - add a symlink to a kobject pointing to a group or an attribute
+ * @kobj:		The kobject containing the group.
+ * @target_kobj:	The target kobject.
+ * @target_name:	The name of the target group or attribute.
+ */
+int sysfs_link_entry_to_kobj(struct kobject *kobj, struct kobject *target_kobj,
+			     const char *target_name)
+{
+	struct kernfs_node *target;
+	struct kernfs_node *entry;
+	struct kernfs_node *link;
+
+	/*
+	 * We don't own @target_kobj and it may be removed at any time.
+	 * Synchronize using sysfs_symlink_target_lock. See sysfs_remove_dir()
+	 * for details.
+	 */
+	spin_lock(&sysfs_symlink_target_lock);
+	target = target_kobj->sd;
+	if (target)
+		kernfs_get(target);
+	spin_unlock(&sysfs_symlink_target_lock);
+	if (!target)
+		return -ENOENT;
+
+	entry = kernfs_find_and_get(target_kobj->sd, target_name);
+	if (!entry) {
+		kernfs_put(target);
+		return -ENOENT;
+	}
+
+	link = kernfs_create_link(kobj->sd, target_name, entry);
+	if (IS_ERR(link) && PTR_ERR(link) == -EEXIST)
+		sysfs_warn_dup(kobj->sd, target_name);
+
+	kernfs_put(entry);
+	kernfs_put(target);
+	return IS_ERR(link) ? PTR_ERR(link) : 0;
+}
+EXPORT_SYMBOL_GPL(sysfs_link_entry_to_kobj);
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 99382c0..f2be044 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -264,6 +264,8 @@ int sysfs_add_link_to_group(struct kobject *kobj, const char *group_name,
 			    struct kobject *target, const char *link_name);
 void sysfs_remove_link_from_group(struct kobject *kobj, const char *group_name,
 				  const char *link_name);
+int sysfs_link_entry_to_kobj(struct kobject *kobj, struct kobject *target_kobj,
+			     const char *target_name);
 
 void sysfs_notify(struct kobject *kobj, const char *dir, const char *attr);
 
@@ -436,6 +438,12 @@ static inline void sysfs_remove_link_from_group(struct kobject *kobj,
 {
 }
 
+int sysfs_link_entry_to_kobj(struct kobject *kobj, struct kobject *target_kobj,
+			     const char *target_name)
+{
+	return 0;
+}
+
 static inline void sysfs_notify(struct kobject *kobj, const char *dir,
 				const char *attr)
 {
-- 
2.1.4