From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azon11012030.outbound.protection.outlook.com [40.107.209.30]) (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 EB1CB326D44 for ; Sat, 26 Sep 2026 01:35:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.209.30 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790386531; cv=fail; b=Paj4SBHXk06EoElQlS/iBMGuGv+9ckjUaTG0c6bvWRkHyDZPQY59jqh6U5MueulOi7n/NIpqJNPQ8IELqzwTl10U0F4oHhYvnqpBDzvHprWTangEH2DraXqZoRUszCFG1QCLvvp922+mpHwI2gcNPZ5CyWnby49dO6CYNvwvFBs= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790386531; c=relaxed/simple; bh=5GRS6m5XwDbWgDI3n1TwHLst/FngnPs90WcokGvF7oA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qsIqMQr0pF2HJr/FgpfkIzpnf3SwS/nVFf2stH5e9qIFvZXlDS54nOaP26DYNYb+ZCyztWQRP4iQ1BFNzMBaeJZS39fxnrQm5sWIAlDHLzFQltBwsSs7EXxIpxiYw03SjFrzLoqOoaZq2pvf5dlyacSGFJsGg0l+fz4V4Mhhz/E= 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=MLcAUGvv; arc=fail smtp.client-ip=40.107.209.30 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="MLcAUGvv" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Knd6Y1J5BgCFQUQq9LUAtMoRZHHCR8/Q8dMeBYNgK6qnXTIfuGJMAeVWQxev+t++KfXxJzL9/gufOSSX0b4f1hTv/9Ok4llrvVerbligoDTkz3wNoB+q63YEx3lykMs7VGTai6tizGqRCAFnSaVfbWWMbeFJHko3bcvzgkxKQtHqt1nMUN7iqgwLuXaDzIuUA6LK9+tOfyBjZd7qzgMc9lZCU56n79voR8W6ZOTbht3+BifFK09bsIHFS6UpldfvdU/ETXMBldFYNo9K8jEuL+MjoyexcGCMzL1khUahrlp1HQVw9IoDnMdhg5YxRhrhFUpGk/MQMcCs8DTL0uWxIg== 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=qVCUgUmhBZWboW7SuNxX8tiB/aFBbeyJWfwWvNpH0I0=; b=OVNPaGmTKXuCAAGZCzffrdhJb7Svx/TnENQTHJgZssEFjySz3OuFozwV+5ZYdH6ZqUcNTkvspnhrTeT6PI8yYUNfgC1sEUoH385f+5Ix2ypIZnygqIjKyMAFqf7FbO8R1TJE3wjnwbQSO4IJw+cmKgRYIEMuuacl6QsPw04z7RJbiQ7YdvbS24U8XvAyR9qnbIeocBktzyO+pbTF/gW3lsPWKeHhJZppF5QdcVUZG11GEEGcP8WOEjLwRYIcSljXrQY221S7KFTAWh1aJWmSMXNntvQqaLf/H6ZmFqeDroqkIDd7X54E+YtcXEGB3DsAg06V1V1N+VkSiQLjOTIvLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=quicinc.com 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=qVCUgUmhBZWboW7SuNxX8tiB/aFBbeyJWfwWvNpH0I0=; b=MLcAUGvv99QDUhxE0ZQZ+q2htX4UYCPETQbF/KYIW1YdSYhACXOozF5f7x0SZ5IRLEdeN62ZpGjCgYE4MqejRFhBks+zXbqTfqGOQ68N052z1wyZz94oYKcATcQE7GA0kCvNvDvCC+BlqFv1U2+cGVakCjqVCfsw3lMbDQ+wlQU= Received: from BN9PR03CA0430.namprd03.prod.outlook.com (2603:10b6:408:113::15) by MW4PR12MB7335.namprd12.prod.outlook.com (2603:10b6:303:22b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.22; Sat, 26 Sep 2026 01:35:23 +0000 Received: from BN2PEPF0000A7FF.namprd02.prod.outlook.com (2603:10b6:408:113:cafe::95) by BN9PR03CA0430.outlook.office365.com (2603:10b6:408:113::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.18 via Frontend Transport; Sat, 26 Sep 2026 01:35:22 +0000 X-MS-Exchange-Authentication-Results: mx.microsoft.com 1; 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 BN2PEPF0000A7FF.mail.protection.outlook.com (10.167.245.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Sat, 26 Sep 2026 01:35:22 +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.49; Fri, 25 Sep 2026 20:35:20 -0500 Received: from xsjdavidzha51.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.49 via Frontend Transport; Fri, 25 Sep 2026 20:35:20 -0500 From: David Zhang To: , , , , , , CC: David Zhang , , Subject: [PATCH V0 04/21] accel/amdxdna: Upgrade firmware version to 6.0 Date: Fri, 25 Sep 2026 18:34:31 -0700 Message-ID: <20260926013448.3840921-5-yidong.zhang@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260926013448.3840921-1-yidong.zhang@amd.com> References: <20260926013448.3840921-1-yidong.zhang@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 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF0000A7FF:EE_|MW4PR12MB7335:EE_ X-MS-Office365-Filtering-Correlation-Id: 596fe80d-948e-444f-f0a6-08df1b6e6e86 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|23010399003|376014|82310400026|1800799024|4143699003|11063799006|10067099003|56012099006|22082099003|18002099003|3023799007; X-Microsoft-Antispam-Message-Info: vvBAam7vTJ7ToJVSIUNEVsGA0mTDK4YwucNLOyxvL9Q1RkGaxETJxYDqqxx1RR1geaT5UaNiJKIXX2Hi4ZVKGY4SPUT7QcQ+maUi8Ays/cmUSOrFkzWy9L34uKUHGlFRbbZQEmCpRG3K41IdLvOSje3qA+KZEARHnwhhsLBaTBsF4ZIRKpSlRmnbq+6xAtvvv0ejyKITac96SapW68DKglHSUJConkvo4AP0rlIJQP6UyP1f6+vC046Qy1OhIozJJnzIdpkDLsyj31NpaDWrj1lh0C3YGtsQd+J4TIYEwC8/Ju4EjUmKSB4k0X/bUy3Tx6QKkCoXTFXSd+USEEjEdapt/ai4EX57dEplQbVhBqtp0RSsvVRdrKEctRw68ep5Q2C09XrHdz9LZchdlQzruac5z4ExYuTKcHSQCZZQlNwD2LmrqCJvcWSnfE2WdgugTiwfFHwoJ5djBgC6McSFfup6L2gmUP0f4wF3XgPEZA0CCsYp5uhPR/KI68XXispA9i9mGJBHAChRHcLy7tXJwOxrot0Uqi7Q4++n0AP5SaHpyIw2Ab79hu9nuD0PN4Ug26sdtQccBaVpG9SbW6yo33KcIYDic1/hiYYE9JARYDzYGGdfzRjAgHPmCbpWry56wxpYfGtdU8rKzwdfturRUqBJ7iYiCgioY8qCktBT0T8aDm+Qn986KrqtkLtF9ZuCPK++15RAN4Nkv1QYTDWyzw== 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)(23010399003)(376014)(82310400026)(1800799024)(4143699003)(11063799006)(10067099003)(56012099006)(22082099003)(18002099003)(3023799007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: O3AOJFahGjrst+wkbhRWMti8Q5o34GZFhopTfswsPXsZSoB6TAGcqSWK2QsbhUgl3m0kL6RVFVGi827VKcJ07d9gtXXb2n0RVUwiIgMwROCjhPyVfEIc3Sel9Bs1JF3Tm+u1Id7gWT8NpyI2vhGB+4Y5Mjz5qC9DbjyDdYoKe6Omp4DuQ5UJH2kVX7+qwV98hdHIX/nCb3Jh4JRVAXxxl9IRMUHWQ/4ko1Z6R2QV28HSywmndmrHWrQ7S6lP0zcWVTM2vVkWfHUiFFIvHrgV3yLffDSSEcsbOor8E/YsCfn6gh8gPFo4BXQKgIZP5xd3HcMwhkqP+cJnXRT3lrhIm5BMtECKTyqfs2sm0MHFwZLvc3D8Ly0IR7SZAyEHB0me9/17aqExZiFjPQyzIF1lBji4afhY3/a0lIGcoMDy64X6GFjw908FkjHrl2C82JtY X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2026 01:35:22.4207 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 596fe80d-948e-444f-f0a6-08df1b6e6e86 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: BN2PEPF0000A7FF.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7335 Upgrade firmware interface version to 6.0. Update host queue layout, opcode definitions, and context creation/destruction request structures. Parse priority band and PASID for hardware context creation. Note on host queue layout and version validation: The host queue header layout moves write_index from offset 16 to offset 64 and data_address from offset 24 to offset 120. Protocol compatibility for this queue layout is validated against the CERT firmware protocol version (host_queue_major/minor via aie_check_cert_protocol()), which was introduced in the preceding patch ("accel/amdxdna: Add CERT firmware version support"). Signed-off-by: David Zhang --- drivers/accel/amdxdna/aie4_ctx.c | 21 ++++++++++++++++++--- drivers/accel/amdxdna/aie4_host_queue.h | 14 ++++++++++++-- drivers/accel/amdxdna/aie4_message.c | 10 ++++++++++ drivers/accel/amdxdna/aie4_msg_priv.h | 20 +++++++++++++++++--- drivers/accel/amdxdna/aie4_pci.h | 1 + drivers/accel/amdxdna/npu3_regs.c | 2 +- 6 files changed, 59 insertions(+), 9 deletions(-) diff --git a/drivers/accel/amdxdna/aie4_ctx.c b/drivers/accel/amdxdna/aie4_ctx.c index 8157f2a6fd10..90da4e8c4f54 100644 --- a/drivers/accel/amdxdna/aie4_ctx.c +++ b/drivers/accel/amdxdna/aie4_ctx.c @@ -110,6 +110,22 @@ static int aie4_msg_destroy_context(struct amdxdna_dev_hdl *ndev, u32 hw_context return aie_send_mgmt_msg_wait(&ndev->aie, &msg); } +static u8 aie4_parse_priority_to_dev(u32 priority) +{ + switch (priority) { + case AMDXDNA_QOS_LOW_PRIORITY: + return AIE4_CONTEXT_PRIORITY_BAND_IDLE; + case AMDXDNA_QOS_NORMAL_PRIORITY: + return AIE4_CONTEXT_PRIORITY_BAND_NORMAL; + case AMDXDNA_QOS_HIGH_PRIORITY: + return AIE4_CONTEXT_PRIORITY_BAND_FOCUS; + case AMDXDNA_QOS_REALTIME_PRIORITY: + return AIE4_CONTEXT_PRIORITY_BAND_REAL_TIME; + default: + return AIE4_CONTEXT_PRIORITY_BAND_NORMAL; + } +} + static int aie4_hwctx_create(struct amdxdna_hwctx *hwctx) { DECLARE_AIE_MSG(aie4_msg_create_hw_context, AIE4_MSG_OP_CREATE_HW_CONTEXT); @@ -129,9 +145,8 @@ static int aie4_hwctx_create(struct amdxdna_hwctx *hwctx) req.partition_id = ndev->partition_id; req.request_num_tiles = hwctx->num_tiles; - req.pasid = FIELD_PREP(AIE4_MSG_PASID, client->pasid) | - FIELD_PREP(AIE4_MSG_PASID_VLD, 1); - req.priority_band = hwctx->qos.priority; + req.pasid = aie4_msg_pasid(client); + req.priority_band = aie4_parse_priority_to_dev(hwctx->qos.priority); req.hsa_addr_high = upper_32_bits(amdxdna_gem_dev_addr(priv->umq_bo)); req.hsa_addr_low = lower_32_bits(amdxdna_gem_dev_addr(priv->umq_bo)); diff --git a/drivers/accel/amdxdna/aie4_host_queue.h b/drivers/accel/amdxdna/aie4_host_queue.h index 1b33eda3f727..97e535939b32 100644 --- a/drivers/accel/amdxdna/aie4_host_queue.h +++ b/drivers/accel/amdxdna/aie4_host_queue.h @@ -10,6 +10,14 @@ #define CTX_MAX_CMDS 32 +/* + * Host queue header layout. + * + * Note: Compatibility for this layout is checked against the CERT firmware + * protocol version (host_queue_major/minor) via aie_check_cert_protocol(), + * introduced in the preceding patch ("accel/amdxdna: Add CERT firmware + * version support"). + */ struct host_queue_header { __u64 read_index; struct { @@ -17,8 +25,10 @@ struct host_queue_header { __u16 minor; } version; __u32 capacity; /* Queue capacity, must be power of two. */ - __u64 write_index; + __u64 padding0[6]; + __u64 write_index; /* different cacheline from read_index to avoid false sharing */ + __u64 padding1[6]; __u64 data_address; /* The xdna dev addr for payload. */ -}; +} __packed; #endif /* _AIE4_HOST_QUEUE_H_ */ diff --git a/drivers/accel/amdxdna/aie4_message.c b/drivers/accel/amdxdna/aie4_message.c index b137a2a40b34..0bb1d18df027 100644 --- a/drivers/accel/amdxdna/aie4_message.c +++ b/drivers/accel/amdxdna/aie4_message.c @@ -5,6 +5,7 @@ #include #include +#include #include #include "aie.h" @@ -14,6 +15,15 @@ #include "amdxdna_mailbox_helper.h" #include "amdxdna_pci_drv.h" +u32 aie4_msg_pasid(struct amdxdna_client *client) +{ + if (!amdxdna_pasid_on(client)) + return 0; + + return FIELD_PREP(AIE4_MSG_PASID, client->pasid) | + FIELD_PREP(AIE4_MSG_PASID_VLD, 1); +} + int aie4_suspend_fw(struct amdxdna_dev_hdl *ndev) { DECLARE_AIE_MSG(aie4_msg_suspend, AIE4_MSG_OP_SUSPEND); diff --git a/drivers/accel/amdxdna/aie4_msg_priv.h b/drivers/accel/amdxdna/aie4_msg_priv.h index 5b97c8057de0..b9f7c61f36e3 100644 --- a/drivers/accel/amdxdna/aie4_msg_priv.h +++ b/drivers/accel/amdxdna/aie4_msg_priv.h @@ -12,7 +12,6 @@ enum aie4_msg_opcode { AIE4_MSG_OP_IDENTIFY = 0x10002, AIE4_MSG_OP_SUSPEND = 0x10003, - AIE4_MSG_OP_ATTACH_WORK_BUFFER = 0x1000D, AIE4_MSG_OP_QUERY_CERT_FIRMWARE_VERSION = 0x1000F, AIE4_MSG_OP_CREATE_VFS = 0x20001, @@ -23,6 +22,8 @@ enum aie4_msg_opcode { AIE4_MSG_OP_CREATE_HW_CONTEXT = 0x30003, AIE4_MSG_OP_DESTROY_HW_CONTEXT = 0x30004, AIE4_MSG_OP_AIE_TILE_INFO = 0x30006, + + AIE4_MSG_OP_ATTACH_WORK_BUFFER = 0x40001, }; enum aie4_msg_status { @@ -32,6 +33,14 @@ enum aie4_msg_status { MAX_AIE4_MSG_STATUS_CODE = 0x4, }; +enum aie4_msg_context_priority_band { + AIE4_CONTEXT_PRIORITY_BAND_IDLE = 0, + AIE4_CONTEXT_PRIORITY_BAND_NORMAL, + AIE4_CONTEXT_PRIORITY_BAND_FOCUS, + AIE4_CONTEXT_PRIORITY_BAND_REAL_TIME, + AIE4_CONTEXT_PRIORITY_BAND_COUNT +}; + struct aie4_msg_identify_req { __u32 rsvd; } __packed; @@ -94,7 +103,9 @@ struct aie4_msg_create_hw_context_req { #define AIE4_MSG_PASID GENMASK(19, 0) #define AIE4_MSG_PASID_VLD GENMASK(31, 31) __u32 pasid; - __u32 priority_band; + __u8 priority_band; + __u8 priority_level; + __u16 restore_id; } __packed; struct aie4_msg_create_hw_context_resp { @@ -106,11 +117,14 @@ struct aie4_msg_create_hw_context_resp { struct aie4_msg_destroy_hw_context_req { __u32 hw_context_id; - __u32 resvd1; +#define AIE4_MSG_GRACEFUL_FLAG GENMASK(0, 0) + __u32 graceful_flag; } __packed; struct aie4_msg_destroy_hw_context_resp { enum aie4_msg_status status; + __u16 restore_id; + __u16 resvd; } __packed; struct aie4_tile_info { diff --git a/drivers/accel/amdxdna/aie4_pci.h b/drivers/accel/amdxdna/aie4_pci.h index 8c62ee6a9b23..bdbb2d7cf0e7 100644 --- a/drivers/accel/amdxdna/aie4_pci.h +++ b/drivers/accel/amdxdna/aie4_pci.h @@ -75,6 +75,7 @@ int aie4_query_npu_firmware_version(struct amdxdna_dev_hdl *ndev, struct amdxdna_drm_query_firmware_version *fw_version); int aie4_query_cert_firmware_version(struct amdxdna_dev_hdl *ndev, struct amdxdna_drm_query_firmware_version *cert_version); +u32 aie4_msg_pasid(struct amdxdna_client *client); /* aie4_ctx.c */ int aie4_hwctx_init(struct amdxdna_hwctx *hwctx); diff --git a/drivers/accel/amdxdna/npu3_regs.c b/drivers/accel/amdxdna/npu3_regs.c index 31208c42ad5f..891c5f243ae5 100644 --- a/drivers/accel/amdxdna/npu3_regs.c +++ b/drivers/accel/amdxdna/npu3_regs.c @@ -38,7 +38,7 @@ #define MP1_C2PMSG_60_ALT_1 0x3B109F0 static const struct amdxdna_fw_feature_tbl npu3_fw_feature_table[] = { - { .major = 5, .min_minor = 10 }, + { .major = 6, .min_minor = 0 }, { 0 } }; -- 2.34.1