Received: by 2002:a25:c205:0:0:0:0:0 with SMTP id s5csp4508999ybf; Wed, 4 Mar 2020 05:25:45 -0800 (PST) X-Google-Smtp-Source: ADFU+vsfHNeExfxZ6po3VMWGtcPTzCIbkA/+QPpydCLPK4aCMYJA7en8MCSu37TvSCvRNyHDN8L2 X-Received: by 2002:aca:4bc6:: with SMTP id y189mr1769503oia.8.1583328345114; Wed, 04 Mar 2020 05:25:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583328345; cv=none; d=google.com; s=arc-20160816; b=fcVw1rmzb5u7WPnXR9IiwCj5OLp3/TaDoP7pwlNOTmqsgbmnGJBD+CYaI69Oh7S7pj zYPJodx8D5LgRhiHS1+OH3buLUkvB8VpICRnk0boBx5xw1snxS2zXVqZv+dAx0hiMFa+ Qct9og0oGl79k7ERMKjy21WTCzbx8tswmzB9HMIrPQQNvB/oaTd7S5HLI6dEThAXUFeH 67+iAPt8LIyuaiLZL2Jn10sNycuuSBzErTZZu0lKN/lJUDR+wxWAI6C/WR3fNzY2FdZ2 Uzq5O6kudIszSHWDpXSsJvnF/NBM3Ab0e4I/+vzQeqNgeaBR7XKPfsQ3Jrrts77jlg/B LPJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ZXz1vNLB8/3nlHC9N4OcdycspiXBE+FVYT8mp12OHEQ=; b=ityvpUhSawuu8/d7umQu64724pR4wvZ3JNAJp0uewytUnvZlKoYbG1Xo9bwdrN/Avq 9plTF8DCUdM2UkBAP+c0xymEO3ZtVk/0INcDre+BfCL5E4aGkDNLXpBCTqS8patuAY82 eOFoh0JequwBEM+p0QzHOsPREdTs5ihqlABVSAWiU8URzMVE3UVzA1lF48rMU2A21kAz y+ldyn7XbVgfFR4Ru/+Ds/qXlPt0NNFUc/eLLLZpr0Yy2otjJ8s/SM9/WxXGIAoZk4V3 M26lSglUiKzmONX01GV2/gRiMI7c9P3XeeuktBCIbmYn2lqrQid0xhjicRCYoVNTpAw5 jlVA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d22si1103170ote.298.2020.03.04.05.25.32; Wed, 04 Mar 2020 05:25:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388084AbgCDNY6 (ORCPT + 99 others); Wed, 4 Mar 2020 08:24:58 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:28958 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388029AbgCDNY5 (ORCPT ); Wed, 4 Mar 2020 08:24:57 -0500 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 024DLM9w132523; Wed, 4 Mar 2020 08:22:52 -0500 Received: from ppma02wdc.us.ibm.com (aa.5b.37a9.ip4.static.sl-reverse.com [169.55.91.170]) by mx0b-001b2d01.pphosted.com with ESMTP id 2yhpwn0kjr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Mar 2020 08:22:51 -0500 Received: from pps.filterd (ppma02wdc.us.ibm.com [127.0.0.1]) by ppma02wdc.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 024DLFwB003952; Wed, 4 Mar 2020 13:22:51 GMT Received: from b03cxnp08027.gho.boulder.ibm.com (b03cxnp08027.gho.boulder.ibm.com [9.17.130.19]) by ppma02wdc.us.ibm.com with ESMTP id 2yffk6tyrg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Mar 2020 13:22:51 +0000 Received: from b03ledav006.gho.boulder.ibm.com (b03ledav006.gho.boulder.ibm.com [9.17.130.237]) by b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 024DMn2a11862626 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 4 Mar 2020 13:22:49 GMT Received: from b03ledav006.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C6E08C6055; Wed, 4 Mar 2020 13:22:49 +0000 (GMT) Received: from b03ledav006.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0546DC605A; Wed, 4 Mar 2020 13:22:48 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by b03ledav006.gho.boulder.ibm.com (Postfix) with ESMTP; Wed, 4 Mar 2020 13:22:48 +0000 (GMT) From: Stefan Berger To: jarkko.sakkinen@linux.intel.com, linux-integrity@vger.kernel.org Cc: aik@ozlabs.ru, david@gibson.dropbear.id.au, linux-kernel@vger.kernel.org, nayna@linux.vnet.ibm.com, gcwilson@linux.ibm.com, jgg@ziepe.ca, Stefan Berger Subject: [PATCH v6 1/3] tpm: of: Handle IBM,vtpm20 case when getting log parameters Date: Wed, 4 Mar 2020 08:22:41 -0500 Message-Id: <20200304132243.179402-2-stefanb@linux.vnet.ibm.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200304132243.179402-1-stefanb@linux.vnet.ibm.com> References: <20200304132243.179402-1-stefanb@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-03-04_05:2020-03-04,2020-03-04 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxscore=0 adultscore=0 spamscore=0 bulkscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2003040102 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Berger A vTPM 2.0 is identified by 'IBM,vtpm20' in the 'compatible' node in the device tree. Handle it in the same way as 'IBM,vtpm'. The vTPM 2.0's log is written in little endian format so that for this aspect we can rely on existing code. Signed-off-by: Stefan Berger Acked-by: Jarkko Sakkinen --- drivers/char/tpm/eventlog/of.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/char/tpm/eventlog/of.c b/drivers/char/tpm/eventlog/of.c index af347c190819..a31a625ad44e 100644 --- a/drivers/char/tpm/eventlog/of.c +++ b/drivers/char/tpm/eventlog/of.c @@ -17,6 +17,12 @@ #include "../tpm.h" #include "common.h" +static const char * const compatibles[] = { + "IBM,vtpm", + "IBM,vtpm20", + NULL +}; + int tpm_read_log_of(struct tpm_chip *chip) { struct device_node *np; @@ -51,7 +57,7 @@ int tpm_read_log_of(struct tpm_chip *chip) * endian format. For this reason, vtpm doesn't need conversion * but physical tpm needs the conversion. */ - if (of_property_match_string(np, "compatible", "IBM,vtpm") < 0) { + if (!of_device_compatible_match(np, compatibles)) { size = be32_to_cpup((__force __be32 *)sizep); base = be64_to_cpup((__force __be64 *)basep); } else { -- 2.23.0