From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: Andrey Pronin <apronin@chromium.org>
Cc: Peter Huewe <peterhuewe@gmx.de>,
Marcel Selhorst <tpmdd@selhorst.net>,
Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org,
groeck@chromium.org, smbarber@chromium.org,
dianders@chromium.org
Subject: Re: [PATCH 2/2] tpm: support driver-specific sysfs attrs in tpm_tis_core
Date: Mon, 18 Jul 2016 22:11:41 +0300 [thread overview]
Message-ID: <20160718191141.GO31463@intel.com> (raw)
In-Reply-To: <1468547496-16215-3-git-send-email-apronin@chromium.org>
On Thu, Jul 14, 2016 at 06:51:36PM -0700, Andrey Pronin wrote:
> Add attr_group to phy_ops that a driver relying on tpm_tis_core_init
> can set to have its specific attributes registered in sysfs.
>
> Signed-off-by: Andrey Pronin <apronin@chromium.org>
> ---
> drivers/char/tpm/tpm-sysfs.c | 1 -
> drivers/char/tpm/tpm.h | 8 +++++++-
> drivers/char/tpm/tpm_tis_core.c | 3 +++
> drivers/char/tpm/tpm_tis_core.h | 1 +
> 4 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c
> index 95ce90d..22c9874 100644
> --- a/drivers/char/tpm/tpm-sysfs.c
> +++ b/drivers/char/tpm/tpm-sysfs.c
> @@ -304,7 +304,6 @@ void tpm_sysfs_add_device(struct tpm_chip *chip)
> * is called before ops is null'd and the sysfs core synchronizes this
> * removal so that no callbacks are running or can run again
> */
> - WARN_ON(chip->groups_cnt != 0);
You should explain this in a commit message if you want to remove it.
In general, this make user space API vendor specific, which is
unacceptable.
/Jarkko
> chip->groups[chip->groups_cnt++] = &tpm_dev_group;
> if (chip->flags & TPM_CHIP_FLAG_TPM2)
> chip->groups[chip->groups_cnt++] = &tpm2_dev_group;
> diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
> index 8890df2..8c69649 100644
> --- a/drivers/char/tpm/tpm.h
> +++ b/drivers/char/tpm/tpm.h
> @@ -173,7 +173,13 @@ struct tpm_chip {
>
> struct dentry **bios_dir;
>
> - const struct attribute_group *groups[3];
> + /* up to 4 attribute groups:
> + * - driver-specific
> + * - common TPM1.2 and TPM2.0
> + * - TPM1.2/2.0-specific
> + * - ppi
> + */
> + const struct attribute_group *groups[5];
> unsigned int groups_cnt;
> #ifdef CONFIG_ACPI
> acpi_handle acpi_dev_handle;
> diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
> index 8110b52..6d5d8f4 100644
> --- a/drivers/char/tpm/tpm_tis_core.c
> +++ b/drivers/char/tpm/tpm_tis_core.c
> @@ -796,6 +796,9 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
> }
> }
>
> + if (priv->phy_ops->attr_group)
> + chip->groups[chip->groups_cnt++] = priv->phy_ops->attr_group;
> +
> return tpm_chip_register(chip);
> out_err:
> tpm_tis_remove(chip);
> diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h
> index 9191aab..4417ed9 100644
> --- a/drivers/char/tpm/tpm_tis_core.h
> +++ b/drivers/char/tpm/tpm_tis_core.h
> @@ -95,6 +95,7 @@ struct tpm_tis_data {
> };
>
> struct tpm_tis_phy_ops {
> + const struct attribute_group *attr_group;
> int (*read_bytes)(struct tpm_tis_data *data, u32 addr, u16 len,
> u8 *result);
> int (*write_bytes)(struct tpm_tis_data *data, u32 addr, u16 len,
> --
> 2.6.6
>
next prev parent reply other threads:[~2016-07-18 19:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-15 1:51 [PATCH 0/2] tpm: driver- and tpm2-specific sysfs attributes Andrey Pronin
2016-07-15 1:51 ` [PATCH 1/2] tpm: add sysfs attributes for tpm2 Andrey Pronin
2016-07-15 3:21 ` Jason Gunthorpe
2016-07-15 3:32 ` Andrey Pronin
2016-07-15 3:34 ` Jason Gunthorpe
2016-07-15 16:56 ` Andrey Pronin
2016-07-15 17:09 ` Jason Gunthorpe
2016-07-18 19:16 ` Jarkko Sakkinen
2016-07-15 1:51 ` [PATCH 2/2] tpm: support driver-specific sysfs attrs in tpm_tis_core Andrey Pronin
2016-07-15 3:23 ` Jason Gunthorpe
2016-07-15 3:35 ` Andrey Pronin
2016-07-18 19:20 ` Jarkko Sakkinen
2016-07-18 19:11 ` Jarkko Sakkinen [this message]
2016-07-18 19:17 ` Andrey Pronin
2016-07-20 2:51 ` [PATCH v2] tpm: add sysfs attributes for tpm2 Andrey Pronin
2016-07-20 17:05 ` Jason Gunthorpe
2016-07-20 17:41 ` Andrey Pronin
2016-07-28 4:06 ` [PATCH v3] " Andrey Pronin
2016-08-09 10:25 ` Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160718191141.GO31463@intel.com \
--to=jarkko.sakkinen@linux.intel.com \
--cc=apronin@chromium.org \
--cc=dianders@chromium.org \
--cc=groeck@chromium.org \
--cc=jgunthorpe@obsidianresearch.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--cc=smbarber@chromium.org \
--cc=tpmdd-devel@lists.sourceforge.net \
--cc=tpmdd@selhorst.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).