Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934952AbcKWR2J (ORCPT ); Wed, 23 Nov 2016 12:28:09 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:58401 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934827AbcKWR2F (ORCPT ); Wed, 23 Nov 2016 12:28:05 -0500 From: Nayna Jain To: tpmdd-devel@lists.sourceforge.net Cc: peterhuewe@gmx.de, tpmdd@selhorst.net, jarkko.sakkinen@linux.intel.com, jgunthorpe@obsidianresearch.com, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Nayna Jain Subject: [PATCH v5 2/3] tpm: enhance read_log_of() to support Physical TPM event log Date: Wed, 23 Nov 2016 12:27:36 -0500 X-Mailer: git-send-email 2.5.0 In-Reply-To: <1479922057-8752-1-git-send-email-nayna@linux.vnet.ibm.com> References: <1479922057-8752-1-git-send-email-nayna@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16112317-0052-0000-0000-000001F41196 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16112317-0053-0000-0000-0000074A4D99 Message-Id: <1479922057-8752-3-git-send-email-nayna@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-11-23_03:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1611230290 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2471 Lines: 75 Physical TPMs use Open Firmware Device Tree bindings that are similar to the IBM Power virtual TPM to support event log. However, these properties store the values in different endianness for Physical and Virtual TPM. This patch fixes the endianness issue by doing appropriate conversion based on Physical or Virtual TPM. Signed-off-by: Nayna Jain --- drivers/char/tpm/tpm_of.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c index 7dee42d7..646aec1 100644 --- a/drivers/char/tpm/tpm_of.c +++ b/drivers/char/tpm/tpm_of.c @@ -27,6 +27,7 @@ int tpm_read_log_of(struct tpm_chip *chip) const u32 *sizep; const u64 *basep; struct tpm_bios_log *log; + u32 log_size; log = &chip->log; if (chip->dev.parent && chip->dev.parent->of_node) @@ -34,25 +35,43 @@ int tpm_read_log_of(struct tpm_chip *chip) else return -ENODEV; + /* + * For both vtpm/tpm, firmware has log addr and log size in big + * endian format. But in case of vtpm, there is a method called + * sml-handover which is run during kernel init even before + * device tree is setup. This sml-handover function takes care + * of endianness and writes to sml-base and sml-size in little + * endian format. For this reason, vtpm doesn't need conversion + * but physical tpm needs the conversion. + */ sizep = of_get_property(np, "linux,sml-size", NULL); + if (of_property_match_string(np, "compatible", "IBM,vtpm") < 0) + log_size = be32_to_cpup(sizep); + else + log_size = *sizep; + basep = of_get_property(np, "linux,sml-base", NULL); if (sizep == NULL && basep == NULL) return -ENODEV; if (sizep == NULL || basep == NULL) return -EIO; - if (*sizep == 0) { + if (log_size == 0) { dev_warn(&chip->dev, "%s: Event log area empty\n", __func__); return -EIO; } - log->bios_event_log = kmalloc(*sizep, GFP_KERNEL); + log->bios_event_log = kmalloc(log_size, GFP_KERNEL); if (!log->bios_event_log) return -ENOMEM; - log->bios_event_log_end = log->bios_event_log + *sizep; + log->bios_event_log_end = log->bios_event_log + log_size; - memcpy(log->bios_event_log, __va(*basep), *sizep); + if (of_property_match_string(np, "compatible", "IBM,vtpm") < 0) + memcpy(chip->log.bios_event_log, __va(be64_to_cpup(basep)), + log_size); + else + memcpy(chip->log.bios_event_log, __va(*basep), log_size); return 0; } -- 2.5.0