From nobody Wed Apr 1 11:10:56 2026 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010001.outbound.protection.outlook.com [52.101.193.1]) (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 E1CE8387346 for ; Mon, 30 Mar 2026 16:37:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.1 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774888650; cv=fail; b=RR13kQQlwsZsoFgrhaWT5PqzhHilKR543QFq8jXZcTrF9ZzBjfYlXxlEMmqE27jeU0I+wEK0Y+9nB3KM6xbJBBDMzKICsFkHTD59GEhZbeFJLQz6gNjWGrAqLEXZkHDef62E4i7wJso/6QlkAEp5ECd4umBwoD3py5mtHtEIXpY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774888650; c=relaxed/simple; bh=hpxdmRM1SwaDkFUjlx+R9n/9aLIw0gvXLnHfJU9FKhQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=n/jZS1e8eTWZ5lbpuP8T40gkHgQU6s3zXelr+6ztQdK9y5i6XJFMDlMhu0o6svpheBzx+/lNZBPOmD7/dnt1HcsV35ILEg3092BnHWbmHRnnA7i2K0pTVMP5ibQezNVA4NaqY986CjE2JFwQrpZA9sKhhbYno6tcZ9A52NlIeo4= 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=S+5t2yKa; arc=fail smtp.client-ip=52.101.193.1 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="S+5t2yKa" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QG/teyT20LevK+03nzgPCQCKWI0rKe9L3N0nGTuI7DHDqFtgF8N2mOEoSVuW4ju3JtGO68zpZOnBgtqh+zk6eOvXDnLZ7+ZsO3Tc8Lb9qGY9UellIO37emj98g6CwVZ8FOljR2Vs5ta3H7H4n7IL2p8swnTATdFu3eNx9zUEq/UCZ5P4OR87oHW1j8gjbsyi5Q57jR+Dh2o7QFzjzy0sK3qUyp0S6LcCFeX4KWsoUQfVeRsRAjH5q2CyMdftTuPY/VXyJrCYMf3sQnppyqvh+NJt9FznYxH8YKTUpKkddu/gaKYbWPDTlLlsIICafB2hAvRNDfSUH5s4Rk89Uzedpw== 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=6C5FzGcTmCZhUnlgFUPViKEK9cqk86tMxfZk43TBTTk=; b=Mm4ic4mWNmlkv0zxPngBexEALEUL6cjVBkDyizsCz2R22ZKSwPqc53IpxL1bvWTnj/oXcugksDJcx9Hc77IKISncnl9LmxxEk7s4uYIxwYNo+hTfhwELTRElSG5iqImdIdISCRFmk4wiuzxK9bysetMWjUqaNEM2ygOVvQcd9iYZjLUkQkbudbZ96L+qwbFukGx5J1pVDmZvo4Aukc4OVE5JS0GFuZYFbwViX3dmjx/r5PbIARBCjWvnYjRLsLzKlVthU4WJTN48KbZsAT4k2ARqVA9R1TJoNaaUmqJTNP2xUFoQU3m/9vRzjfa6dAdATk+R6WEarLgh/J0oTKDIZg== 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=6C5FzGcTmCZhUnlgFUPViKEK9cqk86tMxfZk43TBTTk=; b=S+5t2yKagNOQvf3nGH5ITwjinMNSEC+APfDLhdlqCe/n4xYSt6YWLdqdDDgiouIO3R5K7bZlbr2lLv00tglY+FDNdtQDgsP5RBMMi4HSAWpaiZ/xTczpJy2/A8ZdSIX7v1PrCIq1HWYU6qgJMiBhRUyxe3Wls63GbKOkPwXGlGw= Received: from SA0PR12CA0028.namprd12.prod.outlook.com (2603:10b6:806:6f::33) by CH2PR12MB4165.namprd12.prod.outlook.com (2603:10b6:610:a4::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.15; Mon, 30 Mar 2026 16:37:16 +0000 Received: from SN1PEPF0002636B.namprd02.prod.outlook.com (2603:10b6:806:6f:cafe::a) by SA0PR12CA0028.outlook.office365.com (2603:10b6:806:6f::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9745.28 via Frontend Transport; Mon, 30 Mar 2026 16:37:16 +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 SN1PEPF0002636B.mail.protection.outlook.com (10.167.241.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9745.21 via Frontend Transport; Mon, 30 Mar 2026 16:37:16 +0000 Received: from satlexmb07.amd.com (10.181.42.216) 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; Mon, 30 Mar 2026 11:37:15 -0500 Received: from xsjlizhih51.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Mon, 30 Mar 2026 11:37:14 -0500 From: Lizhi Hou To: , , , , CC: Lizhi Hou , , , Subject: [PATCH V1 1/6] accel/amdxdna: Create shared functions for AIE2 and AIE4 Date: Mon, 30 Mar 2026 09:37:00 -0700 Message-ID: <20260330163705.3153647-2-lizhi.hou@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260330163705.3153647-1-lizhi.hou@amd.com> References: <20260330163705.3153647-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: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636B:EE_|CH2PR12MB4165:EE_ X-MS-Office365-Filtering-Correlation-Id: 39d02fea-4efb-46be-959e-08de8e7a9a7b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700016|376014|56012099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: RFXkRVNYVDCc9uIivQACa3Huv5BTuISjMueWe/9RV9Aktoc1P0WpIY9NCKJY9zHPr8W9zoHlk01nHoglNDhegUTMUtwwqiWSrTRZxgmT0R8W5DpZUAmKigzSmLBk2BAUMl9pFGwOUswb4VTTKyUdzpN4k7WhsEup5IS4JPgYDJKU1lw4D/KHeQOhoWDpmeOSObqGDxDW2+lCxS5WKp40BYcx4TXk+UzgQRsYXwW/K34M0f18kZKryjQYidVGrFEB/Ykj8eYcs1XncCSigq8aV9c0g+rVwitBqkcHmiSl9rHCWYR8+DaoQYilrRrCNE6WweZ1yE55m+xiRo+rb7oadC+W9MrfjauI1zuGd2G1rf0DGLakCokkpYSMdAxKz9XrbkTBm/1UdjGn81nmq5pEKFkM9wqJElkMJDAaGbT51tTIY0j4AILfYYSrLSQ2SYZ/OerBCunN2HwlF2NGdoZMP8t/R+l9mSV3ymO/z4epg7ySk7bzwZs8fVK7wTcFvDgGzJLuxhaa/Zynoxf+V9CSKrjXZKVk5/sSlvBcC7jM95P/hf+eSV0yiVRfblSSBudhX//DCyxC2fV322wvToxS6K4KGh5J+7c3LRT7Kg6daSRrRmavx86YDKAoL43CapEdJiRamOTc0oBeXMAYYt1+D/nthqdCBg1vDiYVV75sTLaeuWMvhco9cnMwZDpptc3qG3AkaeINjlSPMKS3soRj2YpCIuI653rwb9TD5xzaUklHF/fVGGlcdtK6HyEqktcivZ3sWDOHWqpfG5Znpz9Y1g== 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)(36860700016)(376014)(56012099003)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QaQ54Q6d9xOHLSEvSSAJW3qQYwIwBTdqis38hA+ETsFh9R5DkBaZICCPC0NT5j7qjdWMWoIO8KN8uQVaWvgrJcBd8ufBaHE5hiSLnewZk69SuhzJhVG5uTmdTIfn42vZ8lInUoh53szWLPIxiY9SWsAnjjtuKEjjwN4CDSqsPjvsBnkdk6ARTX5OWW7JLHId7z1AgGdQNXqF5EuT/n9esDqnh/aFMXif2UP5+FPGbpTwubKANzwh6bqMcHOk2TRFnfw2Acl/9m7E4rhEJgUtoY4lq1pb7CeMGjfG6sA70qHlrwjtbeFM1x0KtGzHdPvetvcou/b0F2gCQW6fXlYaWPLaK+VW3biFioL4ihvkufqsyI7galdrtflYEpej5b/wGuDGCmWS637IBwVXi07wwy1iuT6g9X0kB3ARuFhWhUsGsdWXx8Q/bYIPA14layLI X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2026 16:37:16.1352 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 39d02fea-4efb-46be-959e-08de8e7a9a7b 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: SN1PEPF0002636B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4165 Content-Type: text/plain; charset="utf-8" The AIE4 platform uses a mailbox management channel mechanism similar to AIE2 to communicate with the firmware. Create aie.h and aie.c and move the functions and structures that can be shared by both platforms from the AIE2-specific files into these common files. This allows AIE2 and AIE4 to reuse the same implementation and reduces code duplication. Signed-off-by: Lizhi Hou Reviewed-by: Mario Limonciello (AMD) --- drivers/accel/amdxdna/Makefile | 1 + drivers/accel/amdxdna/aie.c | 89 +++++++++++++++ drivers/accel/amdxdna/aie.h | 31 ++++++ drivers/accel/amdxdna/aie2_ctx.c | 4 +- drivers/accel/amdxdna/aie2_error.c | 12 +-- drivers/accel/amdxdna/aie2_message.c | 138 +++++++++--------------- drivers/accel/amdxdna/aie2_pci.c | 107 ++++++------------ drivers/accel/amdxdna/aie2_pci.h | 26 +---- drivers/accel/amdxdna/aie2_pm.c | 6 +- drivers/accel/amdxdna/aie2_smu.c | 22 ++-- drivers/accel/amdxdna/amdxdna_pci_drv.h | 8 ++ drivers/accel/amdxdna/npu1_regs.c | 4 +- drivers/accel/amdxdna/npu4_regs.c | 4 +- drivers/accel/amdxdna/npu5_regs.c | 2 +- drivers/accel/amdxdna/npu6_regs.c | 2 +- 15 files changed, 246 insertions(+), 210 deletions(-) create mode 100644 drivers/accel/amdxdna/aie.c create mode 100644 drivers/accel/amdxdna/aie.h diff --git a/drivers/accel/amdxdna/Makefile b/drivers/accel/amdxdna/Makefile index cf9bf19dedb9..5c7911554c46 100644 --- a/drivers/accel/amdxdna/Makefile +++ b/drivers/accel/amdxdna/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only =20 amdxdna-y :=3D \ + aie.o \ aie2_ctx.o \ aie2_error.o \ aie2_message.o \ diff --git a/drivers/accel/amdxdna/aie.c b/drivers/accel/amdxdna/aie.c new file mode 100644 index 000000000000..4b3d4493128e --- /dev/null +++ b/drivers/accel/amdxdna/aie.c @@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2026, Advanced Micro Devices, Inc. + */ + +#include + +#include "aie.h" +#include "amdxdna_mailbox_helper.h" +#include "amdxdna_mailbox.h" +#include "amdxdna_pci_drv.h" + +void aie_dump_mgmt_chann_debug(struct aie_device *aie) +{ + struct amdxdna_dev *xdna =3D aie->xdna; + + XDNA_DBG(xdna, "i2x tail 0x%x", aie->mgmt_i2x.mb_tail_ptr_reg); + XDNA_DBG(xdna, "i2x head 0x%x", aie->mgmt_i2x.mb_head_ptr_reg); + XDNA_DBG(xdna, "i2x ringbuf 0x%x", aie->mgmt_i2x.rb_start_addr); + XDNA_DBG(xdna, "i2x rsize 0x%x", aie->mgmt_i2x.rb_size); + XDNA_DBG(xdna, "x2i tail 0x%x", aie->mgmt_x2i.mb_tail_ptr_reg); + XDNA_DBG(xdna, "x2i head 0x%x", aie->mgmt_x2i.mb_head_ptr_reg); + XDNA_DBG(xdna, "x2i ringbuf 0x%x", aie->mgmt_x2i.rb_start_addr); + XDNA_DBG(xdna, "x2i rsize 0x%x", aie->mgmt_x2i.rb_size); + XDNA_DBG(xdna, "x2i chann index 0x%x", aie->mgmt_chan_idx); + XDNA_DBG(xdna, "mailbox protocol major 0x%x", aie->mgmt_prot_major); + XDNA_DBG(xdna, "mailbox protocol minor 0x%x", aie->mgmt_prot_minor); +} + +void aie_destroy_chann(struct aie_device *aie, struct mailbox_channel **ch= ann) +{ + struct amdxdna_dev *xdna =3D aie->xdna; + + drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock)); + + if (!*chann) + return; + + xdna_mailbox_stop_channel(*chann); + xdna_mailbox_free_channel(*chann); + *chann =3D NULL; +} + +int aie_send_mgmt_msg_wait(struct aie_device *aie, struct xdna_mailbox_msg= *msg) +{ + struct amdxdna_dev *xdna =3D aie->xdna; + struct xdna_notify *hdl =3D msg->handle; + int ret; + + drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock)); + + if (!aie->mgmt_chann) + return -ENODEV; + + ret =3D xdna_send_msg_wait(xdna, aie->mgmt_chann, msg); + if (ret =3D=3D -ETIME) + aie_destroy_chann(aie, &aie->mgmt_chann); + + if (!ret && *hdl->status) { + XDNA_ERR(xdna, "command opcode 0x%x failed, status 0x%x", + msg->opcode, *hdl->data); + ret =3D -EINVAL; + } + + return ret; +} + +int aie_check_protocol(struct aie_device *aie, u32 fw_major, u32 fw_minor) +{ + const struct amdxdna_fw_feature_tbl *feature; + bool found =3D false; + + for (feature =3D aie->xdna->dev_info->fw_feature_tbl; + feature->major; feature++) { + if (feature->major !=3D fw_major) + continue; + if (fw_minor < feature->min_minor) + continue; + if (feature->max_minor > 0 && fw_minor > feature->max_minor) + continue; + + aie->feature_mask |=3D feature->features; + + /* firmware version matches one of the driver support entry */ + found =3D true; + } + + return found ? 0 : -EOPNOTSUPP; +} diff --git a/drivers/accel/amdxdna/aie.h b/drivers/accel/amdxdna/aie.h new file mode 100644 index 000000000000..1bea14b79c7c --- /dev/null +++ b/drivers/accel/amdxdna/aie.h @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2026, Advanced Micro Devices, Inc. + */ +#ifndef _AIE_H_ +#define _AIE_H_ + +#include "amdxdna_pci_drv.h" +#include "amdxdna_mailbox.h" + +struct aie_device { + struct amdxdna_dev *xdna; + struct mailbox_channel *mgmt_chann; + struct xdna_mailbox_chann_res mgmt_x2i; + struct xdna_mailbox_chann_res mgmt_i2x; + u32 mgmt_chan_idx; + u32 mgmt_prot_major; + u32 mgmt_prot_minor; + unsigned long feature_mask; +}; + +#define DECLARE_AIE_MSG(name, op) \ + DECLARE_XDNA_MSG_COMMON(name, op, -1) +#define AIE_FEATURE_ON(aie, feature) test_bit(feature, &(aie)->feature_mas= k) + +void aie_dump_mgmt_chann_debug(struct aie_device *aie); +void aie_destroy_chann(struct aie_device *aie, struct mailbox_channel **ch= ann); +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); + +#endif /* _AIE_H_ */ diff --git a/drivers/accel/amdxdna/aie2_ctx.c b/drivers/accel/amdxdna/aie2_= ctx.c index 66dbbfd322a2..a942ac626d07 100644 --- a/drivers/accel/amdxdna/aie2_ctx.c +++ b/drivers/accel/amdxdna/aie2_ctx.c @@ -525,7 +525,7 @@ static int aie2_alloc_resource(struct amdxdna_hwctx *hw= ctx) struct alloc_requests *xrs_req; int ret; =20 - if (AIE2_FEATURE_ON(xdna->dev_handle, AIE2_TEMPORAL_ONLY)) { + if (AIE_FEATURE_ON(&xdna->dev_handle->aie, AIE2_TEMPORAL_ONLY)) { hwctx->num_unused_col =3D xdna->dev_handle->total_col - hwctx->num_col; hwctx->num_col =3D xdna->dev_handle->total_col; return aie2_create_context(xdna->dev_handle, hwctx); @@ -562,7 +562,7 @@ static void aie2_release_resource(struct amdxdna_hwctx = *hwctx) struct amdxdna_dev *xdna =3D hwctx->client->xdna; int ret; =20 - if (AIE2_FEATURE_ON(xdna->dev_handle, AIE2_TEMPORAL_ONLY)) { + if (AIE_FEATURE_ON(&xdna->dev_handle->aie, AIE2_TEMPORAL_ONLY)) { ret =3D aie2_destroy_context(xdna->dev_handle, hwctx); if (ret && ret !=3D -ENODEV) XDNA_ERR(xdna, "Destroy temporal only context failed, ret %d", ret); diff --git a/drivers/accel/amdxdna/aie2_error.c b/drivers/accel/amdxdna/aie= 2_error.c index 58abb59b6153..9d20e956c020 100644 --- a/drivers/accel/amdxdna/aie2_error.c +++ b/drivers/accel/amdxdna/aie2_error.c @@ -249,12 +249,12 @@ static u32 aie2_error_backtrack(struct amdxdna_dev_hd= l *ndev, void *err_info, u3 enum aie_error_category cat; =20 cat =3D aie_get_error_category(err->row, err->event_id, err->mod_type); - XDNA_ERR(ndev->xdna, "Row: %d, Col: %d, module %d, event ID %d, category= %d", + XDNA_ERR(ndev->aie.xdna, "Row: %d, Col: %d, module %d, event ID %d, cate= gory %d", err->row, err->col, err->mod_type, err->event_id, cat); =20 if (err->col >=3D 32) { - XDNA_WARN(ndev->xdna, "Invalid column number"); + XDNA_WARN(ndev->aie.xdna, "Invalid column number"); break; } =20 @@ -294,7 +294,7 @@ static void aie2_error_worker(struct work_struct *err_w= ork) =20 e =3D container_of(err_work, struct async_event, work); =20 - xdna =3D e->ndev->xdna; + xdna =3D e->ndev->aie.xdna; =20 if (e->resp.status =3D=3D MAX_AIE2_STATUS_CODE) return; @@ -329,7 +329,7 @@ static void aie2_error_worker(struct work_struct *err_w= ork) =20 void aie2_error_async_events_free(struct amdxdna_dev_hdl *ndev) { - struct amdxdna_dev *xdna =3D ndev->xdna; + struct amdxdna_dev *xdna =3D ndev->aie.xdna; struct async_events *events; =20 events =3D ndev->async_events; @@ -344,7 +344,7 @@ void aie2_error_async_events_free(struct amdxdna_dev_hd= l *ndev) =20 int aie2_error_async_events_alloc(struct amdxdna_dev_hdl *ndev) { - struct amdxdna_dev *xdna =3D ndev->xdna; + struct amdxdna_dev *xdna =3D ndev->aie.xdna; u32 total_col =3D ndev->total_col; u32 total_size =3D ASYNC_BUF_SIZE * total_col; struct async_events *events; @@ -402,7 +402,7 @@ int aie2_error_async_events_alloc(struct amdxdna_dev_hd= l *ndev) =20 int aie2_get_array_async_error(struct amdxdna_dev_hdl *ndev, struct amdxdn= a_drm_get_array *args) { - struct amdxdna_dev *xdna =3D ndev->xdna; + struct amdxdna_dev *xdna =3D ndev->aie.xdna; =20 drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock)); =20 diff --git a/drivers/accel/amdxdna/aie2_message.c b/drivers/accel/amdxdna/a= ie2_message.c index a1c546c3e81c..ccf87b1aa1cc 100644 --- a/drivers/accel/amdxdna/aie2_message.c +++ b/drivers/accel/amdxdna/aie2_message.c @@ -16,6 +16,7 @@ #include #include =20 +#include "aie.h" #include "aie2_msg_priv.h" #include "aie2_pci.h" #include "amdxdna_ctx.h" @@ -24,38 +25,12 @@ #include "amdxdna_mailbox_helper.h" #include "amdxdna_pci_drv.h" =20 -#define DECLARE_AIE2_MSG(name, op) \ - DECLARE_XDNA_MSG_COMMON(name, op, MAX_AIE2_STATUS_CODE) - #define EXEC_MSG_OPS(xdna) ((xdna)->dev_handle->exec_msg_ops) =20 -static int aie2_send_mgmt_msg_wait(struct amdxdna_dev_hdl *ndev, - struct xdna_mailbox_msg *msg) -{ - struct amdxdna_dev *xdna =3D ndev->xdna; - struct xdna_notify *hdl =3D msg->handle; - int ret; - - if (!ndev->mgmt_chann) - return -ENODEV; - - ret =3D xdna_send_msg_wait(xdna, ndev->mgmt_chann, msg); - if (ret =3D=3D -ETIME) - aie2_destroy_mgmt_chann(ndev); - - if (!ret && *hdl->status !=3D AIE2_STATUS_SUCCESS) { - XDNA_ERR(xdna, "command opcode 0x%x failed, status 0x%x", - msg->opcode, *hdl->data); - ret =3D -EINVAL; - } - - return ret; -} - void *aie2_alloc_msg_buffer(struct amdxdna_dev_hdl *ndev, u32 *size, dma_addr_t *dma_addr) { - struct amdxdna_dev *xdna =3D ndev->xdna; + struct amdxdna_dev *xdna =3D ndev->aie.xdna; void *vaddr; int order; =20 @@ -79,7 +54,7 @@ void *aie2_alloc_msg_buffer(struct amdxdna_dev_hdl *ndev,= u32 *size, void aie2_free_msg_buffer(struct amdxdna_dev_hdl *ndev, size_t size, void *cpu_addr, dma_addr_t dma_addr) { - struct amdxdna_dev *xdna =3D ndev->xdna; + struct amdxdna_dev *xdna =3D ndev->aie.xdna; =20 if (amdxdna_iova_on(xdna)) { amdxdna_iommu_free(xdna, size, cpu_addr, dma_addr); @@ -91,12 +66,12 @@ void aie2_free_msg_buffer(struct amdxdna_dev_hdl *ndev,= size_t size, =20 int aie2_suspend_fw(struct amdxdna_dev_hdl *ndev) { - DECLARE_AIE2_MSG(suspend, MSG_OP_SUSPEND); + DECLARE_AIE_MSG(suspend, MSG_OP_SUSPEND); int ret; =20 - ret =3D aie2_send_mgmt_msg_wait(ndev, &msg); + ret =3D aie_send_mgmt_msg_wait(&ndev->aie, &msg); if (ret) { - XDNA_ERR(ndev->xdna, "Failed to suspend fw, ret %d", ret); + XDNA_ERR(ndev->aie.xdna, "Failed to suspend fw, ret %d", ret); return ret; } =20 @@ -105,22 +80,22 @@ int aie2_suspend_fw(struct amdxdna_dev_hdl *ndev) =20 int aie2_resume_fw(struct amdxdna_dev_hdl *ndev) { - DECLARE_AIE2_MSG(suspend, MSG_OP_RESUME); + DECLARE_AIE_MSG(suspend, MSG_OP_RESUME); =20 - return aie2_send_mgmt_msg_wait(ndev, &msg); + return aie_send_mgmt_msg_wait(&ndev->aie, &msg); } =20 int aie2_set_runtime_cfg(struct amdxdna_dev_hdl *ndev, u32 type, u64 value) { - DECLARE_AIE2_MSG(set_runtime_cfg, MSG_OP_SET_RUNTIME_CONFIG); + DECLARE_AIE_MSG(set_runtime_cfg, MSG_OP_SET_RUNTIME_CONFIG); int ret; =20 req.type =3D type; req.value =3D value; =20 - ret =3D aie2_send_mgmt_msg_wait(ndev, &msg); + ret =3D aie_send_mgmt_msg_wait(&ndev->aie, &msg); if (ret) { - XDNA_ERR(ndev->xdna, "Failed to set runtime config, ret %d", ret); + XDNA_ERR(ndev->aie.xdna, "Failed to set runtime config, ret %d", ret); return ret; } =20 @@ -129,13 +104,13 @@ int aie2_set_runtime_cfg(struct amdxdna_dev_hdl *ndev= , u32 type, u64 value) =20 int aie2_get_runtime_cfg(struct amdxdna_dev_hdl *ndev, u32 type, u64 *valu= e) { - DECLARE_AIE2_MSG(get_runtime_cfg, MSG_OP_GET_RUNTIME_CONFIG); + DECLARE_AIE_MSG(get_runtime_cfg, MSG_OP_GET_RUNTIME_CONFIG); int ret; =20 req.type =3D type; - ret =3D aie2_send_mgmt_msg_wait(ndev, &msg); + ret =3D aie_send_mgmt_msg_wait(&ndev->aie, &msg); if (ret) { - XDNA_ERR(ndev->xdna, "Failed to get runtime config, ret %d", ret); + XDNA_ERR(ndev->aie.xdna, "Failed to get runtime config, ret %d", ret); return ret; } =20 @@ -145,20 +120,20 @@ int aie2_get_runtime_cfg(struct amdxdna_dev_hdl *ndev= , u32 type, u64 *value) =20 int aie2_assign_mgmt_pasid(struct amdxdna_dev_hdl *ndev, u16 pasid) { - DECLARE_AIE2_MSG(assign_mgmt_pasid, MSG_OP_ASSIGN_MGMT_PASID); + DECLARE_AIE_MSG(assign_mgmt_pasid, MSG_OP_ASSIGN_MGMT_PASID); =20 req.pasid =3D pasid; =20 - return aie2_send_mgmt_msg_wait(ndev, &msg); + return aie_send_mgmt_msg_wait(&ndev->aie, &msg); } =20 int aie2_query_aie_version(struct amdxdna_dev_hdl *ndev, struct aie_versio= n *version) { - DECLARE_AIE2_MSG(aie_version_info, MSG_OP_QUERY_AIE_VERSION); - struct amdxdna_dev *xdna =3D ndev->xdna; + DECLARE_AIE_MSG(aie_version_info, MSG_OP_QUERY_AIE_VERSION); + struct amdxdna_dev *xdna =3D ndev->aie.xdna; int ret; =20 - ret =3D aie2_send_mgmt_msg_wait(ndev, &msg); + ret =3D aie_send_mgmt_msg_wait(&ndev->aie, &msg); if (ret) return ret; =20 @@ -173,10 +148,10 @@ int aie2_query_aie_version(struct amdxdna_dev_hdl *nd= ev, struct aie_version *ver =20 int aie2_query_aie_metadata(struct amdxdna_dev_hdl *ndev, struct aie_metad= ata *metadata) { - DECLARE_AIE2_MSG(aie_tile_info, MSG_OP_QUERY_AIE_TILE_INFO); + DECLARE_AIE_MSG(aie_tile_info, MSG_OP_QUERY_AIE_TILE_INFO); int ret; =20 - ret =3D aie2_send_mgmt_msg_wait(ndev, &msg); + ret =3D aie_send_mgmt_msg_wait(&ndev->aie, &msg); if (ret) return ret; =20 @@ -211,10 +186,10 @@ int aie2_query_aie_metadata(struct amdxdna_dev_hdl *n= dev, struct aie_metadata *m int aie2_query_firmware_version(struct amdxdna_dev_hdl *ndev, struct amdxdna_fw_ver *fw_ver) { - DECLARE_AIE2_MSG(firmware_version, MSG_OP_GET_FIRMWARE_VERSION); + DECLARE_AIE_MSG(firmware_version, MSG_OP_GET_FIRMWARE_VERSION); int ret; =20 - ret =3D aie2_send_mgmt_msg_wait(ndev, &msg); + ret =3D aie_send_mgmt_msg_wait(&ndev->aie, &msg); if (ret) return ret; =20 @@ -228,12 +203,12 @@ int aie2_query_firmware_version(struct amdxdna_dev_hd= l *ndev, =20 static int aie2_destroy_context_req(struct amdxdna_dev_hdl *ndev, u32 id) { - DECLARE_AIE2_MSG(destroy_ctx, MSG_OP_DESTROY_CONTEXT); - struct amdxdna_dev *xdna =3D ndev->xdna; + DECLARE_AIE_MSG(destroy_ctx, MSG_OP_DESTROY_CONTEXT); + struct amdxdna_dev *xdna =3D ndev->aie.xdna; int ret; =20 req.context_id =3D id; - ret =3D aie2_send_mgmt_msg_wait(ndev, &msg); + ret =3D aie_send_mgmt_msg_wait(&ndev->aie, &msg); if (ret && ret !=3D -ENODEV) XDNA_WARN(xdna, "Destroy context failed, ret %d", ret); else if (ret =3D=3D -ENODEV) @@ -245,7 +220,7 @@ static int aie2_destroy_context_req(struct amdxdna_dev_= hdl *ndev, u32 id) static u32 aie2_get_context_priority(struct amdxdna_dev_hdl *ndev, struct amdxdna_hwctx *hwctx) { - if (!AIE2_FEATURE_ON(ndev, AIE2_PREEMPT)) + if (!AIE_FEATURE_ON(&ndev->aie, AIE2_PREEMPT)) return PRIORITY_HIGH; =20 switch (hwctx->qos.priority) { @@ -264,8 +239,8 @@ static u32 aie2_get_context_priority(struct amdxdna_dev= _hdl *ndev, =20 int aie2_create_context(struct amdxdna_dev_hdl *ndev, struct amdxdna_hwctx= *hwctx) { - DECLARE_AIE2_MSG(create_ctx, MSG_OP_CREATE_CONTEXT); - struct amdxdna_dev *xdna =3D ndev->xdna; + DECLARE_AIE_MSG(create_ctx, MSG_OP_CREATE_CONTEXT); + struct amdxdna_dev *xdna =3D ndev->aie.xdna; struct xdna_mailbox_chann_res x2i; struct xdna_mailbox_chann_res i2x; struct cq_pair *cq_pair; @@ -280,7 +255,7 @@ int aie2_create_context(struct amdxdna_dev_hdl *ndev, s= truct amdxdna_hwctx *hwct req.pasid =3D amdxdna_pasid_on(hwctx->client) ? hwctx->client->pasid : 0; req.context_priority =3D aie2_get_context_priority(ndev, hwctx); =20 - ret =3D aie2_send_mgmt_msg_wait(ndev, &msg); + ret =3D aie_send_mgmt_msg_wait(&ndev->aie, &msg); if (ret) return ret; =20 @@ -344,7 +319,7 @@ int aie2_create_context(struct amdxdna_dev_hdl *ndev, s= truct amdxdna_hwctx *hwct =20 int aie2_destroy_context(struct amdxdna_dev_hdl *ndev, struct amdxdna_hwct= x *hwctx) { - struct amdxdna_dev *xdna =3D ndev->xdna; + struct amdxdna_dev *xdna =3D ndev->aie.xdna; int ret; =20 if (!hwctx->priv->mbox_chann) @@ -363,14 +338,14 @@ int aie2_destroy_context(struct amdxdna_dev_hdl *ndev= , struct amdxdna_hwctx *hwc =20 int aie2_map_host_buf(struct amdxdna_dev_hdl *ndev, u32 context_id, u64 ad= dr, u64 size) { - DECLARE_AIE2_MSG(map_host_buffer, MSG_OP_MAP_HOST_BUFFER); - struct amdxdna_dev *xdna =3D ndev->xdna; + DECLARE_AIE_MSG(map_host_buffer, MSG_OP_MAP_HOST_BUFFER); + struct amdxdna_dev *xdna =3D ndev->aie.xdna; int ret; =20 req.context_id =3D context_id; req.buf_addr =3D addr; req.buf_size =3D size; - ret =3D aie2_send_mgmt_msg_wait(ndev, &msg); + ret =3D aie_send_mgmt_msg_wait(&ndev->aie, &msg); if (ret) return ret; =20 @@ -392,8 +367,8 @@ static int amdxdna_hwctx_col_map(struct amdxdna_hwctx *= hwctx, void *arg) int aie2_query_status(struct amdxdna_dev_hdl *ndev, char __user *buf, u32 size, u32 *cols_filled) { - DECLARE_AIE2_MSG(aie_column_info, MSG_OP_QUERY_COL_STATUS); - struct amdxdna_dev *xdna =3D ndev->xdna; + DECLARE_AIE_MSG(aie_column_info, MSG_OP_QUERY_COL_STATUS); + struct amdxdna_dev *xdna =3D ndev->aie.xdna; u32 buf_sz =3D size, aie_bitmap =3D 0; struct amdxdna_client *client; dma_addr_t dma_addr; @@ -415,7 +390,7 @@ int aie2_query_status(struct amdxdna_dev_hdl *ndev, cha= r __user *buf, req.aie_bitmap =3D aie_bitmap; =20 drm_clflush_virt_range(buff_addr, size); /* device can access */ - ret =3D aie2_send_mgmt_msg_wait(ndev, &msg); + ret =3D aie_send_mgmt_msg_wait(&ndev->aie, &msg); if (ret) { XDNA_ERR(xdna, "Error during NPU query, status %d", ret); goto fail; @@ -446,8 +421,8 @@ int aie2_query_telemetry(struct amdxdna_dev_hdl *ndev, char __user *buf, u32 size, struct amdxdna_drm_query_telemetry_header *header) { - DECLARE_AIE2_MSG(get_telemetry, MSG_OP_GET_TELEMETRY); - struct amdxdna_dev *xdna =3D ndev->xdna; + DECLARE_AIE_MSG(get_telemetry, MSG_OP_GET_TELEMETRY); + struct amdxdna_dev *xdna =3D ndev->aie.xdna; dma_addr_t dma_addr; u32 buf_sz =3D size; u8 *addr; @@ -465,7 +440,7 @@ int aie2_query_telemetry(struct amdxdna_dev_hdl *ndev, req.type =3D header->type; =20 drm_clflush_virt_range(addr, size); /* device can access */ - ret =3D aie2_send_mgmt_msg_wait(ndev, &msg); + ret =3D aie_send_mgmt_msg_wait(&ndev->aie, &msg); if (ret) { XDNA_ERR(xdna, "Query telemetry failed, status %d", ret); goto free_buf; @@ -506,8 +481,8 @@ int aie2_register_asyn_event_msg(struct amdxdna_dev_hdl= *ndev, dma_addr_t addr, req.buf_addr =3D addr; req.buf_size =3D size; =20 - XDNA_DBG(ndev->xdna, "Register addr 0x%llx size 0x%x", addr, size); - return xdna_mailbox_send_msg(ndev->mgmt_chann, &msg, TX_TIMEOUT); + XDNA_DBG(ndev->aie.xdna, "Register addr 0x%llx size 0x%x", addr, size); + return xdna_mailbox_send_msg(ndev->aie.mgmt_chann, &msg, TX_TIMEOUT); } =20 int aie2_config_cu(struct amdxdna_hwctx *hwctx, @@ -866,7 +841,6 @@ static int aie2_init_exec_req(void *req, struct amdxdna= _gem_obj *cmd_abo, int ret; u32 op; =20 - op =3D amdxdna_cmd_get_op(cmd_abo); switch (op) { case ERT_START_CU: @@ -915,12 +889,12 @@ aie2_cmdlist_fill_slot(void *slot, struct amdxdna_gem= _obj *cmd_abo, ret =3D EXEC_MSG_OPS(xdna)->fill_dpu_slot(cmd_abo, slot, size); break; case ERT_START_NPU_PREEMPT: - if (!AIE2_FEATURE_ON(xdna->dev_handle, AIE2_PREEMPT)) + if (!AIE_FEATURE_ON(&xdna->dev_handle->aie, AIE2_PREEMPT)) return -EOPNOTSUPP; ret =3D EXEC_MSG_OPS(xdna)->fill_preempt_slot(cmd_abo, slot, size); break; case ERT_START_NPU_PREEMPT_ELF: - if (!AIE2_FEATURE_ON(xdna->dev_handle, AIE2_PREEMPT)) + if (!AIE_FEATURE_ON(&xdna->dev_handle->aie, AIE2_PREEMPT)) return -EOPNOTSUPP; ret =3D EXEC_MSG_OPS(xdna)->fill_elf_slot(cmd_abo, slot, size); break; @@ -935,26 +909,12 @@ aie2_cmdlist_fill_slot(void *slot, struct amdxdna_gem= _obj *cmd_abo, =20 void aie2_msg_init(struct amdxdna_dev_hdl *ndev) { - if (AIE2_FEATURE_ON(ndev, AIE2_NPU_COMMAND)) + if (AIE_FEATURE_ON(&ndev->aie, AIE2_NPU_COMMAND)) ndev->exec_msg_ops =3D &npu_exec_message_ops; else ndev->exec_msg_ops =3D &legacy_exec_message_ops; } =20 -void aie2_destroy_mgmt_chann(struct amdxdna_dev_hdl *ndev) -{ - struct amdxdna_dev *xdna =3D ndev->xdna; - - drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock)); - - if (!ndev->mgmt_chann) - return; - - xdna_mailbox_stop_channel(ndev->mgmt_chann); - xdna_mailbox_free_channel(ndev->mgmt_chann); - ndev->mgmt_chann =3D NULL; -} - static inline struct amdxdna_gem_obj * aie2_cmdlist_get_cmd_buf(struct amdxdna_sched_job *job) { @@ -1199,14 +1159,14 @@ int aie2_config_debug_bo(struct amdxdna_hwctx *hwct= x, struct amdxdna_sched_job * int aie2_query_app_health(struct amdxdna_dev_hdl *ndev, u32 context_id, struct app_health_report *report) { - DECLARE_AIE2_MSG(get_app_health, MSG_OP_GET_APP_HEALTH); - struct amdxdna_dev *xdna =3D ndev->xdna; + DECLARE_AIE_MSG(get_app_health, MSG_OP_GET_APP_HEALTH); + struct amdxdna_dev *xdna =3D ndev->aie.xdna; struct app_health_report *buf; dma_addr_t dma_addr; u32 buf_size; int ret; =20 - if (!AIE2_FEATURE_ON(ndev, AIE2_APP_HEALTH)) { + if (!AIE_FEATURE_ON(&ndev->aie, AIE2_APP_HEALTH)) { XDNA_DBG(xdna, "App health feature not supported"); return -EOPNOTSUPP; } @@ -1223,7 +1183,7 @@ int aie2_query_app_health(struct amdxdna_dev_hdl *nde= v, u32 context_id, req.buf_size =3D buf_size; =20 drm_clflush_virt_range(buf, sizeof(*report)); - ret =3D aie2_send_mgmt_msg_wait(ndev, &msg); + ret =3D aie_send_mgmt_msg_wait(&ndev->aie, &msg); if (ret) { XDNA_ERR(xdna, "Get app health failed, ret %d status 0x%x", ret, resp.st= atus); goto free_buf; diff --git a/drivers/accel/amdxdna/aie2_pci.c b/drivers/accel/amdxdna/aie2_= pci.c index f1ac4e00bd9f..03bac963516d 100644 --- a/drivers/accel/amdxdna/aie2_pci.c +++ b/drivers/accel/amdxdna/aie2_pci.c @@ -60,45 +60,6 @@ struct mgmt_mbox_chann_info { __u32 rsvd[4]; }; =20 -static int aie2_check_protocol(struct amdxdna_dev_hdl *ndev, u32 fw_major,= u32 fw_minor) -{ - const struct aie2_fw_feature_tbl *feature; - bool found =3D false; - - for (feature =3D ndev->priv->fw_feature_tbl; feature->major; feature++) { - if (feature->major !=3D fw_major) - continue; - if (fw_minor < feature->min_minor) - continue; - if (feature->max_minor > 0 && fw_minor > feature->max_minor) - continue; - - ndev->feature_mask |=3D feature->features; - - /* firmware version matches one of the driver support entry */ - found =3D true; - } - - return found ? 0 : -EOPNOTSUPP; -} - -static void aie2_dump_chann_info_debug(struct amdxdna_dev_hdl *ndev) -{ - struct amdxdna_dev *xdna =3D ndev->xdna; - - XDNA_DBG(xdna, "i2x tail 0x%x", ndev->mgmt_i2x.mb_tail_ptr_reg); - XDNA_DBG(xdna, "i2x head 0x%x", ndev->mgmt_i2x.mb_head_ptr_reg); - XDNA_DBG(xdna, "i2x ringbuf 0x%x", ndev->mgmt_i2x.rb_start_addr); - XDNA_DBG(xdna, "i2x rsize 0x%x", ndev->mgmt_i2x.rb_size); - XDNA_DBG(xdna, "x2i tail 0x%x", ndev->mgmt_x2i.mb_tail_ptr_reg); - XDNA_DBG(xdna, "x2i head 0x%x", ndev->mgmt_x2i.mb_head_ptr_reg); - XDNA_DBG(xdna, "x2i ringbuf 0x%x", ndev->mgmt_x2i.rb_start_addr); - XDNA_DBG(xdna, "x2i rsize 0x%x", ndev->mgmt_x2i.rb_size); - XDNA_DBG(xdna, "x2i chann index 0x%x", ndev->mgmt_chan_idx); - XDNA_DBG(xdna, "mailbox protocol major 0x%x", ndev->mgmt_prot_major); - XDNA_DBG(xdna, "mailbox protocol minor 0x%x", ndev->mgmt_prot_minor); -} - static int aie2_get_mgmt_chann_info(struct amdxdna_dev_hdl *ndev) { struct mgmt_mbox_chann_info info_regs; @@ -128,13 +89,13 @@ static int aie2_get_mgmt_chann_info(struct amdxdna_dev= _hdl *ndev) reg[i] =3D readl(ndev->sram_base + off + i * sizeof(u32)); =20 if (info_regs.magic !=3D MGMT_MBOX_MAGIC) { - XDNA_ERR(ndev->xdna, "Invalid mbox magic 0x%x", info_regs.magic); + XDNA_ERR(ndev->aie.xdna, "Invalid mbox magic 0x%x", info_regs.magic); ret =3D -EINVAL; goto done; } =20 - i2x =3D &ndev->mgmt_i2x; - x2i =3D &ndev->mgmt_x2i; + i2x =3D &ndev->aie.mgmt_i2x; + x2i =3D &ndev->aie.mgmt_x2i; =20 i2x->mb_head_ptr_reg =3D AIE2_MBOX_OFF(ndev, info_regs.i2x_head); i2x->mb_tail_ptr_reg =3D AIE2_MBOX_OFF(ndev, info_regs.i2x_tail); @@ -146,14 +107,15 @@ static int aie2_get_mgmt_chann_info(struct amdxdna_de= v_hdl *ndev) x2i->rb_start_addr =3D AIE2_SRAM_OFF(ndev, info_regs.x2i_buf); x2i->rb_size =3D info_regs.x2i_buf_sz; =20 - ndev->mgmt_chan_idx =3D info_regs.msi_id; - ndev->mgmt_prot_major =3D info_regs.prot_major; - ndev->mgmt_prot_minor =3D info_regs.prot_minor; + ndev->aie.mgmt_chan_idx =3D info_regs.msi_id; + ndev->aie.mgmt_prot_major =3D info_regs.prot_major; + ndev->aie.mgmt_prot_minor =3D info_regs.prot_minor; =20 - ret =3D aie2_check_protocol(ndev, ndev->mgmt_prot_major, ndev->mgmt_prot_= minor); + ret =3D aie_check_protocol(&ndev->aie, ndev->aie.mgmt_prot_major, + ndev->aie.mgmt_prot_minor); =20 done: - aie2_dump_chann_info_debug(ndev); + aie_dump_mgmt_chann_debug(&ndev->aie); =20 /* Must clear address at FW_ALIVE_OFF */ writel(0, SRAM_GET_ADDR(ndev, FW_ALIVE_OFF)); @@ -173,13 +135,14 @@ int aie2_runtime_cfg(struct amdxdna_dev_hdl *ndev, continue; =20 if (cfg->feature_mask && - bitmap_subset(&cfg->feature_mask, &ndev->feature_mask, AIE2_FEATURE_= MAX)) + bitmap_subset(&cfg->feature_mask, &ndev->aie.feature_mask, + AIE2_FEATURE_MAX)) continue; =20 value =3D val ? *val : cfg->value; ret =3D aie2_set_runtime_cfg(ndev, cfg->type, value); if (ret) { - XDNA_ERR(ndev->xdna, "Set type %d value %d failed", + XDNA_ERR(ndev->aie.xdna, "Set type %d value %d failed", cfg->type, value); return ret; } @@ -194,13 +157,13 @@ static int aie2_xdna_reset(struct amdxdna_dev_hdl *nd= ev) =20 ret =3D aie2_suspend_fw(ndev); if (ret) { - XDNA_ERR(ndev->xdna, "Suspend firmware failed"); + XDNA_ERR(ndev->aie.xdna, "Suspend firmware failed"); return ret; } =20 ret =3D aie2_resume_fw(ndev); if (ret) { - XDNA_ERR(ndev->xdna, "Resume firmware failed"); + XDNA_ERR(ndev->aie.xdna, "Resume firmware failed"); return ret; } =20 @@ -213,19 +176,19 @@ static int aie2_mgmt_fw_init(struct amdxdna_dev_hdl *= ndev) =20 ret =3D aie2_runtime_cfg(ndev, AIE2_RT_CFG_INIT, NULL); if (ret) { - XDNA_ERR(ndev->xdna, "Runtime config failed"); + XDNA_ERR(ndev->aie.xdna, "Runtime config failed"); return ret; } =20 ret =3D aie2_assign_mgmt_pasid(ndev, 0); if (ret) { - XDNA_ERR(ndev->xdna, "Can not assign PASID"); + XDNA_ERR(ndev->aie.xdna, "Can not assign PASID"); return ret; } =20 ret =3D aie2_xdna_reset(ndev); if (ret) { - XDNA_ERR(ndev->xdna, "Reset firmware failed"); + XDNA_ERR(ndev->aie.xdna, "Reset firmware failed"); return ret; } =20 @@ -236,21 +199,21 @@ static int aie2_mgmt_fw_query(struct amdxdna_dev_hdl = *ndev) { int ret; =20 - ret =3D aie2_query_firmware_version(ndev, &ndev->xdna->fw_ver); + ret =3D aie2_query_firmware_version(ndev, &ndev->aie.xdna->fw_ver); if (ret) { - XDNA_ERR(ndev->xdna, "query firmware version failed"); + XDNA_ERR(ndev->aie.xdna, "query firmware version failed"); return ret; } =20 ret =3D aie2_query_aie_version(ndev, &ndev->version); if (ret) { - XDNA_ERR(ndev->xdna, "Query AIE version failed"); + XDNA_ERR(ndev->aie.xdna, "Query AIE version failed"); return ret; } =20 ret =3D aie2_query_aie_metadata(ndev, &ndev->metadata); if (ret) { - XDNA_ERR(ndev->xdna, "Query AIE metadata failed"); + XDNA_ERR(ndev->aie.xdna, "Query AIE metadata failed"); return ret; } =20 @@ -262,8 +225,8 @@ static int aie2_mgmt_fw_query(struct amdxdna_dev_hdl *n= dev) static void aie2_mgmt_fw_fini(struct amdxdna_dev_hdl *ndev) { if (aie2_suspend_fw(ndev)) - XDNA_ERR(ndev->xdna, "Suspend_fw failed"); - XDNA_DBG(ndev->xdna, "Firmware suspended"); + XDNA_ERR(ndev->aie.xdna, "Suspend_fw failed"); + XDNA_DBG(ndev->aie.xdna, "Firmware suspended"); } =20 static int aie2_xrs_load(void *cb_arg, struct xrs_action_load *action) @@ -331,7 +294,7 @@ static void aie2_hw_stop(struct amdxdna_dev *xdna) =20 aie2_runtime_cfg(ndev, AIE2_RT_CFG_CLK_GATING, NULL); aie2_mgmt_fw_fini(ndev); - aie2_destroy_mgmt_chann(ndev); + aie_destroy_chann(&ndev->aie, &ndev->aie.mgmt_chann); drmm_kfree(&xdna->ddev, ndev->mbox); ndev->mbox =3D NULL; aie2_psp_stop(ndev->psp_hdl); @@ -374,8 +337,8 @@ static int aie2_hw_start(struct amdxdna_dev *xdna) goto disable_dev; } =20 - ndev->mgmt_chann =3D xdna_mailbox_alloc_channel(ndev->mbox); - if (!ndev->mgmt_chann) { + ndev->aie.mgmt_chann =3D xdna_mailbox_alloc_channel(ndev->mbox); + if (!ndev->aie.mgmt_chann) { XDNA_ERR(xdna, "failed to alloc channel"); ret =3D -ENODEV; goto disable_dev; @@ -399,17 +362,17 @@ static int aie2_hw_start(struct amdxdna_dev *xdna) goto stop_psp; } =20 - mgmt_mb_irq =3D pci_irq_vector(pdev, ndev->mgmt_chan_idx); + mgmt_mb_irq =3D pci_irq_vector(pdev, ndev->aie.mgmt_chan_idx); if (mgmt_mb_irq < 0) { ret =3D mgmt_mb_irq; XDNA_ERR(xdna, "failed to alloc irq vector, ret %d", ret); goto stop_psp; } =20 - xdna_mailbox_intr_reg =3D ndev->mgmt_i2x.mb_head_ptr_reg + 4; - ret =3D xdna_mailbox_start_channel(ndev->mgmt_chann, - &ndev->mgmt_x2i, - &ndev->mgmt_i2x, + xdna_mailbox_intr_reg =3D ndev->aie.mgmt_i2x.mb_head_ptr_reg + 4; + ret =3D xdna_mailbox_start_channel(ndev->aie.mgmt_chann, + &ndev->aie.mgmt_x2i, + &ndev->aie.mgmt_i2x, xdna_mailbox_intr_reg, mgmt_mb_irq); if (ret) { @@ -448,14 +411,14 @@ static int aie2_hw_start(struct amdxdna_dev *xdna) =20 stop_fw: aie2_suspend_fw(ndev); - xdna_mailbox_stop_channel(ndev->mgmt_chann); + xdna_mailbox_stop_channel(ndev->aie.mgmt_chann); stop_psp: aie2_psp_stop(ndev->psp_hdl); fini_smu: aie2_smu_fini(ndev); free_channel: - xdna_mailbox_free_channel(ndev->mgmt_chann); - ndev->mgmt_chann =3D NULL; + xdna_mailbox_free_channel(ndev->aie.mgmt_chann); + ndev->aie.mgmt_chann =3D NULL; disable_dev: pci_disable_device(pdev); =20 @@ -516,7 +479,7 @@ static int aie2_init(struct amdxdna_dev *xdna) return -ENOMEM; =20 ndev->priv =3D xdna->dev_info->dev_priv; - ndev->xdna =3D xdna; + ndev->aie.xdna =3D xdna; =20 for (i =3D 0; i < ARRAY_SIZE(npu_fw); i++) { fw_full_path =3D kasprintf(GFP_KERNEL, "%s%s", ndev->priv->fw_path, npu_= fw[i]); diff --git a/drivers/accel/amdxdna/aie2_pci.h b/drivers/accel/amdxdna/aie2_= pci.h index efcf4be035f0..90fb0aafaf40 100644 --- a/drivers/accel/amdxdna/aie2_pci.h +++ b/drivers/accel/amdxdna/aie2_pci.h @@ -10,6 +10,7 @@ #include #include =20 +#include "aie.h" #include "aie2_msg_priv.h" #include "amdxdna_mailbox.h" =20 @@ -20,7 +21,7 @@ #define AIE2_DEVM_BASE 0x4000000 #define AIE2_DEVM_SIZE SZ_64M =20 -#define NDEV2PDEV(ndev) (to_pci_dev((ndev)->xdna->ddev.dev)) +#define NDEV2PDEV(ndev) (to_pci_dev((ndev)->aie.xdna->ddev.dev)) =20 #define AIE2_SRAM_OFF(ndev, addr) ((addr) - (ndev)->priv->sram_dev_addr) #define AIE2_MBOX_OFF(ndev, addr) ((addr) - (ndev)->priv->mbox_dev_addr) @@ -45,7 +46,7 @@ ({ \ typeof(ndev) _ndev =3D (ndev); \ ((_ndev)->priv->mbox_size) ? (_ndev)->priv->mbox_size : \ - pci_resource_len(NDEV2PDEV(_ndev), (_ndev)->xdna->dev_info->mbox_bar); \ + pci_resource_len(NDEV2PDEV(_ndev), (_ndev)->aie.xdna->dev_info->mbox_bar)= ; \ }) =20 #if IS_ENABLED(CONFIG_AMD_PMF) @@ -203,23 +204,16 @@ struct aie2_exec_msg_ops { }; =20 struct amdxdna_dev_hdl { - struct amdxdna_dev *xdna; + struct aie_device aie; const struct amdxdna_dev_priv *priv; void __iomem *sram_base; void __iomem *smu_base; void __iomem *mbox_base; struct psp_device *psp_hdl; =20 - struct xdna_mailbox_chann_res mgmt_x2i; - struct xdna_mailbox_chann_res mgmt_i2x; - u32 mgmt_chan_idx; - u32 mgmt_prot_major; - u32 mgmt_prot_minor; - u32 total_col; struct aie_version version; struct aie_metadata metadata; - unsigned long feature_mask; struct aie2_exec_msg_ops *exec_msg_ops; =20 /* power management and clock*/ @@ -237,7 +231,6 @@ struct amdxdna_dev_hdl { =20 /* Mailbox and the management channel */ struct mailbox *mbox; - struct mailbox_channel *mgmt_chann; struct async_events *async_events; =20 enum aie2_dev_status dev_status; @@ -266,21 +259,12 @@ enum aie2_fw_feature { AIE2_FEATURE_MAX }; =20 -struct aie2_fw_feature_tbl { - u64 features; - u32 major; - u32 max_minor; - u32 min_minor; -}; - #define AIE2_ALL_FEATURES GENMASK_ULL(AIE2_FEATURE_MAX - 1, AIE2_NPU_COMMA= ND) -#define AIE2_FEATURE_ON(ndev, feature) test_bit(feature, &(ndev)->feature_= mask) =20 struct amdxdna_dev_priv { const char *fw_path; const struct rt_config *rt_config; const struct dpm_clk_freq *dpm_clk_tbl; - const struct aie2_fw_feature_tbl *fw_feature_tbl; =20 #define COL_ALIGN_NONE 0 #define COL_ALIGN_NATURE 1 @@ -306,7 +290,7 @@ extern const struct dpm_clk_freq npu1_dpm_clk_table[]; extern const struct dpm_clk_freq npu4_dpm_clk_table[]; extern const struct rt_config npu1_default_rt_cfg[]; extern const struct rt_config npu4_default_rt_cfg[]; -extern const struct aie2_fw_feature_tbl npu4_fw_feature_table[]; +extern const struct amdxdna_fw_feature_tbl npu4_fw_feature_table[]; =20 /* aie2_smu.c */ int aie2_smu_init(struct amdxdna_dev_hdl *ndev); diff --git a/drivers/accel/amdxdna/aie2_pm.c b/drivers/accel/amdxdna/aie2_p= m.c index 29bd4403a94d..5ec6728d04fd 100644 --- a/drivers/accel/amdxdna/aie2_pm.c +++ b/drivers/accel/amdxdna/aie2_pm.c @@ -31,14 +31,14 @@ int aie2_pm_set_dpm(struct amdxdna_dev_hdl *ndev, u32 d= pm_level) { int ret; =20 - ret =3D amdxdna_pm_resume_get_locked(ndev->xdna); + ret =3D amdxdna_pm_resume_get_locked(ndev->aie.xdna); if (ret) return ret; =20 ret =3D ndev->priv->hw_ops.set_dpm(ndev, dpm_level); if (!ret) ndev->dpm_level =3D dpm_level; - amdxdna_pm_suspend_put(ndev->xdna); + amdxdna_pm_suspend_put(ndev->aie.xdna); =20 return ret; } @@ -81,7 +81,7 @@ int aie2_pm_init(struct amdxdna_dev_hdl *ndev) =20 int aie2_pm_set_mode(struct amdxdna_dev_hdl *ndev, enum amdxdna_power_mode= _type target) { - struct amdxdna_dev *xdna =3D ndev->xdna; + struct amdxdna_dev *xdna =3D ndev->aie.xdna; u32 clk_gating, dpm_level; int ret; =20 diff --git a/drivers/accel/amdxdna/aie2_smu.c b/drivers/accel/amdxdna/aie2_= smu.c index d8c31924e501..727637dac3a8 100644 --- a/drivers/accel/amdxdna/aie2_smu.c +++ b/drivers/accel/amdxdna/aie2_smu.c @@ -46,7 +46,7 @@ static int aie2_smu_exec(struct amdxdna_dev_hdl *ndev, u3= 2 reg_cmd, ret =3D readx_poll_timeout(readl, SMU_REG(ndev, SMU_RESP_REG), resp, resp, AIE2_INTERVAL, AIE2_TIMEOUT); if (ret) { - XDNA_ERR(ndev->xdna, "smu cmd %d timed out", reg_cmd); + XDNA_ERR(ndev->aie.xdna, "smu cmd %d timed out", reg_cmd); return ret; } =20 @@ -54,7 +54,7 @@ static int aie2_smu_exec(struct amdxdna_dev_hdl *ndev, u3= 2 reg_cmd, *out =3D readl(SMU_REG(ndev, SMU_OUT_REG)); =20 if (resp !=3D SMU_RESULT_OK) { - XDNA_ERR(ndev->xdna, "smu cmd %d failed, 0x%x", reg_cmd, resp); + XDNA_ERR(ndev->aie.xdna, "smu cmd %d failed, 0x%x", reg_cmd, resp); return -EINVAL; } =20 @@ -69,7 +69,7 @@ int npu1_set_dpm(struct amdxdna_dev_hdl *ndev, u32 dpm_le= vel) ret =3D aie2_smu_exec(ndev, AIE2_SMU_SET_MPNPUCLK_FREQ, ndev->priv->dpm_clk_tbl[dpm_level].npuclk, &freq); if (ret) { - XDNA_ERR(ndev->xdna, "Set npu clock to %d failed, ret %d\n", + XDNA_ERR(ndev->aie.xdna, "Set npu clock to %d failed, ret %d\n", ndev->priv->dpm_clk_tbl[dpm_level].npuclk, ret); return ret; } @@ -78,7 +78,7 @@ int npu1_set_dpm(struct amdxdna_dev_hdl *ndev, u32 dpm_le= vel) ret =3D aie2_smu_exec(ndev, AIE2_SMU_SET_HCLK_FREQ, ndev->priv->dpm_clk_tbl[dpm_level].hclk, &freq); if (ret) { - XDNA_ERR(ndev->xdna, "Set h clock to %d failed, ret %d\n", + XDNA_ERR(ndev->aie.xdna, "Set h clock to %d failed, ret %d\n", ndev->priv->dpm_clk_tbl[dpm_level].hclk, ret); return ret; } @@ -87,7 +87,7 @@ int npu1_set_dpm(struct amdxdna_dev_hdl *ndev, u32 dpm_le= vel) ndev->max_tops =3D 2 * ndev->total_col; ndev->curr_tops =3D ndev->max_tops * freq / 1028; =20 - XDNA_DBG(ndev->xdna, "MP-NPU clock %d, H clock %d\n", + XDNA_DBG(ndev->aie.xdna, "MP-NPU clock %d, H clock %d\n", ndev->npuclk_freq, ndev->hclk_freq); =20 return 0; @@ -99,14 +99,14 @@ int npu4_set_dpm(struct amdxdna_dev_hdl *ndev, u32 dpm_= level) =20 ret =3D aie2_smu_exec(ndev, AIE2_SMU_SET_HARD_DPMLEVEL, dpm_level, NULL); if (ret) { - XDNA_ERR(ndev->xdna, "Set hard dpm level %d failed, ret %d ", + XDNA_ERR(ndev->aie.xdna, "Set hard dpm level %d failed, ret %d ", dpm_level, ret); return ret; } =20 ret =3D aie2_smu_exec(ndev, AIE2_SMU_SET_SOFT_DPMLEVEL, dpm_level, NULL); if (ret) { - XDNA_ERR(ndev->xdna, "Set soft dpm level %d failed, ret %d", + XDNA_ERR(ndev->aie.xdna, "Set soft dpm level %d failed, ret %d", dpm_level, ret); return ret; } @@ -116,7 +116,7 @@ int npu4_set_dpm(struct amdxdna_dev_hdl *ndev, u32 dpm_= level) ndev->max_tops =3D NPU4_DPM_TOPS(ndev, ndev->max_dpm_level); ndev->curr_tops =3D NPU4_DPM_TOPS(ndev, dpm_level); =20 - XDNA_DBG(ndev->xdna, "MP-NPU clock %d, H clock %d\n", + XDNA_DBG(ndev->aie.xdna, "MP-NPU clock %d, H clock %d\n", ndev->npuclk_freq, ndev->hclk_freq); =20 return 0; @@ -132,13 +132,13 @@ int aie2_smu_init(struct amdxdna_dev_hdl *ndev) */ ret =3D aie2_smu_exec(ndev, AIE2_SMU_POWER_OFF, 0, NULL); if (ret) { - XDNA_ERR(ndev->xdna, "Access power failed, ret %d", ret); + XDNA_ERR(ndev->aie.xdna, "Access power failed, ret %d", ret); return ret; } =20 ret =3D aie2_smu_exec(ndev, AIE2_SMU_POWER_ON, 0, NULL); if (ret) { - XDNA_ERR(ndev->xdna, "Power on failed, ret %d", ret); + XDNA_ERR(ndev->aie.xdna, "Power on failed, ret %d", ret); return ret; } =20 @@ -152,5 +152,5 @@ void aie2_smu_fini(struct amdxdna_dev_hdl *ndev) ndev->priv->hw_ops.set_dpm(ndev, 0); ret =3D aie2_smu_exec(ndev, AIE2_SMU_POWER_OFF, 0, NULL); if (ret) - XDNA_ERR(ndev->xdna, "Power off failed, ret %d", ret); + XDNA_ERR(ndev->aie.xdna, "Power off failed, ret %d", ret); } diff --git a/drivers/accel/amdxdna/amdxdna_pci_drv.h b/drivers/accel/amdxdn= a/amdxdna_pci_drv.h index 0661749917d6..5e0bf565a1ae 100644 --- a/drivers/accel/amdxdna/amdxdna_pci_drv.h +++ b/drivers/accel/amdxdna/amdxdna_pci_drv.h @@ -66,6 +66,13 @@ struct amdxdna_dev_ops { int (*get_array)(struct amdxdna_client *client, struct amdxdna_drm_get_ar= ray *args); }; =20 +struct amdxdna_fw_feature_tbl { + u64 features; + u32 major; + u32 max_minor; + u32 min_minor; +}; + /* * struct amdxdna_dev_info - Device hardware information * Record device static information, like reg, mbox, PSP, SMU bar index @@ -83,6 +90,7 @@ struct amdxdna_dev_info { size_t dev_mem_size; char *vbnv; const struct amdxdna_dev_priv *dev_priv; + const struct amdxdna_fw_feature_tbl *fw_feature_tbl; const struct amdxdna_dev_ops *ops; }; =20 diff --git a/drivers/accel/amdxdna/npu1_regs.c b/drivers/accel/amdxdna/npu1= _regs.c index 1320e924e548..2ea7568a2e99 100644 --- a/drivers/accel/amdxdna/npu1_regs.c +++ b/drivers/accel/amdxdna/npu1_regs.c @@ -65,7 +65,7 @@ const struct dpm_clk_freq npu1_dpm_clk_table[] =3D { { 0 } }; =20 -static const struct aie2_fw_feature_tbl npu1_fw_feature_table[] =3D { +static const struct amdxdna_fw_feature_tbl npu1_fw_feature_table[] =3D { { .major =3D 5, .min_minor =3D 7 }, { .features =3D BIT_U64(AIE2_NPU_COMMAND), .major =3D 5, .min_minor =3D 8= }, { 0 } @@ -75,7 +75,6 @@ static const struct amdxdna_dev_priv npu1_dev_priv =3D { .fw_path =3D "amdnpu/1502_00/", .rt_config =3D npu1_default_rt_cfg, .dpm_clk_tbl =3D npu1_dpm_clk_table, - .fw_feature_tbl =3D npu1_fw_feature_table, .col_align =3D COL_ALIGN_NONE, .mbox_dev_addr =3D NPU1_MBOX_BAR_BASE, .mbox_size =3D 0, /* Use BAR size */ @@ -120,5 +119,6 @@ const struct amdxdna_dev_info dev_npu1_info =3D { .vbnv =3D "RyzenAI-npu1", .device_type =3D AMDXDNA_DEV_TYPE_KMQ, .dev_priv =3D &npu1_dev_priv, + .fw_feature_tbl =3D npu1_fw_feature_table, .ops =3D &aie2_ops, }; diff --git a/drivers/accel/amdxdna/npu4_regs.c b/drivers/accel/amdxdna/npu4= _regs.c index 619bff042e52..9689c56c83be 100644 --- a/drivers/accel/amdxdna/npu4_regs.c +++ b/drivers/accel/amdxdna/npu4_regs.c @@ -88,7 +88,7 @@ const struct dpm_clk_freq npu4_dpm_clk_table[] =3D { { 0 } }; =20 -const struct aie2_fw_feature_tbl npu4_fw_feature_table[] =3D { +const struct amdxdna_fw_feature_tbl npu4_fw_feature_table[] =3D { { .major =3D 6, .min_minor =3D 12 }, { .features =3D BIT_U64(AIE2_NPU_COMMAND), .major =3D 6, .min_minor =3D 1= 5 }, { .features =3D BIT_U64(AIE2_PREEMPT), .major =3D 6, .min_minor =3D 12 }, @@ -102,7 +102,6 @@ static const struct amdxdna_dev_priv npu4_dev_priv =3D { .fw_path =3D "amdnpu/17f0_10/", .rt_config =3D npu4_default_rt_cfg, .dpm_clk_tbl =3D npu4_dpm_clk_table, - .fw_feature_tbl =3D npu4_fw_feature_table, .col_align =3D COL_ALIGN_NATURE, .mbox_dev_addr =3D NPU4_MBOX_BAR_BASE, .mbox_size =3D 0, /* Use BAR size */ @@ -147,5 +146,6 @@ const struct amdxdna_dev_info dev_npu4_info =3D { .vbnv =3D "RyzenAI-npu4", .device_type =3D AMDXDNA_DEV_TYPE_KMQ, .dev_priv =3D &npu4_dev_priv, + .fw_feature_tbl =3D npu4_fw_feature_table, .ops =3D &aie2_ops, /* NPU4 can share NPU1's callback */ }; diff --git a/drivers/accel/amdxdna/npu5_regs.c b/drivers/accel/amdxdna/npu5= _regs.c index c0ac5daf32ee..98ee8780f3f5 100644 --- a/drivers/accel/amdxdna/npu5_regs.c +++ b/drivers/accel/amdxdna/npu5_regs.c @@ -66,7 +66,6 @@ static const struct amdxdna_dev_priv npu5_dev_priv =3D { .fw_path =3D "amdnpu/17f0_11/", .rt_config =3D npu4_default_rt_cfg, .dpm_clk_tbl =3D npu4_dpm_clk_table, - .fw_feature_tbl =3D npu4_fw_feature_table, .col_align =3D COL_ALIGN_NATURE, .mbox_dev_addr =3D NPU5_MBOX_BAR_BASE, .mbox_size =3D 0, /* Use BAR size */ @@ -111,5 +110,6 @@ const struct amdxdna_dev_info dev_npu5_info =3D { .vbnv =3D "RyzenAI-npu5", .device_type =3D AMDXDNA_DEV_TYPE_KMQ, .dev_priv =3D &npu5_dev_priv, + .fw_feature_tbl =3D npu4_fw_feature_table, .ops =3D &aie2_ops, }; diff --git a/drivers/accel/amdxdna/npu6_regs.c b/drivers/accel/amdxdna/npu6= _regs.c index ce591ed0d483..31400cca5ec4 100644 --- a/drivers/accel/amdxdna/npu6_regs.c +++ b/drivers/accel/amdxdna/npu6_regs.c @@ -66,7 +66,6 @@ static const struct amdxdna_dev_priv npu6_dev_priv =3D { .fw_path =3D "amdnpu/17f0_10/", .rt_config =3D npu4_default_rt_cfg, .dpm_clk_tbl =3D npu4_dpm_clk_table, - .fw_feature_tbl =3D npu4_fw_feature_table, .col_align =3D COL_ALIGN_NATURE, .mbox_dev_addr =3D NPU6_MBOX_BAR_BASE, .mbox_size =3D 0, /* Use BAR size */ @@ -112,5 +111,6 @@ const struct amdxdna_dev_info dev_npu6_info =3D { .vbnv =3D "RyzenAI-npu6", .device_type =3D AMDXDNA_DEV_TYPE_KMQ, .dev_priv =3D &npu6_dev_priv, + .fw_feature_tbl =3D npu4_fw_feature_table, .ops =3D &aie2_ops, }; --=20 2.34.1