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 14760C5DF8C for ; Fri, 21 Aug 2026 19:54:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A769910F4E5; Fri, 21 Aug 2026 19:54:32 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="VH6aqsWe"; dkim-atps=neutral Received: from PH0PR06CU001.outbound.protection.outlook.com (mail-westus3azon11011044.outbound.protection.outlook.com [40.107.208.44]) by gabe.freedesktop.org (Postfix) with ESMTPS id ED95710F4E4 for ; Fri, 21 Aug 2026 19:54:30 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iuYVPPxLi44JTNtbjvp/j7CRcomufTcf3380pDOwoQaFYRCQ83cb+mkx48qS/fLZKk+/6F3AhVRM96qossPJC1/CQJipE1aIZlHvhB7B31oCTBi/pNX6die5TuoeuPba1dZMm0mkxyN4dE4NRSsR9Si3LuNqtFC81qAW7jScHf8hEMUzpBBcXK/e3yYvdSlxv5B62cs/kEKKaSABx2KpG4uw0+kNpnOI2HGGfiLoTlrGsDx1bviQSj3npOLzGQXlJ3k+PvBcXQFGo/ki49vxHAsFLtIuipaCNRoyVa+vDlAZx7kEmgN8alSWFUOvtArSMuNmqTlgODk9eaRqEBPH5w== 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=6LvpV6Xss6wDO8Uar+Hrxd0hIZbGIl+9mkyJruvRk/I=; b=Xvbtf8dyLTe35rmV4BKJXCxw6Ejyhp83ExHVIXn7QkFZ5vL0PwJvm55z2UPmD+u6B2YoujlC1gQumAk+4vGJteabYU69bl5+/TtbWY/riv95dimeOlXGjinU9yG8SXAT8XLTF3O4HDwRBWEilYb/k2wMr8abrt1UEHMbFelW/6RH5kEl4Aq3WCbBzDWBCf6iJafK6x6iF58XOCBJBObFn0+WcwQl8RzFdHlKG/aO/OqfknQRai/VcLT8aMGv5g82Ti7lvBSLb8r3XSqYzcRke5nFuI+3m8Vv8kVCwEgXvOGkHDA7Kzz12pU34jzmEskRr9H07mroQYpzY13BEAfkDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.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=6LvpV6Xss6wDO8Uar+Hrxd0hIZbGIl+9mkyJruvRk/I=; b=VH6aqsWeW4FbnX/ZgJ1x+31QL9e+os88dJ+dMM+8JQq+pY3+ul5Qt0WZEUNZ73xRvmjgL5eh58GXGuvDp//m7TyITk0IZWHYDyJHhoAcRojkjmzG74PYV6G3HkQxvEwg9hZ2Vms7DQC7FAQWOmBbwhCuj8/QSlON5kbBFo/JKQ4= Received: from CH0PR03CA0061.namprd03.prod.outlook.com (2603:10b6:610:cc::6) by IA1PR12MB7541.namprd12.prod.outlook.com (2603:10b6:208:42f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.11; Fri, 21 Aug 2026 19:35:21 +0000 Received: from CH1PEPF0000AD82.namprd04.prod.outlook.com (2603:10b6:610:cc:cafe::1c) by CH0PR03CA0061.outlook.office365.com (2603:10b6:610:cc::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.339.11 via Frontend Transport; Fri, 21 Aug 2026 19:35:21 +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 CH1PEPF0000AD82.mail.protection.outlook.com (10.167.244.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.3 via Frontend Transport; Fri, 21 Aug 2026 19:35:21 +0000 Received: from satlexmb10.amd.com (10.181.42.219) 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.45; Fri, 21 Aug 2026 14:35:14 -0500 Received: from satlexmb07.amd.com (10.181.42.216) by satlexmb10.amd.com (10.181.42.219) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Fri, 21 Aug 2026 14:35:14 -0500 Received: from p8.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.45 via Frontend Transport; Fri, 21 Aug 2026 14:35:14 -0500 From: Alex Deucher To: CC: Felix Kuehling , Mukul Joshi , Alex Deucher Subject: [PATCH 05/95] drm/amdgpu: Add sysfs API for UALink virtual pod config Date: Fri, 21 Aug 2026 15:33:28 -0400 Message-ID: <20260821193458.808626-6-alexander.deucher@amd.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260821193458.808626-1-alexander.deucher@amd.com> References: <20260821193458.808626-1-alexander.deucher@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000AD82:EE_|IA1PR12MB7541:EE_ X-MS-Office365-Filtering-Correlation-Id: 38ef65a4-15f3-4727-57c0-08deffbb56c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|23010399003|1800799024|376014|82310400026|36860700016|10067099003|56012099006|6133799003|18002099003|22082099003|11063799006; X-Microsoft-Antispam-Message-Info: +fqLcQpvoK+l56gTQsJG3AmoeltbishiDfVhjJLJkodSS/OsitOYmiDfd4g60ubpLNOMbpuWQl1Ey2P8OSEpm9DsXGCsackE01zSroaUg0dQ25yzRFI0GfroCcEo2CcRDWynZq3QrrG4hDd15y6GjSbQ3YXAPdveyoC1JO7cTxQx7eep1SiOYc5wrpk/BZxtQuvSHdub3Law29H/7G5tPAdj66ClSKEBePgYgl1Q2Rwef8sct+EUsDGMtTG3jTtcxSQnarRJ+K2ivRKFZJTiKasA6fzwZmB3qYsHQP+QetEAzHsqtMbVvvmtcbhlL5bzaLkZ13ctu9JpjjHW2S03V/qbpsxlQsFoen4Z6VKvHKsc1diY7CwTgFI2d1gOxg1DCPjMicsKJiwy3zpmcLlIVtiprXVmA3F9QYXrs9bXRdjF7oqS4HDgb1/esu2+xi+9X8NBNaYLabiXLmu7//79gyLJ2+ZZP2fYLEiDMRNQS5SeskU1qc3X+Rgzz98owuvSejNGDvjUhV+jb8Aw9ty9QcPBVxtDUhCzx7qR6LO+qX8lVqJExP/XK2/KC7RwMV3wO/z8DbJNj2nyu2CVxJhwSVQGoylGd/Hs2YUwDY1HmF/+8RvdJNqeKj19bMLbp1oAQfV1fywzyC931CaEE/EyXLLnzPy2tufdXAtKqnu7IE7zkKn2NHks1Ji022Bm4X/qJdscCF1hjSfbywyeWKWSXQ== 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)(23010399003)(1800799024)(376014)(82310400026)(36860700016)(10067099003)(56012099006)(6133799003)(18002099003)(22082099003)(11063799006); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IUHQBixdsS2fx19BbhLcpep0992TIS089lvHj/+LnQr13z8qZ5XC2VXOBDxFoctSQCuj7PWc731PoysNRm9kmWW1yq51Z/EWJE0FeCOS5qrO+WEvaUbj4b0tIrHpI9Lo1GJgET7Jt2HdL3BXWcWzuC13OPF0rDEF5Egxm1+n6oljQviZWkntAJq5NruezC69tgsmLk+oRjL+Fej71/XlfJ3BKPM5XE4BjS3r/pYyWkJqmBw4wgDdNL/dfczbfGylyNzmO6yKSN8Ir2ipfsT2MPF9DNdiMCF0hRIR6UsjPBsK19qEoWFsoEWpEACOkRIOpTfjwtkk/Nr1C8HMnkqwCRZznB4xYfUZ3wY0k+FbasSkdBYWWeIS1z/CvibeEFDmyPvRlbPaISetTtkjKSGFiGZmVxLn1mU9xkWC1eCPWcU+A2fq4Xo127bMTJo3keec X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2026 19:35:21.2246 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 38ef65a4-15f3-4727-57c0-08deffbb56c3 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: CH1PEPF0000AD82.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7541 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Felix Kuehling /ualink/config: Directory for staging virtual pod configuration attributes. Write "true" to commit to apply settings Signed-off-by: Felix Kuehling Reviewed-by: Mukul Joshi Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c | 389 +++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.h | 8 + 2 files changed, 397 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c index 6c9905b15e93d..420e18a658e83 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c @@ -81,6 +81,55 @@ static ssize_t ualink_##prefix##_##name##_show(struct kobject *kobj, \ return show_idbits(info->field, sizeof(info->field)*8, buf); \ } +static ssize_t store_idbits(unsigned long *bits, unsigned int nbits, + const char *buf, size_t count) +{ + char *dup_buf, *str, *tok; + ssize_t r; + u32 id; + + bitmap_zero(bits, nbits); + if (!count) + return 0; + + dup_buf = kstrndup(buf, count, GFP_KERNEL); + if (unlikely(!dup_buf)) + return -ENOMEM; + str = dup_buf; + do { + str += strspn(str, " "); + tok = strsep(&str, ", "); + r = kstrtou32(tok, 10, &id); + if (r < 0) + goto err; + if (id >= nbits) { + r = -ERANGE; + goto err; + } + set_bit(id, bits); + } while (str); + kfree(dup_buf); + + return count; + +err: + kfree(dup_buf); + return r; +} +#define UALINK_IDBITS_STORE(prefix, name, field, nbits) \ +static ssize_t ualink_##prefix##_##name##_store(struct kobject *kobj, \ + struct kobj_attribute *attr,\ + const char *buf, size_t count)\ +{ \ + struct amdgpu_ualink_##prefix *info = to_ualink_##prefix(kobj); \ + DECLARE_BITMAP(bits, nbits); \ + ssize_t r = store_idbits(bits, nbits, buf, count); \ + \ + if (r >= 0) \ + bitmap_copy(info->field, bits, nbits); \ + return r; \ +} + static ssize_t show_idarray(const u32 *array, u32 size, char *buf) { ssize_t len = 0; @@ -198,6 +247,30 @@ static ssize_t ualink_##prefix##_##name##_show(struct kobject *kobj, \ ARRAY_SIZE(ualink_##name##_values), buf); \ } +static ssize_t store_enum(u32 *x, const char * const values[], unsigned int n, + const char *buf, size_t count) +{ + unsigned int i; + + for (i = 0; i < n; i++) { + if (values[i] && sysfs_streq(buf, values[i])) { + *x = i; + return count; + } + } + return -EINVAL; +} +#define UALINK_ENUM_STORE(prefix, name, field) \ +static ssize_t ualink_##prefix##_##name##_store(struct kobject *kobj, \ + struct kobj_attribute *attr,\ + const char *buf, size_t count)\ +{ \ + struct amdgpu_ualink_##prefix *info = to_ualink_##prefix(kobj); \ + \ + return store_enum(&info->field, ualink_##name##_values, \ + ARRAY_SIZE(ualink_##name##_values), \ + buf, count); \ +} static const char * const ualink_link_type_values[] = { "UALoE", "UALink" }; @@ -353,8 +426,297 @@ static const struct kobj_type ualink_ppod_setup_ktype = { .sysfs_ops = &kobj_sysfs_ops }; +UALINK_VALUE_SHOW(vpod_config, vpod_id, vpod.id, "%u"); +UALINK_VALUE_SHOW(vpod_config, vpod_size, vpod.size, "%u"); +UALINK_IDBITS_SHOW(vpod_config, vpod_active_accels, vpod.active_accel_bits); +UALINK_ENUM_SHOW(vpod_config, addr_mode, vpod.addr_mode); + +UALINK_VALUE_STORE(vpod_config, vpod_id, vpod.id, u32, 10); +UALINK_VALUE_STORE(vpod_config, vpod_size, vpod.size, u32, 10); +UALINK_IDBITS_STORE(vpod_config, vpod_active_accels, vpod.active_accel_bits, + AMDGPU_UALINK_ACCEL_MAX); +UALINK_ENUM_STORE(vpod_config, addr_mode, vpod.addr_mode); + +static bool check_vpod_info(struct amdgpu_device *adev, + const struct amdgpu_ualink_info *info) +{ + unsigned int weight; + + if (info->accel_state < AMDGPU_UALINK_ACCEL_STATE_CONFIGURED) { + dev_dbg(adev->dev, "pPod is not yet configured\n"); + return false; + } + if (info->vpod.id >= AMDGPU_UALINK_ACCEL_MAX) { + dev_dbg(adev->dev, "vPod ID %u out of range [0..%u]\n", + info->vpod.id, AMDGPU_UALINK_ACCEL_MAX - 1); + return false; + } + if (info->vpod.size == 0 || info->vpod.size > info->ppod.size) { + dev_dbg(adev->dev, "vPod size %u out of range [1..%u]\n", + info->vpod.size, info->ppod.size); + return false; + } + if (info->vpod.addr_mode >= AMDGPU_UALINK_ADDR_MODE_MAX) { + dev_dbg(adev->dev, "Invalid addr mode %u\n", info->vpod.id); + return false; + } + weight = bitmap_weight(info->vpod.active_accel_bits, AMDGPU_UALINK_ACCEL_MAX); + if (weight != info->vpod.size) { + dev_dbg(adev->dev, "vPod size doesn't match vpod_active_accels list: %u != %u\n", + info->vpod.size, weight); + return false; + } + if (!test_bit(info->ppod.accel_id, info->vpod.active_accel_bits)) { + dev_dbg(adev->dev, "Accelerator ID %u not listed in vpod_active_accels\n", + info->ppod.accel_id); + return false; + } + + return true; +} + +static struct amdgpu_device *find_peer_adev(unsigned int accel_id) +{ + unsigned int i; + + for (i = 0; i < mgpu_info.num_gpu; i++) { + struct amdgpu_device *peer_adev = mgpu_info.gpu_ins[i].adev; + + if (peer_adev->ualink.info && + peer_adev->ualink.info->ppod.accel_id == accel_id) + return peer_adev; + } + + return NULL; +} + +static bool check_local_vpod_integrity(struct amdgpu_device *adev) +{ + struct amdgpu_ualink_info *info = adev->ualink.info; + struct amdgpu_ualink_info *peer_info; + struct amdgpu_device *peer_adev; + unsigned int accel_id; + unsigned int i; + + if (!check_vpod_info(adev, info)) + return false; + + /* Check that all local accelerators listed in vpod_active_accels have + * matching pod IDs + */ + for_each_set_bit(accel_id, info->vpod.active_accel_bits, AMDGPU_UALINK_ACCEL_MAX) { + + if (accel_id == info->ppod.accel_id) + continue; + + peer_adev = find_peer_adev(accel_id); + if (!peer_adev) + continue; + peer_info = peer_adev->ualink.info; + + if (peer_info->vpod.id != info->vpod.id) { + dev_dbg(adev->dev, "Peer %u vpod_id doesn't match: %u != %u", + accel_id, peer_info->vpod.id, info->vpod.id); + return false; + } + if (!uuid_equal(&peer_info->ppod.id, &info->ppod.id)) { + dev_dbg(adev->dev, "Peer %u ppod_id doesn't match: %pU != %pU", + accel_id, &peer_info->ppod.id, &info->ppod.id); + return false; + } + } + + /* Derive local accels from pod IDs of GPUs in mgpu_info */ + info->n_local_accels = 0; + for (i = 0; i < mgpu_info.num_gpu && + info->n_local_accels < AMDGPU_UALINK_LOCAL_ACCELS_MAX; + i++) { + peer_adev = mgpu_info.gpu_ins[i].adev; + peer_info = peer_adev->ualink.info; + + if (peer_adev == adev || + (peer_info && peer_info->vpod.id == info->vpod.id && + uuid_equal(&peer_info->ppod.id, &info->ppod.id))) + info->local_accels[info->n_local_accels++] = + peer_info->ppod.accel_id; + } + + /* Then check consistency of the vpod information on all those GPUs */ + for (i = 0; i < info->n_local_accels; i++) { + unsigned int j; + + for (j = i + 1; j < info->n_local_accels; j++) { + if (info->local_accels[j] == accel_id) { + dev_dbg(adev->dev, + "Accelerator ID %u is not unique among local GPUs\n", + accel_id); + return false; + } + } + + accel_id = info->local_accels[i]; + + /* Skip this GPU, we are looking for our peers */ + if (accel_id == info->ppod.accel_id) + continue; + + peer_adev = find_peer_adev(accel_id); + if (WARN_ON(!peer_adev || !peer_adev->ualink.info)) + /* info->local_accels we just built is corrupted? */ + return false; + peer_info = peer_adev->ualink.info; + + /* Check peer vpod info and consistency */ + if (!check_vpod_info(peer_adev, peer_info)) + return false; + + if (peer_info->ppod.size != info->ppod.size) { + dev_dbg(adev->dev, "Peer %u ppod_size doesn't match: %u != %u\n", + accel_id, peer_info->ppod.size, info->ppod.size); + return false; + } + if (peer_info->vpod.size != info->vpod.size) { + dev_dbg(adev->dev, "Peer %u vpod_size doesn't match: %u != %u\n", + accel_id, peer_info->vpod.size, info->vpod.size); + return false; + } + if (peer_info->vpod.addr_mode != info->vpod.addr_mode) { + dev_dbg(adev->dev, "Peer %u addr_mode doesn't match: %u != %u\n", + accel_id, peer_info->vpod.addr_mode, info->vpod.addr_mode); + return false; + } + if (!bitmap_equal(peer_info->vpod.active_accel_bits, + info->vpod.active_accel_bits, AMDGPU_UALINK_ACCEL_MAX)) { + dev_dbg(adev->dev, "Peer %u vpod_active_accels don't match\n", + accel_id); + return false; + } + + /* Update peer's local accelerator array */ + peer_info->n_local_accels = info->n_local_accels; + memcpy(peer_info->local_accels, info->local_accels, + sizeof(info->local_accels)); + } + return true; +} + +static void activate_accelerator(struct amdgpu_device *adev) +{ + if (adev->ualink.info->accel_state >= AMDGPU_UALINK_ACCEL_STATE_READY) + return; + + adev->ualink.info->accel_state = AMDGPU_UALINK_ACCEL_STATE_READY; +} + +static void deactivate_accelerator(struct amdgpu_device *adev) +{ + if (adev->ualink.info->accel_state < AMDGPU_UALINK_ACCEL_STATE_READY) + return; + + adev->ualink.info->accel_state = AMDGPU_UALINK_ACCEL_STATE_CONFIGURED; +} + +static void activate_local_vpod(struct amdgpu_device *adev) +{ + struct amdgpu_ualink_info *info = adev->ualink.info; + struct amdgpu_device *peer_adev; + unsigned int accel_id; + unsigned int i; + + for (i = 0; i < info->n_local_accels; i++) { + accel_id = info->local_accels[i]; + + peer_adev = find_peer_adev(accel_id); + if (WARN_ON(!peer_adev || !peer_adev->ualink.info)) + /* info->local_accels is corrupted? */ + continue; + + activate_accelerator(peer_adev); + } +} + +static ssize_t ualink_vpod_config_commit_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + struct amdgpu_ualink_vpod_config *config = to_ualink_vpod_config(kobj); + struct amdgpu_ualink_info *info = to_ualink_info(kobj->parent); + struct device *dev = kobj_to_dev(info->kobj.parent); + struct drm_device *ddev = dev_get_drvdata(dev); + struct amdgpu_device *adev = drm_to_adev(ddev); + + if (!sysfs_streq(buf, "true")) + return -EINVAL; + if (info->accel_state < AMDGPU_UALINK_ACCEL_STATE_CONFIGURED) { + dev_dbg(adev->dev, "Ualink ppod is not yet configured\n"); + return -EINVAL; + } + + /* TODO: instead of just copying the info, call ASP vpod config API + * and query ASP for the updated info + */ + info->vpod = config->vpod; + + /* The integrity check makes sure each new GPU is consistent with the + * other GPUs already in the vPod. All known local GPUs can become + * "ready" at the same time. + * + * Misconfiguration of one GPU does not reduce the state of other GPUs + * already in the vPod. + */ + mutex_lock(&mgpu_info.mutex); + if (check_local_vpod_integrity(adev)) + activate_local_vpod(adev); + else if (info->accel_state >= AMDGPU_UALINK_ACCEL_STATE_CONFIGURED) + deactivate_accelerator(adev); + mutex_unlock(&mgpu_info.mutex); + + /* TODO: Update KFD topology for in-domain link */ + + /* TODO: If state was ACTIVE: + * - If addr_mode changed, reset all connections, reset state to READY + * - If accelerators were removed, reset those links, but keep state ACTIVE + * - If accelerators were added, keep state ACTIVE + */ + + return count; +} + +#define UALINK_VPOD_CONFIG_ATTR(name) __ATTR(name, 0600, \ + ualink_vpod_config_##name##_show, \ + ualink_vpod_config_##name##_store) +static struct kobj_attribute ualink_vpod_config_vpod_id = UALINK_VPOD_CONFIG_ATTR(vpod_id); +static struct kobj_attribute ualink_vpod_config_vpod_size = UALINK_VPOD_CONFIG_ATTR(vpod_size); +static struct kobj_attribute ualink_vpod_config_vpod_active_accels = + UALINK_VPOD_CONFIG_ATTR(vpod_active_accels); +static struct kobj_attribute ualink_vpod_config_addr_mode = UALINK_VPOD_CONFIG_ATTR(addr_mode); +static struct kobj_attribute ualink_vpod_config_commit = __ATTR(commit, 0200, NULL, + ualink_vpod_config_commit_store); + +static const struct attribute *ualink_vpod_config_attrs[] = { + &ualink_vpod_config_vpod_id.attr, + &ualink_vpod_config_vpod_size.attr, + &ualink_vpod_config_vpod_active_accels.attr, + &ualink_vpod_config_addr_mode.attr, + &ualink_vpod_config_commit.attr, + NULL +}; + +static void ualink_vpod_config_release(struct kobject *kobj) +{ + struct amdgpu_ualink_vpod_config *config = to_ualink_vpod_config(kobj); + + kfree(config); +} + +static const struct kobj_type ualink_vpod_config_ktype = { + .release = ualink_vpod_config_release, + .sysfs_ops = &kobj_sysfs_ops +}; + int amdgpu_ualink_sysfs_init(struct amdgpu_device *adev) { + struct amdgpu_ualink_vpod_config *vpod_config = NULL; struct amdgpu_ualink_ppod_setup *ppod_setup = NULL; struct amdgpu_ualink_info *info = NULL; int r; @@ -390,11 +752,31 @@ int amdgpu_ualink_sysfs_init(struct amdgpu_device *adev) if (r) goto err_del_ppod_setup; + vpod_config = kzalloc(sizeof(*vpod_config), GFP_KERNEL); + if (!vpod_config) { + r = -ENOMEM; + goto err_remove_ppod_setup_files; + } + r = kobject_init_and_add(&vpod_config->kobj, &ualink_vpod_config_ktype, + &info->kobj, "config"); + if (r) + goto err_put_vpod_config; + r = sysfs_create_files(&vpod_config->kobj, ualink_vpod_config_attrs); + if (r) + goto err_del_vpod_config; + + adev->ualink.config = vpod_config; adev->ualink.setup = ppod_setup; adev->ualink.info = info; return r; +err_del_vpod_config: + kobject_del(&vpod_config->kobj); +err_put_vpod_config: + kobject_put(&vpod_config->kobj); +err_remove_ppod_setup_files: + sysfs_remove_files(&ppod_setup->kobj, ualink_ppod_setup_attrs); err_del_ppod_setup: kobject_del(&ppod_setup->kobj); err_put_ppod_setup: @@ -410,6 +792,13 @@ int amdgpu_ualink_sysfs_init(struct amdgpu_device *adev) void amdgpu_ualink_sysfs_fini(struct amdgpu_device *adev) { + if (adev->ualink.config) { + sysfs_remove_files(&adev->ualink.config->kobj, + ualink_vpod_config_attrs); + kobject_del(&adev->ualink.config->kobj); + kobject_put(&adev->ualink.config->kobj); + adev->ualink.config = NULL; + } if (adev->ualink.setup) { sysfs_remove_files(&adev->ualink.setup->kobj, ualink_ppod_setup_attrs); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.h index ea52dcd44d088..67fe40cd08e71 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.h @@ -93,9 +93,17 @@ struct amdgpu_ualink_ppod_setup { }; #define to_ualink_ppod_setup(ko) container_of(ko, struct amdgpu_ualink_ppod_setup, kobj) +/* UAlink virtual pod config */ +struct amdgpu_ualink_vpod_config { + struct kobject kobj; + struct amdgpu_ualink_vpod_info vpod; +}; +#define to_ualink_vpod_config(ko) container_of(ko, struct amdgpu_ualink_vpod_config, kobj) + struct amdgpu_ualink_mgr { struct amdgpu_ualink_info *info; struct amdgpu_ualink_ppod_setup *setup; + struct amdgpu_ualink_vpod_config *config; }; int amdgpu_ualink_sysfs_init(struct amdgpu_device *adev); -- 2.55.0