Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Ross Philipson <ross.philipson@oracle.com>
To:     linux-kernel@vger.kernel.org, x86@kernel.org,
        linux-integrity@vger.kernel.org, linux-doc@vger.kernel.org,
        linux-crypto@vger.kernel.org, iommu@lists.linux-foundation.org,
        kexec@lists.infradead.org, linux-efi@vger.kernel.org
Cc:     ross.philipson@oracle.com, dpsmith@apertussolutions.com,
        tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com,
        ardb@kernel.org, mjg59@srcf.ucam.org,
        James.Bottomley@hansenpartnership.com, luto@amacapital.net,
        nivedita@alum.mit.edu, kanth.ghatraju@oracle.com,
        trenchboot-devel@googlegroups.com
Subject: [PATCH v6 13/14] tpm: Allow locality 2 to be set when initializing the TPM for Secure Launch
Date:   Thu,  4 May 2023 14:50:22 +0000
Message-Id: <20230504145023.835096-14-ross.philipson@oracle.com>
In-Reply-To: <20230504145023.835096-1-ross.philipson@oracle.com>
References: <20230504145023.835096-1-ross.philipson@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BdK+R1kg4tTRJdf2KQLjGtIbUEPGWtNz/p+RSKxNiO/ZpjfOADNPBJw6KlRK?=
 =?us-ascii?Q?G4kKQaph7hHngx9NztGEeTAbtAImU6KpEcTfo0dUDxCvzsUCokLfeZ1CMdjW?=
 =?us-ascii?Q?SKfjtwe/NxcqOje3dJyBI92v7CkoJlKkitmMx0nWHn5F8hh2k1PUzZAjowb3?=
 =?us-ascii?Q?qdIxKspxRKp9MoTABkefO7d4PODxB1MwhhB6iUnsyIDZeknZrUsiCFpQdV/S?=
 =?us-ascii?Q?wbJ6Y4FQlOjUcWMJYGLAqx7UlyEQyKLIerpgViFfEmXhBQw211Ml+kAXEpye?=
 =?us-ascii?Q?WmspeSSNzdPrLnRKXGdm4ZpZhZtPwz1ZC0MFGLz/1T4nQUgDsM+aVVVDRZ+a?=
 =?us-ascii?Q?xOPBg1AI0Szzky/5Ef96ne01l1bXdm63CkFMCTENOeyMuKpbl/NKlxEgDCkG?=
 =?us-ascii?Q?qoCI0GhSNCvkXEq7fNJ0wVlsaelxZ/XBdtoNeZsWxy4RZNbabv36b4p8dfUp?=
 =?us-ascii?Q?/t9Sb/GWEvrNRcCvRI5WquwKg1ctxoPgLv1Di66uZOp8MB3nTh+z314OzMn7?=
 =?us-ascii?Q?G3sMR+EdoaR9qsMX97FtUzUIeYZBLPcFV+V+Ye6A7jDPiTn/ZYRU9LpCTUSK?=
 =?us-ascii?Q?E8gih1HvdjLK4QfaXr22FKGIg16lgTy713Y7WnOOpG7atBwN8Olhn95ctkzd?=
 =?us-ascii?Q?iM5sZsskv7yvG1Fo6mtxkFmNH9Ah58ljfoj6nuZAk2OxrtHG5kH25ImjPrIH?=
 =?us-ascii?Q?Sn9wo9TpUXNnPw3kl2tYXB1uZh0GwKp4oJyKtgUp3YjuOhJ8xK5allYYEm/H?=
 =?us-ascii?Q?741N8Z2Owrk/S37QDrLUZ6XdsqJkBFvi8kNMdn18wp9UN3WBUQiipFbyT5NS?=
 =?us-ascii?Q?Gn2oLDA3y6YEDEVPxcxot0ISArspXpbfgAz9RMiqJys7ozp5Y9knnYsssNMp?=
 =?us-ascii?Q?DQURKRlvvjunAEfz+SGxj5LnlT5hvNAoyeBSjuIusQrUZIJ+ILudjs3pcN0y?=
 =?us-ascii?Q?7xLLuAyvaXjCBW+73hQVLf1NgxyixYGB5TshbY5tt/zO7H47aWmAIkpDyCOj?=
 =?us-ascii?Q?+MHYfgnVsBkfrQ0I9M+J8uTGiP3HjSxZnefnmy6q5+1+5zA0qOTxnXXz+J9K?=
 =?us-ascii?Q?qEjZis7jlJuCFUszk1bVy0QeUOz9MMzz+gBphnbIH+vzMSmGk5uNFJZoKdyk?=
 =?us-ascii?Q?KzZLB96JhAhsHRu3b0ho7Pz9jm/Fev6Q4ckXHGISsvVpo3I3wlSV3fK25tl+?=
 =?us-ascii?Q?gcd/fV+bvR2Aie5fW36jAfbLAF7Cfcj3iADH1+5cZcE++SC6nnWe1Hc2Eq5Q?=
 =?us-ascii?Q?WuwuDhqG9rhQn2DoPjpeCIk8Ju4+VJXaLB0AwefABp1WKlXHB6I6VPp4w7yh?=
 =?us-ascii?Q?TOotgbwuJJRxEuCtrdC6aESyTtu2ujIUFtKsHTL/2MUTu1cIYiqvc/YOuwVY?=
 =?us-ascii?Q?wE9oZ0E6tOZ8fB3eTXWK+E+srKnKT9sdYsgecdZybxmwCH0OTsHl0uyto9Mo?=
 =?us-ascii?Q?etvbjeDgL5dv9XreOioicWkU4wURPFbyUucC9NHCqYFaonHuzUlGUEWxs3y1?=
 =?us-ascii?Q?AkN/al+KPKCN26mpA6TWRN2Ugu/NXY4NzMNGBCf9X3pUMYNwfMnlkBlpbrWV?=
 =?us-ascii?Q?swwTBHdrzTg+ql3P3KzduqxLTsKz8pBtgx5ToF4TaCy7u9zDsZXcZgY2mL19?=
 =?us-ascii?Q?ZA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?QP/auNSJ3WMt+OAHWuNFm49rsOBqfd6Uc0MH0YLK1BymBaJ0Uv1rJKWewfYD?=
 =?us-ascii?Q?zv4tYjNfjVHIzNGXC4XWWleIFF839hCfuoajAI1jfuEfCYoqD8k3GfdNUXUN?=
 =?us-ascii?Q?it9L8JXenFg8B0ZasV542jRa2MJRaJJhFc/5EOb8qM7M0kJ05u1mFLENd3Ye?=
 =?us-ascii?Q?XzDP5wBkzB+AIVhOUpglBHucIfS66FUrGvDJwld1YoqL9XDV0OqBYLnqEYnG?=
 =?us-ascii?Q?8u3UXHTvo8X7Fe/iVPf0p74bIw/wpPt5jzlczW+hFscUL/LT1LEpNl1I564/?=
 =?us-ascii?Q?oqLNmfAeWeo7fj6fRaKi5o49Yo+d+x17bZc7qxkJJTK7lUVEqMnsC8WGJGtK?=
 =?us-ascii?Q?KOKspMPdrWPp5mqMz6aCJJcGekh6F6K97WkdFqRB+JMRj1NiF7BZ2DoIEzd7?=
 =?us-ascii?Q?M2n8YZEmSEavneVmdMGjEufji++0I+irn4cdKWqYf0Rro1OBacY5Vwt9ObUH?=
 =?us-ascii?Q?vkRe8PtcbSg0BE5T5cStenDI7yMuKcQIjcfNKH8v6HXupL4/+/4Iz3B4RkRn?=
 =?us-ascii?Q?cTC2TLO/MtkV8v3pHRxbLSqavnB9SRx9WShdmIGP7fCeEJi4/vsNlVCnhjpd?=
 =?us-ascii?Q?DF9cFuqRWZkYmEfrZV4Y/zlcGDCrFKGeNRqhLNgJl89bmGKbIuKvPgIrQLqv?=
 =?us-ascii?Q?VLei7KWyT06FAZ48XDkplORZVGiLB+Wf4se+i/WfM2GLKIhcmG8c9rP8063Z?=
 =?us-ascii?Q?oFOETNvo/9qEAM7uB75MJR/XjUIoSZTFfou2mmCcbPYjBtm/oi4ZBPiGYMxt?=
 =?us-ascii?Q?2gZXlKzUNZbmv8vGscpsqlnZwG9+JH3k0Cyvah5rIvo+k5btEPjbNBV8G2yy?=
 =?us-ascii?Q?jFD+1nXu3/5NSkhcce2b6hZVI0GJJMHa1VLI2zotRM18IOA84l5Oc2kXU4HO?=
 =?us-ascii?Q?rLhNMM+ciJAS38ubUKtEZr3t1b3+Dr8G22TndfBICGUXn3U4AeqXR8aJ79RX?=
 =?us-ascii?Q?EoTp8kg2oPEN2oyZKngVMyniV/XBM42SPMetnOwLLipQ160BXUFhXeIRgIk9?=
 =?us-ascii?Q?f/lZuNVHPFab9IaSO5adAZHEP9uc2mtFs4qqBSK6bOkmtjO42SbvtE04MtIz?=
 =?us-ascii?Q?X3tqnz1mf+UUtzEueFxxado+4oEuBjnosqE0MDLtHXJ37LLZBErQyH1uwHWu?=
 =?us-ascii?Q?q0js0k9Oqp3D1RIh8mh1pXpfPpytncF9aezgCgye92Az7BatVn6YK1EtsdXb?=
 =?us-ascii?Q?DbN2t1TVOqXGb94e/WKn4dLqw1W4a5crzpUM4jikMiL3kBTuw4zwzfYwLVJO?=
 =?us-ascii?Q?XD8XBZk5ccRsbVtl3G7nDzXnVErsXGyzPVryvhq1U6f6n62z/Ooy5FdAVx+t?=
 =?us-ascii?Q?+Mk=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d623d4af-d2c3-4ab9-3649-08db4caf05fd
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3793.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2023 14:51:20.7734
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 6vrkSM7gJqyIlATbG+YsUcYajnfEA+NHk1lYGLkAYfAEP/f/mO4xspwaxyZNbjDKcK1ruN77P1xr1ZklRQ1me33qGiBTcL5MMnFM+siGcfw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB6982
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-04_10,2023-05-04_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 spamscore=0
 mlxlogscore=999 phishscore=0 malwarescore=0 adultscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2305040122
