From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from SN4PR2101CU001.outbound.protection.outlook.com (mail-southcentralusazon11012031.outbound.protection.outlook.com [40.93.195.31]) (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 6810448BD57 for ; Tue, 5 May 2026 16:11:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.195.31 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777997511; cv=fail; b=OzkGG/HZra/BFv4dYRAeB1obld4worpjDB61BwTOpce6myOWAmOLA96WFvLNfqCX5D/pJ4FWqwnGaqO8d8avX506iSIbO2oATFtDlj4m9U7xVqEvhSHgIZ/Rwoki/xzfP9NTYcn6qFSRQW0W+9wbxDoor36pntnWMYcq6X69bDc= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777997511; c=relaxed/simple; bh=YpAYU+vgo0o9usaQ+m6iEwbG39d5PDviGMD1DDjI2RA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sQ6heLCS8GewZ1nATXp2zqearXys0MCzR8dk/qgtZ/ePBJlxKcX2GrSRq7goUHlkN264kT/+SOOXm7GAE/c3WgJLaAGcmcymt3lTJswljgRKVtxB+5mbuGlPmG8WUT35t/kYEZAScaT0L3jDCcWZ1Ib+JGD05PtxnLuPMzJQh6I= 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=QRAzzU6a; arc=fail smtp.client-ip=40.93.195.31 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="QRAzzU6a" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=teozwAGtw/620Rv4sWrhgq3lbt2fWsFk3WysBs1+NyDhUPkPd0wv3tJXDdR/Q0T317QoopbOUtIIcsTt3DRQ/+cWz8OEIiIZxSayc4OmV2TbKKFpuPic/oWEVDI+DE29exeIHI7roTlW0PMFJT5ALgsbv0s6S6LG9cUFXM0fursEB0T+RU9qUw26EiPb9yOLNONmPe+t1ZLX88opeqOoiFseCMauyBYPDR0srhRfzHO+AjFNfAz69e+zQlaAgbZRlTr0RpoalfSTwAq0Z+XsLu0sIn+Tm+JIQ/eusymH5SNSenefzueFURlps0fMeGngbax5kzZFE/HU8i0UgG4WIw== 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=Ok6hvNw+XyY4X9cbinS8X6WIMGMlckSp23v2BE8O+GA=; b=S9ELTEb8x6GLIP8O4ei6Bd8LATxk63U2TO/THV/bGO+RsF6chabJ1ZXiUo/I/Q4AiQz+N7jgj2zdF2uaceV843SIqZB+knnz8mrfr+BtliquSUCcjiAbVjYTJuTyeS5V4pLNb8jy34McAPml4B+NtkeJie1aYx71yteKbE3zFwjKHukBIw5N0hjL/5qZqPPG7tvSJo6TCrlD7XCqhASrFelNMXD1siY3ZM0MxsFDpOju1omQG7PXd+6a8utgT5lBiYThjFs7qnTWs6L9SCrZWfATGGVXVhrg4/ewaXqf0j6NsjU6Nx4/p8o56CFmkppbZLeN6NyzT6pL9yem6IxvNg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=Ok6hvNw+XyY4X9cbinS8X6WIMGMlckSp23v2BE8O+GA=; b=QRAzzU6aUGWGjF1lXO2H691Dz9+9bglfEyXWoQedRPRXyeI6nxyC4N0iFvLLEBcrsspgWgA8x6/K0BY7SqhnxdJB/lh/EiHwGPJfu4gNIO2Uf6rEnlnb8IXBhDnGhZMH+JnXvOALkmBguXoY+4x/iaXSgV1pKOAM6hnhbcuZ15o= Received: from CH2PR08CA0009.namprd08.prod.outlook.com (2603:10b6:610:5a::19) by MW4PR12MB6804.namprd12.prod.outlook.com (2603:10b6:303:20d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9870.25; Tue, 5 May 2026 16:11:41 +0000 Received: from CY4PEPF0000EE32.namprd05.prod.outlook.com (2603:10b6:610:5a:cafe::27) by CH2PR08CA0009.outlook.office365.com (2603:10b6:610:5a::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9723.25 via Frontend Transport; Tue, 5 May 2026 16:11:41 +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 CY4PEPF0000EE32.mail.protection.outlook.com (10.167.242.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9891.9 via Frontend Transport; Tue, 5 May 2026 16:11:41 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.17; Tue, 5 May 2026 11:10:54 -0500 Received: from satlexmb08.amd.com (10.181.42.217) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 5 May 2026 11:09:48 -0500 Received: from xsjlizhih51.xilinx.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Tue, 5 May 2026 11:09:47 -0500 From: Lizhi Hou To: , , , , CC: David Zhang , , , , Hayden Laccabue , Lizhi Hou Subject: [PATCH V1 5/6] accel/amdxdna: Add AIE4 metadata query support Date: Tue, 5 May 2026 09:09:35 -0700 Message-ID: <20260505160936.3917732-6-lizhi.hou@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260505160936.3917732-1-lizhi.hou@amd.com> References: <20260505160936.3917732-1-lizhi.hou@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: 8bit Content-Type: text/plain Received-SPF: None (SATLEXMB04.amd.com: lizhi.hou@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE32:EE_|MW4PR12MB6804:EE_ X-MS-Office365-Filtering-Correlation-Id: a530d998-34c6-4410-6407-08deaac0fea6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|376014|1800799024|82310400026|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: nX953m6Dr+Xwnb0EROIWxjG1uqaryCNzSMfCsSAskDe/JBMxHKR5WLFoFA2Laa0IEylJcd53XKMaEAVx1Pu5pz2WzYL+xy3w4oX7NQ3NO+9p7yfKakHc0klOT0411IEYs/VYXFQHBUkZW3hwMgUoaiqJoAQnZOSeU5HRUBUG7Mp5/U0JQsEW6d1HGaxqutCvaSpHD8qwQQkKx59OUDrfv+9T15EsBRYkfCvwBBHlJkzJCLAXLgnVEn7AlLrhRzHAPgzc6G4GMx4v7hiOmIHIcpFUMdBlA/rh+ynKhoT5+rMsAwCMGnMIisyCLTpdmtwrQtcOlNFCxXS2gqHgmQjUHvrGvk7zc6Fd3PVRI+/TD0KeKXnkZp/mO7yOo1ckqSVLVYOwzpFwbj4sRSZaFxX1RpeQ4h/hegq5DrxxCHEZ2rKNzGRAL+B57KLXVhE/XicrtzP7z1sKu7nDvIJjubTBbcbJ2/192Z5R3+Flw8dyj8zEVI/rqBoS+8zqufCVy0yCqm4Aw3pVl6vaC9vacR3erBEF3OKO+iR8QtFYa5he6S1TbAIfTjaGWFiNxPh5xvTU2OXLBs0gnLOjUYS/Xut4VkmV2SCtQpjCHjTkTnkoxMoJKETWfxXB1zr5dEqZW7RCwXFW+orSCmo3K0TGTMC5X05vLYB95ARKMTqFQWLfFRMYsd0jEI1MWdtSDF2zXY7rW9Kp7y8zfYC2EKzEjmKMu/nJdfQ9p5zXtbeQKtJGt/E= 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)(36860700016)(376014)(1800799024)(82310400026)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ynHKgF2uXPfz9coL+yOjLhsTTL8yomqhlzlgEPNQo6ILUPFXWHvjvoi4CzjY1G995KjzMItf6j2y12MRFY2wxQyBjI0Z4KWkHSnq+rdnd2HoZ8DgVhAxDHu5swCN/x+NxL/1GxrvQyBFwYVavWKeUmPXF5Fp/jnk28b/lYxiCzPG3TVf5aa6+zYPPe7Q5Qy+rmiFVNJPxXg18nKg/WqwYTouVFYq3qHb7b71LRFvP7zyUHk3s8pYW7DUvkIWP79G4gbmCeWxUTRLel0N2tN3ao8q9AdF4GCtLd97kHxoogDNR0Sjc6NTZCPEfZy72QSx6vWcpHlRVu3LIWi4zm4+uZSveLBI8PEo+GALsTnKZ279pVXG5oXTYxRxmZ02dLdxsYMZV745zF35E0X/3Flm7t46BVN+ORDRQJ0s2V8ANoyD+fT+V+y56X7a+779sn7E X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2026 16:11:41.5317 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a530d998-34c6-4410-6407-08deaac0fea6 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: CY4PEPF0000EE32.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6804 From: David Zhang Add support for querying device metadata on AIE4 via a mailbox message. Refactor aie2_get_aie_metadata() into a common helper by moving it to aie.c and renaming it to amdxdna_get_metadata(), allowing both AIE2 and AIE4 to reuse the implementation. Co-developed-by: Hayden Laccabue Signed-off-by: Hayden Laccabue Signed-off-by: David Zhang Signed-off-by: Lizhi Hou --- drivers/accel/amdxdna/aie.c | 45 ++++++++++++++++++++++ drivers/accel/amdxdna/aie.h | 27 ++++++++++++++ drivers/accel/amdxdna/aie2_ctx.c | 4 +- drivers/accel/amdxdna/aie2_message.c | 2 +- drivers/accel/amdxdna/aie2_pci.c | 54 ++------------------------- drivers/accel/amdxdna/aie2_pci.h | 24 ------------ drivers/accel/amdxdna/aie4_message.c | 37 ++++++++++++++++++ drivers/accel/amdxdna/aie4_msg_priv.h | 34 +++++++++++++++++ drivers/accel/amdxdna/aie4_pci.c | 30 +++++++++++++++ drivers/accel/amdxdna/aie4_pci.h | 1 + 10 files changed, 181 insertions(+), 77 deletions(-) diff --git a/drivers/accel/amdxdna/aie.c b/drivers/accel/amdxdna/aie.c index 66849ba9026a..a31051cc1ec8 100644 --- a/drivers/accel/amdxdna/aie.c +++ b/drivers/accel/amdxdna/aie.c @@ -117,3 +117,48 @@ void amdxdna_vbnv_init(struct amdxdna_dev *xdna) amdxdna_update_vbnv(xdna, info->rev_vbnv_tbl, rev); } + +int amdxdna_get_metadata(struct aie_device *aie, + struct amdxdna_client *client, + struct amdxdna_drm_get_info *args) +{ + struct amdxdna_drm_query_aie_metadata *meta; + int ret = 0; + u32 buf_sz; + + meta = kzalloc_obj(*meta); + if (!meta) + return -ENOMEM; + + meta->col_size = aie->metadata.size; + meta->cols = aie->metadata.cols; + meta->rows = aie->metadata.rows; + + meta->version.major = aie->metadata.version.major; + meta->version.minor = aie->metadata.version.minor; + + meta->core.row_count = aie->metadata.core.row_count; + meta->core.row_start = aie->metadata.core.row_start; + meta->core.dma_channel_count = aie->metadata.core.dma_channel_count; + meta->core.lock_count = aie->metadata.core.lock_count; + meta->core.event_reg_count = aie->metadata.core.event_reg_count; + + meta->mem.row_count = aie->metadata.mem.row_count; + meta->mem.row_start = aie->metadata.mem.row_start; + meta->mem.dma_channel_count = aie->metadata.mem.dma_channel_count; + meta->mem.lock_count = aie->metadata.mem.lock_count; + meta->mem.event_reg_count = aie->metadata.mem.event_reg_count; + + meta->shim.row_count = aie->metadata.shim.row_count; + meta->shim.row_start = aie->metadata.shim.row_start; + meta->shim.dma_channel_count = aie->metadata.shim.dma_channel_count; + meta->shim.lock_count = aie->metadata.shim.lock_count; + meta->shim.event_reg_count = aie->metadata.shim.event_reg_count; + + buf_sz = min(args->buffer_size, sizeof(*meta)); + if (copy_to_user(u64_to_user_ptr(args->buffer), meta, buf_sz)) + ret = -EFAULT; + + kfree(meta); + return ret; +} diff --git a/drivers/accel/amdxdna/aie.h b/drivers/accel/amdxdna/aie.h index 7a68b114f235..4bb3719ee0c0 100644 --- a/drivers/accel/amdxdna/aie.h +++ b/drivers/accel/amdxdna/aie.h @@ -14,6 +14,29 @@ struct psp_device; struct smu_device; +struct aie_version { + u16 major; + u16 minor; +}; + +struct aie_tile_metadata { + u16 row_count; + u16 row_start; + u16 dma_channel_count; + u16 lock_count; + u16 event_reg_count; +}; + +struct aie_metadata { + u32 size; + u16 cols; + u16 rows; + struct aie_version version; + struct aie_tile_metadata core; + struct aie_tile_metadata mem; + struct aie_tile_metadata shim; +}; + struct aie_device { struct amdxdna_dev *xdna; struct mailbox_channel *mgmt_chann; @@ -26,6 +49,8 @@ struct aie_device { struct psp_device *psp_hdl; struct smu_device *smu_hdl; + + struct aie_metadata metadata; }; #define DECLARE_AIE_MSG(name, op) \ @@ -94,6 +119,8 @@ void aie_destroy_chann(struct aie_device *aie, struct mailbox_channel **chann); int aie_send_mgmt_msg_wait(struct aie_device *aie, struct xdna_mailbox_msg *msg); int aie_check_protocol(struct aie_device *aie, u32 fw_major, u32 fw_minor); void amdxdna_vbnv_init(struct amdxdna_dev *xdna); +int amdxdna_get_metadata(struct aie_device *aie, struct amdxdna_client *client, + struct amdxdna_drm_get_info *args); /* aie_psp.c */ struct psp_device *aiem_psp_create(struct drm_device *ddev, struct psp_config *conf); diff --git a/drivers/accel/amdxdna/aie2_ctx.c b/drivers/accel/amdxdna/aie2_ctx.c index 139825ac8515..7d6094aefb6f 100644 --- a/drivers/accel/amdxdna/aie2_ctx.c +++ b/drivers/accel/amdxdna/aie2_ctx.c @@ -489,12 +489,12 @@ static int aie2_hwctx_col_list(struct amdxdna_hwctx *hwctx) } ndev = xdna->dev_handle; - if (unlikely(!ndev->metadata.core.row_count)) { + if (unlikely(!ndev->aie.metadata.core.row_count)) { XDNA_WARN(xdna, "Core tile row count is zero"); return -EINVAL; } - hwctx->num_col = hwctx->num_tiles / ndev->metadata.core.row_count; + hwctx->num_col = hwctx->num_tiles / ndev->aie.metadata.core.row_count; if (!hwctx->num_col || hwctx->num_col > ndev->total_col) { XDNA_ERR(xdna, "Invalid num_col %d", hwctx->num_col); return -EINVAL; diff --git a/drivers/accel/amdxdna/aie2_message.c b/drivers/accel/amdxdna/aie2_message.c index 6e98af7b74db..f555ffecea6f 100644 --- a/drivers/accel/amdxdna/aie2_message.c +++ b/drivers/accel/amdxdna/aie2_message.c @@ -375,7 +375,7 @@ int aie2_query_status(struct amdxdna_dev_hdl *ndev, char __user *buf, u8 *buff_addr; int ret; - buf_sz = ndev->metadata.cols * ndev->metadata.size; + buf_sz = ndev->aie.metadata.cols * ndev->aie.metadata.size; buff_addr = aie2_alloc_msg_buffer(ndev, &buf_sz, &dma_addr); if (IS_ERR(buff_addr)) return PTR_ERR(buff_addr); diff --git a/drivers/accel/amdxdna/aie2_pci.c b/drivers/accel/amdxdna/aie2_pci.c index f0ddb843eb21..6c8a0f70b73d 100644 --- a/drivers/accel/amdxdna/aie2_pci.c +++ b/drivers/accel/amdxdna/aie2_pci.c @@ -219,13 +219,13 @@ static int aie2_mgmt_fw_query(struct amdxdna_dev_hdl *ndev) return ret; } - ret = aie2_query_aie_metadata(ndev, &ndev->metadata); + ret = aie2_query_aie_metadata(ndev, &ndev->aie.metadata); if (ret) { XDNA_ERR(ndev->aie.xdna, "Query AIE metadata failed"); return ret; } - ndev->total_col = min(aie2_max_col, ndev->metadata.cols); + ndev->total_col = min(aie2_max_col, ndev->aie.metadata.cols); return 0; } @@ -658,53 +658,6 @@ static int aie2_get_aie_status(struct amdxdna_client *client, return 0; } -static int aie2_get_aie_metadata(struct amdxdna_client *client, - struct amdxdna_drm_get_info *args) -{ - struct amdxdna_drm_query_aie_metadata *meta; - struct amdxdna_dev *xdna = client->xdna; - struct amdxdna_dev_hdl *ndev; - int ret = 0; - u32 buf_sz; - - ndev = xdna->dev_handle; - meta = kzalloc_obj(*meta); - if (!meta) - return -ENOMEM; - - meta->col_size = ndev->metadata.size; - meta->cols = ndev->metadata.cols; - meta->rows = ndev->metadata.rows; - - meta->version.major = ndev->metadata.version.major; - meta->version.minor = ndev->metadata.version.minor; - - meta->core.row_count = ndev->metadata.core.row_count; - meta->core.row_start = ndev->metadata.core.row_start; - meta->core.dma_channel_count = ndev->metadata.core.dma_channel_count; - meta->core.lock_count = ndev->metadata.core.lock_count; - meta->core.event_reg_count = ndev->metadata.core.event_reg_count; - - meta->mem.row_count = ndev->metadata.mem.row_count; - meta->mem.row_start = ndev->metadata.mem.row_start; - meta->mem.dma_channel_count = ndev->metadata.mem.dma_channel_count; - meta->mem.lock_count = ndev->metadata.mem.lock_count; - meta->mem.event_reg_count = ndev->metadata.mem.event_reg_count; - - meta->shim.row_count = ndev->metadata.shim.row_count; - meta->shim.row_start = ndev->metadata.shim.row_start; - meta->shim.dma_channel_count = ndev->metadata.shim.dma_channel_count; - meta->shim.lock_count = ndev->metadata.shim.lock_count; - meta->shim.event_reg_count = ndev->metadata.shim.event_reg_count; - - buf_sz = min(args->buffer_size, sizeof(*meta)); - if (copy_to_user(u64_to_user_ptr(args->buffer), meta, buf_sz)) - ret = -EFAULT; - - kfree(meta); - return ret; -} - static int aie2_get_aie_version(struct amdxdna_client *client, struct amdxdna_drm_get_info *args) { @@ -1039,6 +992,7 @@ static int aie2_get_preempt_state(struct amdxdna_client *client, static int aie2_get_info(struct amdxdna_client *client, struct amdxdna_drm_get_info *args) { struct amdxdna_dev *xdna = client->xdna; + struct amdxdna_dev_hdl *ndev = xdna->dev_handle; int ret, idx; if (!drm_dev_enter(&xdna->ddev, &idx)) @@ -1053,7 +1007,7 @@ static int aie2_get_info(struct amdxdna_client *client, struct amdxdna_drm_get_i ret = aie2_get_aie_status(client, args); break; case DRM_AMDXDNA_QUERY_AIE_METADATA: - ret = aie2_get_aie_metadata(client, args); + ret = amdxdna_get_metadata(&ndev->aie, client, args); break; case DRM_AMDXDNA_QUERY_AIE_VERSION: ret = aie2_get_aie_version(client, args); diff --git a/drivers/accel/amdxdna/aie2_pci.h b/drivers/accel/amdxdna/aie2_pci.h index f12073175676..c884fed610f9 100644 --- a/drivers/accel/amdxdna/aie2_pci.h +++ b/drivers/accel/amdxdna/aie2_pci.h @@ -77,29 +77,6 @@ struct amdxdna_fw_ver; struct amdxdna_hwctx; struct amdxdna_sched_job; -struct aie_version { - u16 major; - u16 minor; -}; - -struct aie_tile_metadata { - u16 row_count; - u16 row_start; - u16 dma_channel_count; - u16 lock_count; - u16 event_reg_count; -}; - -struct aie_metadata { - u32 size; - u16 cols; - u16 rows; - struct aie_version version; - struct aie_tile_metadata core; - struct aie_tile_metadata mem; - struct aie_tile_metadata shim; -}; - enum rt_config_category { AIE2_RT_CFG_INIT, AIE2_RT_CFG_CLK_GATING, @@ -178,7 +155,6 @@ struct amdxdna_dev_hdl { u32 total_col; struct aie_version version; - struct aie_metadata metadata; struct aie2_exec_msg_ops *exec_msg_ops; /* power management and clock*/ diff --git a/drivers/accel/amdxdna/aie4_message.c b/drivers/accel/amdxdna/aie4_message.c index d621dd32ac40..ac89a9a842b2 100644 --- a/drivers/accel/amdxdna/aie4_message.c +++ b/drivers/accel/amdxdna/aie4_message.c @@ -25,3 +25,40 @@ int aie4_suspend_fw(struct amdxdna_dev_hdl *ndev) return ret; } + +int aie4_query_aie_metadata(struct amdxdna_dev_hdl *ndev, struct aie_metadata *metadata) +{ + DECLARE_AIE_MSG(aie4_msg_aie4_tile_info, AIE4_MSG_OP_AIE_TILE_INFO); + int ret; + + ret = aie_send_mgmt_msg_wait(&ndev->aie, &msg); + if (ret) + return ret; + + metadata->size = resp.info.size; + metadata->cols = resp.info.cols; + metadata->rows = resp.info.rows; + + metadata->version.major = resp.info.major; + metadata->version.minor = resp.info.minor; + + metadata->core.row_count = resp.info.core_rows; + metadata->core.row_start = resp.info.core_row_start; + metadata->core.dma_channel_count = resp.info.core_dma_channels; + metadata->core.lock_count = resp.info.core_locks; + metadata->core.event_reg_count = resp.info.core_events; + + metadata->mem.row_count = resp.info.mem_rows; + metadata->mem.row_start = resp.info.mem_row_start; + metadata->mem.dma_channel_count = resp.info.mem_dma_channels; + metadata->mem.lock_count = resp.info.mem_locks; + metadata->mem.event_reg_count = resp.info.mem_events; + + metadata->shim.row_count = resp.info.shim_rows; + metadata->shim.row_start = resp.info.shim_row_start; + metadata->shim.dma_channel_count = resp.info.shim_dma_channels; + metadata->shim.lock_count = resp.info.shim_locks; + metadata->shim.event_reg_count = resp.info.shim_events; + + return 0; +} diff --git a/drivers/accel/amdxdna/aie4_msg_priv.h b/drivers/accel/amdxdna/aie4_msg_priv.h index 7faa01ca3436..69e220e40900 100644 --- a/drivers/accel/amdxdna/aie4_msg_priv.h +++ b/drivers/accel/amdxdna/aie4_msg_priv.h @@ -18,6 +18,7 @@ enum aie4_msg_opcode { AIE4_MSG_OP_DESTROY_PARTITION = 0x30002, AIE4_MSG_OP_CREATE_HW_CONTEXT = 0x30003, AIE4_MSG_OP_DESTROY_HW_CONTEXT = 0x30004, + AIE4_MSG_OP_AIE_TILE_INFO = 0x30006, }; enum aie4_msg_status { @@ -96,4 +97,37 @@ struct aie4_msg_destroy_hw_context_resp { enum aie4_msg_status status; } __packed; +struct aie4_tile_info { + __u32 size; + __u16 major; + __u16 minor; + __u16 cols; + __u16 rows; + __u16 core_rows; + __u16 mem_rows; + __u16 shim_rows; + __u16 core_row_start; + __u16 mem_row_start; + __u16 shim_row_start; + __u16 core_dma_channels; + __u16 mem_dma_channels; + __u16 shim_dma_channels; + __u16 core_locks; + __u16 mem_locks; + __u16 shim_locks; + __u16 core_events; + __u16 mem_events; + __u16 shim_events; + __u16 resvd; +} __packed; + +struct aie4_msg_aie4_tile_info_req { + __u32 resvd; +} __packed; + +struct aie4_msg_aie4_tile_info_resp { + enum aie4_msg_status status; + struct aie4_tile_info info; +} __packed; + #endif /* _AIE4_MSG_PRIV_H_ */ diff --git a/drivers/accel/amdxdna/aie4_pci.c b/drivers/accel/amdxdna/aie4_pci.c index 9ff34ce57fcb..8b5eff0e45c1 100644 --- a/drivers/accel/amdxdna/aie4_pci.c +++ b/drivers/accel/amdxdna/aie4_pci.c @@ -269,6 +269,11 @@ static void aie4_partition_fini(struct amdxdna_dev_hdl *ndev) XDNA_ERR(xdna, "partition fini failed: %d", ret); } +static int aie4_query(struct amdxdna_dev_hdl *ndev) +{ + return aie4_query_aie_metadata(ndev, &ndev->aie.metadata); +} + static int aie4_pf_hw_start(struct amdxdna_dev_hdl *ndev) { int ret; @@ -308,6 +313,10 @@ static int aie4_vf_hw_start(struct amdxdna_dev_hdl *ndev) if (ret) return ret; + ret = aie4_query(ndev); + if (ret) + goto mailbox_fini; + ret = aie4_partition_init(ndev); if (ret) goto mailbox_fini; @@ -535,6 +544,26 @@ static int aie4_doorbell_mmap(struct amdxdna_client *client, struct vm_area_stru return ret; } +static int aie4_get_info(struct amdxdna_client *client, struct amdxdna_drm_get_info *args) +{ + struct amdxdna_dev *xdna = client->xdna; + struct amdxdna_dev_hdl *ndev = xdna->dev_handle; + int ret; + + switch (args->param) { + case DRM_AMDXDNA_QUERY_AIE_METADATA: + ret = amdxdna_get_metadata(&ndev->aie, client, args); + break; + default: + XDNA_ERR(xdna, "Not supported request parameter %u", args->param); + ret = -EOPNOTSUPP; + } + + XDNA_DBG(xdna, "Got param %d", args->param); + + return ret; +} + static int aie4_pf_init(struct amdxdna_dev *xdna) { int ret; @@ -581,4 +610,5 @@ const struct amdxdna_dev_ops aie4_vf_ops = { .hwctx_fini = aie4_hwctx_fini, .mmap = aie4_doorbell_mmap, .cmd_wait = aie4_cmd_wait, + .get_aie_info = aie4_get_info, }; diff --git a/drivers/accel/amdxdna/aie4_pci.h b/drivers/accel/amdxdna/aie4_pci.h index b69489acd53d..1886cffc62db 100644 --- a/drivers/accel/amdxdna/aie4_pci.h +++ b/drivers/accel/amdxdna/aie4_pci.h @@ -56,6 +56,7 @@ struct amdxdna_dev_hdl { }; /* aie4_message.c */ +int aie4_query_aie_metadata(struct amdxdna_dev_hdl *ndev, struct aie_metadata *metadata); int aie4_suspend_fw(struct amdxdna_dev_hdl *ndev); /* aie4_ctx.c */ -- 2.34.1