From nobody Sat May 10 13:05:55 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 80.81.252.135 is neither permitted nor denied by domain of seabios.org) smtp.mailfrom=seabios-bounces@seabios.org Return-Path: Received: from mail.coreboot.org (mail.coreboot.org [80.81.252.135]) by mx.zohomail.com with SMTPS id 1519759112533909.3447508572405; Tue, 27 Feb 2018 11:18:32 -0800 (PST) Received: from [127.0.0.1] (helo=ra.coreboot.org) by mail.coreboot.org with esmtp (Exim 4.86_2) (envelope-from ) id 1eqkn5-0007hV-Pg; Tue, 27 Feb 2018 20:19:55 +0100 Received: from mail-db5eur01on0127.outbound.protection.outlook.com ([104.47.2.127] helo=EUR01-DB5-obe.outbound.protection.outlook.com) by mail.coreboot.org with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) (Exim 4.86_2) (envelope-from ) id 1eqkmt-0007bg-8m for seabios@seabios.org; Tue, 27 Feb 2018 20:19:53 +0100 Received: from localhost.localdomain (96.82.2.57) by AM3PR04MB1345.eurprd04.prod.outlook.com (2a01:111:e400:5369::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.548.13; Tue, 27 Feb 2018 19:17:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=SILICOMLTD.onmicrosoft.com; s=selector1-silicomusa-com01i; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=lvtXZrN8Y7e63hm83+bvhHVXJ/ieUS1b5X4S08R/T3c=; b=3ZrJwo83TBODiCxDzmM+b6pP2tWR39Gwx8FWrdiDiVsz22kZMTzBT3HSNYHdxbMKNULzlrCWBh30aGxAJokxLyPOBUh4U/TA3xPPsG3yT5me67QsFxtqBnN1KLSw2cUzKkYSSo+eP7L4hvWekeU+Tj7ahAeS6/E3K0f092efg40= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=stephend@silicom-usa.com; From: Stephen Douthit To: Kevin O'Connor , Stefan Berger , seabios@seabios.org Date: Tue, 27 Feb 2018 14:17:11 -0500 Message-Id: <20180227191711.1943-4-stephend@silicom-usa.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180227191711.1943-1-stephend@silicom-usa.com> References: <20180227191711.1943-1-stephend@silicom-usa.com> MIME-Version: 1.0 X-Originating-IP: [96.82.2.57] X-ClientProxiedBy: DM5PR17CA0068.namprd17.prod.outlook.com (2603:10b6:3:13f::30) To AM3PR04MB1345.eurprd04.prod.outlook.com (2a01:111:e400:5369::27) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f4062be7-79ad-4a2a-663f-08d57e16c09f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:AM3PR04MB1345; X-Microsoft-Exchange-Diagnostics: 1; AM3PR04MB1345; 3:7ndBcIuvGcjzigF2c9FOiyvJlkUZdHulqHqSBL4OE698GyjFAMrp5+ayG/+CuKlzvLWxqv/H9axJDRkZACwqOwC4GR0DFpI4KSpw9ZrmLzoyoWdJm2+DP/6D8jZBGy3goJr2h9MFq7Trx6SKytY6y70Rw/F3BywVfxFO2EsY+uCpWcgvfPKATDcNr0A7f+XlW524NtJ0IbmzzPZrMl74OVRiCb10oM9+VSJ1bPhtQ7bYxbBTlMRdrk/d+6btJ5VU; 25:cCltWW04axlS6tNH6qDvex9YmbyME4t65dCqmmy5i9Um8TBZ66uFMeJPTEvDgY6m4CfLMnbtlgqQ0Zq3wsRw/IOVuoWy/Acj0vOSVaDFoHlevVDcyHupkpl0waACDqhbKf2wWLrh/ewLgULLtnbglEOZbLPHj6ZsTGY6N+jvSXZZME2gHRxkY4Y5FEKvIgPBuiDETcjF9sNadOgLEB+8IjfQTs6U4JiIqRw4rUOcpnca+AqCPZtvP28hbvzFyyMEqZ9SzMzwRGiuRocIx2FLP8kPGiydnZr73lYNPjnJ0RlYJLUMZdmBxdeCsWibyPIaV7UVXDV1nelR4LF2gDaeJw==; 31:qh/vc0D3f7z2FBk4P+rX8OLTNyMO0Q9W8h9+gafKpb0IX4+cQxKPrxk31l7/iOe2Mhp6+NNg1L6MvP30DXu7eMN1L9O8x9xfGgu1fen7ZaxG/0hTOaovYjly9eslfvjYq7qMmhNGGR0wEHwFgt48JaRwib8XFqSBM4IAAj1UMxEfxOoewZeXEg7Igcdj1YlYU484EOuklKUtdWnscOX4S3Y5H0ic3ktSF3Q9MFTT5Lo= X-MS-TrafficTypeDiagnostic: AM3PR04MB1345: X-Microsoft-Exchange-Diagnostics: 1; AM3PR04MB1345; 20:vsYCSKBTffcSd7VLpKz6rXFgCexxCeWGV7HkRKGXUqJ/qI/0rGPqZ81urH8VQ3aXbYhyMvQK+WJ0kzUIO2dibxwBzjJMq6RA/IOSvsfsMdyli77lYWKX1PopRG+t0TEg07tV/q02rjx73O4ozzkcp84n6oGPoymQW0cbzwrpR/wvAb3YhBFO9sn9ZrPnflJdE/5XpCTQAni7Iy0qYUKP2VPu8MAFbbTHIrAFmW/M4yDruoiqflSBwdzY1oU0Rey18wU97Gb2MxXQ1/HLJXnBnc9w0MHLyZwJLx9oNe4xEx/+aYW6Sy0SgFzw1syhrc2bKoMvTWiSrttkZVJt9LJnSlHf6c0hiud92PQteLwSeKIRmL5pfBRW0Aek6DfWVwFG6gkG2G/nPfHpw7ZQYmJtDNaX3Z3FziMCHsSkSScgpBFwuIcmw32iSj3FqFbxutM+/68mw6nGFH6EopcJnIOMU2QuYh7IR63zbPS1E/qVX/MoOtlZbqlyW/3JNsCBcoW4; 4:1537iY469yv5K2Vu+eChDdrTlJXD89SV2Bi1OWZ4MZnVk7WcjG9pzfMi4vW1sWdpjyfzuITxg98PgpWiPJtZDA24Tvkb/Opv9RvOYloJAgoBwxMlMOgmkrb7Pt1WDcTDD7LUT8NHxSeEqFzQbAaJG6grSQpzPzDqCz008slD6o6STEk05JGdmd9EixYWe+sOHyPJLvSvtk73cmAHkMHIsQudBeuqcMCuLnV/w0LVMECSowE4Usj6ggDW9M/cMNzAWdGZDfdqx+rikWmsfSJ/MT8jYg3Llzc37YinOnXpmZdaw48mP1x7jTtwQ6uyjSf8 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(20558992708506); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231220)(944501161)(52105095)(6041288)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:AM3PR04MB1345; BCL:0; PCL:0; RULEID:; SRVR:AM3PR04MB1345; X-Forefront-PRVS: 05961EBAFC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(366004)(376002)(346002)(396003)(39850400004)(39380400002)(189003)(199004)(6666003)(2950100002)(97736004)(2906002)(106356001)(186003)(16526019)(48376002)(316002)(47776003)(478600001)(1857600001)(6486002)(68736007)(50466002)(16586007)(110136005)(6512007)(7736002)(81166006)(81156014)(66066001)(6116002)(305945005)(105586002)(3846002)(53936002)(25786009)(51416003)(52116002)(76176011)(8676002)(86362001)(36756003)(26005)(386003)(1076002)(8936002)(5660300001)(6506007)(50226002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM3PR04MB1345; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: none (zoho.com: 80.81.252.135 is neither permitted nor denied by domain of seabios.org) client-ip=80.81.252.135; envelope-from=seabios-bounces@seabios.org; helo=mail.coreboot.org; Received-SPF: None (protection.outlook.com: silicom-usa.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM3PR04MB1345; 23:w9UG7h8V3JNHwpJg4ngSWD5XEnNnyy3m/IK13dCIS?= =?us-ascii?Q?04RFQw+iFSJjhePzvaDiewkMIZYphbp8pF75PlnM3cwM3VwXIxhdDvO2IjLe?= =?us-ascii?Q?6urBZNCr+/Git2lWp0qH5HYfTOM11xHX0jq7idAKxwodpzZYL0lIMm/WBd9e?= =?us-ascii?Q?EXuZsFBCV3k4Z92h/A/7U65a92ya1M7m71Ud40hSOij1WkPgTC9zcrByNpmy?= =?us-ascii?Q?d+dRNF0hM/UEi3TkX4VJjTQua49A13zDSFCw1yzuaQj3g4AuJPVpoyMzIf/M?= =?us-ascii?Q?IAto6ZDPYQIFvdHW6uKrNgZ26ajZfmiNISs1YxzK8WbDFE9hKKAIQnjOeW97?= =?us-ascii?Q?yURO1Xaax2qoajit0P1WUj0Dnv4W8fshqzWJrm8EPKpHEQLSFRe6FHRp8ghM?= =?us-ascii?Q?ijsanmhDHfAAhhKaOIqSlzf31dfQk1gdkZqNuOuScxeMf0zW8eZZn8kFqVaH?= =?us-ascii?Q?EYH4fcwTw0vx+30unLyYRNKY4KnRGUx8aayvgnCd+CR+00d/YRY0Nq3q2COF?= =?us-ascii?Q?uHp/plJJTTBHUNiOONHmSiqNqEBSkiNokNRW4Wzw5SvRwPrlx7WIERbbJdF4?= =?us-ascii?Q?DGu2MxcBcTi/toZ0VT3Uj3Gk8fJD3QsxnEvUrjQaWRBPfigDe4wFgRsV9oFA?= =?us-ascii?Q?aypC+vpygF8+69AD0oT4yX4MyRCWrp4WRzTMYfCki7cvqV4IB7xRCzAoRLDn?= =?us-ascii?Q?wctP3gX8Ro/nZZe/LPKpbCYUJ+/FcYSYTpE/h7ssj/2nrFZbsICHx1+tiUAM?= =?us-ascii?Q?wnA6XoIuONfmUuyMXLmadQQ6XQFCgsxj/guZqWiWdqZgEXlYbwTKt2RpY27V?= =?us-ascii?Q?pxZWDGkcJsp8jyoJzj3kOweviPwQiZ2WSuSxjNTSOsTeX8ysPtQzAzb3FTDB?= =?us-ascii?Q?OMHuq9Io7zdc63IytN2G5ujyh2TI6fftHJbhP/lpuafIwHKMF4LPdJ6zwhUr?= =?us-ascii?Q?w2SZ3pogLY6lgpk1hPag4FJUJSejHrElQca7p8Za66JaFquPDxpohkMlKxTQ?= =?us-ascii?Q?hULKG02pgMMx0/ZLFc9rnN6sefigaw89A7DKRMuMGHr2wwa7m5Pa5whQEJOC?= =?us-ascii?Q?mnGvFps9YGVdKknGvQYiAqV49zz5t466l7I53C3KkSIXquDWERC6xh6VR/uR?= =?us-ascii?Q?sLqwYKJzuy489x0S0AX6tHIVF2IB0Rn?= X-Microsoft-Exchange-Diagnostics: 1; AM3PR04MB1345; 6:XoHsmB6gjv7G6kdNuSE/N892jNHsqvhfCG3YEShnOI98xGyM0eSQkDV9P4OQf+nmIFT6UT3HjW/vECJeQnrWY+U03PkcSSLhbXV7Q7j07QStJBgBXCSn0eULwjEVANPXUN7DSkaOYsJ4NWxpITi7CMq6JNyXGH32kGcsOk+FjCBlyg4RLD8tlDCH7WXaF1anbskj1iHfRCJ2lV0UAQR18Us8Bgh5HBNX6YCdNG8fX56eoDlb/TsVVzX4WH/5ACXmWHNG1xtfm1EfhZZg7BLV0r0l7UEv4x8gW8pjxVNYjR95bt73b/GkqnkJJ8ES6XIavYlCZGMBl/zzQRBcPm09JGHa3ILApISghKsFrqVh0XA=; 5:VTtqWtOQfgDGpVi+gUthpzgofI6PtElORHfcOWUvh7h7/WN9ozoa1ERPiDS7IuBhgfcZbmgElEa8XXIfB+GUTAn0wsvwodq1B6sHFdhqZJm2nS864GQAOzmMGpm+3whgA8fYAqJMqAUNgUpCoPfLo/2fgpRkTXPldIGYiHyjxm8=; 24:o2VK8c30/jn+j6NyiCyMdvCkjKtOe40m7y0vhDBca6OfCHTncag1XlYfgKW1cHl7/cjkyMeeWlgalNNlQRLVmEK0Dn/wAJSDD1hgjyiJCvc=; 7:OrLPi2TaqBaysZMCdmFCqIkto4mB6jVHf9G+JezgK8B3BTSZhJyyjSaxJtcVWtY8q5f9W5oUumUNd8u4HQAIlFErTS7GfQSha+lz5HltJuiO2se491R9ioGXeniHo79JIRtU2yYkB0XBJk2Y4hznp1VZ3C/XNu2ja7Gi7TtcJTQVljRXPPpYhWR5vs3p3a1UvnEN9hPAbL8nTIWboUTyv6KKqi4v6E3b/oymKXzgY5aySBuzNFr8mDRxq0S1Yyvc SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: silicom-usa.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2018 19:17:31.9938 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f4062be7-79ad-4a2a-663f-08d57e16c09f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: c9e326d8-ce47-4930-8612-cc99d3c87ad1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR04MB1345 X-Spam-Score: 1.3 (+) Subject: [SeaBIOS] [PATCH v1 3/3] tpm: Handle unimplemented TIS_REG_IFACE_ID in tis_get_tpm_version() X-BeenThere: seabios@seabios.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SeaBIOS mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Errors-To: seabios-bounces@seabios.org Sender: "SeaBIOS" X-Duff: Orig. Duff, Duff Lite, Duff Dry, Duff Dark, Raspberry Duff, Lady Duff, Red Duff, Tartar Control Duff X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" If a device reports 0xf in the InterfaceType field of the TPM_INTERFACE_ID, then the rest of the fields are invalid, and the InterfaceVersion field of the TPM_INTF_CAPABILITY register must be checked instead. Signed-off-by: Stephen Douthit Reviewed-by: Stefan Berger Tested-by: Stefan Berger --- src/hw/tpm_drivers.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/hw/tpm_drivers.c b/src/hw/tpm_drivers.c index da8bb63..ed58bf5 100644 --- a/src/hw/tpm_drivers.c +++ b/src/hw/tpm_drivers.c @@ -142,13 +142,23 @@ static u32 tis_probe(void) =20 static TPMVersion tis_get_tpm_version(void) { - /* TPM 2 has an interface register */ - u32 ifaceid =3D readl(TIS_REG(0, TIS_REG_IFACE_ID)); - - if ((ifaceid & 0xf) =3D=3D 0) { - /* TPM 2 */ + u32 reg =3D readl(TIS_REG(0, TIS_REG_IFACE_ID)); + + /* + * FIFO interface as defined in TIS1.3 is active + * Interface capabilities are defined in TIS_REG_INTF_CAPABILITY + */ + if ((reg & 0xf) =3D=3D 0xf) { + reg =3D readl(TIS_REG(0, TIS_REG_INTF_CAPABILITY)); + /* Interface 1.3 for TPM 2.0 */ + if (((reg >> 28) & 0x7) =3D=3D 3) + return TPM_VERSION_2; + } + /* FIFO interface as defined in PTP for TPM 2.0 is active */ + else if ((reg & 0xf) =3D=3D 0) { return TPM_VERSION_2; } + return TPM_VERSION_1_2; } =20 --=20 2.14.3 _______________________________________________ SeaBIOS mailing list SeaBIOS@seabios.org https://mail.coreboot.org/mailman/listinfo/seabios