X-Proofpoint-GUID: TrJtrQHeL_WVFPcka0zpWrC_VBMY6cAg
X-Proofpoint-ORIG-GUID: TrJtrQHeL_WVFPcka0zpWrC_VBMY6cAg
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

The Secure Launch MLE environment uses PCRs that are only accessible from
the DRTM locality 2. By default the TPM drivers always initialize the
locality to 0. When a Secure Launch is in progress, initialize the
locality to 2.

Signed-off-by: Ross Philipson <ross.philipson@oracle.com>
---
 drivers/char/tpm/tpm-chip.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 80aaa10..5dd2eed 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -23,6 +23,7 @@
 #include <linux/major.h>
 #include <linux/tpm_eventlog.h>
 #include <linux/hw_random.h>
+#include <linux/slaunch.h>
 #include "tpm.h"
 
 DEFINE_IDR(dev_nums_idr);
@@ -34,12 +35,18 @@
 
 static int tpm_request_locality(struct tpm_chip *chip)
 {
+	int locality;
 	int rc;
 
 	if (!chip->ops->request_locality)
 		return 0;
 
-	rc = chip->ops->request_locality(chip, 0);
+	if (slaunch_get_flags() & SL_FLAG_ACTIVE)
+		locality = 2;
+	else
+		locality = 0;
+
+	rc = chip->ops->request_locality(chip, locality);
 	if (rc < 0)
 		return rc;
 
-- 
1.8.3.1