From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0103DC3F2C6 for ; Wed, 11 Mar 2020 12:06:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D3A5521655 for ; Wed, 11 Mar 2020 12:06:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728996AbgCKMGE (ORCPT ); Wed, 11 Mar 2020 08:06:04 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:62628 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729180AbgCKMGD (ORCPT ); Wed, 11 Mar 2020 08:06:03 -0400 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 02BC2rd6145953; Wed, 11 Mar 2020 08:03:55 -0400 Received: from ppma01dal.us.ibm.com (83.d6.3fa9.ip4.static.sl-reverse.com [169.63.214.131]) by mx0a-001b2d01.pphosted.com with ESMTP id 2ypxtvukkt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 11 Mar 2020 08:03:26 -0400 Received: from pps.filterd (ppma01dal.us.ibm.com [127.0.0.1]) by ppma01dal.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 02BBt5l5010969; Wed, 11 Mar 2020 12:01:37 GMT Received: from b01cxnp23033.gho.pok.ibm.com (b01cxnp23033.gho.pok.ibm.com [9.57.198.28]) by ppma01dal.us.ibm.com with ESMTP id 2ypjxr5q51-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 11 Mar 2020 12:01:37 +0000 Received: from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp23033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 02BC1akj44433762 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 11 Mar 2020 12:01:36 GMT Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 49881B2065; Wed, 11 Mar 2020 12:01:36 +0000 (GMT) Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1CBCDB2064; Wed, 11 Mar 2020 12:01:36 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP; Wed, 11 Mar 2020 12:01:36 +0000 (GMT) Subject: Re: [PATCH 1/3] tpm: of: Handle IBM,vtpm20 case when getting log parameters To: Nayna , Stefan Berger , linux-integrity@vger.kernel.org Cc: aik@ozlabs.ru, david@gibson.dropbear.id.au, linux-kernel@vger.kernel.org, gcwilson@linux.ibm.com, Jarkko Sakkinen References: <20200204132706.3220416-1-stefanb@linux.vnet.ibm.com> <20200204132706.3220416-2-stefanb@linux.vnet.ibm.com> <1699b8ee-34d3-1dfd-7102-7dd1b7f6b641@linux.vnet.ibm.com> From: Stefan Berger Message-ID: <82136d10-ec07-9e79-d918-a30277443743@linux.ibm.com> Date: Wed, 11 Mar 2020 08:01:35 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.3.1 MIME-Version: 1.0 In-Reply-To: <1699b8ee-34d3-1dfd-7102-7dd1b7f6b641@linux.vnet.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-03-11_05:2020-03-11,2020-03-11 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 priorityscore=1501 mlxlogscore=999 suspectscore=0 adultscore=0 malwarescore=0 impostorscore=0 spamscore=0 bulkscore=0 phishscore=0 lowpriorityscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2003110078 Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org On 2/13/20 12:46 PM, Nayna wrote: > > On 2/4/20 8:27 AM, Stefan Berger wrote: >> 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 >> --- >>   drivers/char/tpm/eventlog/of.c | 3 ++- >>   1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/char/tpm/eventlog/of.c >> b/drivers/char/tpm/eventlog/of.c >> index af347c190819..a9ce66d09a75 100644 >> --- a/drivers/char/tpm/eventlog/of.c >> +++ b/drivers/char/tpm/eventlog/of.c >> @@ -51,7 +51,8 @@ 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_property_match_string(np, "compatible", "IBM,vtpm") < 0 && >> +        of_property_match_string(np, "compatible", "IBM,vtpm20") < 0) { > > How about changing this to use of_device_compatible_match() ? I have to roll back the change to using use_of_device_compatible_match() due to a build failure on xtensa. So we'll  be using what I had in this patch here.    Stefan