From: Nayna Jain <nayna@linux.vnet.ibm.com> To: tpmdd-devel@lists.sourceforge.net Cc: peterhuewe@gmx.de, tpmdd@selhorst.net, jarkko.sakkinen@linux.intel.com, jgunthorpe@obsidianresearch.com, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, Nayna Jain <nayna@linux.vnet.ibm.com> Subject: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) Date: Mon, 14 Nov 2016 05:00:51 -0500 [thread overview] Message-ID: <1479117656-12403-5-git-send-email-nayna@linux.vnet.ibm.com> (raw) In-Reply-To: <1479117656-12403-1-git-send-email-nayna@linux.vnet.ibm.com> Check for TPM2 chip in tpm_sysfs_add_device, tpm_bios_log_setup and tpm_bios_log_teardown in order to make code flow cleaner and to enable to implement TPM 2.0 support later on. This is partially derived from the commit by Nayna Jain with the extension that also tpm1_chip_register is dropped. Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> --- drivers/char/tpm/tpm-chip.c | 31 +++++-------------------------- drivers/char/tpm/tpm-sysfs.c | 3 +++ drivers/char/tpm/tpm_eventlog.c | 3 +++ 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index d0c1872..250a651 100644 --- a/drivers/char/tpm/tpm-chip.c +++ b/drivers/char/tpm/tpm-chip.c @@ -276,28 +276,6 @@ static void tpm_del_char_device(struct tpm_chip *chip) up_write(&chip->ops_sem); } -static int tpm1_chip_register(struct tpm_chip *chip) -{ - int rc; - - if (chip->flags & TPM_CHIP_FLAG_TPM2) - return 0; - - tpm_sysfs_add_device(chip); - - rc = tpm_bios_log_setup(chip); - - return rc; -} - -static void tpm1_chip_unregister(struct tpm_chip *chip) -{ - if (chip->flags & TPM_CHIP_FLAG_TPM2) - return; - - tpm_bios_log_teardown(chip); -} - static void tpm_del_legacy_sysfs(struct tpm_chip *chip) { struct attribute **i; @@ -364,7 +342,9 @@ int tpm_chip_register(struct tpm_chip *chip) return rc; } - rc = tpm1_chip_register(chip); + tpm_sysfs_add_device(chip); + + rc = tpm_bios_log_setup(chip); if (rc) return rc; @@ -372,7 +352,7 @@ int tpm_chip_register(struct tpm_chip *chip) rc = tpm_add_char_device(chip); if (rc) { - tpm1_chip_unregister(chip); + tpm_bios_log_teardown(chip); return rc; } @@ -402,8 +382,7 @@ EXPORT_SYMBOL_GPL(tpm_chip_register); void tpm_chip_unregister(struct tpm_chip *chip) { tpm_del_legacy_sysfs(chip); - - tpm1_chip_unregister(chip); + tpm_bios_log_teardown(chip); tpm_del_char_device(chip); } EXPORT_SYMBOL_GPL(tpm_chip_unregister); diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c index 59a1ead..848ad65 100644 --- a/drivers/char/tpm/tpm-sysfs.c +++ b/drivers/char/tpm/tpm-sysfs.c @@ -284,6 +284,9 @@ static const struct attribute_group tpm_dev_group = { void tpm_sysfs_add_device(struct tpm_chip *chip) { + if (chip->flags & TPM_CHIP_FLAG_TPM2) + return; + /* The sysfs routines rely on an implicit tpm_try_get_ops, device_del * is called before ops is null'd and the sysfs core synchronizes this * removal so that no callbacks are running or can run again diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c index 62e9da6..57ac862 100644 --- a/drivers/char/tpm/tpm_eventlog.c +++ b/drivers/char/tpm/tpm_eventlog.c @@ -373,6 +373,9 @@ int tpm_bios_log_setup(struct tpm_chip *chip) const char *name = dev_name(&chip->dev); unsigned int cnt; + if (chip->flags & TPM_CHIP_FLAG_TPM2) + return 0; + cnt = 0; chip->bios_dir[cnt] = securityfs_create_dir(name, NULL); if (is_bad(chip->bios_dir[cnt])) -- 2.5.0
WARNING: multiple messages have this Message-ID (diff)
From: Nayna Jain <nayna-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org> To: tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-security-module-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) Date: Mon, 14 Nov 2016 05:00:51 -0500 [thread overview] Message-ID: <1479117656-12403-5-git-send-email-nayna@linux.vnet.ibm.com> (raw) In-Reply-To: <1479117656-12403-1-git-send-email-nayna-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org> Check for TPM2 chip in tpm_sysfs_add_device, tpm_bios_log_setup and tpm_bios_log_teardown in order to make code flow cleaner and to enable to implement TPM 2.0 support later on. This is partially derived from the commit by Nayna Jain with the extension that also tpm1_chip_register is dropped. Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> --- drivers/char/tpm/tpm-chip.c | 31 +++++-------------------------- drivers/char/tpm/tpm-sysfs.c | 3 +++ drivers/char/tpm/tpm_eventlog.c | 3 +++ 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index d0c1872..250a651 100644 --- a/drivers/char/tpm/tpm-chip.c +++ b/drivers/char/tpm/tpm-chip.c @@ -276,28 +276,6 @@ static void tpm_del_char_device(struct tpm_chip *chip) up_write(&chip->ops_sem); } -static int tpm1_chip_register(struct tpm_chip *chip) -{ - int rc; - - if (chip->flags & TPM_CHIP_FLAG_TPM2) - return 0; - - tpm_sysfs_add_device(chip); - - rc = tpm_bios_log_setup(chip); - - return rc; -} - -static void tpm1_chip_unregister(struct tpm_chip *chip) -{ - if (chip->flags & TPM_CHIP_FLAG_TPM2) - return; - - tpm_bios_log_teardown(chip); -} - static void tpm_del_legacy_sysfs(struct tpm_chip *chip) { struct attribute **i; @@ -364,7 +342,9 @@ int tpm_chip_register(struct tpm_chip *chip) return rc; } - rc = tpm1_chip_register(chip); + tpm_sysfs_add_device(chip); + + rc = tpm_bios_log_setup(chip); if (rc) return rc; @@ -372,7 +352,7 @@ int tpm_chip_register(struct tpm_chip *chip) rc = tpm_add_char_device(chip); if (rc) { - tpm1_chip_unregister(chip); + tpm_bios_log_teardown(chip); return rc; } @@ -402,8 +382,7 @@ EXPORT_SYMBOL_GPL(tpm_chip_register); void tpm_chip_unregister(struct tpm_chip *chip) { tpm_del_legacy_sysfs(chip); - - tpm1_chip_unregister(chip); + tpm_bios_log_teardown(chip); tpm_del_char_device(chip); } EXPORT_SYMBOL_GPL(tpm_chip_unregister); diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c index 59a1ead..848ad65 100644 --- a/drivers/char/tpm/tpm-sysfs.c +++ b/drivers/char/tpm/tpm-sysfs.c @@ -284,6 +284,9 @@ static const struct attribute_group tpm_dev_group = { void tpm_sysfs_add_device(struct tpm_chip *chip) { + if (chip->flags & TPM_CHIP_FLAG_TPM2) + return; + /* The sysfs routines rely on an implicit tpm_try_get_ops, device_del * is called before ops is null'd and the sysfs core synchronizes this * removal so that no callbacks are running or can run again diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c index 62e9da6..57ac862 100644 --- a/drivers/char/tpm/tpm_eventlog.c +++ b/drivers/char/tpm/tpm_eventlog.c @@ -373,6 +373,9 @@ int tpm_bios_log_setup(struct tpm_chip *chip) const char *name = dev_name(&chip->dev); unsigned int cnt; + if (chip->flags & TPM_CHIP_FLAG_TPM2) + return 0; + cnt = 0; chip->bios_dir[cnt] = securityfs_create_dir(name, NULL); if (is_bad(chip->bios_dir[cnt])) -- 2.5.0 ------------------------------------------------------------------------------ Developer Access Program for Intel Xeon Phi Processors Access to Intel Xeon Phi processor-based developer platforms. With one year of Intel Parallel Studio XE. Training and support from Colfax. Order your platform today. http://sdm.link/xeonphi
next prev parent reply other threads:[~2016-11-14 10:02 UTC|newest] Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-14 10:00 [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Nayna Jain 2016-11-14 10:00 ` [PATCH v6 1/9] tpm: define a generic open() method for ascii & bios measurements Nayna Jain 2016-11-14 10:00 ` Nayna Jain 2016-11-14 10:00 ` [PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files Nayna Jain 2016-11-14 22:18 ` Jarkko Sakkinen 2016-11-14 22:18 ` Jarkko Sakkinen 2016-11-14 22:21 ` Jarkko Sakkinen 2016-11-14 22:21 ` Jarkko Sakkinen 2016-11-15 0:11 ` [tpmdd-devel] " Jarkko Sakkinen 2016-11-15 0:11 ` Jarkko Sakkinen 2016-11-14 10:00 ` [PATCH v6 3/9] tpm: replace dynamically allocated bios_dir with a static array Nayna Jain 2016-11-14 10:00 ` Nayna Jain 2016-11-22 11:23 ` Jarkko Sakkinen 2016-11-22 16:58 ` Jason Gunthorpe 2016-11-22 16:58 ` Jason Gunthorpe 2016-11-24 13:57 ` Jarkko Sakkinen 2016-11-24 13:57 ` Jarkko Sakkinen 2016-11-24 16:53 ` Jason Gunthorpe 2016-11-24 16:53 ` Jason Gunthorpe 2016-11-25 8:08 ` Jarkko Sakkinen 2016-11-25 8:08 ` Jarkko Sakkinen 2016-11-25 19:38 ` Jason Gunthorpe 2016-11-26 12:54 ` Jarkko Sakkinen 2016-11-22 19:26 ` Nayna 2016-11-24 14:01 ` Jarkko Sakkinen 2016-11-14 10:00 ` Nayna Jain [this message] 2016-11-14 10:00 ` [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) Nayna Jain 2016-11-22 11:22 ` Jarkko Sakkinen 2016-11-22 16:42 ` Jason Gunthorpe 2016-11-22 16:42 ` Jason Gunthorpe 2016-11-23 18:33 ` Nayna 2016-11-23 18:33 ` Nayna 2016-11-24 11:52 ` Jarkko Sakkinen 2016-11-24 11:51 ` Jarkko Sakkinen 2016-11-24 11:51 ` Jarkko Sakkinen 2016-11-14 10:00 ` [PATCH v6 5/9] tpm: have event log use the tpm_chip Nayna Jain 2016-11-14 10:00 ` Nayna Jain 2016-11-14 23:44 ` Jarkko Sakkinen 2016-11-15 0:12 ` Jarkko Sakkinen 2016-11-15 0:12 ` Jarkko Sakkinen 2016-11-14 10:00 ` [PATCH v6 6/9] tpm: fix the missing .owner in tpm_bios_measurements_ops Nayna Jain 2016-11-14 10:00 ` Nayna Jain 2016-11-14 22:22 ` Jarkko Sakkinen 2016-11-15 0:13 ` Jarkko Sakkinen 2016-11-14 10:00 ` [PATCH v6 7/9] tpm: redefine read_log() to handle ACPI/OF at runtime Nayna Jain 2016-11-14 10:00 ` Nayna Jain 2016-11-15 0:14 ` Jarkko Sakkinen 2016-11-14 10:00 ` [PATCH v6 8/9] tpm: replace of_find_node_by_name() with dev of_node property Nayna Jain 2016-11-14 10:00 ` Nayna Jain 2016-11-14 10:00 ` [PATCH v6 9/9] tpm: cleanup of printk error messages Nayna Jain 2016-11-14 10:00 ` Nayna Jain 2016-11-14 22:24 ` Jarkko Sakkinen 2016-11-14 22:24 ` Jarkko Sakkinen 2016-11-15 0:15 ` Jarkko Sakkinen 2016-11-14 22:33 ` [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jarkko Sakkinen 2016-11-14 22:33 ` Jarkko Sakkinen 2016-11-15 0:25 ` Jarkko Sakkinen 2016-11-15 0:30 ` Jarkko Sakkinen 2016-11-15 0:30 ` Jarkko Sakkinen 2016-11-15 2:15 ` Jarkko Sakkinen 2016-11-15 5:35 ` Nayna 2016-11-15 5:35 ` Nayna 2016-11-15 17:40 ` Jarkko Sakkinen 2016-11-15 18:06 ` Jason Gunthorpe 2016-11-15 18:54 ` Jarkko Sakkinen 2016-11-19 18:36 ` Jason Gunthorpe 2016-11-19 18:36 ` Jason Gunthorpe 2016-11-20 9:58 ` Jarkko Sakkinen 2016-11-21 18:25 ` Jason Gunthorpe
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=1479117656-12403-5-git-send-email-nayna@linux.vnet.ibm.com \ --to=nayna@linux.vnet.ibm.com \ --cc=jarkko.sakkinen@linux.intel.com \ --cc=jgunthorpe@obsidianresearch.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=peterhuewe@gmx.de \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.