From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E56B31125857 for ; Wed, 11 Mar 2026 17:18:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F90110E2FD; Wed, 11 Mar 2026 17:18:52 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="19usv+nH"; dkim-atps=neutral Received: from PH0PR06CU001.outbound.protection.outlook.com (mail-westus3azon11011002.outbound.protection.outlook.com [40.107.208.2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0B77A10E2FD for ; Wed, 11 Mar 2026 17:18:51 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=J2l4fLk+l4KJa+uzhCEkSIIOTaiEV+C5Hh5UdW8MhhOIHQ7qUxsv9vFa1RTX3Q2VAMNfsU/AY7K3BdJWQd8925djtpe2ATHk//AD95+ps+ZUdXHFwdd5ffgOOpwd+aidECSTuKy5jgK9yV1o1VydwaFmIppeuW8lNJZQytlonPDFODdoAMARuYU4eRPQOrPhaQIu/9r2Vm9AS/jOP93vgrWAF3M7dLpLdiHPis2JpmUJbie/vZEeFyjdUSYYZnLlUEMNzCmowghr1dB+Dt6kRLm0fangcrMVhg/zeD86REnHyOuMs2v8P7FqQRn6YI+fzO3JGiUPbx9DEaKtomJtFg== 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=gxyYkTTPMqtx64QET61JR8A66PcwVHm0eI6vJ0z21fY=; b=wTNXYye2pBdjRdHzV9cuTWmihliS1OZztleqWPNyXueSceG8fF5n8WjKOoALkdkSaFNlI5UlZZvqNbarF4qkBtcu/+1BxE6KfktxT5GImOWiIWpk9NmfvcCmMmtIvADYjIilPAw9tRO0HLRx9jOGo+ne2CXBMGNsY1BGq79p00dMLM9NBGjX2EhFCJMoxm5r3nexLPr4mzkUF1oFnIDAEd+w4BUxFVjOUw7CWD90UUrGbkcGqH7XRAGAPJmd+dmC5jBCCFRLOBpGzNQCSVMXKkb4212QPyc6tiWO+S6XYogowH8CkdUUjIUsPOb6GmBuAL3pC+xU5+shEbXbKHfXSQ== 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=gxyYkTTPMqtx64QET61JR8A66PcwVHm0eI6vJ0z21fY=; b=19usv+nH81LOHo2kJAYGWt5ohxa/2r0cGJfEsl1sLWB9tsKM3S/AT9GyaPowYt7G6vmglV3B+Hx8mGuakeBh3dyVzzdBhn/fmpf+iOEUJXoUQCd80//5Op8R/HNC8ySDV3AwV/rp70ZsSXdetQzV4Ben7lEHNM1iN+GNLhgtH9M= Received: from CY5PR18CA0001.namprd18.prod.outlook.com (2603:10b6:930:5::6) by IA0PR12MB8422.namprd12.prod.outlook.com (2603:10b6:208:3de::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9723.4; Wed, 11 Mar 2026 17:18:46 +0000 Received: from CY4PEPF0000E9DA.namprd05.prod.outlook.com (2603:10b6:930:5:cafe::16) by CY5PR18CA0001.outlook.office365.com (2603:10b6:930:5::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9678.27 via Frontend Transport; Wed, 11 Mar 2026 17:18:46 +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=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by CY4PEPF0000E9DA.mail.protection.outlook.com (10.167.241.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9678.18 via Frontend Transport; Wed, 11 Mar 2026 17:18:45 +0000 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Wed, 11 Mar 2026 12:18:45 -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; Wed, 11 Mar 2026 12:18:44 -0500 From: Lizhi Hou To: , , , , CC: "Mario Limonciello (AMD)" , , , , Lizhi Hou Subject: [PATCH V2] accel/amdxdna: Support sensors for column utilization Date: Wed, 11 Mar 2026 10:18:42 -0700 Message-ID: <20260311171842.473453-1-lizhi.hou@amd.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9DA:EE_|IA0PR12MB8422:EE_ X-MS-Office365-Filtering-Correlation-Id: fa95ebf8-8d53-4fc8-d197-08de7f92409a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700016|376014|82310400026|56012099003|18002099003; X-Microsoft-Antispam-Message-Info: E4QeuMqhEQhnHbhL+npUi3Z0Sw+mBATW9rzbDzFb4lddMUAVV2Ki1DoFTbaMGQH/O1vGmlgiOl6mWTRI5J7enrwGxV1aTDFy0msMQlXqgyi3qJiGsPxrbdsYhlb9M0fDGGCbOnvbRbDJNFgX/4Jgx2GTDbDRE+RqfoIPiL47QSylPLMl2Ijus2Thl/tmk1RWRD3PqaRLyv3O16qpBj4RfhfWSh9/SKCFptliBPkXoFqWm1rPkv+NFKN773EW03mQhvZ1a3EU22oLJDxwBQgoDG4RWwT7vpRGj5JUyq8vrWALgykVDChJWmvJLwzGY117ZbPHntbmpfq3ZMzzyURkoSXDaBFHSf+YWyO+FrqxdavTaak8klYuYWjT72j5zpqQuCGuwgI/XlgWJ1GU3+WfRp6iaQ1Qfra9BrtXvOy1g+JmwU2L8sWDJkVZdHywGuEUz8iT4Bdg5CSA5u3HwqS8A8u0jXLQ41IxzKfFuDudEwIhbY+hZ1+RRmtI97J/jC/10MfBSipNFMnUD2dQikXOSFvdH/+pKmiTmBy1cVFiHsNcvRNBBBQn86DmiUL6mRAF8sVoJR8WkhsiUq9qqnH6J/3AWZ0Igf8drtuiKo2sWvBY197+5nCUUc14nwPh9NSfhOWIZLUZ9SKdeat7Tcpc1QrFdLNzENWccp5ilfSjweOjRxTYIGDBtZ4dOHmDbdhIpBGOSIDdU6aHmUBL3J6bC1e+lRXgxKvswNIUYebdPkLZcQzO/zhtvgjMqXpGMrHOEvMjMH3oKwUUTXM2kF89eA== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:satlexmb08.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(1800799024)(36860700016)(376014)(82310400026)(56012099003)(18002099003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4kmx6oEaCZZB/PRx72+W8/KlJfJNEICbw0TE0XDs6sSUl2w9RP0KsSN2G5c6RGIO15EiYkVhOZhiFK9uY8MUot8QKwuil2hKeUgQa5bPu0auVEdeUdOXi6anip8wJ2cs7LCFDCyUeE3R8b+ACUqplwUGB1Rj8VqOM7JBWHTvCGHDoF5WS4dEGjmLx+bMYgqYjY6c2VK2kbhg0r7noWul2glWtSKNRq5V8rC+Y601UhUEN+0ePW67ZMsoAIyawFOFhY/l985t0HR2bJE1DyYGHXJJki8rHZs9FaSxUNwWna088PTZ2wxKcqj0hKNzXRqg7nEnLkvqErqYRtjyfpQv/KFhhiqiDJwpPaBjslv9Yo9idfH09oQppL1joipkkwCnx2RqxftCHooplGA9vqZ0kmovHlMnMaaNY8nEciCDal4BVqOf/QucFs/WpXhmWw5p X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2026 17:18:45.8120 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fa95ebf8-8d53-4fc8-d197-08de7f92409a 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=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9DA.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8422 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: "Mario Limonciello (AMD)" The AMD PMF driver provides realtime column utilization (npu_busy) metrics for the NPU. Extend the DRM_IOCTL_AMDXDNA_GET_INFO sensor query to expose these metrics to userspace. Add AMDXDNA_SENSOR_TYPE_COLUMN_UTILIZATION to the sensor type enum and update aie2_get_sensors() to return both the total power and up to 8 column utilization sensors if the user buffer permits. Signed-off-by: Mario Limonciello (AMD) Reviewed-by: Lizhi Hou [lizhi: support legacy tool which uses small buffer. checkpatch cleanup] Signed-off-by: Lizhi Hou --- drivers/accel/amdxdna/aie2_pci.c | 34 +++++++++++++++++++++++++++----- drivers/accel/amdxdna/aie2_pci.h | 8 ++++++++ include/uapi/drm/amdxdna_accel.h | 3 ++- 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/drivers/accel/amdxdna/aie2_pci.c b/drivers/accel/amdxdna/aie2_pci.c index a2e586512e26..c57c785a2d15 100644 --- a/drivers/accel/amdxdna/aie2_pci.c +++ b/drivers/accel/amdxdna/aie2_pci.c @@ -787,16 +787,18 @@ static int aie2_get_clock_metadata(struct amdxdna_client *client, static int aie2_get_sensors(struct amdxdna_client *client, struct amdxdna_drm_get_info *args) { + struct amdxdna_dev_hdl *ndev = client->xdna->dev_handle; struct amdxdna_drm_query_sensor sensor = {}; + struct amd_pmf_npu_metrics npu_metrics; + u32 sensors_count = 0, i; int ret; - if (args->buffer_size < sizeof(sensor)) - return -EINVAL; - - ret = AIE2_GET_PMF_NPU_DATA(npu_power, sensor.input); + ret = AIE2_GET_PMF_NPU_METRICS(&npu_metrics); if (ret) return ret; + sensor.type = AMDXDNA_SENSOR_TYPE_POWER; + sensor.input = npu_metrics.npu_power; sensor.unitm = -3; scnprintf(sensor.label, sizeof(sensor.label), "Total Power"); scnprintf(sensor.units, sizeof(sensor.units), "mW"); @@ -804,7 +806,29 @@ static int aie2_get_sensors(struct amdxdna_client *client, if (copy_to_user(u64_to_user_ptr(args->buffer), &sensor, sizeof(sensor))) return -EFAULT; - args->buffer_size = sizeof(sensor); + sensors_count++; + if (args->buffer_size <= sensors_count * sizeof(sensor)) + goto out; + + for (i = 0; i < min_t(u32, ndev->total_col, 8); i++) { + memset(&sensor, 0, sizeof(sensor)); + sensor.input = npu_metrics.npu_busy[i]; + sensor.type = AMDXDNA_SENSOR_TYPE_COLUMN_UTILIZATION; + sensor.unitm = 0; + scnprintf(sensor.label, sizeof(sensor.label), "Column %d Utilization", i); + scnprintf(sensor.units, sizeof(sensor.units), "%%"); + + if (copy_to_user(u64_to_user_ptr(args->buffer) + sensors_count * sizeof(sensor), + &sensor, sizeof(sensor))) + return -EFAULT; + + sensors_count++; + if (args->buffer_size <= sensors_count * sizeof(sensor)) + goto out; + } + +out: + args->buffer_size = sensors_count * sizeof(sensor); return 0; } diff --git a/drivers/accel/amdxdna/aie2_pci.h b/drivers/accel/amdxdna/aie2_pci.h index 1bb88711bedb..0ae174862592 100644 --- a/drivers/accel/amdxdna/aie2_pci.h +++ b/drivers/accel/amdxdna/aie2_pci.h @@ -48,6 +48,7 @@ }) #if IS_ENABLED(CONFIG_AMD_PMF) +#define AIE2_GET_PMF_NPU_METRICS(metrics) amd_pmf_get_npu_data(metrics) #define AIE2_GET_PMF_NPU_DATA(field, val) \ ({ \ struct amd_pmf_npu_metrics _npu_metrics; \ @@ -58,6 +59,13 @@ (_ret); \ }) #else +#define AIE2_GET_PMF_NPU_METRICS(metrics) \ +({ \ + typeof(metrics) _m = metrics; \ + memset(_m, 0xff, sizeof(*_m)); \ + (-EOPNOTSUPP); \ +}) + #define SENSOR_DEFAULT_npu_power U32_MAX #define AIE2_GET_PMF_NPU_DATA(field, val) \ ({ \ diff --git a/include/uapi/drm/amdxdna_accel.h b/include/uapi/drm/amdxdna_accel.h index 9c44db2b3dcd..5bd13f4435f5 100644 --- a/include/uapi/drm/amdxdna_accel.h +++ b/include/uapi/drm/amdxdna_accel.h @@ -353,7 +353,8 @@ struct amdxdna_drm_query_clock_metadata { }; enum amdxdna_sensor_type { - AMDXDNA_SENSOR_TYPE_POWER + AMDXDNA_SENSOR_TYPE_POWER, + AMDXDNA_SENSOR_TYPE_COLUMN_UTILIZATION }; /** -- 2.34.1