From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nayna Subject: Re: [PATCH v5 7/7] tpm: replace or remove printk error messages Date: Thu, 20 Oct 2016 19:01:51 +0530 Message-ID: <5808C747.4040709@linux.vnet.ibm.com> References: <1476838185-24007-1-git-send-email-nayna@linux.vnet.ibm.com> <1476838185-24007-8-git-send-email-nayna@linux.vnet.ibm.com> <20161019161854.iuzgacimusfcivvf@intel.com> <5B8DA87D05A7694D9FA63FD143655C1B5430045A@hasmsx108.ger.corp.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <5B8DA87D05A7694D9FA63FD143655C1B5430045A-Jy8z56yoSI8MvF1YICWikbfspsVTdybXVpNB7YpNyf8@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: tpmdd-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org To: "Winkler, Tomas" , Jarkko Sakkinen Cc: "tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org" List-Id: tpmdd-devel@lists.sourceforge.net On 10/20/2016 01:04 PM, Winkler, Tomas wrote: >> On Tue, Oct 18, 2016 at 08:49:45PM -0400, Nayna Jain wrote: >>> This patch removes the unnecessary error messages on failing to >>> allocate memory and replaces pr_err/printk with dev_dbg/dev_info as >>> applicable. >>> >>> Suggested-by: Jason Gunthorpe >>> Signed-off-by: Nayna Jain >> >> Reviewed-by: Jarkko Sakkinen >> >> /Jarkko >> >>> --- >>> drivers/char/tpm/tpm_acpi.c | 17 +++++------------ >>> drivers/char/tpm/tpm_of.c | 30 ++++++++++-------------------- >>> 2 files changed, 15 insertions(+), 32 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 **)&buff); >>> >>> - 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(&chip->dev, "%s: ERROR - TCPA log area empty\n", >>> + __func__); > > > Why to keep __func__ here, dev_dbg already does it for you. I tried to trace through dev_dbg - http://lxr.free-electrons.com/source/include/linux/device.h#L1195 which further calls dev_printk from http://lxr.free-electrons.com/source/drivers/base/core.c#L2199 I couldn't find it printing __func__ anywhere.. I just see it printing "driver" and "dev" as tpm : tpm0. Please let me know if I am missing something Thanks & Regards, - Nayna > >>> 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..8b7e677 100644 >>> --- a/drivers/char/tpm/tpm_of.c >>> +++ b/drivers/char/tpm/tpm_of.c >>> @@ -31,40 +31,30 @@ int read_log_of(struct tpm_chip *chip) >>> log = &chip->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; >>> - } >>> + if (sizep == NULL) >>> + return -EIO; >>> + >>> if (*sizep == 0) { >>> - pr_err("%s: ERROR - event log area empty\n", __func__); >>> - goto cleanup_eio; >>> + dev_info(&chip->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; >>> - } >>> + if (basep == NULL) >>> + 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 >>> >> > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot