From nobody Tue Dec 2 01:33:05 2025 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012069.outbound.protection.outlook.com [52.101.53.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4ED22F8BCD; Fri, 21 Nov 2025 08:07:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763712446; cv=fail; b=NPmOKY1bpb617hGvdHxtlCkHi9dJnR/w0XVPGENw1w7ZJAsvNQYoVFirLbc3ykToQK1g5zM7f9ii/7wdmjOs6/VDCEUUvCj2lqw1YvbPw0CiJw5T/VUZSJZIaO8UUHfvfW4tRfmCg5Isc74jDUWxr87SSXCQg+8Ab8pblJEuXF8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763712446; c=relaxed/simple; bh=eESXuq1cgqrFmPJCVSmA4s+jGH5QBcptGBVCekio0wg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FvkS/7fF1oTzKA66qpQ4sAyt4G+W+0ybtDK6JNnNSw9rLZfFBmhEVN7t28Ubz99wZlR5o6eBirmuGG0kIh06veedQ7HpACVkKiYG/h8v1Vf7mEUsQojpvYeQomJCkckF3t6Uj1gQ2dRS8sJ9+P0wbYIpLZ7EQT6KcDSvTpS53Pc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=HJZeKCrs; arc=fail smtp.client-ip=52.101.53.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="HJZeKCrs" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YHKgu2w79DbL6iUz9jWqBrN7sANsQMCIvEfJClV2dc1ka1GaFN1A1SYTOvHDp2uM4Uzum0Fq6A1Wy7269ydnsbRawgxJvf+nD30ZwfXjF7t7e00SJ3kqqwKgBakCIcS0tTMr5t6Nzqbpae9pkhKqwPcF8fmKgd+O/qnT0PkH2vslyb/t4rOjBu2S8M13bQG4YOzyHdNbbgkxek7HVxWethT6k1Z2Z629HOQwfinnAAh7YECqp/PB/sgQtPPyjZiOG/XUo/+DJrtS3GwDHmKYTwy6r42sNbngPwn6HYytOEY2zg/xSnVoabSZNNp5k/iEu/uV+xnzEm840u7uOf56MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kO0wfA8Pcb6a6tsLhWY6VkzyCEzMkYR0HZfhkTZvbVw=; b=RpnXSgySMLDlxylcFSGGusR2hgw3JrnWJ1vLicV51sjnt8RJARBm452g1oopTnNmk3uNb0bRcX6lrKiQhw5/mnOkEuIA3pNntZNCJnnVCxjcNYMlt9/MDom3HJZQXxpvoVjHi4lnGnylvThJrU3n/dXplfMHb5R1X8lv4kGZeM2syfsPqPjzu4P1A74BpJ08xxTZCpnnZ4A1O5ed1GzVA/T3/7Udss9/hKfHjaKKMJ0I7sU0CQV3tWr0pz8mgA9+2TpyS8mej4hbyGIorxVWsjIdZdoV8dy9xplyHMsunfhEE/Kjt0DprUG/j0z5Nn/9bR/D4q1/pIo1PoBjIRIpUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kO0wfA8Pcb6a6tsLhWY6VkzyCEzMkYR0HZfhkTZvbVw=; b=HJZeKCrssta5H2Bq/E1S9FILlNWG7ZONQ/ftiQL+tLUkxz+ll0bApQcY7+UqM1/AaRkF3mrk0S2OhIJc1N3NnrlrwaTtYHtSn+jc9svbyelLiUhTj6BBIZs8d2UoXyu+0fKtrBtgvA4ou/r8AQxrbSfdQT+BiwB8R6E6EvB3YMM= Received: from DM6PR06CA0089.namprd06.prod.outlook.com (2603:10b6:5:336::22) by IA1PR12MB8520.namprd12.prod.outlook.com (2603:10b6:208:44d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.12; Fri, 21 Nov 2025 08:07:21 +0000 Received: from CY4PEPF0000EE3B.namprd03.prod.outlook.com (2603:10b6:5:336:cafe::ec) by DM6PR06CA0089.outlook.office365.com (2603:10b6:5:336::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9343.11 via Frontend Transport; Fri, 21 Nov 2025 08:07:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CY4PEPF0000EE3B.mail.protection.outlook.com (10.167.242.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.9 via Frontend Transport; Fri, 21 Nov 2025 08:07:20 +0000 Received: from aiemdee.l.aik.id.au (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Fri, 21 Nov 2025 00:07:08 -0800 From: Alexey Kardashevskiy To: CC: , Tom Lendacky , John Allen , Herbert Xu , "David S. Miller" , Ashish Kalra , Joerg Roedel , Suravee Suthikulpanit , Will Deacon , Robin Murphy , "Borislav Petkov (AMD)" , Kim Phillips , Jerry Snitselaar , Vasant Hegde , Jason Gunthorpe , Gao Shiyuan , Sean Christopherson , "Nikunj A Dadhania" , Michael Roth , Amit Shah , Peter Gonda , , Alexey Kardashevskiy Subject: [PATCH kernel v2 1/5] ccp: Make snp_reclaim_pages and __sev_do_cmd_locked public Date: Fri, 21 Nov 2025 19:06:25 +1100 Message-ID: <20251121080629.444992-2-aik@amd.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251121080629.444992-1-aik@amd.com> References: <20251121080629.444992-1-aik@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE3B:EE_|IA1PR12MB8520:EE_ X-MS-Office365-Filtering-Correlation-Id: e2c808be-b7db-4f12-40c1-08de28d4fef0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?FS1xlbeQqJ9M0dGvTaQTtYzjnh0r+wktMXDdBht9SEXF1Uosc4vwJ28m0UA0?= =?us-ascii?Q?pFCM0grxp78Fcfga/EO2/1zVAFTMrHEYWPEqii3i7kzT2o/fDVO9lLPpAfOH?= =?us-ascii?Q?lyXU567dgBNuB0qxk8OSFZq1PRHubfA/RcV9VVUsYf48W08lwdATMGlJxc8r?= =?us-ascii?Q?OGzVD06xlWd5OYbflpnqUGYnGQ1ViUEj2ylaGb0wYOEzP+CjFy6Kro1lGiIT?= =?us-ascii?Q?k9E8ySxLlSEOYuW1rs8q4IKPHOi/wv8yQknwzE8A5l7cvrrExlSS/R6YjgFV?= =?us-ascii?Q?PttkExThw9AOwnON++V42gdFY1txdS8xBBukTJv7O+0wZRAy0B1Hop0tCE6G?= =?us-ascii?Q?DOl9SeD3kMW6+pMC/TJ3PY/YuKLFlyht5hsYMg3pukNETAwtKUIkbvolwuo3?= =?us-ascii?Q?1PJEH4dAXcahz2S7vq0V1ruuttAXrzaIRDameRXMN23Qd2SbzxQ3+6VwtAGS?= =?us-ascii?Q?o6ajhoE2Y2dCAHlqtQGTV3qMPn7KQCbafvnk+uS4Qk1LXWRLWqFOTGArgpTh?= =?us-ascii?Q?KEVoWcPXiifCD6MxXY39rHkOUA3SMwolv+Dfxbs95RqeMI94dMUTwibLEDX5?= =?us-ascii?Q?ogZyVWON/Tc/lFKH5JoGFUC0Yvy8iMSEqo26NFLi5zjmXDv/RcJGy0LmP6g4?= =?us-ascii?Q?ssVR7eTgqkX0isinXoymRff4FAueAVOXdkTWW6jBwoEThmEFmNlsaqWV17/Q?= =?us-ascii?Q?u4TpTvTkIhi2ouJLKfEulxkedoU/3ebjrvraaZjNAWFpnf6y148KhXa7qfQx?= =?us-ascii?Q?9o12Mh0URd1aXH5YtXvy1zFBTyrC3JCqaCdcCfqoSBjy/SPvHEoh7wB+0zoH?= =?us-ascii?Q?2JfAC6dHGnBP0CuEh6A8//s3HTe/GdNxReRghbDPJ//4i3BopsPZSiTq4oof?= =?us-ascii?Q?6bowWpBN6VgXTQVBs7uUpid+eiO/zjee7aE6Wd4wKHOIcoIFxkhZNljFCvZ2?= =?us-ascii?Q?nXqvs3uvqH1H5ge5u5/g3FAsqiG0kxRvr7jYohiU0YihU9M8U6bTvS+75HxX?= =?us-ascii?Q?idswQzleKLmHLfGkpcqxdpE8TpCWnsJVcyHPfXmblkOLyg31+y7msv78lBt8?= =?us-ascii?Q?T7CCTrqFpeTpaudXJfMa1LGEYDvZwymACm7Yxw+DwmETISTEY90qGcGa69ER?= =?us-ascii?Q?7GE6MWmI1Kx0ow+qD1SNF3HkuGECsEEOSUkRHlyyi1/Mq7/sAodMU8TOkUat?= =?us-ascii?Q?DzTG+XzUmpLBRGJVmMQ+XwEowA2uTarRws8e9iwHzr3UPqWmF4vH1cgfUB1a?= =?us-ascii?Q?DJFbrTBnM0mVD42EuTFrXwl3cX+1dT4HTXqGaG2Buoh1xMk49PHEoWmqYuI2?= =?us-ascii?Q?xsFTmBh6DNNXTtnsEO7ozVPQaH7iT0ztcWb3GFfoyBSI+OJ74YgKb1aFzIdQ?= =?us-ascii?Q?rOflxC1FrArCUKyJngTttaNfnUhQg2gQRVJ/7NhCYYzrIJkExj9/1LReQrPY?= =?us-ascii?Q?CIJnzY3esxeKSHb3ke7ZrE0TQioVgSZ0douYCis8r7AOgtYqLhKn5ePcqsQG?= =?us-ascii?Q?M/WAJoHJaevY68PifFqIOeETq2m2QHwSewoUbA1gHpHQ4FK48ivwnztl9a8V?= =?us-ascii?Q?mL1RuOGhlQ2A56xKpWM=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(82310400026)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2025 08:07:20.7636 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e2c808be-b7db-4f12-40c1-08de28d4fef0 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE3B.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8520 Content-Type: text/plain; charset="utf-8" The snp_reclaim_pages() helper reclaims pages in the FW state. SEV-TIO and the TMPM driver (a hardware engine which smashes IOMMU PDEs among other things) will use to reclaim memory when cleaning up. Share and export snp_reclaim_pages(). Most of the SEV-TIO code uses sev_do_cmd() which locks the sev_cmd_mutex and already exported. But the SNP init code (which also sets up SEV-TIO) executes under the sev_cmd_mutex lock so the SEV-TIO code has to use the __sev_do_cmd_locked() helper. This one though does not need to be exported/shared globally as SEV-TIO is a part of the CCP driver still. Share __sev_do_cmd_locked() via the CCP internal header. Signed-off-by: Alexey Kardashevskiy Acked-by: Joerg Roedel --- drivers/crypto/ccp/sev-dev.h | 2 ++ include/linux/psp-sev.h | 6 ++++++ drivers/crypto/ccp/sev-dev.c | 11 +++-------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/ccp/sev-dev.h b/drivers/crypto/ccp/sev-dev.h index ac03bd0848f7..b9029506383f 100644 --- a/drivers/crypto/ccp/sev-dev.h +++ b/drivers/crypto/ccp/sev-dev.h @@ -66,6 +66,8 @@ struct sev_device { int sev_dev_init(struct psp_device *psp); void sev_dev_destroy(struct psp_device *psp); =20 +int __sev_do_cmd_locked(int cmd, void *data, int *psp_ret); + void sev_pci_init(void); void sev_pci_exit(void); =20 diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h index e0dbcb4b4fd9..34a25209f909 100644 --- a/include/linux/psp-sev.h +++ b/include/linux/psp-sev.h @@ -992,6 +992,7 @@ int sev_do_cmd(int cmd, void *data, int *psp_ret); =20 void *psp_copy_user_blob(u64 uaddr, u32 len); void *snp_alloc_firmware_page(gfp_t mask); +int snp_reclaim_pages(unsigned long paddr, unsigned int npages, bool locke= d); void snp_free_firmware_page(void *addr); void sev_platform_shutdown(void); bool sev_is_snp_ciphertext_hiding_supported(void); @@ -1027,6 +1028,11 @@ static inline void *snp_alloc_firmware_page(gfp_t ma= sk) return NULL; } =20 +static inline int snp_reclaim_pages(unsigned long paddr, unsigned int npag= es, bool locked) +{ + return -ENODEV; +} + static inline void snp_free_firmware_page(void *addr) { } =20 static inline void sev_platform_shutdown(void) { } diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c index 0d13d47c164b..9e0c16b36f9c 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -387,13 +387,7 @@ static int sev_write_init_ex_file_if_required(int cmd_= id) return sev_write_init_ex_file(); } =20 -/* - * snp_reclaim_pages() needs __sev_do_cmd_locked(), and __sev_do_cmd_locke= d() - * needs snp_reclaim_pages(), so a forward declaration is needed. - */ -static int __sev_do_cmd_locked(int cmd, void *data, int *psp_ret); - -static int snp_reclaim_pages(unsigned long paddr, unsigned int npages, boo= l locked) +int snp_reclaim_pages(unsigned long paddr, unsigned int npages, bool locke= d) { int ret, err, i; =20 @@ -427,6 +421,7 @@ static int snp_reclaim_pages(unsigned long paddr, unsig= ned int npages, bool lock snp_leak_pages(__phys_to_pfn(paddr), npages - i); return ret; } +EXPORT_SYMBOL_GPL(snp_reclaim_pages); =20 static int rmp_mark_pages_firmware(unsigned long paddr, unsigned int npage= s, bool locked) { @@ -857,7 +852,7 @@ static int snp_reclaim_cmd_buf(int cmd, void *cmd_buf) return 0; } =20 -static int __sev_do_cmd_locked(int cmd, void *data, int *psp_ret) +int __sev_do_cmd_locked(int cmd, void *data, int *psp_ret) { struct cmd_buf_desc desc_list[CMD_BUF_DESC_MAX] =3D {0}; struct psp_device *psp =3D psp_master; --=20 2.51.1 From nobody Tue Dec 2 01:33:05 2025 Received: from CH5PR02CU005.outbound.protection.outlook.com (mail-northcentralusazon11012018.outbound.protection.outlook.com [40.107.200.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39F442F8BCD; Fri, 21 Nov 2025 08:07:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.200.18 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763712481; cv=fail; b=UkxPYYWORT3FbleX9W8MlpYPLfcS+SEyKyYTaz8s3kCkJdkpwUCwBREwzEoIjeSSC85AE69VmObAYgbKHMbYdN/dpKDIsQN/D+rUrZCQfZDdfGoBPnparfN8dWOTbv5jJgcPYkRgHeu34RvYy16UTNzTkIEgOlyIx7qMrvrLJCA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763712481; c=relaxed/simple; bh=mtbj9BcCXZ+HbP0JZoZMpEx/k3RYiOl2HMocVlkDQKA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=T+2alfXA3IgVpU4Lrwn3tWR+vKzPEPYoLWUCGjsDyRn4Hqktbw3+lturSYCerQZ4501gyn6cXdsQ5feeqtT124nzL5ihJ7vRKYP2e44uN3QlmMgxvhn8QCtz8GTtvlNbOLHOzSC0qF4urfuNxVIrb5VjWKBFGc4T23lWQPvQXEk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=Te/qqWEy; arc=fail smtp.client-ip=40.107.200.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="Te/qqWEy" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QTlkKcqnuOmcKFCufIeqkNINfqKR5yqGOfwHMjXMM0l0VU3LchC7GpA03+tpQITl1yesAIIfjWFTSy1rwZfzdD+G8mRm0H6Sc2SHkDS2oHjQafMnLzzwgXzDbb8rV37zLFiNu3PXRcOHs4Fhlocktxt96MZFTGn55/TElTN5EFU6nbJvy4X08y5HWS8Rdu19UCEBoLAyH+DIzvKanDBwBASbzW8mHM9+SBemJs8YpRB+owBF3Xq0yPyx5toJsiOol97gW1ujI3ZmBf+qCtHoUv/gC197ZNM8an1hRHTJ7IMrvtDbKAhWq6l1BE94vzJLInQC3OLK+6LGq2ivKrut7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0LlyfLyyyH0IEfszPb4PAEgt3/VBclYGV/TLxzpIQq4=; b=dhwjQ7WCr33Ovfop4vw53BdFoEb90hXnNp460QaAiE1PM0OHo0Zh9grnu8Q2Syjlb0Kla03ur8ljszomsKROvxRquLI6+n/tyQ3zveID0faNeKHo9KWh8InZyw3MTcWoY1/kp24MdL4s2N6o1g2/2sm6wrkwY6Ib3yUcmx1VxfCLgMjxC884exEVVZuI9zz1/D3yoTVHJN8VkfpTIW+G2oz3d0koSQeODmjFu8PAwjZVvVULszQTIExWqLKAl9E/uWmkue1cGZKfEsEyfRchJFo88yR+tJY8HA7buOd7WWlGeAQWCJVTcxJNx9N2xHH/puY+SksyTahnEaDNCPdnVw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0LlyfLyyyH0IEfszPb4PAEgt3/VBclYGV/TLxzpIQq4=; b=Te/qqWEykdJydBI+QWfu1lKSH6XPtF+RkVIWNGsyHCP6xSWrOXpB7i1FkgwgWWf3RlpNVZ3EZm7WndqM1eMWBj3lDLuNrODper9XhZp1XZV0FVcLWRet5hLGvlSea2ARrPNtEB7z/3j8oJAI7hofqj6ku/SXQ1zAcPZy9IWV94U= Received: from CY8PR19CA0044.namprd19.prod.outlook.com (2603:10b6:930:6::13) by CY5PR12MB6645.namprd12.prod.outlook.com (2603:10b6:930:42::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Fri, 21 Nov 2025 08:07:52 +0000 Received: from CY4PEPF0000EE3A.namprd03.prod.outlook.com (2603:10b6:930:6:cafe::94) by CY8PR19CA0044.outlook.office365.com (2603:10b6:930:6::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9343.12 via Frontend Transport; Fri, 21 Nov 2025 08:07:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CY4PEPF0000EE3A.mail.protection.outlook.com (10.167.242.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.9 via Frontend Transport; Fri, 21 Nov 2025 08:07:52 +0000 Received: from aiemdee.l.aik.id.au (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Fri, 21 Nov 2025 00:07:40 -0800 From: Alexey Kardashevskiy To: CC: , Tom Lendacky , John Allen , Herbert Xu , "David S. Miller" , Ashish Kalra , Joerg Roedel , Suravee Suthikulpanit , Will Deacon , Robin Murphy , "Borislav Petkov (AMD)" , Kim Phillips , Jerry Snitselaar , Vasant Hegde , Jason Gunthorpe , Gao Shiyuan , Sean Christopherson , "Nikunj A Dadhania" , Michael Roth , Amit Shah , Peter Gonda , , Alexey Kardashevskiy Subject: [PATCH kernel v2 2/5] psp-sev: Assign numbers to all status codes and add new Date: Fri, 21 Nov 2025 19:06:26 +1100 Message-ID: <20251121080629.444992-3-aik@amd.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251121080629.444992-1-aik@amd.com> References: <20251121080629.444992-1-aik@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE3A:EE_|CY5PR12MB6645:EE_ X-MS-Office365-Filtering-Correlation-Id: 6c8a701a-782c-45f1-df7b-08de28d511f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|7416014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?iL39OT1iwzXzUI33EjTdpGgyNpt2o0fFC4h9a8zzvspHFjydadAlGglPW+B9?= =?us-ascii?Q?wHTOD1z6RRHLyU3l0cnEW2XMpHyKBnfrc77Mrmo5v/Jcb7Qk77ckCmlhUmIY?= =?us-ascii?Q?FRqyThgLVeYANntXapneaqRO8XvePbtwaBqRVl6Qd4Ul3pjQyMo9k9+oU2aZ?= =?us-ascii?Q?FT7If9WpRmZLM4wc82pokk1bw4k487uf9/ZXGj7X5lOm73Pry8MHcHt8r/XV?= =?us-ascii?Q?XCCYQPvejp8B9DVhy5XYSIkI8PJZN2umZCa2U9kAwstOLgCFNroC5GbKnVln?= =?us-ascii?Q?h16SySd3T0TSfCVuoQYOo7DvcylHLggbgzUeLfmWUG3uEb96PMOk+qOq194j?= =?us-ascii?Q?i49qBpiXAkYQxmi48p4t1AnrPiFZrWEfUHIzdcKnCnMZ+GL1G9akmKaC3Fuk?= =?us-ascii?Q?YW/jzk/AKxLzV2JxAbeOvyJ5qxx/b9HZZZZPnLqvx2j3eDQifrrjZA0E56Hm?= =?us-ascii?Q?gnLbjjhHFHCqsaremL9ffJ7w01bisGo1/KUyx3kipMTizQ1Do9bhlJjkPnsr?= =?us-ascii?Q?nhJ7P3iBCEXuE/lfIyDCRBJKzK6B7vNEoEgGxq6gGR46doDuFSJTtYPGWqeH?= =?us-ascii?Q?76IzI0NklpzFuJXhP0Rh0tM+5yaR5SZ+8ECuxfrqSAHvG/YyGLho4fQYVsnf?= =?us-ascii?Q?3yNq5fwBPMxsd8BeN4Xj0CY6fDDJ28RZTK4luJkybK/g3EIcqAI/HC9kS1L8?= =?us-ascii?Q?lHglCvNKMSvmzXNUQ21PIV23epE9+ViLFywqpsYNEW2mJbweEof7l9nMWI1B?= =?us-ascii?Q?aZgxlAQ+vgng+U26FWfq33HvVPMvTbvuznjIyARYwALfE+gKRQHZWGHiT9Q2?= =?us-ascii?Q?EAY25d5luhVP9HShaiO7QGl9+zHVEpIMrcbXmTtlCrn5DCYuVp0szEzzW03x?= =?us-ascii?Q?60umpkhU2IqhEOwExt2qpuBMr+BUxh1rsFoAptY5nykgP0c3UW3HFHnAW+lM?= =?us-ascii?Q?WKw/HHIIqzSKyur8Vz1VWg5izhZCcwWUYurOIzRq8lVePekZSTCx18u4t+L2?= =?us-ascii?Q?KiW8wMaqyCbLfrWC/6P6G9Z7gsuIEaiDeXCP6SqVFD4k7ZSrRnbl9wPnmMdJ?= =?us-ascii?Q?qn6IKEJu8OAFOhvf8vCFgDIJdOBngAbkQVxkWG9VVrv2bhbhXQKxDTvpz34M?= =?us-ascii?Q?gjZWmKsGJ1irKpT2cAHx7C5w9Pv8EEehaRPeG+wXqpGZWZ0SP68wlCvvmDkA?= =?us-ascii?Q?FDHvp+cJ+vam4wWEVP8nT0bfxLz0j3MYuU7r8IeWGZYb/OCSDz8w3Nj6h7iK?= =?us-ascii?Q?9i2EqG4uVieyhElF8kD6EZBqMS3k1vgj5ImRgKS3lnL1G3PK1Mszo6DrwFVN?= =?us-ascii?Q?wyoKY6Rwbl3K5qlDq6/R2guNmH+BzsS533IJ6YuDGSG6/Ynck4FhSJwtLr6T?= =?us-ascii?Q?CRGqL5waJbj50tWtvUcitvf8PcyzVJ+uh2EAMqEre/7he5Cuba15X9I8hbwA?= =?us-ascii?Q?U/ZpTSwlm70pEolF7A7zwqfa/kEV8gMoRYU2EIJuqEkpeaMlH4qbkdBUG8ZW?= =?us-ascii?Q?QFoPhLOdjKuCRbqwWPN0d5AJvA5NOOyALB4UDgVjkCxwbyJR33MS64yB9xvL?= =?us-ascii?Q?a9JzwJLhBDybJtD2KEA=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(376014)(7416014)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2025 08:07:52.6775 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6c8a701a-782c-45f1-df7b-08de28d511f5 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE3A.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6645 Content-Type: text/plain; charset="utf-8" Make the definitions explicit. Add some more new codes. The following patches will be using SPDM_REQUEST and EXPAND_BUFFER_LENGTH_REQUEST, others are useful for the PSP FW diagnostics. Signed-off-by: Alexey Kardashevskiy Acked-by: Joerg Roedel --- include/uapi/linux/psp-sev.h | 66 ++++++++++++-------- 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/include/uapi/linux/psp-sev.h b/include/uapi/linux/psp-sev.h index c2fd324623c4..2b5b042eb73b 100644 --- a/include/uapi/linux/psp-sev.h +++ b/include/uapi/linux/psp-sev.h @@ -47,32 +47,32 @@ typedef enum { * with possible values from the specification. */ SEV_RET_NO_FW_CALL =3D -1, - SEV_RET_SUCCESS =3D 0, - SEV_RET_INVALID_PLATFORM_STATE, - SEV_RET_INVALID_GUEST_STATE, - SEV_RET_INAVLID_CONFIG, + SEV_RET_SUCCESS =3D 0, + SEV_RET_INVALID_PLATFORM_STATE =3D 0x0001, + SEV_RET_INVALID_GUEST_STATE =3D 0x0002, + SEV_RET_INAVLID_CONFIG =3D 0x0003, SEV_RET_INVALID_CONFIG =3D SEV_RET_INAVLID_CONFIG, - SEV_RET_INVALID_LEN, - SEV_RET_ALREADY_OWNED, - SEV_RET_INVALID_CERTIFICATE, - SEV_RET_POLICY_FAILURE, - SEV_RET_INACTIVE, - SEV_RET_INVALID_ADDRESS, - SEV_RET_BAD_SIGNATURE, - SEV_RET_BAD_MEASUREMENT, - SEV_RET_ASID_OWNED, - SEV_RET_INVALID_ASID, - SEV_RET_WBINVD_REQUIRED, - SEV_RET_DFFLUSH_REQUIRED, - SEV_RET_INVALID_GUEST, - SEV_RET_INVALID_COMMAND, - SEV_RET_ACTIVE, - SEV_RET_HWSEV_RET_PLATFORM, - SEV_RET_HWSEV_RET_UNSAFE, - SEV_RET_UNSUPPORTED, - SEV_RET_INVALID_PARAM, - SEV_RET_RESOURCE_LIMIT, - SEV_RET_SECURE_DATA_INVALID, + SEV_RET_INVALID_LEN =3D 0x0004, + SEV_RET_ALREADY_OWNED =3D 0x0005, + SEV_RET_INVALID_CERTIFICATE =3D 0x0006, + SEV_RET_POLICY_FAILURE =3D 0x0007, + SEV_RET_INACTIVE =3D 0x0008, + SEV_RET_INVALID_ADDRESS =3D 0x0009, + SEV_RET_BAD_SIGNATURE =3D 0x000A, + SEV_RET_BAD_MEASUREMENT =3D 0x000B, + SEV_RET_ASID_OWNED =3D 0x000C, + SEV_RET_INVALID_ASID =3D 0x000D, + SEV_RET_WBINVD_REQUIRED =3D 0x000E, + SEV_RET_DFFLUSH_REQUIRED =3D 0x000F, + SEV_RET_INVALID_GUEST =3D 0x0010, + SEV_RET_INVALID_COMMAND =3D 0x0011, + SEV_RET_ACTIVE =3D 0x0012, + SEV_RET_HWSEV_RET_PLATFORM =3D 0x0013, + SEV_RET_HWSEV_RET_UNSAFE =3D 0x0014, + SEV_RET_UNSUPPORTED =3D 0x0015, + SEV_RET_INVALID_PARAM =3D 0x0016, + SEV_RET_RESOURCE_LIMIT =3D 0x0017, + SEV_RET_SECURE_DATA_INVALID =3D 0x0018, SEV_RET_INVALID_PAGE_SIZE =3D 0x0019, SEV_RET_INVALID_PAGE_STATE =3D 0x001A, SEV_RET_INVALID_MDATA_ENTRY =3D 0x001B, @@ -87,6 +87,22 @@ typedef enum { SEV_RET_RESTORE_REQUIRED =3D 0x0025, SEV_RET_RMP_INITIALIZATION_FAILED =3D 0x0026, SEV_RET_INVALID_KEY =3D 0x0027, + SEV_RET_SHUTDOWN_INCOMPLETE =3D 0x0028, + SEV_RET_INCORRECT_BUFFER_LENGTH =3D 0x0030, + SEV_RET_EXPAND_BUFFER_LENGTH_REQUEST =3D 0x0031, + SEV_RET_SPDM_REQUEST =3D 0x0032, + SEV_RET_SPDM_ERROR =3D 0x0033, + SEV_RET_SEV_STATUS_ERR_IN_DEV_CONN =3D 0x0035, + SEV_RET_SEV_STATUS_INVALID_DEV_CTX =3D 0x0036, + SEV_RET_SEV_STATUS_INVALID_TDI_CTX =3D 0x0037, + SEV_RET_SEV_STATUS_INVALID_TDI =3D 0x0038, + SEV_RET_SEV_STATUS_RECLAIM_REQUIRED =3D 0x0039, + SEV_RET_IN_USE =3D 0x003A, + SEV_RET_SEV_STATUS_INVALID_DEV_STATE =3D 0x003B, + SEV_RET_SEV_STATUS_INVALID_TDI_STATE =3D 0x003C, + SEV_RET_SEV_STATUS_DEV_CERT_CHANGED =3D 0x003D, + SEV_RET_SEV_STATUS_RESYNC_REQ =3D 0x003E, + SEV_RET_SEV_STATUS_RESPONSE_TOO_LARGE =3D 0x003F, SEV_RET_MAX, } sev_ret_code; =20 --=20 2.51.1 From nobody Tue Dec 2 01:33:05 2025 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11013009.outbound.protection.outlook.com [40.107.201.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5773C2E7F17; Fri, 21 Nov 2025 08:08:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.9 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763712507; cv=fail; b=SoM8Ff9XGKNbt+VqQLYS/knHioLKCRhaarH/F3n+j4xh0x9lN50mGkvDqcIE4heAiHnkdaYZv7wge9Es18ebzPfnmSif/5Uldya0vtTsBmFE1s3+Whxb102djmNrdbCNGPjfwuWOQD5weAL45vNdvbSyvESEIqSkb9FiQbJp+L0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763712507; c=relaxed/simple; bh=Tpk+JjEkqqzHKrC0rWwdYLZJWWP37Nlde339wCz0LkM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YlXMWoMR1ezY5CKQkMx1+xB81kSRXnAOPrtNKcbom767O8TqYJ4uN0axCmmkgV7y70MkAHK5Hu35mFR27H2my0neWBh7JioFqdnR2T7LePRNUe8wPE4eiEEIEeSYegEmUxNO9R8i/KMISo0Yvcwe+hAN+2SNqBcoU8ZpqAlym9c= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=XqhgEOe8; arc=fail smtp.client-ip=40.107.201.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="XqhgEOe8" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JxOGv3IjFNA3ieuEZIkdM0SN5IYq7YkF/l4Q8MWw6eOrv/oFEz4QsxX3KTnAOqRLXj9EXbvyU96ZUfxES1avJCvQgGlTYEpdZWBEP261mEOdWNUuzhnT1KLv6Om1V/I1p2VPqC6fJc7nLh0/9Jgnl1MxhDzpB5MU2BSnFVsG6j6UQ+CdAFMACgW8dnQg6J5AqLYfAakyVoJIoyKlkZhUHhXwnZG3uX7I++U4pOlsHExygicUrt/L4AuqGwiLhEnWlT6q0dxMiGjHJ0OenG6hj/854h0dCC9f9aIhxUqTF2WG1SRvBr1QOAELewR0O3h34zL4yr43XqeTUioVuDzvGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uTCW9vMS+OKj4a4kAiX1B3dxybqcDaJ/IMvL/pBlFfA=; b=ctkAxUqGF5wcrGa/6BLnNYVjPaJ9YBuLZoHDWhWEF1/gBe5+W24t4+ktSz27IB18+USCJKrpy9m3NuMB6mI4K2+hgRTHwwDPJG52iTbaRj/ICNtCVV1DkMsOOB8Z4SWJxheewgZSgVyp91n+KYW3oBNgojThUJxXh4q++9VSaMHGVaKVB5mJJfTh29Xai1W5jS3lTjwgjcVgKsn/6DbXsdbIQLJh8HULN1k/ASIOVamw2eVf75cRHr7gKVz4OSpYjfgx2J5pihqW7iQoJ1CIXoyaY9Apr2w7/y+xWiKbS+NYDJfPOz987MZO7S4oBtXMG8Yi9m0tRY5Ul6s3z6ZcOw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uTCW9vMS+OKj4a4kAiX1B3dxybqcDaJ/IMvL/pBlFfA=; b=XqhgEOe8Sc0BIF6rupsGNLEn8gvEntJIVfYxbMppuHu2AorRS3C01hgr5BO56d9/VosaGveZzevFsSe1vvorzcqwgBurIGG3tAkWJNpwAwek/U5fwHZyc92cvqtD+h+GRgowArgd0ZxeOrAcf7Qsx9ZsPhuZwSW7xV9ggWO+Irs= Received: from DM6PR14CA0064.namprd14.prod.outlook.com (2603:10b6:5:18f::41) by SA1PR12MB7412.namprd12.prod.outlook.com (2603:10b6:806:2b2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.16; Fri, 21 Nov 2025 08:08:20 +0000 Received: from CY4PEPF0000EE38.namprd03.prod.outlook.com (2603:10b6:5:18f:cafe::c9) by DM6PR14CA0064.outlook.office365.com (2603:10b6:5:18f::41) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9343.12 via Frontend Transport; Fri, 21 Nov 2025 08:08:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CY4PEPF0000EE38.mail.protection.outlook.com (10.167.242.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.9 via Frontend Transport; Fri, 21 Nov 2025 08:08:19 +0000 Received: from aiemdee.l.aik.id.au (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Fri, 21 Nov 2025 00:08:07 -0800 From: Alexey Kardashevskiy To: CC: , Tom Lendacky , John Allen , Herbert Xu , "David S. Miller" , Ashish Kalra , Joerg Roedel , Suravee Suthikulpanit , Will Deacon , Robin Murphy , "Borislav Petkov (AMD)" , Kim Phillips , Jerry Snitselaar , Vasant Hegde , Jason Gunthorpe , Gao Shiyuan , Sean Christopherson , "Nikunj A Dadhania" , Michael Roth , Amit Shah , Peter Gonda , , Alexey Kardashevskiy Subject: [PATCH kernel v2 3/5] iommu/amd: Report SEV-TIO support Date: Fri, 21 Nov 2025 19:06:27 +1100 Message-ID: <20251121080629.444992-4-aik@amd.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251121080629.444992-1-aik@amd.com> References: <20251121080629.444992-1-aik@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE38:EE_|SA1PR12MB7412:EE_ X-MS-Office365-Filtering-Correlation-Id: 3178deec-7d76-4099-39b4-08de28d52221 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|7416014|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?cUbkbzbgYfHcZoyUsBaRDDRvyt8phfrUHV2UajBmbT/wFvGiZIcOUckZ9FRR?= =?us-ascii?Q?ggWARPg/k/2FevRXkpM1AtjsAysj9dvwgJNfoJj4W/Tiqc+aREwAA3xRgyf7?= =?us-ascii?Q?fFjn8wFGwt7BriKbnAS84BN6wQZxYHR7a1igATRx8sDN0FDw/dn0WtpUageu?= =?us-ascii?Q?ZBai3ZWXjiCSXK7EmUeDWSmQYemjCjtgIF8Va5t56LD3RmaXaFvGglhDyr6j?= =?us-ascii?Q?YetZWnfagZGNoPZGgmFPXwNkF3uVm7ilVXUZKdVxxU6qAJcLsegA1hZU0xdv?= =?us-ascii?Q?6VQSOzGhp8lV+T1bzRkxXn9OhVqd+pz0AI+0ERRHH1ISBQrRKItZjYcnemtp?= =?us-ascii?Q?JfV6PbS2149OQrDa3p4Fm1lt4A0+fRCLgyWyZQbbuozaU7JvgpcnQ0eLvC1m?= =?us-ascii?Q?AGDAfkzplbS8n3Twyr/QsD2b//q7G7t8kU3gZ6XdAubXWdrWkB/rh9rw6kJD?= =?us-ascii?Q?lTw8bBfPQ7pqNqnC7+dKLrPFRm/at/aW/u6aBigCiCpjkhZYam3R74pHYuDN?= =?us-ascii?Q?uvsOkUxbphF+jQczX5sa3a7XZ6eTp+e6voEh/0RWKvh718PMQNkdXspew8Xq?= =?us-ascii?Q?6fmIxs5U5XeL89KXlu/9YNpegYDLawKQXjFqdGoWw1xVjCg1rHjgxZGzBvsP?= =?us-ascii?Q?n/apWet/8QvcqdCWwx6bdlLJ7BgNcSGhkQYyylpQejUOHhOZtM6WjVomt4PU?= =?us-ascii?Q?6WB6OA5iwk/surh4h6R9nbvDbcdt+SUx4svRf2MFlbLhGl1YHCOLoWSAa05F?= =?us-ascii?Q?opfoAaA8WbE0DT6IfoV0FiLuCeO4mwCgZ8+i2rHljQMoi/U6gWgTQxGHJGuK?= =?us-ascii?Q?QqfK7bQ6u5R504q0e5q8ot6w6bqfeGvA0kSnLRLEudryyN+CXkK32iTjTXDM?= =?us-ascii?Q?ZbPZ5LU1LYDI+InnzDxJmkOawPAiOsmwVcSua8c+T2/HOEF7l+Nv3g3Xe1Fm?= =?us-ascii?Q?Md79ekCz1Dq5Nq5XrhDL8PSgK0iAV4r40uN8rGyDGzessPTXOnY8CIEQDmyR?= =?us-ascii?Q?jkLHnEnHlBVXQjZWVp7naM1VISuJKjtCGJK/8A57pUlFCbQGqoGgq2PWhgTZ?= =?us-ascii?Q?c1lGOZ1jqWPq8UN1syhsNxjPMKRUXtGbu4P/onO0HwKOg/zkgop2b4ZsE/+J?= =?us-ascii?Q?HZAX8pRBIWRA2R7xg8l7rvyvQ1TXGt5dbfN7XYQy6byDykIyxD/UvytXy49Q?= =?us-ascii?Q?tOeUZMkMHQAk1MOHpOOqJroA2AbBq0b3gi3iu+SndXvupJSzTroQ/vnCFlT9?= =?us-ascii?Q?HpJy+eT2XMtOztHRozc5qPSAOvoTcpS48KSrJ1ODQt3OpSKqximNnG2x9SMo?= =?us-ascii?Q?2ZefYKBk9shnPhfC35QjVYVWUYLIk2EEQ/DWD2ZhgureBhyJw6rp5oKaEm53?= =?us-ascii?Q?GrSQ0xAF1njo0CK4IxsTgwn9UCEEEapoQ4+gwTjJ0DixVfS07d9kT/PhNFc+?= =?us-ascii?Q?PkFSzM1XSgQAb+JU5LXuwf3BZl/bPmM+YsDPYcjACu4IIAIC6jKcAoENJ705?= =?us-ascii?Q?oQJxrFKBM09qZG3qiCDodZf/UlgIsP5bqZY0lU03ilMxwXTGpauEY2Z904Ds?= =?us-ascii?Q?77FIheaRmaXnywpw8H0=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(7416014)(376014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2025 08:08:19.8047 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3178deec-7d76-4099-39b4-08de28d52221 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE38.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7412 Content-Type: text/plain; charset="utf-8" The SEV-TIO switch in the AMD BIOS is reported to the OS via the IOMMU Extended Feature 2 register (EFR2), bit 1. Add helper to parse the bit and report the feature presence. Signed-off-by: Alexey Kardashevskiy Acked-by: Joerg Roedel --- drivers/iommu/amd/amd_iommu_types.h | 1 + include/linux/amd-iommu.h | 2 ++ drivers/iommu/amd/init.c | 9 +++++++++ 3 files changed, 12 insertions(+) diff --git a/drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd/amd_io= mmu_types.h index a698a2e7ce2a..a2f72c53d3cc 100644 --- a/drivers/iommu/amd/amd_iommu_types.h +++ b/drivers/iommu/amd/amd_iommu_types.h @@ -107,6 +107,7 @@ =20 =20 /* Extended Feature 2 Bits */ +#define FEATURE_SEVSNPIO_SUP BIT_ULL(1) #define FEATURE_SNPAVICSUP GENMASK_ULL(7, 5) #define FEATURE_SNPAVICSUP_GAM(x) \ (FIELD_GET(FEATURE_SNPAVICSUP, x) =3D=3D 0x1) diff --git a/include/linux/amd-iommu.h b/include/linux/amd-iommu.h index 8cced632ecd0..0f64f09d1f34 100644 --- a/include/linux/amd-iommu.h +++ b/include/linux/amd-iommu.h @@ -18,10 +18,12 @@ struct task_struct; struct pci_dev; =20 extern void amd_iommu_detect(void); +extern bool amd_iommu_sev_tio_supported(void); =20 #else /* CONFIG_AMD_IOMMU */ =20 static inline void amd_iommu_detect(void) { } +static inline bool amd_iommu_sev_tio_supported(void) { return false; } =20 #endif /* CONFIG_AMD_IOMMU */ =20 diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c index f2991c11867c..ba95467ba492 100644 --- a/drivers/iommu/amd/init.c +++ b/drivers/iommu/amd/init.c @@ -2252,6 +2252,9 @@ static void print_iommu_info(void) if (check_feature(FEATURE_SNP)) pr_cont(" SNP"); =20 + if (check_feature2(FEATURE_SEVSNPIO_SUP)) + pr_cont(" SEV-TIO"); + pr_cont("\n"); } =20 @@ -4015,4 +4018,10 @@ int amd_iommu_snp_disable(void) return 0; } EXPORT_SYMBOL_GPL(amd_iommu_snp_disable); + +bool amd_iommu_sev_tio_supported(void) +{ + return check_feature2(FEATURE_SEVSNPIO_SUP); +} +EXPORT_SYMBOL_GPL(amd_iommu_sev_tio_supported); #endif --=20 2.51.1 From nobody Tue Dec 2 01:33:05 2025 Received: from CH5PR02CU005.outbound.protection.outlook.com (mail-northcentralusazon11012020.outbound.protection.outlook.com [40.107.200.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6E942DE719; Fri, 21 Nov 2025 08:08:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.200.20 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763712537; cv=fail; b=rxz2LHG+bRZgbV7qWN/2FMJYrDtXB6SdJbUUkQd5OqZ6RTNPxDMkzkAW6vr50eAA0B8OAksboBvKfO+nlbDuFK61xYx8ySA8xlz2EBJ69sPF9hr3mcXTDgEfReXYXuAHjOgzCjxDBnT2GPKLc04Su29Z4EHn5Fx6pzFpc0aWR5U= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763712537; c=relaxed/simple; bh=of6eDeh+Ayp2Ym6RB98ftLPufzlBbDyL2hPnWlTHamk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UkGURp5WwLaj0j66UP0yu/Nzuuf67lyq1B8aQqbG/QDSUJ1eRuvj6wqLMgBASHXE9xxrj2MKGQvjvS9n0VT4oz+poFyYd1Vgbp1Gs1CaBeRTORCCvZBafko/8c9sRQPQ8n8KM7I0WpSIv+wHSi4T02oj928Xk0pTdLgIZycoe0s= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=LlJxyi2r; arc=fail smtp.client-ip=40.107.200.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="LlJxyi2r" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TdVlRiJvQyOioosBXc9Z1cx9T1y4v3OmMhKThXxZMBX3o34uTk67Jmxd/onV0AMvOkF3oXoY5/rCCebIJ6niD8maP8lob+TS/Hr8z3309CG1GJaHBWur7g3eHkwf5aYkCHdYHB2W4jgMoVtH5193DmmzPAUQgdrgJ7vCsM4fpTpV/eZtsvOc62zKdHn5vS2fuz+dH29rkn9/h3SUNSQ8gytNM4EPWVMeZkusIbUPBG1dWJidY5H9VGWogwBw3rGTsPCA+dKEsxJwLXHTuDTwu4Li6HqwdFMRSd0u0etGyCQAZgx17yFSL5noNUkH1kM1SoomD7OWLR+STuOFq3W64w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=000nAwWv/D4KpbFuG2buv6PGScLlDcNooq66HQwfwMc=; b=C4QVLB7H5033Su6OYpsAUvymkJIx1vmTtIVKLp+m7v5JDTfbBMT/F+B+YXSb5Pw/qhwsfPBbKIMHcgvCNF2tXRm70hiv/um9CgFo6fEW802HFksbEWl6gN0YsYvfMRja9Wxf5z8M9ZTXhRCfxyfDI+9bri2V4av+R6kPig3XxuZOdG+Wi7cMDyHtbyTALAhtxMEbLUttjjjF/IWPn6ZHebzuSW3KQvT77YrnGeXgr5Lcj13Ce7Y1rM0/1VHzLqUxNCVrJeCOJU813qc5NkBnCMSOjpp9qL+r4vue21dTNrDB7oDFlQ3osut2i0x9g3HvvpFmyLBCw7IYOo97BhZ4pA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=000nAwWv/D4KpbFuG2buv6PGScLlDcNooq66HQwfwMc=; b=LlJxyi2r/joY7ioRTI/vuxfuQ8tsbkuC4UFUkEUJPdLNQLH+WHeS/NKMsZwALAgtfN+A+d2Wmh5YpeJN9H1xMIoykHo/Reu65l1ysW5P6gPtzE9blyQoSCTUz/KMQoyBq46KNDT88T3hJzFIozVWshy6TDSHuWbsLeR/9R7oFOU= Received: from BYAPR03CA0020.namprd03.prod.outlook.com (2603:10b6:a02:a8::33) by DM6PR12MB4370.namprd12.prod.outlook.com (2603:10b6:5:2aa::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.11; Fri, 21 Nov 2025 08:08:52 +0000 Received: from CO1PEPF000042AE.namprd03.prod.outlook.com (2603:10b6:a02:a8:cafe::d8) by BYAPR03CA0020.outlook.office365.com (2603:10b6:a02:a8::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9343.11 via Frontend Transport; Fri, 21 Nov 2025 08:08:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CO1PEPF000042AE.mail.protection.outlook.com (10.167.243.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.9 via Frontend Transport; Fri, 21 Nov 2025 08:08:51 +0000 Received: from aiemdee.l.aik.id.au (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Fri, 21 Nov 2025 00:08:39 -0800 From: Alexey Kardashevskiy To: CC: , Tom Lendacky , John Allen , Herbert Xu , "David S. Miller" , Ashish Kalra , Joerg Roedel , Suravee Suthikulpanit , Will Deacon , Robin Murphy , "Borislav Petkov (AMD)" , Kim Phillips , Jerry Snitselaar , Vasant Hegde , Jason Gunthorpe , Gao Shiyuan , Sean Christopherson , "Nikunj A Dadhania" , Michael Roth , Amit Shah , Peter Gonda , , Alexey Kardashevskiy Subject: [PATCH kernel v2 4/5] crypto: ccp: Enable SEV-TIO feature in the PSP when supported Date: Fri, 21 Nov 2025 19:06:28 +1100 Message-ID: <20251121080629.444992-5-aik@amd.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251121080629.444992-1-aik@amd.com> References: <20251121080629.444992-1-aik@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042AE:EE_|DM6PR12MB4370:EE_ X-MS-Office365-Filtering-Correlation-Id: a64e269c-b2f6-47b0-6a0c-08de28d5353b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|7416014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Ehof338VbDwhaC7bamxF6rhHogbDuMGuey9dab0mTEX8bLlAyLSj1Hb0eSFG?= =?us-ascii?Q?vvgmHZa4J4sd4Tn4gRaupBdktMjMP7jWNteu2OI+VM71MgjeJRFFoJNIQXLK?= =?us-ascii?Q?cDc+MJEv+J2BUUqhuxzBtBc8zZV0Q9yM9G4pGN7qdR1Bt+C8HbfNOrmCza16?= =?us-ascii?Q?PkMjP8pOca1CDI985S6BE2E0RcAsrl/7B/kW8lG48ZGiPwy9ltUzf/y4F7UP?= =?us-ascii?Q?9rSsTgoqV457Uh66TvbOMh9rE2M+VUBJHl41OfqvCoNv8mhH3lT7+xIDl8fW?= =?us-ascii?Q?Cw8+m7wKJoMsZvbGT4JuEV+1qeG/0GjzJ3DZehseERSuzYbiUjdlphRxnQak?= =?us-ascii?Q?RxbqADaXWQrKQQ15edL4SeAJuRHI7XTqIpD/nijVFZv1GjiXRTIqwlR3MpmC?= =?us-ascii?Q?sGdlRcxa+J4nQp/JeprHyusvdma+k+K+pc6Og1XblwTIwMlrqJBbYofimwSV?= =?us-ascii?Q?FIPTLY9EqzY6lKkaHy9bUtB8LjRkN/A+aKkwPJ95le8TaqOyI6/k6TdhxFtB?= =?us-ascii?Q?bCm9IxBQAaeb/FaQUtKIevUA7xnKj83gQimU/2jmozyYzUK+v+jXI0hpKZQH?= =?us-ascii?Q?yhNbWyXxw88fgOzZPM93r7E9gojmIvNJEKuzQPIQ6iH/qXCbBleLod7oyaBN?= =?us-ascii?Q?SB0GjCtGdySNQFBawjbXz2tyacGGiRX5kWjgy4Ve+NXE+uHoPfcewMmoKduU?= =?us-ascii?Q?1ac18l1LZN1/YUWi3PAQljLB5hp+yWM/GQ6pktsharHNGreYD2ttZhq0YFuu?= =?us-ascii?Q?23Ml9Tu2drx0zGuqfaFBroEYNrIigJZco5jarSj5rFawaUY2jmxX5dqg+hRH?= =?us-ascii?Q?tTBbuhIEkH1Ucx/bogXqf/7yzIy+G/3e8D3U6LVvZUUD1VV8crMZvZugPIOu?= =?us-ascii?Q?w8gDvOrYSlcH3KG7Va6YwZlwpOUhVp6PdRMgMSfip68FxxAVoFYa56njXtZp?= =?us-ascii?Q?WgSGAC5vcIPf+WncV0FxNOj/5y8ZGhWAPP+hXfCTlJFXbZ+8DBG2ogIUl4ve?= =?us-ascii?Q?79ohIv6yWitME6v0p82tPqdoTfCqvZoqr8OqGK7VFP3Pv9GEbwizgHcm7e7Y?= =?us-ascii?Q?rFmWW/A/X73VFqqrZkG3OL1CjhYNFET0dbiKG12ioPlACzzi1V+O0vmaRwKt?= =?us-ascii?Q?PZYQOsbxEWVv9E5yxzXWmK4c18jON9qA7hhBnHbC2Dz9XxIFfzEKK120eOvS?= =?us-ascii?Q?S3e7CMVaOO4cW9nnuf2jckqus9Qm8hK0O/LsgAeyON4MsHO6YJj+sukPFnCM?= =?us-ascii?Q?aBIm3tpBk3bjq1WUQKkDxiVpU6rSb8i3ym5HrW+a3iWIm/JAaC128m9ku0Pj?= =?us-ascii?Q?ZRYPST0Q0Ims3Sx8b046mhoJw3it3DK2Yr/EhJ7yh5aXOad9+WLdHmWN2Ur+?= =?us-ascii?Q?bHY5dPhscFuB+yhIXl35sAnvyFeVILH/CbFgjVtRbOHzy+6ZuBCeK43R0548?= =?us-ascii?Q?j1iG4gUlMGc4arKskYIl9+MOmbGplMUWyhEargfZzI/qrymUnQ1G1FOlKwcm?= =?us-ascii?Q?/8tZrvP0/1YBReZqE+tXuvi6WNPKHeA3phryuozg+f8V6jFKoAxSCuKnqmwM?= =?us-ascii?Q?74sPSeLrm9SSdzglBlM=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(376014)(7416014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2025 08:08:51.8097 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a64e269c-b2f6-47b0-6a0c-08de28d5353b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000042AE.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4370 Content-Type: text/plain; charset="utf-8" The PSP advertises the SEV-TIO support via the FEATURE_INFO command advertised via SNP_PLATFORM_STATUS. The BIOS advertises the SEV-TIO enablement via the IOMMU EFR2 register (added in an earlier patch). Enable SEV-TIO during the SNP_INIT_EX call if both the PSP and the BIOS advertise support for it. Signed-off-by: Alexey Kardashevskiy Acked-by: Joerg Roedel --- include/linux/psp-sev.h | 4 +++- drivers/crypto/ccp/sev-dev.c | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h index 34a25209f909..c0c817ca3615 100644 --- a/include/linux/psp-sev.h +++ b/include/linux/psp-sev.h @@ -750,7 +750,8 @@ struct sev_data_snp_init_ex { u32 list_paddr_en:1; u32 rapl_dis:1; u32 ciphertext_hiding_en:1; - u32 rsvd:28; + u32 tio_en:1; + u32 rsvd:27; u32 rsvd1; u64 list_paddr; u16 max_snp_asid; @@ -850,6 +851,7 @@ struct snp_feature_info { } __packed; =20 #define SNP_CIPHER_TEXT_HIDING_SUPPORTED BIT(3) +#define SNP_SEV_TIO_SUPPORTED BIT(1) /* EBX */ =20 #ifdef CONFIG_CRYPTO_DEV_SP_PSP =20 diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c index 9e0c16b36f9c..2f1c9614d359 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -1358,6 +1358,11 @@ static int snp_filter_reserved_mem_regions(struct re= source *rs, void *arg) return 0; } =20 +static bool sev_tio_present(struct sev_device *sev) +{ + return (sev->snp_feat_info_0.ebx & SNP_SEV_TIO_SUPPORTED) !=3D 0; +} + static int __sev_snp_init_locked(int *error, unsigned int max_snp_asid) { struct psp_device *psp =3D psp_master; @@ -1434,6 +1439,8 @@ static int __sev_snp_init_locked(int *error, unsigned= int max_snp_asid) data.init_rmp =3D 1; data.list_paddr_en =3D 1; data.list_paddr =3D __psp_pa(snp_range_list); + data.tio_en =3D sev_tio_present(sev) && + amd_iommu_sev_tio_supported(); cmd =3D SEV_CMD_SNP_INIT_EX; } else { cmd =3D SEV_CMD_SNP_INIT; @@ -1471,7 +1478,8 @@ static int __sev_snp_init_locked(int *error, unsigned= int max_snp_asid) =20 snp_hv_fixed_pages_state_update(sev, HV_FIXED); sev->snp_initialized =3D true; - dev_dbg(sev->dev, "SEV-SNP firmware initialized\n"); + dev_dbg(sev->dev, "SEV-SNP firmware initialized, SEV-TIO is %s\n", + data.tio_en ? "enabled" : "disabled"); =20 dev_info(sev->dev, "SEV-SNP API:%d.%d build:%d\n", sev->api_major, sev->api_minor, sev->build); --=20 2.51.1 From nobody Tue Dec 2 01:33:05 2025 Received: from BYAPR05CU005.outbound.protection.outlook.com (mail-westusazon11010044.outbound.protection.outlook.com [52.101.85.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2106C337BB3; Fri, 21 Nov 2025 08:09:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.85.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763712574; cv=fail; b=D+neDtN4QJmAJ0bp2Wt4r1mUDILEzMSf4RtsqxSAd59iEeNumquolGiURSRVq0bqFjTf/VaPix1R9FxJhOXBh2MZkR7FAUVkV+niPUMP4VW23Wkjnllj37ySi1EqoaXXU8CUU/IWEqoAE9eT3VH45Mzo5WwFMHp5MYdcYK5iVs8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763712574; c=relaxed/simple; bh=t7EerIki8oUxL0p2X1to4CYJuyHcHmITx8X2fxeaG8A=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Fm/JszW03m5+ui+7XUP3+b0Ad9OOH/RoZ4UvsrgWMw1L0V6PZpnb5pqXDyat3fb8xUgmXFRIYtPFS4hmjXkiTiQkZxmAr+M7roH8IvqAb8GAcFNxa5QSABqz0jJk/oUlwtBZg6HZ4RJvxhw793zb5WiOIfqTKu52lUv1e9nlYT4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=Za/X0S5n; arc=fail smtp.client-ip=52.101.85.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="Za/X0S5n" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IhzmsyhVCmIAEUtZQNWHZHcPrCrDjQuOK8NV3sNbgzasdiW2SFImw7QXGS1p9zGs5/jEkKlTJiiOAlaKiuSpIH/mEB3GvCByhK0EqLwX4p1IyywwivEEuBesB/MeazaAyQGRAgtyU62s4s6suSrqX/jBcmtKm4fA5XCmuYKQhEXekJIsHhl7JbCOgkF6vnbGCFXTFB1rhyArJO2h6mYO+c8WmP4qUB9etVnRQDjgUjm2zHsKaiDcOZDuITXfgdVmvHQACoNYKnoKAu1pFcWvDj7tscE0B9RaAU//YtvJW+SrgLXM0Msqmq+HMP9gJs44UpGehcq4DuPkoHvwbSdXIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TULNlnKH7AdMBIk0qIimVhr3tVxIJeijKihq4sz0x+8=; b=DRUXQFCehDraSCmJwJDXNTiIFxcJdLzA80zbmpV5XjlOsvhqMpXJdLe/oG7+sBZWr3dkURjII+EN4PXLKeo3usnf7L7zCxtn9TOGnGFcGSfAKcS+U1Vm8Em6wyQn5yOMTZ2oychxYEyOzjlQXpK8x7BuC65tJ2M8nLmC2ni285+0a/vivlncaFo3vzIv0gix8QSrPfkB8wjEni0uvqmGixxNmfH+BkOCIR9kj1sMHSV1ECTxBb/2D8uG9cwvH1TVE0z+2SEsuBY+bNgUT1+NfuyOu+J8hcidHPzagWHOCJYSm1eIXSt07MgYbPR6OAAOzcoWmUDCgBL2BklKSvUZ9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TULNlnKH7AdMBIk0qIimVhr3tVxIJeijKihq4sz0x+8=; b=Za/X0S5nX2ci50JmfxbYm11b4lHtYKZAZAz2HNbbO6TI09n60D44IDWWlL50JMS5YNnGxvVtEVnNW8os0fUxfmAC55iezsZ+ibbKcxBQcVJL/ppxZra6ICKkdy8kXwQzOaunjcmY5Eawo5FDk3Vai8AXnigQGM7/EZuf1uZfOAw= Received: from SJ0PR05CA0205.namprd05.prod.outlook.com (2603:10b6:a03:330::30) by MN2PR12MB4304.namprd12.prod.outlook.com (2603:10b6:208:1d0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.11; Fri, 21 Nov 2025 08:09:20 +0000 Received: from CO1PEPF000042AD.namprd03.prod.outlook.com (2603:10b6:a03:330::4) by SJ0PR05CA0205.outlook.office365.com (2603:10b6:a03:330::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9343.10 via Frontend Transport; Fri, 21 Nov 2025 08:09:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CO1PEPF000042AD.mail.protection.outlook.com (10.167.243.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.9 via Frontend Transport; Fri, 21 Nov 2025 08:09:19 +0000 Received: from aiemdee.l.aik.id.au (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Fri, 21 Nov 2025 00:09:06 -0800 From: Alexey Kardashevskiy To: CC: , Tom Lendacky , John Allen , Herbert Xu , "David S. Miller" , Ashish Kalra , Joerg Roedel , Suravee Suthikulpanit , Will Deacon , Robin Murphy , "Borislav Petkov (AMD)" , Kim Phillips , Jerry Snitselaar , Vasant Hegde , Jason Gunthorpe , Gao Shiyuan , Sean Christopherson , "Nikunj A Dadhania" , Michael Roth , Amit Shah , Peter Gonda , , Alexey Kardashevskiy Subject: [PATCH kernel v2 5/5] crypto/ccp: Implement SEV-TIO PCIe IDE (phase1) Date: Fri, 21 Nov 2025 19:06:29 +1100 Message-ID: <20251121080629.444992-6-aik@amd.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251121080629.444992-1-aik@amd.com> References: <20251121080629.444992-1-aik@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042AD:EE_|MN2PR12MB4304:EE_ X-MS-Office365-Filtering-Correlation-Id: 50d36094-9f95-417a-2eeb-08de28d545ca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|7416014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?906RXnfTbXf2yrj+maa5L8sVxcydver5RWuUl5xywSQ2mth5uPR18lfCQXNc?= =?us-ascii?Q?XWvxAr+3xCXK7R5kFPRdEkytmoCCh9vqlQM8DC6wqyWCal3+nWhveF+qDGiP?= =?us-ascii?Q?NdqrcmCzt2Eqb8gt0CT1ZP3FTpYp7z4ieMXEfBtMKXtZpphi7IVDDI7sEzZJ?= =?us-ascii?Q?XP6sg8lSfMm0TwY2+HST3M20J1B8pRgVD4EVD3eUEDDn+EWPSXpZvU5Virzl?= =?us-ascii?Q?CkE5KYm0d/OiCWOX/rHfq27kcVU7rERX56uSC7R//RJP2LzhMZOBmItFz9pN?= =?us-ascii?Q?3Y1m9ml6eQsMd2fNeiG+Q0Duc9IK+ZInNN0x6QkifRMdnUBJthe5JavualEM?= =?us-ascii?Q?Y8ZL7qa4e722Uo25Cpwcc7rYuzUrBFAHKXw92sPC1h48KXBHQ3zTwxUdLj5o?= =?us-ascii?Q?A137esvGJxKSAbq7aIG7GKHORluckGkByH/yXoYbpMqPj6GOBzSZFIw1XjlK?= =?us-ascii?Q?o73DeQDNoeMk6VZz11JLT+wdg6xQta6k3P518wFcsJSo7gqUL29VPFK5WaaP?= =?us-ascii?Q?fP9v91LDs1ur3aQUaURYLZ38hWQszhitGP9v7F6mexznpE9sdgbVxe2cvOqz?= =?us-ascii?Q?DE43D9p3moge30H5gPrk7fIjrAlzK9IP2r1hbXbzeBms7BBchxEEQSflCPOZ?= =?us-ascii?Q?kTIYrG6VaiGCGtRh8MLRfVSqMP/HNjzTGNBIjZFBXNCi5VPgds/9u/eSkYQj?= =?us-ascii?Q?RR1vS1cN5yt1FARfEklcSSBgfVTYzTviJdgQrc2pxp2H+N9AejwoH3iWCiAt?= =?us-ascii?Q?fBD15Xb/Sx/ZnaOnqI2g5WqlJI66Tf9S0IheHj1K++E2rNrHDBB1u6I9Hjy7?= =?us-ascii?Q?iIBjpZfR8oYx3cUFVLoLwLz+qtmMhY5w4Ews1zCB1IKmklBtK2hCxAUKrvkO?= =?us-ascii?Q?sjlaWqR6korAfruaf/uyKEIQdH64itCznRLy7yrrso5EwyRZlVlomlnoWZZs?= =?us-ascii?Q?ALGzfT5R4cilZn8YO/dxQ6s/QvcerJTg1uXXf0kOOyPWV/8NU4Bzo4L+TEo3?= =?us-ascii?Q?1XQbASC9KdckXzvCTgXrkvIs7C9NTKAT7JVeCFfzniaayuvi5fsqoMfCln27?= =?us-ascii?Q?Kcasg5FFuCtrpn76jl9ZKe8sSSLkDXFB+WteVWNJqMSfIoDTvqdpWdFzMif/?= =?us-ascii?Q?4EO0/tZCWyWmDam/Cs4cw7s+AVJdCzVcu6kpAiHndzKH0I8DuqHnddsW0TGm?= =?us-ascii?Q?NX58gl7ErgwGzix7rU/qaNeDkRbyB+3lswQsAS3xaYbwtiSQwJSyPmH4d1Sy?= =?us-ascii?Q?Vh5DFKx81yITmw15xBWcYI7Mv/E166x9hbAXpBasPdKCVJrTiMFCUK9vYu88?= =?us-ascii?Q?+IiVEXOoMbgulW6ZhDWv51ZAEAU1DPdQMsUHUVeaVRUoJ6KcwnKhjE5HGvWj?= =?us-ascii?Q?gTke+ycnZ7iNN49kGNUDP5v1Kyg+8+UMAwnNBsvqSx8TcJVGAuuEx2b4/GuP?= =?us-ascii?Q?O8YtsenRfedi5fmOlerifqL4BZJqzv3zOrAei3zy1sVD5iTsW0KOenEht+Km?= =?us-ascii?Q?Ua1g/BAqT0vwZx9+HFLsEXcnBR0ov42A/NjkyugwRa8pWabp0vKVl0HMYuWL?= =?us-ascii?Q?jzCprCBpyCc2m2+1N1A=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(376014)(7416014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2025 08:09:19.6100 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 50d36094-9f95-417a-2eeb-08de28d545ca X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000042AD.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4304 Content-Type: text/plain; charset="utf-8" Implement the SEV-TIO (Trusted I/O) firmware interface for PCIe TDISP (Trust Domain In-Socket Protocol). This enables secure communication between trusted domains and PCIe devices through the PSP (Platform Security Processor). The implementation includes: - Device Security Manager (DSM) operations for establishing secure links - SPDM (Security Protocol and Data Model) over DOE (Data Object Exchange) - IDE (Integrity Data Encryption) stream management for secure PCIe This module bridges the SEV firmware stack with the generic PCIe TSM framework. This is phase1 as described in Documentation/driver-api/pci/tsm.rst. On AMD SEV, the AMD PSP firmware acts as TSM (manages the security/trust). The CCP driver provides the interface to it and registers in the TSM subsystem. Implement SEV TIO PSP command wrappers in sev-dev-tio.c and store the data in the SEV-TIO-specific structs. Implement TSM hooks and IDE setup in sev-dev-tsm.c. Signed-off-by: Alexey Kardashevskiy Acked-by: Joerg Roedel --- Changes: v2: * address bunch of comments from v1 (almost all) --- drivers/crypto/ccp/Kconfig | 1 + drivers/crypto/ccp/Makefile | 8 + drivers/crypto/ccp/sev-dev-tio.h | 142 ++++ drivers/crypto/ccp/sev-dev.h | 7 + include/linux/psp-sev.h | 7 + drivers/crypto/ccp/sev-dev-tio.c | 863 ++++++++++++++++++++ drivers/crypto/ccp/sev-dev-tsm.c | 405 +++++++++ drivers/crypto/ccp/sev-dev.c | 48 +- 8 files changed, 1480 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/ccp/Kconfig b/drivers/crypto/ccp/Kconfig index f394e45e11ab..3e737d3e21c8 100644 --- a/drivers/crypto/ccp/Kconfig +++ b/drivers/crypto/ccp/Kconfig @@ -25,6 +25,7 @@ config CRYPTO_DEV_CCP_CRYPTO default m depends on CRYPTO_DEV_CCP_DD depends on CRYPTO_DEV_SP_CCP + select PCI_TSM select CRYPTO_HASH select CRYPTO_SKCIPHER select CRYPTO_AUTHENC diff --git a/drivers/crypto/ccp/Makefile b/drivers/crypto/ccp/Makefile index a9626b30044a..839df68b70ff 100644 --- a/drivers/crypto/ccp/Makefile +++ b/drivers/crypto/ccp/Makefile @@ -16,6 +16,14 @@ ccp-$(CONFIG_CRYPTO_DEV_SP_PSP) +=3D psp-dev.o \ hsti.o \ sfs.o =20 +ifeq ($(CONFIG_CRYPTO_DEV_SP_PSP)$(CONFIG_PCI_TSM),yy) +ccp-y +=3D sev-dev-tsm.o sev-dev-tio.o +endif + +ifeq ($(CONFIG_CRYPTO_DEV_SP_PSP)$(CONFIG_PCI_TSM),my) +ccp-m +=3D sev-dev-tsm.o sev-dev-tio.o +endif + obj-$(CONFIG_CRYPTO_DEV_CCP_CRYPTO) +=3D ccp-crypto.o ccp-crypto-objs :=3D ccp-crypto-main.o \ ccp-crypto-aes.o \ diff --git a/drivers/crypto/ccp/sev-dev-tio.h b/drivers/crypto/ccp/sev-dev-= tio.h new file mode 100644 index 000000000000..7c42351210ef --- /dev/null +++ b/drivers/crypto/ccp/sev-dev-tio.h @@ -0,0 +1,142 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __PSP_SEV_TIO_H__ +#define __PSP_SEV_TIO_H__ + +#include +#include +#include +#include + +#if defined(CONFIG_CRYPTO_DEV_SP_PSP) + +struct sla_addr_t { + union { + u64 sla; + struct { + u64 page_type:1; + u64 page_size:1; + u64 reserved1:10; + u64 pfn:40; + u64 reserved2:12; + }; + }; +} __packed; + +#define SEV_TIO_MAX_COMMAND_LENGTH 128 + +/* SPDM control structure for DOE */ +struct tsm_spdm { + unsigned long req_len; + void *req; + unsigned long rsp_len; + void *rsp; +}; + +/* Describes TIO device */ +struct tsm_dsm_tio { + u8 cert_slot; + struct sla_addr_t dev_ctx; + struct sla_addr_t req; + struct sla_addr_t resp; + struct sla_addr_t scratch; + struct sla_addr_t output; + size_t output_len; + size_t scratch_len; + struct tsm_spdm spdm; + struct sla_buffer_hdr *reqbuf; /* vmap'ed @req for DOE */ + struct sla_buffer_hdr *respbuf; /* vmap'ed @resp for DOE */ + + int cmd; + int psp_ret; + u8 cmd_data[SEV_TIO_MAX_COMMAND_LENGTH]; + void *data_pg; /* Data page for DEV_STATUS/TDI_STATUS/TDI_INFO/ASID_FENCE= */ + +#define TIO_IDE_MAX_TC 8 + struct pci_ide *ide[TIO_IDE_MAX_TC]; +}; + +/* Describes TSM structure for PF0 pointed by pci_dev->tsm */ +struct tio_dsm { + struct pci_tsm_pf0 tsm; + struct tsm_dsm_tio data; + struct sev_device *sev; +}; + +/* Data object IDs */ +#define SPDM_DOBJ_ID_NONE 0 +#define SPDM_DOBJ_ID_REQ 1 +#define SPDM_DOBJ_ID_RESP 2 + +struct spdm_dobj_hdr { + u32 id; /* Data object type identifier */ + u32 length; /* Length of the data object, INCLUDING THIS HEADER */ + union { + u16 ver; /* Version of the data object structure */ + struct { + u8 minor; + u8 major; + } version; + }; +} __packed; + +/** + * struct sev_tio_status - TIO_STATUS command's info_paddr buffer + * + * @length: Length of this structure in bytes + * @tio_en: Indicates that SNP_INIT_EX initialized the RMP for SEV-TIO + * @tio_init_done: Indicates TIO_INIT has been invoked + * @spdm_req_size_min: Minimum SPDM request buffer size in bytes + * @spdm_req_size_max: Maximum SPDM request buffer size in bytes + * @spdm_scratch_size_min: Minimum SPDM scratch buffer size in bytes + * @spdm_scratch_size_max: Maximum SPDM scratch buffer size in bytes + * @spdm_out_size_min: Minimum SPDM output buffer size in bytes + * @spdm_out_size_max: Maximum for the SPDM output buffer size in bytes + * @spdm_rsp_size_min: Minimum SPDM response buffer size in bytes + * @spdm_rsp_size_max: Maximum SPDM response buffer size in bytes + * @devctx_size: Size of a device context buffer in bytes + * @tdictx_size: Size of a TDI context buffer in bytes + * @tio_crypto_alg: TIO crypto algorithms supported + */ +struct sev_tio_status { + u32 length; + union { + u32 flags; + struct { + u32 tio_en:1; + u32 tio_init_done:1; + }; + }; + u32 spdm_req_size_min; + u32 spdm_req_size_max; + u32 spdm_scratch_size_min; + u32 spdm_scratch_size_max; + u32 spdm_out_size_min; + u32 spdm_out_size_max; + u32 spdm_rsp_size_min; + u32 spdm_rsp_size_max; + u32 devctx_size; + u32 tdictx_size; + u32 tio_crypto_alg; + u8 reserved[12]; +} __packed; + +int sev_tio_init_locked(void *tio_status_page); +int sev_tio_continue(struct tsm_dsm_tio *dev_data); + +int sev_tio_dev_create(struct tsm_dsm_tio *dev_data, u16 device_id, u16 ro= ot_port_id, + u8 segment_id); +int sev_tio_dev_connect(struct tsm_dsm_tio *dev_data, u8 tc_mask, u8 ids[8= ], u8 cert_slot); +int sev_tio_dev_disconnect(struct tsm_dsm_tio *dev_data, bool force); +int sev_tio_dev_reclaim(struct tsm_dsm_tio *dev_data); + +#endif /* CONFIG_CRYPTO_DEV_SP_PSP */ + +#if defined(CONFIG_PCI_TSM) +void sev_tsm_init_locked(struct sev_device *sev, void *tio_status_page); +void sev_tsm_uninit(struct sev_device *sev); +int sev_tio_cmd_buffer_len(int cmd); +#else +static inline int sev_tio_cmd_buffer_len(int cmd) { return 0; } +#endif + +#endif /* __PSP_SEV_TIO_H__ */ diff --git a/drivers/crypto/ccp/sev-dev.h b/drivers/crypto/ccp/sev-dev.h index b9029506383f..dced4a8e9f01 100644 --- a/drivers/crypto/ccp/sev-dev.h +++ b/drivers/crypto/ccp/sev-dev.h @@ -34,6 +34,8 @@ struct sev_misc_dev { struct miscdevice misc; }; =20 +struct sev_tio_status; + struct sev_device { struct device *dev; struct psp_device *psp; @@ -61,6 +63,11 @@ struct sev_device { =20 struct sev_user_data_snp_status snp_plat_status; struct snp_feature_info snp_feat_info_0; + +#if defined(CONFIG_PCI_TSM) + struct tsm_dev *tsmdev; + struct sev_tio_status *tio_status; +#endif }; =20 int sev_dev_init(struct psp_device *psp); diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h index c0c817ca3615..cce864dbf281 100644 --- a/include/linux/psp-sev.h +++ b/include/linux/psp-sev.h @@ -109,6 +109,13 @@ enum sev_cmd { SEV_CMD_SNP_VLEK_LOAD =3D 0x0CD, SEV_CMD_SNP_FEATURE_INFO =3D 0x0CE, =20 + /* SEV-TIO commands */ + SEV_CMD_TIO_STATUS =3D 0x0D0, + SEV_CMD_TIO_INIT =3D 0x0D1, + SEV_CMD_TIO_DEV_CREATE =3D 0x0D2, + SEV_CMD_TIO_DEV_RECLAIM =3D 0x0D3, + SEV_CMD_TIO_DEV_CONNECT =3D 0x0D4, + SEV_CMD_TIO_DEV_DISCONNECT =3D 0x0D5, SEV_CMD_MAX, }; =20 diff --git a/drivers/crypto/ccp/sev-dev-tio.c b/drivers/crypto/ccp/sev-dev-= tio.c new file mode 100644 index 000000000000..f7b2a515aae7 --- /dev/null +++ b/drivers/crypto/ccp/sev-dev-tio.c @@ -0,0 +1,863 @@ +// SPDX-License-Identifier: GPL-2.0-only + +// Interface to PSP for CCP/SEV-TIO/SNP-VM + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "sev-dev.h" +#include "sev-dev-tio.h" + +#define to_tio_status(dev_data) \ + (container_of((dev_data), struct tio_dsm, data)->sev->tio_status) + +#define SLA_PAGE_TYPE_DATA 0 +#define SLA_PAGE_TYPE_SCATTER 1 +#define SLA_PAGE_SIZE_4K 0 +#define SLA_PAGE_SIZE_2M 1 +#define SLA_SZ(s) ((s).page_size =3D=3D SLA_PAGE_SIZE_2M ? SZ_2M : SZ_4K) +#define SLA_SCATTER_LEN(s) (SLA_SZ(s) / sizeof(struct sla_addr_t)) +#define SLA_EOL ((struct sla_addr_t) { .pfn =3D ((1UL << 40) - 1) }) +#define SLA_NULL ((struct sla_addr_t) { 0 }) +#define IS_SLA_NULL(s) ((s).sla =3D=3D SLA_NULL.sla) +#define IS_SLA_EOL(s) ((s).sla =3D=3D SLA_EOL.sla) + +static phys_addr_t sla_to_pa(struct sla_addr_t sla) +{ + u64 pfn =3D sla.pfn; + u64 pa =3D pfn << PAGE_SHIFT; + + return pa; +} + +static void *sla_to_va(struct sla_addr_t sla) +{ + void *va =3D __va(__sme_clr(sla_to_pa(sla))); + + return va; +} + +#define sla_to_pfn(sla) (__pa(sla_to_va(sla)) >> PAGE_SHIFT) +#define sla_to_page(sla) virt_to_page(sla_to_va(sla)) + +static struct sla_addr_t make_sla(struct page *pg, bool stp) +{ + u64 pa =3D __sme_set(page_to_phys(pg)); + struct sla_addr_t ret =3D { + .pfn =3D pa >> PAGE_SHIFT, + .page_size =3D SLA_PAGE_SIZE_4K, /* Do not do SLA_PAGE_SIZE_2M ATM */ + .page_type =3D stp ? SLA_PAGE_TYPE_SCATTER : SLA_PAGE_TYPE_DATA + }; + + return ret; +} + +/* the BUFFER Structure */ +#define SLA_BUFFER_FLAG_ENCRYPTION BIT(0) + +/** + * struct sla_buffer_hdr - Scatter list address buffer header + * + * @capacity_sz: Total capacity of the buffer in bytes + * @payload_sz: Size of buffer payload in bytes, must be multiple of 32B + * @flags: Buffer flags (SLA_BUFFER_FLAG_ENCRYPTION: buffer is encrypted) + * @iv: Initialization vector used for encryption + * @authtag: Authentication tag for encrypted buffer + */ +struct sla_buffer_hdr { + u32 capacity_sz; + u32 payload_sz; /* The size of BUFFER_PAYLOAD in bytes. Must be multiple = of 32B */ + u32 flags; + u8 reserved1[4]; + u8 iv[16]; /* IV used for the encryption of this buffer */ + u8 authtag[16]; /* Authentication tag for this buffer */ + u8 reserved2[16]; +} __packed; + +enum spdm_data_type_t { + DOBJ_DATA_TYPE_SPDM =3D 0x1, + DOBJ_DATA_TYPE_SECURE_SPDM =3D 0x2, +}; + +struct spdm_dobj_hdr_req { + struct spdm_dobj_hdr hdr; /* hdr.id =3D=3D SPDM_DOBJ_ID_REQ */ + u8 data_type; /* spdm_data_type_t */ + u8 reserved2[5]; +} __packed; + +struct spdm_dobj_hdr_resp { + struct spdm_dobj_hdr hdr; /* hdr.id =3D=3D SPDM_DOBJ_ID_RESP */ + u8 data_type; /* spdm_data_type_t */ + u8 reserved2[5]; +} __packed; + +/* Defined in sev-dev-tio.h so sev-dev-tsm.c can read types of blobs */ +struct spdm_dobj_hdr_cert; +struct spdm_dobj_hdr_meas; +struct spdm_dobj_hdr_report; + +/* Used in all SPDM-aware TIO commands */ +struct spdm_ctrl { + struct sla_addr_t req; + struct sla_addr_t resp; + struct sla_addr_t scratch; + struct sla_addr_t output; +} __packed; + +static size_t sla_dobj_id_to_size(u8 id) +{ + size_t n; + + BUILD_BUG_ON(sizeof(struct spdm_dobj_hdr_resp) !=3D 0x10); + switch (id) { + case SPDM_DOBJ_ID_REQ: + n =3D sizeof(struct spdm_dobj_hdr_req); + break; + case SPDM_DOBJ_ID_RESP: + n =3D sizeof(struct spdm_dobj_hdr_resp); + break; + default: + WARN_ON(1); + n =3D 0; + break; + } + + return n; +} + +#define SPDM_DOBJ_HDR_SIZE(hdr) sla_dobj_id_to_size((hdr)->id) +#define SPDM_DOBJ_DATA(hdr) ((u8 *)(hdr) + SPDM_DOBJ_HDR_SIZE(hdr)) +#define SPDM_DOBJ_LEN(hdr) ((hdr)->length - SPDM_DOBJ_HDR_SIZE(hdr)) + +#define sla_to_dobj_resp_hdr(buf) ((struct spdm_dobj_hdr_resp *) \ + sla_to_dobj_hdr_check((buf), SPDM_DOBJ_ID_RESP)) +#define sla_to_dobj_req_hdr(buf) ((struct spdm_dobj_hdr_req *) \ + sla_to_dobj_hdr_check((buf), SPDM_DOBJ_ID_REQ)) + +static struct spdm_dobj_hdr *sla_to_dobj_hdr(struct sla_buffer_hdr *buf) +{ + if (!buf) + return NULL; + + return (struct spdm_dobj_hdr *) &buf[1]; +} + +static struct spdm_dobj_hdr *sla_to_dobj_hdr_check(struct sla_buffer_hdr *= buf, u32 check_dobjid) +{ + struct spdm_dobj_hdr *hdr =3D sla_to_dobj_hdr(buf); + + if (WARN_ON_ONCE(!hdr)) + return NULL; + + if (hdr->id !=3D check_dobjid) { + pr_err("! ERROR: expected %d, found %d\n", check_dobjid, hdr->id); + return NULL; + } + + return hdr; +} + +static void *sla_to_data(struct sla_buffer_hdr *buf, u32 dobjid) +{ + struct spdm_dobj_hdr *hdr =3D sla_to_dobj_hdr(buf); + + if (WARN_ON_ONCE(dobjid !=3D SPDM_DOBJ_ID_REQ && dobjid !=3D SPDM_DOBJ_ID= _RESP)) + return NULL; + + if (!hdr) + return NULL; + + return (u8 *) hdr + sla_dobj_id_to_size(dobjid); +} + +/** + * struct sev_data_tio_status - SEV_CMD_TIO_STATUS command + * + * @length: Length of this command buffer in bytes + * @status_paddr: System physical address of the TIO_STATUS structure + */ +struct sev_data_tio_status { + u32 length; + u8 reserved[4]; + u64 status_paddr; +} __packed; + +/* TIO_INIT */ +struct sev_data_tio_init { + u32 length; + u8 reserved[12]; +} __packed; + +/** + * struct sev_data_tio_dev_create - TIO_DEV_CREATE command + * + * @length: Length in bytes of this command buffer + * @dev_ctx_sla: Scatter list address pointing to a buffer to be used as a= device context buffer + * @device_id: PCIe Routing Identifier of the device to connect to + * @root_port_id: PCIe Routing Identifier of the root port of the device + * @segment_id: PCIe Segment Identifier of the device to connect to + */ +struct sev_data_tio_dev_create { + u32 length; + u8 reserved1[4]; + struct sla_addr_t dev_ctx_sla; + u16 device_id; + u16 root_port_id; + u8 segment_id; + u8 reserved2[11]; +} __packed; + +/** + * struct sev_data_tio_dev_connect - TIO_DEV_CONNECT command + * + * @length: Length in bytes of this command buffer + * @spdm_ctrl: SPDM control structure defined in Section 5.1 + * @dev_ctx_sla: Scatter list address of the device context buffer + * @tc_mask: Bitmask of the traffic classes to initialize for SEV-TIO usag= e. + * Setting the kth bit of the TC_MASK to 1 indicates that the tr= affic + * class k will be initialized + * @cert_slot: Slot number of the certificate requested for constructing t= he SPDM session + * @ide_stream_id: IDE stream IDs to be associated with this device. + * Valid only if corresponding bit in TC_MASK is set + */ +struct sev_data_tio_dev_connect { + u32 length; + u8 reserved1[4]; + struct spdm_ctrl spdm_ctrl; + u8 reserved2[8]; + struct sla_addr_t dev_ctx_sla; + u8 tc_mask; + u8 cert_slot; + u8 reserved3[6]; + u8 ide_stream_id[8]; + u8 reserved4[8]; +} __packed; + +/** + * struct sev_data_tio_dev_disconnect - TIO_DEV_DISCONNECT command + * + * @length: Length in bytes of this command buffer + * @flags: Command flags (TIO_DEV_DISCONNECT_FLAG_FORCE: force disconnect) + * @spdm_ctrl: SPDM control structure defined in Section 5.1 + * @dev_ctx_sla: Scatter list address of the device context buffer + */ +#define TIO_DEV_DISCONNECT_FLAG_FORCE BIT(0) + +struct sev_data_tio_dev_disconnect { + u32 length; + u32 flags; + struct spdm_ctrl spdm_ctrl; + struct sla_addr_t dev_ctx_sla; +} __packed; + +/** + * struct sev_data_tio_dev_meas - TIO_DEV_MEASUREMENTS command + * + * @length: Length in bytes of this command buffer + * @flags: Command flags (TIO_DEV_MEAS_FLAG_RAW_BITSTREAM: request raw mea= surements) + * @spdm_ctrl: SPDM control structure defined in Section 5.1 + * @dev_ctx_sla: Scatter list address of the device context buffer + * @meas_nonce: Nonce for measurement freshness verification + */ +#define TIO_DEV_MEAS_FLAG_RAW_BITSTREAM BIT(0) + +struct sev_data_tio_dev_meas { + u32 length; + u32 flags; + struct spdm_ctrl spdm_ctrl; + struct sla_addr_t dev_ctx_sla; + u8 meas_nonce[32]; +} __packed; + +/** + * struct sev_data_tio_dev_certs - TIO_DEV_CERTIFICATES command + * + * @length: Length in bytes of this command buffer + * @spdm_ctrl: SPDM control structure defined in Section 5.1 + * @dev_ctx_sla: Scatter list address of the device context buffer + */ +struct sev_data_tio_dev_certs { + u32 length; + u8 reserved[4]; + struct spdm_ctrl spdm_ctrl; + struct sla_addr_t dev_ctx_sla; +} __packed; + +/** + * struct sev_data_tio_dev_reclaim - TIO_DEV_RECLAIM command + * + * @length: Length in bytes of this command buffer + * @dev_ctx_sla: Scatter list address of the device context buffer + * + * This command reclaims resources associated with a device context. + */ +struct sev_data_tio_dev_reclaim { + u32 length; + u8 reserved[4]; + struct sla_addr_t dev_ctx_sla; +} __packed; + +static struct sla_buffer_hdr *sla_buffer_map(struct sla_addr_t sla) +{ + struct sla_buffer_hdr *buf; + + BUILD_BUG_ON(sizeof(struct sla_buffer_hdr) !=3D 0x40); + if (IS_SLA_NULL(sla)) + return NULL; + + if (sla.page_type =3D=3D SLA_PAGE_TYPE_SCATTER) { + struct sla_addr_t *scatter =3D sla_to_va(sla); + unsigned int i, npages =3D 0; + + for (i =3D 0; i < SLA_SCATTER_LEN(sla); ++i) { + if (WARN_ON_ONCE(SLA_SZ(scatter[i]) > SZ_4K)) + return NULL; + + if (WARN_ON_ONCE(scatter[i].page_type =3D=3D SLA_PAGE_TYPE_SCATTER)) + return NULL; + + if (IS_SLA_EOL(scatter[i])) { + npages =3D i; + break; + } + } + if (WARN_ON_ONCE(!npages)) + return NULL; + + struct page **pp =3D kmalloc_array(npages, sizeof(pp[0]), GFP_KERNEL); + if (!pp) + return NULL; + + for (i =3D 0; i < npages; ++i) + pp[i] =3D sla_to_page(scatter[i]); + + buf =3D vm_map_ram(pp, npages, 0); + kfree(pp); + } else { + struct page *pg =3D sla_to_page(sla); + + buf =3D vm_map_ram(&pg, 1, 0); + } + + return buf; +} + +static void sla_buffer_unmap(struct sla_addr_t sla, struct sla_buffer_hdr = *buf) +{ + if (!buf) + return; + + if (sla.page_type =3D=3D SLA_PAGE_TYPE_SCATTER) { + struct sla_addr_t *scatter =3D sla_to_va(sla); + unsigned int i, npages =3D 0; + + for (i =3D 0; i < SLA_SCATTER_LEN(sla); ++i) { + if (IS_SLA_EOL(scatter[i])) { + npages =3D i; + break; + } + } + if (!npages) + return; + + vm_unmap_ram(buf, npages); + } else { + vm_unmap_ram(buf, 1); + } +} + +static void dobj_response_init(struct sla_buffer_hdr *buf) +{ + struct spdm_dobj_hdr *dobj =3D sla_to_dobj_hdr(buf); + + dobj->id =3D SPDM_DOBJ_ID_RESP; + dobj->version.major =3D 0x1; + dobj->version.minor =3D 0; + dobj->length =3D 0; + buf->payload_sz =3D sla_dobj_id_to_size(dobj->id) + dobj->length; +} + +static void sla_free(struct sla_addr_t sla, size_t len, bool firmware_stat= e) +{ + unsigned int npages =3D PAGE_ALIGN(len) >> PAGE_SHIFT; + struct sla_addr_t *scatter =3D NULL; + int ret =3D 0, i; + + if (IS_SLA_NULL(sla)) + return; + + if (firmware_state) { + if (sla.page_type =3D=3D SLA_PAGE_TYPE_SCATTER) { + scatter =3D sla_to_va(sla); + + for (i =3D 0; i < npages; ++i) { + if (IS_SLA_EOL(scatter[i])) + break; + + ret =3D snp_reclaim_pages(sla_to_pa(scatter[i]), 1, false); + if (ret) + break; + } + } else { + ret =3D snp_reclaim_pages(sla_to_pa(sla), 1, false); + } + } + + if (WARN_ON(ret)) + return; + + if (scatter) { + for (i =3D 0; i < npages; ++i) { + if (IS_SLA_EOL(scatter[i])) + break; + free_page((unsigned long)sla_to_va(scatter[i])); + } + } + + free_page((unsigned long)sla_to_va(sla)); +} + +static struct sla_addr_t sla_alloc(size_t len, bool firmware_state) +{ + unsigned long i, npages =3D PAGE_ALIGN(len) >> PAGE_SHIFT; + struct sla_addr_t *scatter =3D NULL; + struct sla_addr_t ret =3D SLA_NULL; + struct sla_buffer_hdr *buf; + struct page *pg; + + if (npages =3D=3D 0) + return ret; + + if (WARN_ON_ONCE(npages > ((PAGE_SIZE / sizeof(struct sla_addr_t)) + 1))) + return ret; + + BUILD_BUG_ON(PAGE_SIZE < SZ_4K); + + if (npages > 1) { + pg =3D alloc_page(GFP_KERNEL | __GFP_ZERO); + if (!pg) + return SLA_NULL; + + ret =3D make_sla(pg, true); + scatter =3D page_to_virt(pg); + for (i =3D 0; i < npages; ++i) { + pg =3D alloc_page(GFP_KERNEL | __GFP_ZERO); + if (!pg) + goto no_reclaim_exit; + + scatter[i] =3D make_sla(pg, false); + } + scatter[i] =3D SLA_EOL; + } else { + pg =3D alloc_page(GFP_KERNEL | __GFP_ZERO); + if (!pg) + return SLA_NULL; + + ret =3D make_sla(pg, false); + } + + buf =3D sla_buffer_map(ret); + if (!buf) + goto no_reclaim_exit; + + buf->capacity_sz =3D (npages << PAGE_SHIFT); + sla_buffer_unmap(ret, buf); + + if (firmware_state) { + if (scatter) { + for (i =3D 0; i < npages; ++i) { + if (rmp_make_private(sla_to_pfn(scatter[i]), 0, + PG_LEVEL_4K, 0, true)) + goto free_exit; + } + } else { + if (rmp_make_private(sla_to_pfn(ret), 0, PG_LEVEL_4K, 0, true)) + goto no_reclaim_exit; + } + } + + return ret; + +no_reclaim_exit: + firmware_state =3D false; +free_exit: + sla_free(ret, len, firmware_state); + return SLA_NULL; +} + +/* Expands a buffer, only firmware owned buffers allowed for now */ +static int sla_expand(struct sla_addr_t *sla, size_t *len) +{ + struct sla_buffer_hdr *oldbuf =3D sla_buffer_map(*sla), *newbuf; + struct sla_addr_t oldsla =3D *sla, newsla; + size_t oldlen =3D *len, newlen; + + if (!oldbuf) + return -EFAULT; + + newlen =3D oldbuf->capacity_sz; + if (oldbuf->capacity_sz =3D=3D oldlen) { + /* This buffer does not require expansion, must be another buffer */ + sla_buffer_unmap(oldsla, oldbuf); + return 1; + } + + pr_notice("Expanding BUFFER from %ld to %ld bytes\n", oldlen, newlen); + + newsla =3D sla_alloc(newlen, true); + if (IS_SLA_NULL(newsla)) + return -ENOMEM; + + newbuf =3D sla_buffer_map(newsla); + if (!newbuf) { + sla_free(newsla, newlen, true); + return -EFAULT; + } + + memcpy(newbuf, oldbuf, oldlen); + + sla_buffer_unmap(newsla, newbuf); + sla_free(oldsla, oldlen, true); + *sla =3D newsla; + *len =3D newlen; + + return 0; +} + +static int sev_tio_do_cmd(int cmd, void *data, size_t data_len, int *psp_r= et, + struct tsm_dsm_tio *dev_data) +{ + int rc; + + *psp_ret =3D 0; + rc =3D sev_do_cmd(cmd, data, psp_ret); + + if (WARN_ON(!rc && *psp_ret =3D=3D SEV_RET_SPDM_REQUEST)) + return -EIO; + + if (rc =3D=3D 0 && *psp_ret =3D=3D SEV_RET_EXPAND_BUFFER_LENGTH_REQUEST) { + int rc1, rc2; + + rc1 =3D sla_expand(&dev_data->output, &dev_data->output_len); + if (rc1 < 0) + return rc1; + + rc2 =3D sla_expand(&dev_data->scratch, &dev_data->scratch_len); + if (rc2 < 0) + return rc2; + + if (!rc1 && !rc2) + /* Neither buffer requires expansion, this is wrong */ + return -EFAULT; + + *psp_ret =3D 0; + rc =3D sev_do_cmd(cmd, data, psp_ret); + } + + if ((rc =3D=3D 0 || rc =3D=3D -EIO) && *psp_ret =3D=3D SEV_RET_SPDM_REQUE= ST) { + struct spdm_dobj_hdr_resp *resp_hdr; + struct spdm_dobj_hdr_req *req_hdr; + struct sev_tio_status *tio_status =3D to_tio_status(dev_data); + size_t resp_len =3D tio_status->spdm_req_size_max - + (sla_dobj_id_to_size(SPDM_DOBJ_ID_RESP) + sizeof(struct sla_buffer_hdr)= ); + + if (!dev_data->cmd) { + if (WARN_ON_ONCE(!data_len || (data_len !=3D *(u32 *) data))) + return -EINVAL; + if (WARN_ON(data_len > sizeof(dev_data->cmd_data))) + return -EFAULT; + memcpy(dev_data->cmd_data, data, data_len); + memset(&dev_data->cmd_data[data_len], 0xFF, + sizeof(dev_data->cmd_data) - data_len); + dev_data->cmd =3D cmd; + } + + req_hdr =3D sla_to_dobj_req_hdr(dev_data->reqbuf); + resp_hdr =3D sla_to_dobj_resp_hdr(dev_data->respbuf); + switch (req_hdr->data_type) { + case DOBJ_DATA_TYPE_SPDM: + rc =3D PCI_DOE_FEATURE_CMA; + break; + case DOBJ_DATA_TYPE_SECURE_SPDM: + rc =3D PCI_DOE_FEATURE_SSESSION; + break; + default: + return -EINVAL; + } + resp_hdr->data_type =3D req_hdr->data_type; + dev_data->spdm.req_len =3D req_hdr->hdr.length - + sla_dobj_id_to_size(SPDM_DOBJ_ID_REQ); + dev_data->spdm.rsp_len =3D resp_len; + } else if (dev_data && dev_data->cmd) { + /* For either error or success just stop the bouncing */ + memset(dev_data->cmd_data, 0, sizeof(dev_data->cmd_data)); + dev_data->cmd =3D 0; + } + + return rc; +} + +int sev_tio_continue(struct tsm_dsm_tio *dev_data) +{ + struct spdm_dobj_hdr_resp *resp_hdr; + int ret; + + if (!dev_data || !dev_data->cmd) + return -EINVAL; + + resp_hdr =3D sla_to_dobj_resp_hdr(dev_data->respbuf); + resp_hdr->hdr.length =3D ALIGN(sla_dobj_id_to_size(SPDM_DOBJ_ID_RESP) + + dev_data->spdm.rsp_len, 32); + dev_data->respbuf->payload_sz =3D resp_hdr->hdr.length; + + ret =3D sev_tio_do_cmd(dev_data->cmd, dev_data->cmd_data, 0, + &dev_data->psp_ret, dev_data); + if (ret) + return ret; + + if (dev_data->psp_ret !=3D SEV_RET_SUCCESS) + return -EINVAL; + + return 0; +} + +static void spdm_ctrl_init(struct spdm_ctrl *ctrl, struct tsm_dsm_tio *dev= _data) +{ + ctrl->req =3D dev_data->req; + ctrl->resp =3D dev_data->resp; + ctrl->scratch =3D dev_data->scratch; + ctrl->output =3D dev_data->output; +} + +static void spdm_ctrl_free(struct tsm_dsm_tio *dev_data) +{ + struct sev_tio_status *tio_status =3D to_tio_status(dev_data); + size_t len =3D tio_status->spdm_req_size_max - + (sla_dobj_id_to_size(SPDM_DOBJ_ID_RESP) + + sizeof(struct sla_buffer_hdr)); + struct tsm_spdm *spdm =3D &dev_data->spdm; + + sla_buffer_unmap(dev_data->resp, dev_data->respbuf); + sla_buffer_unmap(dev_data->req, dev_data->reqbuf); + spdm->rsp =3D NULL; + spdm->req =3D NULL; + sla_free(dev_data->req, len, true); + sla_free(dev_data->resp, len, false); + sla_free(dev_data->scratch, tio_status->spdm_scratch_size_max, true); + + dev_data->req.sla =3D 0; + dev_data->resp.sla =3D 0; + dev_data->scratch.sla =3D 0; + dev_data->respbuf =3D NULL; + dev_data->reqbuf =3D NULL; + sla_free(dev_data->output, tio_status->spdm_out_size_max, true); +} + +static int spdm_ctrl_alloc(struct tsm_dsm_tio *dev_data) +{ + struct sev_tio_status *tio_status =3D to_tio_status(dev_data); + struct tsm_spdm *spdm =3D &dev_data->spdm; + int ret; + + dev_data->req =3D sla_alloc(tio_status->spdm_req_size_max, true); + dev_data->resp =3D sla_alloc(tio_status->spdm_req_size_max, false); + dev_data->scratch_len =3D tio_status->spdm_scratch_size_max; + dev_data->scratch =3D sla_alloc(dev_data->scratch_len, true); + dev_data->output_len =3D tio_status->spdm_out_size_max; + dev_data->output =3D sla_alloc(dev_data->output_len, true); + + if (IS_SLA_NULL(dev_data->req) || IS_SLA_NULL(dev_data->resp) || + IS_SLA_NULL(dev_data->scratch) || IS_SLA_NULL(dev_data->dev_ctx)) { + ret =3D -ENOMEM; + goto free_spdm_exit; + } + + dev_data->reqbuf =3D sla_buffer_map(dev_data->req); + dev_data->respbuf =3D sla_buffer_map(dev_data->resp); + if (!dev_data->reqbuf || !dev_data->respbuf) { + ret =3D -EFAULT; + goto free_spdm_exit; + } + + spdm->req =3D sla_to_data(dev_data->reqbuf, SPDM_DOBJ_ID_REQ); + spdm->rsp =3D sla_to_data(dev_data->respbuf, SPDM_DOBJ_ID_RESP); + if (!spdm->req || !spdm->rsp) { + ret =3D -EFAULT; + goto free_spdm_exit; + } + + dobj_response_init(dev_data->respbuf); + + return 0; + +free_spdm_exit: + spdm_ctrl_free(dev_data); + return ret; +} + +int sev_tio_init_locked(void *tio_status_page) +{ + struct sev_tio_status *tio_status =3D tio_status_page; + struct sev_data_tio_status data_status =3D { + .length =3D sizeof(data_status), + }; + int ret, psp_ret; + + data_status.status_paddr =3D __psp_pa(tio_status_page); + ret =3D __sev_do_cmd_locked(SEV_CMD_TIO_STATUS, &data_status, &psp_ret); + if (ret) + return ret; + + if (tio_status->length < offsetofend(struct sev_tio_status, tdictx_size) = || + tio_status->flags & 0xFFFFFF00) + return -EFAULT; + + if (!tio_status->tio_en && !tio_status->tio_init_done) + return -ENOENT; + + if (tio_status->tio_init_done) + return -EBUSY; + + struct sev_data_tio_init ti =3D { .length =3D sizeof(ti) }; + + ret =3D __sev_do_cmd_locked(SEV_CMD_TIO_INIT, &ti, &psp_ret); + if (ret) + return ret; + + ret =3D __sev_do_cmd_locked(SEV_CMD_TIO_STATUS, &data_status, &psp_ret); + if (ret) + return ret; + + return 0; +} + +int sev_tio_dev_create(struct tsm_dsm_tio *dev_data, u16 device_id, + u16 root_port_id, u8 segment_id) +{ + struct sev_tio_status *tio_status =3D to_tio_status(dev_data); + struct sev_data_tio_dev_create create =3D { + .length =3D sizeof(create), + .device_id =3D device_id, + .root_port_id =3D root_port_id, + .segment_id =3D segment_id, + }; + void *data_pg; + int ret; + + dev_data->dev_ctx =3D sla_alloc(tio_status->devctx_size, true); + if (IS_SLA_NULL(dev_data->dev_ctx)) + return -ENOMEM; + + data_pg =3D snp_alloc_firmware_page(GFP_KERNEL_ACCOUNT); + if (!data_pg) { + ret =3D -ENOMEM; + goto free_ctx_exit; + } + + create.dev_ctx_sla =3D dev_data->dev_ctx; + ret =3D sev_do_cmd(SEV_CMD_TIO_DEV_CREATE, &create, &dev_data->psp_ret); + if (ret) + goto free_data_pg_exit; + + dev_data->data_pg =3D data_pg; + + return 0; + +free_data_pg_exit: + snp_free_firmware_page(data_pg); +free_ctx_exit: + sla_free(create.dev_ctx_sla, tio_status->devctx_size, true); + return ret; +} + +int sev_tio_dev_reclaim(struct tsm_dsm_tio *dev_data) +{ + struct sev_tio_status *tio_status =3D to_tio_status(dev_data); + struct sev_data_tio_dev_reclaim r =3D { + .length =3D sizeof(r), + .dev_ctx_sla =3D dev_data->dev_ctx, + }; + int ret; + + if (dev_data->data_pg) { + snp_free_firmware_page(dev_data->data_pg); + dev_data->data_pg =3D NULL; + } + + if (IS_SLA_NULL(dev_data->dev_ctx)) + return 0; + + ret =3D sev_do_cmd(SEV_CMD_TIO_DEV_RECLAIM, &r, &dev_data->psp_ret); + + sla_free(dev_data->dev_ctx, tio_status->devctx_size, true); + dev_data->dev_ctx =3D SLA_NULL; + + spdm_ctrl_free(dev_data); + + return ret; +} + +int sev_tio_dev_connect(struct tsm_dsm_tio *dev_data, u8 tc_mask, u8 ids[8= ], u8 cert_slot) +{ + struct sev_data_tio_dev_connect connect =3D { + .length =3D sizeof(connect), + .tc_mask =3D tc_mask, + .cert_slot =3D cert_slot, + .dev_ctx_sla =3D dev_data->dev_ctx, + .ide_stream_id =3D { + ids[0], ids[1], ids[2], ids[3], + ids[4], ids[5], ids[6], ids[7] + }, + }; + int ret; + + if (WARN_ON(IS_SLA_NULL(dev_data->dev_ctx))) + return -EFAULT; + if (!(tc_mask & 1)) + return -EINVAL; + + ret =3D spdm_ctrl_alloc(dev_data); + if (ret) + return ret; + + spdm_ctrl_init(&connect.spdm_ctrl, dev_data); + + return sev_tio_do_cmd(SEV_CMD_TIO_DEV_CONNECT, &connect, sizeof(connect), + &dev_data->psp_ret, dev_data); +} + +int sev_tio_dev_disconnect(struct tsm_dsm_tio *dev_data, bool force) +{ + struct sev_data_tio_dev_disconnect dc =3D { + .length =3D sizeof(dc), + .dev_ctx_sla =3D dev_data->dev_ctx, + .flags =3D force ? TIO_DEV_DISCONNECT_FLAG_FORCE : 0, + }; + + if (WARN_ON_ONCE(IS_SLA_NULL(dev_data->dev_ctx))) + return -EFAULT; + + spdm_ctrl_init(&dc.spdm_ctrl, dev_data); + + return sev_tio_do_cmd(SEV_CMD_TIO_DEV_DISCONNECT, &dc, sizeof(dc), + &dev_data->psp_ret, dev_data); +} + +int sev_tio_cmd_buffer_len(int cmd) +{ + switch (cmd) { + case SEV_CMD_TIO_STATUS: return sizeof(struct sev_data_tio_status); + case SEV_CMD_TIO_INIT: return sizeof(struct sev_data_tio_init); + case SEV_CMD_TIO_DEV_CREATE: return sizeof(struct sev_data_tio_dev_creat= e); + case SEV_CMD_TIO_DEV_RECLAIM: return sizeof(struct sev_data_tio_dev_recl= aim); + case SEV_CMD_TIO_DEV_CONNECT: return sizeof(struct sev_data_tio_dev_conn= ect); + case SEV_CMD_TIO_DEV_DISCONNECT: return sizeof(struct sev_data_tio_dev_di= sconnect); + default: return 0; + } +} diff --git a/drivers/crypto/ccp/sev-dev-tsm.c b/drivers/crypto/ccp/sev-dev-= tsm.c new file mode 100644 index 000000000000..ea29cd5d0ff9 --- /dev/null +++ b/drivers/crypto/ccp/sev-dev-tsm.c @@ -0,0 +1,405 @@ +// SPDX-License-Identifier: GPL-2.0-only + +// Interface to CCP/SEV-TIO for generic PCIe TDISP module + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "psp-dev.h" +#include "sev-dev.h" +#include "sev-dev-tio.h" + +MODULE_IMPORT_NS("PCI_IDE"); + +#define TIO_DEFAULT_NR_IDE_STREAMS 1 + +static uint nr_ide_streams =3D TIO_DEFAULT_NR_IDE_STREAMS; +module_param_named(ide_nr, nr_ide_streams, uint, 0644); +MODULE_PARM_DESC(ide_nr, "Set the maximum number of IDE streams per PHB"); + +#define dev_to_sp(dev) ((struct sp_device *)dev_get_drvdata(dev)) +#define dev_to_psp(dev) ((struct psp_device *)(dev_to_sp(dev)->psp_data)) +#define dev_to_sev(dev) ((struct sev_device *)(dev_to_psp(dev)->sev_data)) +#define tsm_dev_to_sev(tsmdev) dev_to_sev((tsmdev)->dev.parent) + +#define pdev_to_tio_dsm(pdev) (container_of((pdev)->tsm, struct tio_dsm, t= sm.base_tsm)) + +static int sev_tio_spdm_cmd(struct tio_dsm *dsm, int ret) +{ + struct tsm_dsm_tio *dev_data =3D &dsm->data; + struct tsm_spdm *spdm =3D &dev_data->spdm; + + /* Check the main command handler response before entering the loop */ + if (ret =3D=3D 0 && dev_data->psp_ret !=3D SEV_RET_SUCCESS) + return -EINVAL; + + if (ret <=3D 0) + return ret; + + /* ret > 0 means "SPDM requested" */ + while (ret =3D=3D PCI_DOE_FEATURE_CMA || ret =3D=3D PCI_DOE_FEATURE_SSESS= ION) { + ret =3D pci_doe(dsm->tsm.doe_mb, PCI_VENDOR_ID_PCI_SIG, ret, + spdm->req, spdm->req_len, spdm->rsp, spdm->rsp_len); + if (ret < 0) + break; + + WARN_ON_ONCE(ret =3D=3D 0); /* The response should never be empty */ + spdm->rsp_len =3D ret; + ret =3D sev_tio_continue(dev_data); + } + + return ret; +} + +static int stream_enable(struct pci_ide *ide) +{ + struct pci_dev *rp =3D pcie_find_root_port(ide->pdev); + int ret; + + ret =3D pci_ide_stream_enable(rp, ide); + if (ret) + return ret; + + ret =3D pci_ide_stream_enable(ide->pdev, ide); + if (ret) + pci_ide_stream_disable(rp, ide); + + return ret; +} + +static int streams_enable(struct pci_ide **ide) +{ + int ret =3D 0; + + for (int i =3D 0; i < TIO_IDE_MAX_TC; ++i) { + if (ide[i]) { + ret =3D stream_enable(ide[i]); + if (ret) + break; + } + } + + return ret; +} + +static void stream_disable(struct pci_ide *ide) +{ + pci_ide_stream_disable(ide->pdev, ide); + pci_ide_stream_disable(pcie_find_root_port(ide->pdev), ide); +} + +static void streams_disable(struct pci_ide **ide) +{ + for (int i =3D 0; i < TIO_IDE_MAX_TC; ++i) + if (ide[i]) + stream_disable(ide[i]); +} + +static void stream_setup(struct pci_ide *ide) +{ + struct pci_dev *rp =3D pcie_find_root_port(ide->pdev); + + ide->partner[PCI_IDE_EP].rid_start =3D 0; + ide->partner[PCI_IDE_EP].rid_end =3D 0xffff; + ide->partner[PCI_IDE_RP].rid_start =3D 0; + ide->partner[PCI_IDE_RP].rid_end =3D 0xffff; + + ide->pdev->ide_cfg =3D 0; + ide->pdev->ide_tee_limit =3D 1; + rp->ide_cfg =3D 1; + rp->ide_tee_limit =3D 0; + + pci_warn(ide->pdev, "Forcing CFG/TEE for %s", pci_name(rp)); + pci_ide_stream_setup(ide->pdev, ide); + pci_ide_stream_setup(rp, ide); +} + +static u8 streams_setup(struct pci_ide **ide, u8 *ids) +{ + bool def =3D false; + u8 tc_mask =3D 0; + int i; + + for (i =3D 0; i < TIO_IDE_MAX_TC; ++i) { + if (!ide[i]) { + ids[i] =3D 0xFF; + continue; + } + + tc_mask |=3D BIT(i); + ids[i] =3D ide[i]->stream_id; + + if (!def) { + struct pci_ide_partner *settings; + + settings =3D pci_ide_to_settings(ide[i]->pdev, ide[i]); + settings->default_stream =3D 1; + def =3D true; + } + + stream_setup(ide[i]); + } + + return tc_mask; +} + +static int streams_register(struct pci_ide **ide) +{ + int ret =3D 0, i; + + for (i =3D 0; i < TIO_IDE_MAX_TC; ++i) { + if (ide[i]) { + ret =3D pci_ide_stream_register(ide[i]); + if (ret) + break; + } + } + + return ret; +} + +static void streams_unregister(struct pci_ide **ide) +{ + for (int i =3D 0; i < TIO_IDE_MAX_TC; ++i) + if (ide[i]) + pci_ide_stream_unregister(ide[i]); +} + +static void stream_teardown(struct pci_ide *ide) +{ + pci_ide_stream_teardown(ide->pdev, ide); + pci_ide_stream_teardown(pcie_find_root_port(ide->pdev), ide); +} + +static void streams_teardown(struct pci_ide **ide) +{ + for (int i =3D 0; i < TIO_IDE_MAX_TC; ++i) { + if (ide[i]) { + stream_teardown(ide[i]); + pci_ide_stream_free(ide[i]); + ide[i] =3D NULL; + } + } +} + +static int stream_alloc(struct pci_dev *pdev, struct pci_ide **ide, + unsigned int tc) +{ + struct pci_dev *rp =3D pcie_find_root_port(pdev); + struct pci_ide *ide1; + + if (ide[tc]) { + pci_err(pdev, "Stream for class=3D%d already registered", tc); + return -EBUSY; + } + + /* FIXME: find a better way */ + if (nr_ide_streams !=3D TIO_DEFAULT_NR_IDE_STREAMS) + pci_notice(pdev, "Enable non-default %d streams", nr_ide_streams); + pci_ide_set_nr_streams(to_pci_host_bridge(rp->bus->bridge), nr_ide_stream= s); + + ide1 =3D pci_ide_stream_alloc(pdev); + if (!ide1) + return -EFAULT; + + /* Blindly assign streamid=3D0 to TC=3D0, and so on */ + ide1->stream_id =3D tc; + + ide[tc] =3D ide1; + + return 0; +} + +static struct pci_tsm *tio_pf0_probe(struct pci_dev *pdev, struct sev_devi= ce *sev) +{ + struct tio_dsm *dsm __free(kfree) =3D kzalloc(sizeof(*dsm), GFP_KERNEL); + int rc; + + if (!dsm) + return NULL; + + rc =3D pci_tsm_pf0_constructor(pdev, &dsm->tsm, sev->tsmdev); + if (rc) + return NULL; + + pci_dbg(pdev, "TSM enabled\n"); + dsm->sev =3D sev; + return &no_free_ptr(dsm)->tsm.base_tsm; +} + +static struct pci_tsm *dsm_probe(struct tsm_dev *tsmdev, struct pci_dev *p= dev) +{ + struct sev_device *sev =3D tsm_dev_to_sev(tsmdev); + + if (is_pci_tsm_pf0(pdev)) + return tio_pf0_probe(pdev, sev); + return 0; +} + +static void dsm_remove(struct pci_tsm *tsm) +{ + struct pci_dev *pdev =3D tsm->pdev; + + pci_dbg(pdev, "TSM disabled\n"); + + if (is_pci_tsm_pf0(pdev)) { + struct tio_dsm *dsm =3D container_of(tsm, struct tio_dsm, tsm.base_tsm); + + pci_tsm_pf0_destructor(&dsm->tsm); + kfree(dsm); + } +} + +static int dsm_create(struct tio_dsm *dsm) +{ + struct pci_dev *pdev =3D dsm->tsm.base_tsm.pdev; + u8 segment_id =3D pdev->bus ? pci_domain_nr(pdev->bus) : 0; + struct pci_dev *rootport =3D pcie_find_root_port(pdev); + u16 device_id =3D pci_dev_id(pdev); + u16 root_port_id; + u32 lnkcap =3D 0; + + if (pci_read_config_dword(rootport, pci_pcie_cap(rootport) + PCI_EXP_LNKC= AP, + &lnkcap)) + return -ENODEV; + + root_port_id =3D FIELD_GET(PCI_EXP_LNKCAP_PN, lnkcap); + + return sev_tio_dev_create(&dsm->data, device_id, root_port_id, segment_id= ); +} + +static int dsm_connect(struct pci_dev *pdev) +{ + struct tio_dsm *dsm =3D pdev_to_tio_dsm(pdev); + struct tsm_dsm_tio *dev_data =3D &dsm->data; + u8 ids[TIO_IDE_MAX_TC]; + u8 tc_mask; + int ret; + + if (pci_find_doe_mailbox(pdev, PCI_VENDOR_ID_PCI_SIG, + PCI_DOE_FEATURE_SSESSION) !=3D dsm->tsm.doe_mb) { + pci_err(pdev, "CMA DOE MB must support SSESSION\n"); + return -EFAULT; + } + + ret =3D stream_alloc(pdev, dev_data->ide, 0); + if (ret) + return ret; + + ret =3D dsm_create(dsm); + if (ret) + goto ide_free_exit; + + tc_mask =3D streams_setup(dev_data->ide, ids); + + ret =3D sev_tio_dev_connect(dev_data, tc_mask, ids, dev_data->cert_slot); + ret =3D sev_tio_spdm_cmd(dsm, ret); + if (ret) + goto free_exit; + + streams_enable(dev_data->ide); + + ret =3D streams_register(dev_data->ide); + if (ret) + goto free_exit; + + return 0; + +free_exit: + sev_tio_dev_reclaim(dev_data); + + streams_disable(dev_data->ide); +ide_free_exit: + + streams_teardown(dev_data->ide); + + return ret; +} + +static void dsm_disconnect(struct pci_dev *pdev) +{ + bool force =3D SYSTEM_HALT <=3D system_state && system_state <=3D SYSTEM_= RESTART; + struct tio_dsm *dsm =3D pdev_to_tio_dsm(pdev); + struct tsm_dsm_tio *dev_data =3D &dsm->data; + int ret; + + ret =3D sev_tio_dev_disconnect(dev_data, force); + ret =3D sev_tio_spdm_cmd(dsm, ret); + if (ret && !force) { + ret =3D sev_tio_dev_disconnect(dev_data, true); + sev_tio_spdm_cmd(dsm, ret); + } + + sev_tio_dev_reclaim(dev_data); + + streams_disable(dev_data->ide); + streams_unregister(dev_data->ide); + streams_teardown(dev_data->ide); +} + +static struct pci_tsm_ops sev_tsm_ops =3D { + .probe =3D dsm_probe, + .remove =3D dsm_remove, + .connect =3D dsm_connect, + .disconnect =3D dsm_disconnect, +}; + +void sev_tsm_init_locked(struct sev_device *sev, void *tio_status_page) +{ + struct sev_tio_status *t =3D kzalloc(sizeof(*t), GFP_KERNEL); + struct tsm_dev *tsmdev; + int ret; + + WARN_ON(sev->tio_status); + + if (!t) + return; + + ret =3D sev_tio_init_locked(tio_status_page); + if (ret) { + pr_warn("SEV-TIO STATUS failed with %d\n", ret); + goto error_exit; + } + + tsmdev =3D tsm_register(sev->dev, &sev_tsm_ops); + if (IS_ERR(tsmdev)) + goto error_exit; + + memcpy(t, tio_status_page, sizeof(*t)); + + pr_notice("SEV-TIO status: EN=3D%d INIT_DONE=3D%d rq=3D%d..%d rs=3D%d..%d= " + "scr=3D%d..%d out=3D%d..%d dev=3D%d tdi=3D%d algos=3D%x\n", + t->tio_en, t->tio_init_done, + t->spdm_req_size_min, t->spdm_req_size_max, + t->spdm_rsp_size_min, t->spdm_rsp_size_max, + t->spdm_scratch_size_min, t->spdm_scratch_size_max, + t->spdm_out_size_min, t->spdm_out_size_max, + t->devctx_size, t->tdictx_size, + t->tio_crypto_alg); + + sev->tsmdev =3D tsmdev; + sev->tio_status =3D t; + + return; + +error_exit: + kfree(t); + pr_err("Failed to enable SEV-TIO: ret=3D%d en=3D%d initdone=3D%d SEV=3D%d= \n", + ret, t->tio_en, t->tio_init_done, boot_cpu_has(X86_FEATURE_SEV)); +} + +void sev_tsm_uninit(struct sev_device *sev) +{ + if (sev->tsmdev) + tsm_unregister(sev->tsmdev); + + sev->tsmdev =3D NULL; +} diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c index 2f1c9614d359..365867f381e9 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -38,6 +38,7 @@ =20 #include "psp-dev.h" #include "sev-dev.h" +#include "sev-dev-tio.h" =20 #define DEVICE_NAME "sev" #define SEV_FW_FILE "amd/sev.fw" @@ -75,6 +76,12 @@ static bool psp_init_on_probe =3D true; module_param(psp_init_on_probe, bool, 0444); MODULE_PARM_DESC(psp_init_on_probe, " if true, the PSP will be initialize= d on module init. Else the PSP will be initialized on the first command req= uiring it"); =20 +#if defined(CONFIG_PCI_TSM) +static bool sev_tio_enabled =3D true; +module_param_named(tio, sev_tio_enabled, bool, 0444); +MODULE_PARM_DESC(tio, "Enables TIO in SNP_INIT_EX"); +#endif + MODULE_FIRMWARE("amd/amd_sev_fam17h_model0xh.sbin"); /* 1st gen EPYC */ MODULE_FIRMWARE("amd/amd_sev_fam17h_model3xh.sbin"); /* 2nd gen EPYC */ MODULE_FIRMWARE("amd/amd_sev_fam19h_model0xh.sbin"); /* 3rd gen EPYC */ @@ -251,7 +258,7 @@ static int sev_cmd_buffer_len(int cmd) case SEV_CMD_SNP_COMMIT: return sizeof(struct sev_data_snp_commit); case SEV_CMD_SNP_FEATURE_INFO: return sizeof(struct sev_data_snp_feature= _info); case SEV_CMD_SNP_VLEK_LOAD: return sizeof(struct sev_user_data_snp_vlek_= load); - default: return 0; + default: return sev_tio_cmd_buffer_len(cmd); } =20 return 0; @@ -1439,8 +1446,14 @@ static int __sev_snp_init_locked(int *error, unsigne= d int max_snp_asid) data.init_rmp =3D 1; data.list_paddr_en =3D 1; data.list_paddr =3D __psp_pa(snp_range_list); + +#if defined(CONFIG_PCI_TSM) data.tio_en =3D sev_tio_present(sev) && + sev_tio_enabled && psp_init_on_probe && amd_iommu_sev_tio_supported(); + if (sev_tio_present(sev) && !psp_init_on_probe) + dev_warn(sev->dev, "SEV-TIO as incompatible with psp_init_on_probe=3D0\= n"); +#endif cmd =3D SEV_CMD_SNP_INIT_EX; } else { cmd =3D SEV_CMD_SNP_INIT; @@ -1487,6 +1500,24 @@ static int __sev_snp_init_locked(int *error, unsigne= d int max_snp_asid) atomic_notifier_chain_register(&panic_notifier_list, &snp_panic_notifier); =20 +#if defined(CONFIG_PCI_TSM) + if (data.tio_en) { + /* + * This executes with the sev_cmd_mutex held so down the stack + * snp_reclaim_pages(locked=3Dfalse) might be needed (which is extremely + * unlikely) but will cause a deadlock. + * Instead of exporting __snp_alloc_firmware_pages(), allocate a page + * for this one call here. + */ + void *tio_status =3D page_address(__snp_alloc_firmware_pages( + GFP_KERNEL_ACCOUNT | __GFP_ZERO, 0, true)); + + if (tio_status) { + sev_tsm_init_locked(sev, tio_status); + __snp_free_firmware_pages(virt_to_page(tio_status), 0, true); + } + } +#endif sev_es_tmr_size =3D SNP_TMR_SIZE; =20 return 0; @@ -2766,7 +2797,22 @@ static void __sev_firmware_shutdown(struct sev_devic= e *sev, bool panic) =20 static void sev_firmware_shutdown(struct sev_device *sev) { +#if defined(CONFIG_PCI_TSM) + /* + * Calling without sev_cmd_mutex held as TSM will likely try disconnecting + * IDE and this ends up calling sev_do_cmd() which locks sev_cmd_mutex. + */ + if (sev->tio_status) + sev_tsm_uninit(sev); +#endif + mutex_lock(&sev_cmd_mutex); + +#if defined(CONFIG_PCI_TSM) + kfree(sev->tio_status); + sev->tio_status =3D NULL; +#endif + __sev_firmware_shutdown(sev, false); mutex_unlock(&sev_cmd_mutex); } --=20 2.51.1