Re: [tpmdd-devel] [PATCH v4 6/8] tpm: remove printk error messages

2016-10-12 Thread Nayna


On 10/10/2016 04:52 AM, Jason Gunthorpe wrote:
> On Sun, Oct 09, 2016 at 07:25:30AM +0530, Nayna wrote:
>
>>> diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
>>> index 22b8f81..1464cae 100644
>>> +++ b/drivers/char/tpm/tpm_of.c
>>> @@ -31,40 +31,34 @@ int read_log_of(struct tpm_chip *chip)
>>> log = >log;
>>> if (chip->dev.parent->of_node)
>>> np = chip->dev.parent->of_node;
>>> -   if (!np) {
>>> -   pr_err("%s: ERROR - IBMVTPM not supported\n", __func__);
>>> +   if (!np)
>>> return -ENODEV;
>>> -   }
>
>
>>> sizep = of_get_property(np, "linux,sml-size", NULL);
>>> if (sizep == NULL) {
>>> -   pr_err("%s: ERROR - SML size not found\n", __func__);
>>> -   goto cleanup_eio;
>>> +   dev_dbg(>dev, "%s: ERROR - SML size not found\n",
>>> +   __func__);
>>> +   return -EIO;
>>> }
>
> The properties are optional (eg my DT bound TPMs on ARM do not have
> them) so I'm not sure the debug is appropriate either...

Hmm.. does that imply that do we even need a msg ?. or probably if 
dev_info(..) looks appropriate, this can give the indication that the 
platform does not support eventlog, and that is ok.

Thanks & Regards,
   - Nayna

>
> Everything else looks OK to me.
>
> Jason
>


--
Check out the vibrant tech community on one of the world's most 
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel


[tpmdd-devel] [PATCH v4 6/8] tpm: remove printk error messages

2016-09-28 Thread Nayna Jain
This patch removes the unnecessary messages for failure to allocate
memory. It also replaces pr_err/printk with dev_dbg.

Suggested-by: Jason Gunthorpe 
Signed-off-by: Nayna Jain 
---
 drivers/char/tpm/tpm_acpi.c | 17 +
 drivers/char/tpm/tpm_of.c   | 26 ++
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
index 859bdba..22e42da 100644
--- a/drivers/char/tpm/tpm_acpi.c
+++ b/drivers/char/tpm/tpm_acpi.c
@@ -60,11 +60,8 @@ int read_log_acpi(struct tpm_chip *chip)
status = acpi_get_table(ACPI_SIG_TCPA, 1,
(struct acpi_table_header **));
 
-   if (ACPI_FAILURE(status)) {
-   printk(KERN_ERR "%s: ERROR - Could not get TCPA table\n",
-  __func__);
+   if (ACPI_FAILURE(status))
return -EIO;
-   }
 
switch(buff->platform_class) {
case BIOS_SERVER:
@@ -78,25 +75,21 @@ int read_log_acpi(struct tpm_chip *chip)
break;
}
if (!len) {
-   printk(KERN_ERR "%s: ERROR - TCPA log area empty\n", __func__);
+   dev_dbg(>dev, "%s: ERROR - TCPA log area empty\n",
+   __func__);
return -EIO;
}
 
/* malloc EventLog space */
log->bios_event_log = kmalloc(len, GFP_KERNEL);
-   if (!log->bios_event_log) {
-   printk("%s: ERROR - Not enough  Memory for BIOS measurements\n",
-   __func__);
+   if (!log->bios_event_log)
return -ENOMEM;
-   }
 
log->bios_event_log_end = log->bios_event_log + len;
 
virt = acpi_os_map_iomem(start, len);
-   if (!virt) {
-   printk("%s: ERROR - Unable to map memory\n", __func__);
+   if (!virt)
goto err;
-   }
 
memcpy_fromio(log->bios_event_log, virt, len);
 
diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
index 22b8f81..1464cae 100644
--- a/drivers/char/tpm/tpm_of.c
+++ b/drivers/char/tpm/tpm_of.c
@@ -31,40 +31,34 @@ int read_log_of(struct tpm_chip *chip)
log = >log;
if (chip->dev.parent->of_node)
np = chip->dev.parent->of_node;
-   if (!np) {
-   pr_err("%s: ERROR - IBMVTPM not supported\n", __func__);
+   if (!np)
return -ENODEV;
-   }
 
sizep = of_get_property(np, "linux,sml-size", NULL);
if (sizep == NULL) {
-   pr_err("%s: ERROR - SML size not found\n", __func__);
-   goto cleanup_eio;
+   dev_dbg(>dev, "%s: ERROR - SML size not found\n",
+   __func__);
+   return -EIO;
}
if (*sizep == 0) {
-   pr_err("%s: ERROR - event log area empty\n", __func__);
-   goto cleanup_eio;
+   dev_dbg(>dev, "%s: ERROR - event log area empty\n",
+   __func__);
+   return -EIO;
}
 
basep = of_get_property(np, "linux,sml-base", NULL);
if (basep == NULL) {
-   pr_err("%s: ERROR - SML not found\n", __func__);
-   goto cleanup_eio;
+   dev_dbg(>dev, "%s: ERROR - SML not found\n", __func__);
+   return -EIO;
}
 
log->bios_event_log = kmalloc(*sizep, GFP_KERNEL);
-   if (!log->bios_event_log) {
-   pr_err("%s: ERROR - Not enough memory for BIOS measurements\n",
-  __func__);
+   if (!log->bios_event_log)
return -ENOMEM;
-   }
 
log->bios_event_log_end = log->bios_event_log + *sizep;
 
memcpy(log->bios_event_log, __va(*basep), *sizep);
 
return 0;
-
-cleanup_eio:
-   return -EIO;
 }
-- 
2.5.0


--
___
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel