Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5efae7d6 authored by Nayna Jain's avatar Nayna Jain Committed by Jarkko Sakkinen
Browse files

tpm: cleanup of printk error messages 



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: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarNayna Jain <nayna@linux.vnet.ibm.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent ed4fdb4f

drivers/char/tpm/tpm_acpi.c

+4 −12
Original line number Original line Diff line number Diff line
@@ -60,11 +60,8 @@ int tpm_read_log_acpi(struct tpm_chip *chip) 
	status = acpi_get_table(ACPI_SIG_TCPA, 1,

	status = acpi_get_table(ACPI_SIG_TCPA, 1,

				(struct acpi_table_header **)&buff);

				(struct acpi_table_header **)&buff);





	if (ACPI_FAILURE(status)) {

	if (ACPI_FAILURE(status))

		printk(KERN_ERR "%s: ERROR - Could not get TCPA table\n",

		       __func__);

		return -EIO;

		return -EIO;

	}





	switch(buff->platform_class) {

	switch(buff->platform_class) {

	case BIOS_SERVER:

	case BIOS_SERVER:
@@ -78,25 +75,20 @@ int tpm_read_log_acpi(struct tpm_chip *chip) 
		break;

		break;

	}

	}

	if (!len) {

	if (!len) {

		printk(KERN_ERR "%s: ERROR - TCPA log area empty\n", __func__);

		dev_warn(&chip->dev, "%s: TCPA log area empty\n", __func__);

		return -EIO;

		return -EIO;

	}

	}





	/* malloc EventLog space */

	/* malloc EventLog space */

	log->bios_event_log = kmalloc(len, GFP_KERNEL);

	log->bios_event_log = kmalloc(len, GFP_KERNEL);

	if (!log->bios_event_log) {

	if (!log->bios_event_log)

		printk("%s: ERROR - Not enough  Memory for BIOS measurements\n",

			__func__);

		return -ENOMEM;

		return -ENOMEM;

	}





	log->bios_event_log_end = log->bios_event_log + len;

	log->bios_event_log_end = log->bios_event_log + len;





	virt = acpi_os_map_iomem(start, len);

	virt = acpi_os_map_iomem(start, len);

	if (!virt) {

	if (!virt)

		printk("%s: ERROR - Unable to map memory\n", __func__);

		goto err;

		goto err;

	}





	memcpy_fromio(log->bios_event_log, virt, len);

	memcpy_fromio(log->bios_event_log, virt, len);

drivers/char/tpm/tpm_of.c

+9 −20
Original line number Original line Diff line number Diff line
@@ -31,40 +31,29 @@ int tpm_read_log_of(struct tpm_chip *chip) 
	log = &chip->log;

	log = &chip->log;

	if (chip->dev.parent->of_node)

	if (chip->dev.parent->of_node)

		np = chip->dev.parent->of_node;

		np = chip->dev.parent->of_node;

	if (!np) {

	if (!np)

		pr_err("%s: ERROR - IBMVTPM not supported\n", __func__);

		return -ENODEV;

		return -ENODEV;

	}





	sizep = of_get_property(np, "linux,sml-size", NULL);

	sizep = of_get_property(np, "linux,sml-size", NULL);

	if (sizep == NULL) {

	if (sizep == NULL)

		pr_err("%s: ERROR - SML size not found\n", __func__);

		return -EIO;

		goto cleanup_eio;



	}

	if (*sizep == 0) {

	if (*sizep == 0) {

		pr_err("%s: ERROR - event log area empty\n", __func__);

		dev_warn(&chip->dev, "%s: Event log area empty\n", __func__);

		goto cleanup_eio;

		return -EIO;

	}

	}





	basep = of_get_property(np, "linux,sml-base", NULL);

	basep = of_get_property(np, "linux,sml-base", NULL);

	if (basep == NULL) {

	if (basep == NULL)

		pr_err("%s: ERROR - SML not found\n", __func__);

		return -EIO;

		goto cleanup_eio;

	}





	log->bios_event_log = kmalloc(*sizep, GFP_KERNEL);

	log->bios_event_log = kmalloc(*sizep, GFP_KERNEL);

	if (!log->bios_event_log) {

	if (!log->bios_event_log)

		pr_err("%s: ERROR - Not enough memory for BIOS measurements\n",

		       __func__);

		return -ENOMEM;

		return -ENOMEM;

	}





	log->bios_event_log_end = log->bios_event_log + *sizep;

	log->bios_event_log_end = log->bios_event_log + *sizep;





	memcpy(log->bios_event_log, __va(*basep), *sizep);

	memcpy(log->bios_event_log, __va(*basep), *sizep);





	return 0;

	return 0;



cleanup_eio:

	return -EIO;

}
 
}