From patchwork Wed Nov 22 08:02:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gangurde, Abhijit" X-Patchwork-Id: 168152 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp1165236vqb; Wed, 22 Nov 2023 00:05:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IGqTebkS1gbDVD4Pl9pJE5LHhNkkSpnWKlM+YFuqU2QNPoKVPWp6WLkn582HfuyrevIlJly X-Received: by 2002:a05:6830:4b2:b0:6b9:1473:7fa3 with SMTP id l18-20020a05683004b200b006b914737fa3mr1885620otd.27.1700640328198; Wed, 22 Nov 2023 00:05:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1700640328; cv=pass; d=google.com; s=arc-20160816; b=gWAfgzqC0N4OBSdtSWrDzLbW7Z4i1ChKAjNMhp3W04dGuCuEzUbJfEP7MclIddE7Lg rNtQK11iUr+NtBB5IUCWdaipe55o61t+HEUubgB6z5Q/sO5BppHmTlZ4P8oZ+Kbp4PPB UNk25ielx/AML6DY4JsSWZsWQw4fDv9HCX1c2KadrgpWlmT2bUnQpDT6ShvlDHUbW74/ VeUAUVKZ31ku0IiatMLI2bNBE/AHZ0twhwbrTCO1yZx0B8tZxgPKR8spJBld590MgW+7 cS4UWY3Cr1bVVtHgeujDEMwwa8mHJJdJ4Lnlp4IZN+nGlmJHHfxf8fBzeKdH1biL39bY 49sg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=HL2w59sjEoe9KnO7WaMCfjHu9rSES9QIy7+92rYqmh0=; fh=zHGxHrPGbIMWVPxSj4Epz01rzPPXhFNg2h3Kw+vVv7A=; b=hY+iVFA4/RLzuQBRqEbnoU86gKbsXQcFWbeOP/za5rs6k/96RZfQRg34ID2vWqpXc0 p1kxTJzFB+JYhDidjSs8Pg4lXDIFYZi9RHUKHTHtfY0+ytV0qigg8bjf06J010YCZAtU eKxuoDuV09TH8j1ealLgKmvh9S9jzxY9lvYoAryiiQVIglGJQwSbkKxXKQVEtLqqA4mp o1uvOKafOOzqIjCU6JWX+4Bv3SKI9gbonc028ZMXwBoeOCIHYm5a0SfHsiwj5eGv2vZO T0+/m6C6I8L0RGKHyb9ODPdhoktVJgmBcGFdiF9b/ba/VY0SRjfE6u+2fiUMK/LJqi1I 3QMQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=yEH35Iju; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id c19-20020a630d13000000b005b99ea783aasi11445769pgl.755.2023.11.22.00.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 00:05:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=yEH35Iju; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 6AD1B80C0344; Wed, 22 Nov 2023 00:03:25 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234599AbjKVIDZ (ORCPT + 99 others); Wed, 22 Nov 2023 03:03:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234943AbjKVIDY (ORCPT ); Wed, 22 Nov 2023 03:03:24 -0500 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2043.outbound.protection.outlook.com [40.107.243.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 000089D for ; Wed, 22 Nov 2023 00:03:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N9vgADmLtBJog7Vyh4oZR4cIiU2MjddS4elldFMDIgbLrI9STfVUd5LMOpFBRE2LVkd8vGdhV31ShADNWhz8hjKqZdl18Ie6PB7tj5ZoC9z93fGuNDWnFo8HCzAPp2MlPtiBvoDc8/1bduwiZ3MdWtLB5zKpCheW96KcNfjsG1qVVv+5fcdznC+F6B+Qt5XHD71rXwYrJocEZdhGjxiYbWUVnnUylTb4pCyRNhpPDn96nLS2iPSnU+9HuiE2qq0wWipG681U+8Ra4hS1dRLjxojrFb6Z27PiignokK39z//QSlpOpD28sfjHolaJnZi5d9UneSfdjWpYP4kgfv/k0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=HL2w59sjEoe9KnO7WaMCfjHu9rSES9QIy7+92rYqmh0=; b=XoFNKIylTzwj/a/IrlJkq07L2kdoqyOD7Cmpw12wBUQXMgwoq4cRe5ZEoudtvncNCnYwUFmvZ7dZwsLNW4HJbGJdvvOKnMhfIszc5cYdM8Mwm+lqt/kdxx8Kw4cVYG7IzX1EWx/vJr64q02LvswiIJt0WOxUWojmK0GcQXb/lcktDU1lxgfIZowY+jViBbc45ZgpyLU8vA0BnrZVWzTlDpRI7z5AozWQofGy9NiykvWabc/mHBwdOCoawb+Kx7lNP0LrtoV6OowU7DTmnsgP6nM5p/Il6CdLpgp/ZV1XKt3qt5a1mqQETSUaXHIUHnG1IEFEr7X4oTbTSD5Kp/aFdg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linuxfoundation.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=HL2w59sjEoe9KnO7WaMCfjHu9rSES9QIy7+92rYqmh0=; b=yEH35Ijus7KJx5r4xBcHmfxSnwzu1oWAIGXhKfObPoLOxNLR5k3vobK+ghbTuZA4aj6IsKNqmsUhbnL5OcVwsOoYOoG3jgY9k5b1LbM/bV8HGzh0AK6w1i3m4QaYL1JBzpH+IuOnTrfyLJ2gO0H0o1upUH8yMEJ+c8Y1AwhRt9U= Received: from DM6PR03CA0071.namprd03.prod.outlook.com (2603:10b6:5:100::48) by SA1PR12MB6677.namprd12.prod.outlook.com (2603:10b6:806:250::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.28; Wed, 22 Nov 2023 08:03:15 +0000 Received: from DS2PEPF00003445.namprd04.prod.outlook.com (2603:10b6:5:100:cafe::b4) by DM6PR03CA0071.outlook.office365.com (2603:10b6:5:100::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.18 via Frontend Transport; Wed, 22 Nov 2023 08:03:15 +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=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by DS2PEPF00003445.mail.protection.outlook.com (10.167.17.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7025.12 via Frontend Transport; Wed, 22 Nov 2023 08:03:15 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Wed, 22 Nov 2023 02:03:14 -0600 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Wed, 22 Nov 2023 02:03:14 -0600 Received: from xhdipdslab61.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Wed, 22 Nov 2023 02:03:12 -0600 From: Abhijit Gangurde To: , , CC: , , , , Abhijit Gangurde Subject: [PATCH 1/2] cdx: create sysfs bin files for cdx resources Date: Wed, 22 Nov 2023 13:32:59 +0530 Message-ID: <20231122080300.3727388-1-abhijit.gangurde@amd.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003445:EE_|SA1PR12MB6677:EE_ X-MS-Office365-Filtering-Correlation-Id: 06f94668-4a3b-45d0-4b66-08dbeb317b0e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VzPVzpp8L7X/vocpFcDTM1JRyuf9aX3DdqUV6/LUW9z9I+M5zqgOqzoWkZpC1Cw66qrBBQGQlAY+TGgBnyg9LXxjdEkSUkBe84cenOM+sT2WhntzOdGpuhe0o2gXNCpg3iloYOfFuNauS39k7407pzVqP6Y+HXSrDHXe6JHbhgLyslIQp6pay4Z57PuO86+r2doygUOHwB1LbGyRP641rSWY9DDyFodrcg/57ABx4HD8dkBS4gLpNfZ0yzhas8O9e14QfC5NjH7AZbwKNxpiimlufHgn7PAleC+nX4mTIdTNRekIe8QnzX3EbWLQCG4BE9FWZm4JNke4LEpPEc0bhoABgt47ELAQnqOWXwcCWHHFJRGyc9rO5wByy4LOA5pNUkWf/d74nMlgjLXPo+hVhNJUxe0XahExWxBYpw5GMqNBtrDO48Ie0wYs15zxdm/XNU7w/g2JaxZ/Z3AWHZJlArHh8l8r8coxzRK3bvc6qFO3A7uAIQYJof4gSo0+4+KaGtt7cLkdhPRuAVBZEeYwxMry6YT7PnMBpBrrDwJA5I4pVl8wTLXe6+dY8FmOIBHfEVdMmKPVHheMR9nb368kSsXDZ+MIoqOowz3wQx0beBTTk7X0VEIRMVSjVIs6UbKe0X/zBrACO5o7BYvAP9+H02alz8hg15k5gP1Iv65TsDkLhrHKTKl+bSDhgxDR3yrp7uOJM/MqE5S4fsIuxEZ4euLY5eSfrFWJZI7R1G89LEXoC+2Axi2Bh/PaN04BG7w0FRzGrUNqTAkfNAhsG2dNUQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(376002)(39860400002)(346002)(136003)(396003)(230922051799003)(451199024)(64100799003)(82310400011)(186009)(1800799012)(36840700001)(46966006)(40470700004)(40460700003)(356005)(336012)(70586007)(2616005)(26005)(1076003)(426003)(36860700001)(4326008)(41300700001)(70206006)(8936002)(8676002)(44832011)(47076005)(2906002)(478600001)(5660300002)(110136005)(54906003)(316002)(83380400001)(6636002)(6666004)(36756003)(81166007)(82740400003)(86362001)(40480700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2023 08:03:15.2735 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 06f94668-4a3b-45d0-4b66-08dbeb317b0e 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=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF00003445.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6677 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Wed, 22 Nov 2023 00:03:25 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783250632603177468 X-GMAIL-MSGID: 1783250632603177468 Resource binary file contains the content of the memory regions. These resources devices can be used to mmap the MMIO regions in the user-space. Co-developed-by: Puneet Gupta Signed-off-by: Puneet Gupta Signed-off-by: Abhijit Gangurde --- Documentation/ABI/testing/sysfs-bus-cdx | 7 ++ drivers/cdx/cdx.c | 118 +++++++++++++++++++++++- include/linux/cdx/cdx_bus.h | 10 ++ 3 files changed, 134 insertions(+), 1 deletion(-) diff --git a/Documentation/ABI/testing/sysfs-bus-cdx b/Documentation/ABI/testing/sysfs-bus-cdx index 8c067ff99e54..e84277531414 100644 --- a/Documentation/ABI/testing/sysfs-bus-cdx +++ b/Documentation/ABI/testing/sysfs-bus-cdx @@ -98,6 +98,13 @@ Description: # echo 1 > /sys/bus/cdx/devices/.../remove +What: /sys/bus/cdx/devices/.../resource +Date: July 2023 +Contact: puneet.gupta@amd.com +Description: + The resource binary file contains the content of the memory + regions. These files can be m'maped from userspace. + What: /sys/bus/cdx/devices/.../modalias Date: July 2023 Contact: nipun.gupta@amd.com diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c index c5873980a9d3..4edf64f9e98d 100644 --- a/drivers/cdx/cdx.c +++ b/drivers/cdx/cdx.c @@ -78,6 +78,8 @@ static DEFINE_MUTEX(cdx_controller_lock); static char *compat_node_name = "xlnx,versal-net-cdx"; +static void cdx_destroy_res_attr(struct cdx_device *cdx_dev, int num); + /** * cdx_dev_reset - Reset a CDX device * @dev: CDX device @@ -146,6 +148,7 @@ static int cdx_unregister_device(struct device *dev, if (cdx_dev->enabled && cdx->ops->bus_disable) cdx->ops->bus_disable(cdx, cdx_dev->bus_num); } else { + cdx_destroy_res_attr(cdx_dev, MAX_CDX_DEV_RESOURCES); kfree(cdx_dev->driver_override); cdx_dev->driver_override = NULL; } @@ -641,11 +644,105 @@ static void cdx_device_release(struct device *dev) kfree(cdx_dev); } +static const struct vm_operations_struct cdx_phys_vm_ops = { +#ifdef CONFIG_HAVE_IOREMAP_PROT + .access = generic_access_phys, +#endif +}; + +/** + * cdx_mmap_resource - map a CDX resource into user memory space + * @fp: File pointer. Not used in this function, but required where + * this API is registered as a callback. + * @kobj: kobject for mapping + * @attr: struct bin_attribute for the file being mapped + * @vma: struct vm_area_struct passed into the mmap + * + * Use the regular CDX mapping routines to map a CDX resource into userspace. + * + * Return: true on success, false otherwise. + */ +static int cdx_mmap_resource(struct file *fp, struct kobject *kobj, + struct bin_attribute *attr, + struct vm_area_struct *vma) +{ + struct cdx_device *cdx_dev = to_cdx_device(kobj_to_dev(kobj)); + int num = (unsigned long)attr->private; + struct resource *res; + unsigned long size; + + res = &cdx_dev->res[num]; + if (iomem_is_exclusive(res->start)) + return -EINVAL; + + /* Make sure the caller is mapping a valid resource for this device */ + size = ((cdx_resource_len(cdx_dev, num) - 1) >> PAGE_SHIFT) + 1; + if (vma->vm_pgoff + vma_pages(vma) > size) + return -EINVAL; + + /* + * Map memory region and vm->vm_pgoff is expected to be an + * offset within that region. + */ + vma->vm_page_prot = pgprot_device(vma->vm_page_prot); + vma->vm_pgoff += (cdx_resource_start(cdx_dev, num) >> PAGE_SHIFT); + vma->vm_ops = &cdx_phys_vm_ops; + return io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, + vma->vm_end - vma->vm_start, + vma->vm_page_prot); +} + +static void cdx_destroy_res_attr(struct cdx_device *cdx_dev, int num) +{ + int i; + + /* removing the bin attributes */ + for (i = 0; i < num; i++) { + struct bin_attribute *res_attr; + + res_attr = cdx_dev->res_attr[i]; + if (res_attr) { + sysfs_remove_bin_file(&cdx_dev->dev.kobj, res_attr); + kfree(res_attr); + } + } +} + +#define CDX_RES_ATTR_NAME_LEN 10 +static int cdx_create_res_attr(struct cdx_device *cdx_dev, int num) +{ + struct bin_attribute *res_attr; + char *res_attr_name; + int ret; + + res_attr = kzalloc(sizeof(*res_attr) + CDX_RES_ATTR_NAME_LEN, GFP_ATOMIC); + if (!res_attr) + return -ENOMEM; + + res_attr_name = (char *)(res_attr + 1); + + sysfs_bin_attr_init(res_attr); + + cdx_dev->res_attr[num] = res_attr; + sprintf(res_attr_name, "resource%d", num); + + res_attr->mmap = cdx_mmap_resource; + res_attr->attr.name = res_attr_name; + res_attr->attr.mode = 0600; + res_attr->size = cdx_resource_len(cdx_dev, num); + res_attr->private = (void *)(unsigned long)num; + ret = sysfs_create_bin_file(&cdx_dev->dev.kobj, res_attr); + if (ret) + kfree(res_attr); + + return ret; +} + int cdx_device_add(struct cdx_dev_params *dev_params) { struct cdx_controller *cdx = dev_params->cdx; struct cdx_device *cdx_dev; - int ret; + int ret, i; cdx_dev = kzalloc(sizeof(*cdx_dev), GFP_KERNEL); if (!cdx_dev) @@ -696,7 +793,26 @@ int cdx_device_add(struct cdx_dev_params *dev_params) goto fail; } + /* Create resource attributes */ + for (i = 0; i < MAX_CDX_DEV_RESOURCES; i++) { + if (cdx_resource_flags(cdx_dev, i) & IORESOURCE_MEM) { + /* skip empty resources */ + if (!cdx_resource_len(cdx_dev, i)) + continue; + + ret = cdx_create_res_attr(cdx_dev, i); + if (ret != 0) { + dev_err(&cdx_dev->dev, + "cdx device resource<%d> file creation failed: %d", i, ret); + goto resource_create_fail; + } + } + } + return 0; +resource_create_fail: + cdx_destroy_res_attr(cdx_dev, i); + device_del(&cdx_dev->dev); fail: /* * Do not free cdx_dev here as it would be freed in diff --git a/include/linux/cdx/cdx_bus.h b/include/linux/cdx/cdx_bus.h index db39835b93d2..3096c31d5b9f 100644 --- a/include/linux/cdx/cdx_bus.h +++ b/include/linux/cdx/cdx_bus.h @@ -154,6 +154,7 @@ struct cdx_device { u8 bus_num; u8 dev_num; struct resource res[MAX_CDX_DEV_RESOURCES]; + struct bin_attribute *res_attr[MAX_CDX_DEV_RESOURCES]; u8 res_count; u64 dma_mask; u16 flags; @@ -170,6 +171,15 @@ struct cdx_device { #define to_cdx_device(_dev) \ container_of(_dev, struct cdx_device, dev) +#define cdx_resource_start(dev, num) ((dev)->res[(num)].start) +#define cdx_resource_end(dev, num) ((dev)->res[(num)].end) +#define cdx_resource_flags(dev, num) ((dev)->res[(num)].flags) +#define cdx_resource_len(dev, num) \ + ((cdx_resource_start((dev), (num)) == 0 && \ + cdx_resource_end((dev), (num)) == \ + cdx_resource_start((dev), (num))) ? 0 : \ + (cdx_resource_end((dev), (num)) - \ + cdx_resource_start((dev), (num)) + 1)) /** * struct cdx_driver - CDX device driver * @driver: Generic device driver From patchwork Wed Nov 22 08:03:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gangurde, Abhijit" X-Patchwork-Id: 168146 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp1164445vqb; Wed, 22 Nov 2023 00:03:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IENFGA2R0Q9EFjzCzR9IsF7Sj4iIzOY1YWNQDGCUKDEOmgytABelCiILl67qFFMuSisYJGb X-Received: by 2002:a17:90b:1b07:b0:280:23e1:e4dd with SMTP id nu7-20020a17090b1b0700b0028023e1e4ddmr2609604pjb.17.1700640227201; Wed, 22 Nov 2023 00:03:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1700640227; cv=pass; d=google.com; s=arc-20160816; b=yoSyM+h5VN8O968DQth+x+A+A7BR1r7Kh0Io3e1lj5mNiYrRuP7U9Tq8Sneax+z8uF g1PSt3HfGEwDkyYyVOsI47rMSyNSieO8/gZgyeUybKtesEgZwVkzlZTuFreLUpXkHKtm 3RvPpfBn0SW5ODRHrJluwMarnFK5qDMmBR9WkmX7OpvY63CZ9J62dZwTvUXCqHy6hz+n 1kq7olrHZzouXhK0YJjsfbTUHkIBcSFH2iOtnvQeMq9Q4s2J+iZ8dWeCvSHZKLiyoigs 4PnCzKDwxuC2ZmRROxJdxFLwt6IaB35MJH+IS2ggG8/xZaJaWcywIwb6Jn/oD33qTzCh Cp/A== ARC-Message-Signature: i=2; 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=k8jn3RKSGW+UK6pLa1fN9RoACYuz7Prrixw0YTYU7tg=; fh=zHGxHrPGbIMWVPxSj4Epz01rzPPXhFNg2h3Kw+vVv7A=; b=qWvPIwEs4uVR8woCljl+/eDXZrb/Da00yfpZSk6Iun+C5vsJ2SyfBDiQS63vZx1IWF gGewkfSZQJX4LfXpFBE9rjGfCYtboVyJEE4OJOvkztGY3hWSiuZajFJO4VURGSH28jda 9xKz2W5Q9t7+l+APaFEHORWqTbFp8JXG1rSP9maasHwem1IXXswMeUxMkajuN6ZYD4eC sCY3AJEhPy1BUL1cZOx5Kd1rqQW+Psa9FPZt7rghpOjl3+PQjAEHURhLrS7V5+fmSDF9 ut4/+zp8/9SqhEDa68sgU/39QTmiHjQkWFuIjB15LYj54q6+3JYEI6f+ixyvgu9+4xOC OiEw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=WJUyguwH; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id om11-20020a17090b3a8b00b00280203592dbsi1020085pjb.90.2023.11.22.00.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 00:03:47 -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=@amd.com header.s=selector1 header.b=WJUyguwH; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 23C10801D281; Wed, 22 Nov 2023 00:03:36 -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 S234982AbjKVIDd (ORCPT + 99 others); Wed, 22 Nov 2023 03:03:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234966AbjKVID3 (ORCPT ); Wed, 22 Nov 2023 03:03:29 -0500 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 606CB110 for ; Wed, 22 Nov 2023 00:03:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=je0tKIhntnBp+Imne9RdkQek30ym+r/DzEcHf3BkOJEo4aW6DhL8IO3uFQtUqgyT7T1cS4U00j82JZ7rFhCVE87aYybpcWN36dUciH7xY/TpHCCaErYHZKRZpZDvXvql2vU8moPdxx+GSyFYebMwdkpiU2aw/X3iJX8BgzFSfF24gMaVT+kGxzO0SjIWA1/bhYSWQuIo/zM4hGS/TsOY4AyY+eoMBZ2lLb9eDYTlXnPpulPwRZoMgRkwRLMpvzcQhS027rRYVhvzWsG8M70QBp6wQxuhuetF7grxASAdXICIF8BpD0Q/EpOd8G7IRHrieK7Su9dUtQN3zebT9ggHvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=k8jn3RKSGW+UK6pLa1fN9RoACYuz7Prrixw0YTYU7tg=; b=esSUshG8vwxqC13TuWHoL0TblFWu5g1+4jzjskEtk6H7+Q33WIKfohy2ZCaOP3elmgsMZ1kd/DPzJwf0bG5H/zU9vJZUL5lDB4kKCc7XUoyoNwz8bQGyZL+oT4ZjpmE06Am/ybkzbAMdaHi3RbaiGr9xtH8uNQcD/QVAt/I8JEVbq8uSospzvqvP5iN5Jq1mcikyCq5GzPG6Macx+7UVvu6C5pOujMGktuVh8Kg71X6B9KWw68OCJyOFCAU7dPURwkArRhLve8VdjcIYDENFWUCuDzrpSQs8VUGR2nIS7QWSNgQfJxwLCy2RNVz0Z8ouTd0+HYFUFaDP4QQaHccRlQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linuxfoundation.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=k8jn3RKSGW+UK6pLa1fN9RoACYuz7Prrixw0YTYU7tg=; b=WJUyguwH0e55N2nN9N+XrpOBI5+D/cJAtOVQ1sXc6BIrW6poGmuV63YS/CKHMaMXcz6hcF7Uy9mvl48plK9b4Jj8h0nynYEZhWXWm7lMZys6w+ZZ4oXfwRxUL5zlXG/DCRGplQm7sCgLb3ABeWWjm2Cl/GIpah5v8RVhqj6JSQo= Received: from CH5P221CA0005.NAMP221.PROD.OUTLOOK.COM (2603:10b6:610:1f2::29) by CH3PR12MB8909.namprd12.prod.outlook.com (2603:10b6:610:179::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.18; Wed, 22 Nov 2023 08:03:23 +0000 Received: from DS2PEPF00003445.namprd04.prod.outlook.com (2603:10b6:610:1f2:cafe::8a) by CH5P221CA0005.outlook.office365.com (2603:10b6:610:1f2::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.18 via Frontend Transport; Wed, 22 Nov 2023 08:03:23 +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=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by DS2PEPF00003445.mail.protection.outlook.com (10.167.17.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7025.12 via Frontend Transport; Wed, 22 Nov 2023 08:03:23 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Wed, 22 Nov 2023 02:03:20 -0600 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Wed, 22 Nov 2023 00:03:20 -0800 Received: from xhdipdslab61.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Wed, 22 Nov 2023 02:03:18 -0600 From: Abhijit Gangurde To: , , CC: , , , , Abhijit Gangurde Subject: [PATCH 2/2] cdx: Create resource debugfs file for cdx device Date: Wed, 22 Nov 2023 13:33:00 +0530 Message-ID: <20231122080300.3727388-2-abhijit.gangurde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231122080300.3727388-1-abhijit.gangurde@amd.com> References: <20231122080300.3727388-1-abhijit.gangurde@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003445:EE_|CH3PR12MB8909:EE_ X-MS-Office365-Filtering-Correlation-Id: eedf9794-1c72-4ff2-3b16-08dbeb317faf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SuE/8VP17npSAQOScRXtUqNoLxp9cacWps7X5bQjPn117cJYdxAE+OXgOLbEx3ap356kYLIbwUcfX3utDqNwRQuMsR5Kh51lKxVfRzEjsuo9LSoGJ9YRF62sIZoML6bvsn+bBgZY7QcZSiQgLt/ctOKjBs/6eJFkEP+vWRL25ow+N1jB+XcZiR7UQyAzn50AWPrN/EmoJLRGKXd6SvMFyZ5QEGh9dNgMrSrEXG5oNkWiyAtDdhESGcXOgvAn8ZTkMoSvn0GVf8a89fi7EuKpkcvJ45ZLedWNGflqFfDAEXOJYosf1X9Rhwrgl3mBhycFLn6KYjzqnti5aGCubgRgCHZmNoiaRaEKliY8bEIbtf8axVW3643QOMiy/qbA2lVyqy54YO8co58M3SJHVv88UwpPoja9dVX2yjfFpSHjTECftAY7rnIsO7PTz26B1UlM7vd67k7EBBqDfkt2+Rgk8qQcp0YTW9hZJBXQkBEuVkFEPVfEBMabl0EPdFGRCOdpyV1zblnxeex0YPYBE2OBPNQ6F9bnuBBkS12cGSi580EsapPjFNjnwxcKqg1LJrTDMrnJq4eRUm2nymvNC/vDrJ7oEwWocIz4rb1YPZIJuCVAp7F9nnw0aM7PXDUxd2SwgpP5rUi1DR8Nxi/kJ6pN1qkodiA1WroAVoj9IQdjpnJ+rbCbJXKcDrPnqG96GDT8T1ORII3SJG1Y4WxVesK2veMsnEf3eTjM6511Ns9AUjq636qLDm+YYOIDuvQNvQojlDQXsG6NABokjtCFUxw0mQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(396003)(39860400002)(136003)(376002)(346002)(230922051799003)(82310400011)(1800799012)(64100799003)(186009)(451199024)(36840700001)(46966006)(40470700004)(44832011)(5660300002)(40480700001)(8676002)(8936002)(4326008)(41300700001)(2906002)(70586007)(70206006)(110136005)(316002)(54906003)(6636002)(40460700003)(47076005)(26005)(478600001)(1076003)(36756003)(6666004)(2616005)(426003)(336012)(356005)(81166007)(36860700001)(83380400001)(86362001)(82740400003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2023 08:03:23.0547 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eedf9794-1c72-4ff2-3b16-08dbeb317faf 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=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF00003445.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8909 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, 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]); Wed, 22 Nov 2023 00:03:36 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783250526644312241 X-GMAIL-MSGID: 1783250526644312241 resource debugfs file contains host addresses of CDX device resources. Each line of the resource file describe a region with start, end and flag fields. Signed-off-by: Abhijit Gangurde --- drivers/cdx/cdx.c | 42 ++++++++++++++++++++++++++++++++++++- include/linux/cdx/cdx_bus.h | 2 ++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c index 4edf64f9e98d..e01376272ed3 100644 --- a/drivers/cdx/cdx.c +++ b/drivers/cdx/cdx.c @@ -65,6 +65,7 @@ #include #include #include +#include #include "cdx.h" /* Default DMA mask for devices on a CDX bus */ @@ -75,6 +76,8 @@ static DEFINE_IDA(cdx_controller_ida); /* Lock to protect controller ops */ static DEFINE_MUTEX(cdx_controller_lock); +/* Debugfs dir for cdx bus */ +static struct dentry *cdx_debugfs_dir; static char *compat_node_name = "xlnx,versal-net-cdx"; @@ -149,6 +152,7 @@ static int cdx_unregister_device(struct device *dev, cdx->ops->bus_disable(cdx, cdx_dev->bus_num); } else { cdx_destroy_res_attr(cdx_dev, MAX_CDX_DEV_RESOURCES); + debugfs_remove_recursive(cdx_dev->debugfs_dir); kfree(cdx_dev->driver_override); cdx_dev->driver_override = NULL; } @@ -552,6 +556,34 @@ static const struct attribute_group *cdx_dev_groups[] = { NULL, }; +static int cdx_debug_resource_show(struct seq_file *s, void *data) +{ + struct cdx_device *cdx_dev = s->private; + int i; + + for (i = 0; i < MAX_CDX_DEV_RESOURCES; i++) { + struct resource *res = &cdx_dev->res[i]; + + seq_printf(s, "0x%016llx 0x%016llx 0x%016llx\n", + (unsigned long long)res->start, + (unsigned long long)res->end, + (unsigned long long)res->flags); + } + + return 0; +} +DEFINE_SHOW_ATTRIBUTE(cdx_debug_resource); + +static void cdx_device_debugfs_init(struct cdx_device *cdx_dev) +{ + cdx_dev->debugfs_dir = debugfs_create_dir(dev_name(&cdx_dev->dev), cdx_debugfs_dir); + if (IS_ERR(cdx_dev->debugfs_dir)) + return; + + debugfs_create_file("resource", 0444, cdx_dev->debugfs_dir, cdx_dev, + &cdx_debug_resource_fops); +} + static ssize_t rescan_store(const struct bus_type *bus, const char *buf, size_t count) { @@ -809,6 +841,8 @@ int cdx_device_add(struct cdx_dev_params *dev_params) } } + cdx_device_debugfs_init(cdx_dev); + return 0; resource_create_fail: cdx_destroy_res_attr(cdx_dev, i); @@ -913,6 +947,12 @@ EXPORT_SYMBOL_NS_GPL(cdx_unregister_controller, CDX_BUS_CONTROLLER); static int __init cdx_bus_init(void) { - return bus_register(&cdx_bus_type); + int ret; + + ret = bus_register(&cdx_bus_type); + if (!ret) + cdx_debugfs_dir = debugfs_create_dir(cdx_bus_type.name, NULL); + + return ret; } postcore_initcall(cdx_bus_init); diff --git a/include/linux/cdx/cdx_bus.h b/include/linux/cdx/cdx_bus.h index 3096c31d5b9f..681fd4d644ab 100644 --- a/include/linux/cdx/cdx_bus.h +++ b/include/linux/cdx/cdx_bus.h @@ -128,6 +128,7 @@ struct cdx_controller { * @dev_num: Device number for this device * @res: array of MMIO region entries * @res_attr: resource binary attribute + * @debugfs_dir: debugfs directory for this device * @res_count: number of valid MMIO regions * @dma_mask: Default DMA mask * @flags: CDX device flags @@ -155,6 +156,7 @@ struct cdx_device { u8 dev_num; struct resource res[MAX_CDX_DEV_RESOURCES]; struct bin_attribute *res_attr[MAX_CDX_DEV_RESOURCES]; + struct dentry *debugfs_dir; u8 res_count; u64 dma_mask; u16 flags;