Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp1613928rdb; Thu, 7 Dec 2023 04:26:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IGHa4QZp+fytVyA8RSvOQbHHEnTK+n6EsBv3+AUh2vrHl5b6QBa+KQhkvPedRIIJst4YPD4 X-Received: by 2002:a17:902:d48b:b0:1d0:71fc:b3ae with SMTP id c11-20020a170902d48b00b001d071fcb3aemr2687098plg.29.1701951961716; Thu, 07 Dec 2023 04:26:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701951961; cv=none; d=google.com; s=arc-20160816; b=Kx/woDCCwVN97csJhlmidM3J44a6gXs36Nbpn0jUeTCFm10ZMbu+H4BC+iuNnKrvax wTyc4Kux9glm2lHFqQ7n+qoggohQSMygXcbk6nH/24fpbpgPMzFevUNuRm8Yxgafi1W6 9YY58c8wGF2Brn+dN+KcSRwyRD7R/2IOcJgbLqTOM50OP8RrS9+jKgACnCDzQaJe1ewD fIehS7/oaI13HddYFZd8WAXErsPmgS20qPtl49RCl3Gt1SM36qo3Q3G00deS7ZxRNFuz mZqnS3o5pDssul/pzi2a+Ksjnh6eZVhB7hLtsA7d0XgwjHq1uP4boK3SSTp+ejyiuDTH ogCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OL/njccnJ0of/NXUyBupj32Tru6Wvlc93EBZH01ugbs=; fh=PceJZ/KGF6ujSpGwn68DXpj5qiXzqwvBM4Q702GUgLM=; b=TrkMSBFdV4rKOv6gp8cpZvBjQQUNE2M3pOJDeBKiMVYZOSeAMdNIa3t3gvGZ8EtpgL p2zRIWPWGe4bcmdrEFubZdYSw5/oD7tCFkerxjm1uO4ik1IoE3EojKzQx9tJ312N0cl6 wgIa5Avh73V5ucgSMQEEzQp5J+1iwdG3/x91zehVGBRJ2tgIKYLoUSSD6K9fMWy2wDMt Bu4t9H8oNBM8BuMm4IMdUGEq1+DNEsj7diH5z1QoN3ROwSgt0RkOrGzIX/Jx5xH0mVTE Ln6NVGMj/z/UuQAtCqMlIYEUbVRWliZqdU9+0kv2pYgTmFzLuwd3gpLOtZLK4cQ8qRhK O35A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BHXT3Gp6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id c6-20020a170902c1c600b001d06ae1f9ccsi1024360plc.606.2023.12.07.04.26.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 04:26:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BHXT3Gp6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 5BD4C8087F12; Thu, 7 Dec 2023 04:25:27 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379337AbjLGMYw (ORCPT + 99 others); Thu, 7 Dec 2023 07:24:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379288AbjLGMYs (ORCPT ); Thu, 7 Dec 2023 07:24:48 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E234DD5C for ; Thu, 7 Dec 2023 04:24:54 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 753FFC433C9; Thu, 7 Dec 2023 12:24:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701951894; bh=/Qy3zG8E9tn/KPpMqCwh71W5AGo9u8gLdNF43wXGlpY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BHXT3Gp6YtSwXjgKhY9VyjB4fFNu4xOUcjKuBZtzYR9B1Bix0JeAo4pRptILBFT3o oMy28rqecKS6VJh7sRa+bPrnfoWNGxt6k94ma5nPHTXxVRmQjgixCEYGYXJG29Texl rZkIqlukgXqiKcyYgFig0ekPzIycT+XaXacBDr9qEIcoodG6764esxcSzGcc03qYMD DbAQ0T9+HXaqSnKfOA+NVeVVtM1ud3KvK5gqwGf+PhhGXk0G/8+lCEDD/+dPzkT3nk 2XmNmggJJTwIKJEDVigIT7FMq+G8jAEYzs0MaIrm4gGytAEKTfZAP5VLbk6xqrchUh k97KEZKOFjDqg== From: Oded Gabbay To: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Tomer Tayar Subject: [PATCH 4/5] accel/habanalabs: add parent_device sysfs attribute Date: Thu, 7 Dec 2023 14:24:43 +0200 Message-Id: <20231207122444.50512-4-ogabbay@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231207122444.50512-1-ogabbay@kernel.org> References: <20231207122444.50512-1-ogabbay@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 07 Dec 2023 04:25:27 -0800 (PST) From: Tomer Tayar The device debugfs directory was modified to be named as the device-name. This name is the parent device name, i.e. either the PCI address in case of an ASIC, or the simulator device name in case of a simulator. This change makes it more difficult for a user to access the debugfs directory for a specific accel device, because he can't just use the accel minor id, but he needs to do more device-dependent operations to get the device name. To make it easier to get this name, add a 'parent_device' sysfs attribute that the user can read using the minor id before accessing debugfs. Signed-off-by: Tomer Tayar Reviewed-by: Oded Gabbay Signed-off-by: Oded Gabbay --- Documentation/ABI/testing/sysfs-driver-habanalabs | 6 ++++++ drivers/accel/habanalabs/common/habanalabs.h | 3 +++ drivers/accel/habanalabs/common/sysfs.c | 9 +++++++++ 3 files changed, 18 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-driver-habanalabs b/Documentation/ABI/testing/sysfs-driver-habanalabs index 89fe3b09d4ad..4244f5af4b54 100644 --- a/Documentation/ABI/testing/sysfs-driver-habanalabs +++ b/Documentation/ABI/testing/sysfs-driver-habanalabs @@ -155,6 +155,12 @@ KernelVersion: not yet upstreamed Contact: ogabbay@kernel.org Description: Displays the device's module id +What: /sys/class/accel/accel/device/parent_device +Date: Nov 2023 +KernelVersion: 6.8 +Contact: ttayar@habana.ai +Description: Displays the name of the parent device of the accel device + What: /sys/class/accel/accel/device/pci_addr Date: Jan 2019 KernelVersion: 5.1 diff --git a/drivers/accel/habanalabs/common/habanalabs.h b/drivers/accel/habanalabs/common/habanalabs.h index dd3fe3ddc00a..2a900c9941fe 100644 --- a/drivers/accel/habanalabs/common/habanalabs.h +++ b/drivers/accel/habanalabs/common/habanalabs.h @@ -3521,6 +3521,9 @@ struct hl_device { u8 heartbeat; }; +/* Retrieve PCI device name in case of a PCI device or dev name in simulator */ +#define HL_DEV_NAME(hdev) \ + ((hdev)->pdev ? dev_name(&(hdev)->pdev->dev) : "NA-DEVICE") /** * struct hl_cs_encaps_sig_handle - encapsulated signals handle structure diff --git a/drivers/accel/habanalabs/common/sysfs.c b/drivers/accel/habanalabs/common/sysfs.c index c940c5f1d109..8a9f98832157 100644 --- a/drivers/accel/habanalabs/common/sysfs.c +++ b/drivers/accel/habanalabs/common/sysfs.c @@ -410,6 +410,13 @@ static ssize_t module_id_show(struct device *dev, return sprintf(buf, "%u\n", le32_to_cpu(hdev->asic_prop.cpucp_info.card_location)); } +static ssize_t parent_device_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct hl_device *hdev = dev_get_drvdata(dev); + + return sprintf(buf, "%s\n", HL_DEV_NAME(hdev)); +} + static DEVICE_ATTR_RO(armcp_kernel_ver); static DEVICE_ATTR_RO(armcp_ver); static DEVICE_ATTR_RO(cpld_ver); @@ -430,6 +437,7 @@ static DEVICE_ATTR_RO(uboot_ver); static DEVICE_ATTR_RO(fw_os_ver); static DEVICE_ATTR_RO(security_enabled); static DEVICE_ATTR_RO(module_id); +static DEVICE_ATTR_RO(parent_device); static struct bin_attribute bin_attr_eeprom = { .attr = {.name = "eeprom", .mode = (0444)}, @@ -456,6 +464,7 @@ static struct attribute *hl_dev_attrs[] = { &dev_attr_fw_os_ver.attr, &dev_attr_security_enabled.attr, &dev_attr_module_id.attr, + &dev_attr_parent_device.attr, NULL, }; -- 2.34.1