From nobody Thu Dec 18 06:22:21 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54F1DC83F18 for ; Sat, 26 Aug 2023 04:56:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231841AbjHZEwg (ORCPT ); Sat, 26 Aug 2023 00:52:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231603AbjHZEwD (ORCPT ); Sat, 26 Aug 2023 00:52:03 -0400 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 7826E2137 for ; Fri, 25 Aug 2023 21:51:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VzxDSdN+0prcsJ3g0Xf62DlFaP8v8RSLAE/OGeegwH93wWzWi5xzSkhYnV9ImnDGdQvV67QpdUXbDSJb6P55H7xp5zvUPEkiylqSHDsz4N1p5EuzisN542JRhFQQrRYAP+qK7ypEy/9IFaelOqLvqYrW2EBq0uCN+RrA2DNtGmZu74TKGDsWtUxRjvQ612sBExTpVr43gixl9c15aqfor2JYIPghZ09ahDg41oxyAwA3CFkfZJkBDLGUkTFAaJjG9VeORC9bUeGt7ESbK3EdLo4obpAQ2bLezrp360fR7n/xwmVtMNVtXSw8PJzITyaJKw1WhkUMBzSY+z4z74fCVA== 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=f88kgwzT4HIkL9puzbph1MsoBva+epZs24z6mKop6BE=; b=Z00G9IgMmRcpGzMSs64vVBq0rTwSmpmipfXWj+kX2cu948LdJWC2KoxWTR1GXHEnNwv3BNPbddSj6Ej5HI0a6lEhwR6sT/ft/FUo3lxP0dzEnhaJQU9sea1AUXwLYWa9OExt7s6uPf8T1diIXLhv9CqXoRNhqNm5MYVVOQWSHg+r5BsGcCazvRwuC++0rIgcK33zwX3BQXoWY2s1d1CoIjF9AQi4AAavBdzaaNE5exLrZwaY3OyQ1Juf0abGnL2U61dGNPGTgnKXzz0digWM0PVMsRC649vklDA0gjayAJGtahUvF5gcQRkssFnf3FOMLC0NVJubvp4wXf0gvjuSmw== 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 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=f88kgwzT4HIkL9puzbph1MsoBva+epZs24z6mKop6BE=; b=PvYjvxDWgWXIQc0DYLTiAiYl0cT+Rtd39vphvb22cEQ95XQ4oCD13RZNVf443eR+gdhsdsMS2KAn/Xixe8XRvrwro5SlRvzpjQTU4GOvnRV0+hnyoKX50zJ0+4gfG0fEOqQggcK+aonxnsnBnAy9cM7zwolsBL+khe7ucVK5jDY= Received: from CY8PR02CA0013.namprd02.prod.outlook.com (2603:10b6:930:4d::24) by PH7PR12MB7113.namprd12.prod.outlook.com (2603:10b6:510:1ec::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.27; Sat, 26 Aug 2023 04:51:54 +0000 Received: from CY4PEPF0000EE36.namprd05.prod.outlook.com (2603:10b6:930:4d:cafe::ed) by CY8PR02CA0013.outlook.office365.com (2603:10b6:930:4d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.34 via Frontend Transport; Sat, 26 Aug 2023 04:51:53 +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 CY4PEPF0000EE36.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6699.15 via Frontend Transport; Sat, 26 Aug 2023 04:51:53 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) 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.27; Fri, 25 Aug 2023 23:51:52 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 25 Aug 2023 23:51:49 -0500 Received: from xhdipdslab59.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Fri, 25 Aug 2023 23:51:46 -0500 From: Abhijit Gangurde To: , , CC: , , , , , Abhijit Gangurde Subject: [PATCH v4 1/5] cdx: Remove cdx controller list from cdx bus system Date: Sat, 26 Aug 2023 10:19:40 +0530 Message-ID: <20230826044944.4161017-2-abhijit.gangurde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230826044944.4161017-1-abhijit.gangurde@amd.com> References: <20230826044944.4161017-1-abhijit.gangurde@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE36:EE_|PH7PR12MB7113:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a72cac0-3c50-4424-931f-08dba5f02aff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2Lx0cwkQZQCkBK1mRILLuMdC1pKwkXu+OKU8zMb6lwm5mAzEUUpq5w01KrgsyNpDD3vKdjEjcKSbXJkeBidEscZJ7iF1WY24U+f3hmB4loEDTHmqm3ehj09OdzkBWRETVUVe4Nz7DLodbpBkImy4xK3MHG7dAtcvWDLU7LeKJ0mYbvkXyGKj0TMYgg+fBzFpc0orMFFdnZ2h4gqvjQoE7gI/Oitb/5YdX8kXlwPhmALz5B3F3qMJ8ZflqWvo+1QKh1gPHmpN9GZZKtmVYrVHW1EM7IW5sSQgMV7fjpN/sr+hjZxb6jBXbpqMnsqkHlmxjBUipRyM4RVRf6ja0Ek3tjdLUAI9iaPEwB+sGxvQD0AAg967Z+QPHsRkqv2ZTorKCaRbCbpfHxeiJxV8cvAVWVHDvIBS9h3dSOJJx9vgE6fNE2N/Un90TUKh7XEBo53d8EaZ7PPnDxJbbYAPMcUGWc+MkMPa8QApiab5tzc5LNMoQy3Tg0NYrTdPVlG0yWL7tccKpHKOgZR7jCoxjaIG63vdDDxkdzmQOw9mLQcLe1vSLTPyE+Zs0h2Ox1htuw/EXLdkVP4HocjFkAJHBlGwqOvGFfeMg+Z7CW+hCpLtFjFq6tOQjG3mmnqSfIQcm4TiR6NMjUHFPed7LR0xxtuIq633CpuH+UgA4ACGAVLWryxFJTH28vS8Vv0s0y1DmB61nngx3SBDQKC9liO4KHqGqzg27qGHRvVk7Pj4feSvWWfk5JluhdXWPrbQP9F0CgMXuLkWjG7PDEG99nRva+5+dA== 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)(346002)(376002)(39860400002)(136003)(396003)(82310400011)(186009)(1800799009)(451199024)(36840700001)(46966006)(40470700004)(40460700003)(2616005)(1076003)(5660300002)(8676002)(4326008)(8936002)(47076005)(426003)(36756003)(83380400001)(336012)(44832011)(36860700001)(26005)(40480700001)(82740400003)(6666004)(356005)(81166007)(70206006)(54906003)(70586007)(316002)(110136005)(478600001)(41300700001)(2906002)(86362001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2023 04:51:53.4246 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3a72cac0-3c50-4424-931f-08dba5f02aff 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: CY4PEPF0000EE36.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7113 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove xarray list of cdx controller. Instead, use platform bus to locate the cdx controller using compat string used by cdx controller platform driver. Also, use ida to allocate a unique id for the controller. Signed-off-by: Abhijit Gangurde --- Changes in v4: - Make cdx_controller_ida as static Changes in v3: - New patch in the series - Remove xarray list and use platform bus - Use ida to get unique id for controller drivers/cdx/cdx.c | 39 ++++++++++++++++++++++++------------- include/linux/cdx/cdx_bus.h | 2 ++ 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c index d2cad4c670a0..600482694161 100644 --- a/drivers/cdx/cdx.c +++ b/drivers/cdx/cdx.c @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include #include #include @@ -70,8 +70,10 @@ #define CDX_DEFAULT_DMA_MASK (~0ULL) #define MAX_CDX_CONTROLLERS 16 =20 -/* CDX controllers registered with the CDX bus */ -static DEFINE_XARRAY_ALLOC(cdx_controllers); +/* IDA for CDX controllers registered with the CDX bus */ +static DEFINE_IDA(cdx_controller_ida); + +static char *compat_node_name =3D "xlnx,versal-net-cdx"; =20 /** * cdx_dev_reset - Reset a CDX device @@ -384,7 +386,8 @@ static ssize_t rescan_store(const struct bus_type *bus, const char *buf, size_t count) { struct cdx_controller *cdx; - unsigned long index; + struct platform_device *pd; + struct device_node *np; bool val; =20 if (kstrtobool(buf, &val) < 0) @@ -397,12 +400,19 @@ static ssize_t rescan_store(const struct bus_type *bu= s, cdx_unregister_devices(&cdx_bus_type); =20 /* Rescan all the devices */ - xa_for_each(&cdx_controllers, index, cdx) { - int ret; + for_each_compatible_node(np, NULL, compat_node_name) { + if (!np) + return -EINVAL; =20 - ret =3D cdx->ops->scan(cdx); - if (ret) - dev_err(cdx->dev, "cdx bus scanning failed\n"); + pd =3D of_find_device_by_node(np); + if (!pd) + return -EINVAL; + + cdx =3D platform_get_drvdata(pd); + if (cdx && cdx->controller_registered && cdx->ops->scan) + cdx->ops->scan(cdx); + + put_device(&pd->dev); } =20 return count; @@ -520,17 +530,19 @@ int cdx_register_controller(struct cdx_controller *cd= x) { int ret; =20 - ret =3D xa_alloc(&cdx_controllers, &cdx->id, cdx, - XA_LIMIT(0, MAX_CDX_CONTROLLERS - 1), GFP_KERNEL); - if (ret) { + ret =3D ida_alloc_range(&cdx_controller_ida, 0, MAX_CDX_CONTROLLERS - 1,= GFP_KERNEL); + if (ret < 0) { dev_err(cdx->dev, "No free index available. Maximum controllers already registered\n"); cdx->id =3D (u8)MAX_CDX_CONTROLLERS; return ret; } =20 + cdx->id =3D ret; + /* Scan all the devices */ cdx->ops->scan(cdx); + cdx->controller_registered =3D true; =20 return 0; } @@ -541,8 +553,9 @@ void cdx_unregister_controller(struct cdx_controller *c= dx) if (cdx->id >=3D MAX_CDX_CONTROLLERS) return; =20 + cdx->controller_registered =3D false; device_for_each_child(cdx->dev, NULL, cdx_unregister_device); - xa_erase(&cdx_controllers, cdx->id); + ida_free(&cdx_controller_ida, cdx->id); } EXPORT_SYMBOL_GPL(cdx_unregister_controller); =20 diff --git a/include/linux/cdx/cdx_bus.h b/include/linux/cdx/cdx_bus.h index bead71b7bc73..82c27b8c94e1 100644 --- a/include/linux/cdx/cdx_bus.h +++ b/include/linux/cdx/cdx_bus.h @@ -63,12 +63,14 @@ struct cdx_ops { * @dev: Linux device associated with the CDX controller. * @priv: private data * @id: Controller ID + * @controller_registered: controller registered with bus * @ops: CDX controller ops */ struct cdx_controller { struct device *dev; void *priv; u32 id; + bool controller_registered; struct cdx_ops *ops; }; =20 --=20 2.25.1 From nobody Thu Dec 18 06:22:21 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4A45C83F1B for ; Sat, 26 Aug 2023 04:56:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231853AbjHZEwi (ORCPT ); Sat, 26 Aug 2023 00:52:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231833AbjHZEwP (ORCPT ); Sat, 26 Aug 2023 00:52:15 -0400 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2047.outbound.protection.outlook.com [40.107.223.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E6022137 for ; Fri, 25 Aug 2023 21:52:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kyYK8dbXzbn1elcAs27XaXhlJWd2nPB/Bjt6SLeCo4ZkOuWD/f7HOBtx1tO/wBVUm2AMFnl0yU5IJ/ZOSlgjpXk6ATUiKbv6KppBuIVwPTa6XkXIYCgxrRtHnWzNB5300CcV2+D3DnMniBjDJN5Fh1H3RvwyDTE+xynLVzWlzniCo2TTx03WtUnCgZnXNtH/gLOakUi2RTM5EYf9zNIBCZ6+uUdRS3D6h5kxpsH9ltSL9W+5fe7OhfixeIYimli/yUyDmXQRzSJI5/lzhMAN/wx5Jq3UlMiUISNsW/DXejSt+JkWwNqIRW3OiLNQ0NN3OW4rLQ3q3xwoETe9r3UlFg== 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=muSDNwkSAxPapbs3pBN3Ph6h07k35IArMK2169xjOPg=; b=XARQcyDHUYDqqYEe5j0hT1+OPY5bb6jeOnjMmjrsY29Lv92+PA3HZ9SZc5jmN/6rpa+y5Ce8daIpJMZQpmlAsFRGoYrTjNTdjwoR0DFXvYe73P7dhRqAF1cZxWemo9EDwOx50iU2gmb1bNT5Q73TH/pjwLqxwuT1A8+D0/SlhzlzXoWfArx8ug10Dgg03WSV9IxrqFbrMXyaWDFvIFbjDphLiRKaYprlbR9UbItGxKWCxtsWZqXzqw1bOWhAO0ntcTy08mDZAnp9q2ODyc2XZAKSGwpFXYbWUGRMWvHJ4FcjR6nw9J/ZRJ7Lie4cg2WHBB5eqxViandIZi28BD5I6A== 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 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=muSDNwkSAxPapbs3pBN3Ph6h07k35IArMK2169xjOPg=; b=imYYOXW/bR5HNgQbLrvHF32Tj185oBc9WU8bS9BWD5inxzqPmzdgVPfbeiqP9X1FQlwIHbgRiTIurE/nE7quZC391RjxyZwHOKSrvJAN8wKRWgCcrCtvtLqlx6N9IX5ZthJ/ShunyxU128PTvI71HKgKS8z9fyHcSbb7Wc2A6/k= Received: from DS7PR03CA0347.namprd03.prod.outlook.com (2603:10b6:8:55::6) by LV3PR12MB9265.namprd12.prod.outlook.com (2603:10b6:408:215::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.34; Sat, 26 Aug 2023 04:52:09 +0000 Received: from CY4PEPF0000EE3B.namprd03.prod.outlook.com (2603:10b6:8:55:cafe::39) by DS7PR03CA0347.outlook.office365.com (2603:10b6:8:55::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.30 via Frontend Transport; Sat, 26 Aug 2023 04:52:09 +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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CY4PEPF0000EE3B.mail.protection.outlook.com (10.167.242.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6699.15 via Frontend Transport; Sat, 26 Aug 2023 04:52:08 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 25 Aug 2023 23:52:07 -0500 Received: from xhdipdslab59.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Fri, 25 Aug 2023 23:52:05 -0500 From: Abhijit Gangurde To: , , CC: , , , , , Abhijit Gangurde Subject: [PATCH v4 2/5] cdx: Introduce lock to protect controller ops Date: Sat, 26 Aug 2023 10:19:41 +0530 Message-ID: <20230826044944.4161017-3-abhijit.gangurde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230826044944.4161017-1-abhijit.gangurde@amd.com> References: <20230826044944.4161017-1-abhijit.gangurde@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE3B:EE_|LV3PR12MB9265:EE_ X-MS-Office365-Filtering-Correlation-Id: e4c217d9-0d97-4d53-85ad-08dba5f03434 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LmmcdJACqhM+chJItBQJdYcdpf+7g6+75hTgsmgzYDwesqlKUXClGakKvziK/bDPBivBmmhkp782mcrxeGPdlkERSYI1V9ec6/IDqfav5Shn97BYi8qzDCqPm7pDLo3fkbPO4Jd8/Qtasoc1025RkEjEL/1iiW2d3tFfjwZZ7oNNcHc+OzETlAzaTco1XME87sj/ThfhF15dFv3W4s+uZnyo0tDkzwueu0/AlybUm4o5gzkI4Uq6Q0cAar//Fg5ZsKNL0GA5XqmTPT5oO6d4f/NsfylAG6Qqrjh76mKV6J/gdnLnZq0nqypFYveQqiWMJA4Sq82eVlAbTfTnh/9Xuh14nY/2Jazs96rVBD2NG1B5DcGQYn3eps1EDSFDpbk31gLZmxcODM8r8GW02xUMel5FMjsqOlNTJNgzdaaZovtY5c/u6+5/wBNzKnDJauLNoNSn1zuLxZbnvhrOOysSwccBtDrs1vapYESsJDzSnw9kGn472N92FsYYJaQSh+ivajUyYxCXeUwIkgAbXoT0MdjUL0hqnvXLK7FGX50tp3BkEHRFvnC86fkH8xco8qGnALT3q/DJN/mGESb8OjHwP2Cr0ZbMBqyvbHsU6xV3j42Yk+5daNg4N3JUPmnmIRnPQxL8myUiZHvK1uVwfTqL+sGP+fedt8J+/wqsE43w06gzpb8gdc2AFazQZgJIZwP2K+uHm0aQoaTNiMWh+P6yj2kxO3bTTrmcuDqa2mS4hj+4dEE/y7Osv90v8BYdecd4Y+aOtQp4l1vwGQrGsIyH2g== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(39860400002)(376002)(396003)(136003)(346002)(1800799009)(186009)(451199024)(82310400011)(40470700004)(46966006)(36840700001)(6666004)(40480700001)(2616005)(1076003)(40460700003)(44832011)(5660300002)(86362001)(2906002)(4326008)(110136005)(36756003)(41300700001)(8676002)(8936002)(54906003)(70206006)(70586007)(316002)(82740400003)(81166007)(356005)(478600001)(83380400001)(36860700001)(47076005)(26005)(426003)(336012)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2023 04:52:08.8554 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e4c217d9-0d97-4d53-85ad-08dba5f03434 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE3B.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9265 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add a mutex lock to prevent race between controller ops initiated by the bus subsystem and the controller registration/unregistration. Signed-off-by: Abhijit Gangurde --- Changes in v4: - None Changes in v3: - None Changes in v2: - New patch in the series - Introduce new lock drivers/cdx/cdx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c index 600482694161..cbfe9a2f3646 100644 --- a/drivers/cdx/cdx.c +++ b/drivers/cdx/cdx.c @@ -72,6 +72,8 @@ =20 /* IDA for CDX controllers registered with the CDX bus */ static DEFINE_IDA(cdx_controller_ida); +/* Lock to protect controller ops */ +static DEFINE_MUTEX(cdx_controller_lock); =20 static char *compat_node_name =3D "xlnx,versal-net-cdx"; =20 @@ -396,6 +398,8 @@ static ssize_t rescan_store(const struct bus_type *bus, if (!val) return -EINVAL; =20 + mutex_lock(&cdx_controller_lock); + /* Unregister all the devices on the bus */ cdx_unregister_devices(&cdx_bus_type); =20 @@ -415,6 +419,8 @@ static ssize_t rescan_store(const struct bus_type *bus, put_device(&pd->dev); } =20 + mutex_unlock(&cdx_controller_lock); + return count; } static BUS_ATTR_WO(rescan); @@ -538,11 +544,13 @@ int cdx_register_controller(struct cdx_controller *cd= x) return ret; } =20 + mutex_lock(&cdx_controller_lock); cdx->id =3D ret; =20 /* Scan all the devices */ cdx->ops->scan(cdx); cdx->controller_registered =3D true; + mutex_unlock(&cdx_controller_lock); =20 return 0; } @@ -553,9 +561,13 @@ void cdx_unregister_controller(struct cdx_controller *= cdx) if (cdx->id >=3D MAX_CDX_CONTROLLERS) return; =20 + mutex_lock(&cdx_controller_lock); + cdx->controller_registered =3D false; device_for_each_child(cdx->dev, NULL, cdx_unregister_device); ida_free(&cdx_controller_ida, cdx->id); + + mutex_unlock(&cdx_controller_lock); } EXPORT_SYMBOL_GPL(cdx_unregister_controller); =20 --=20 2.25.1 From nobody Thu Dec 18 06:22:21 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C394C83F16 for ; Sat, 26 Aug 2023 04:56:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231862AbjHZExK (ORCPT ); Sat, 26 Aug 2023 00:53:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231833AbjHZEwl (ORCPT ); Sat, 26 Aug 2023 00:52:41 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2087.outbound.protection.outlook.com [40.107.94.87]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 351C3128 for ; Fri, 25 Aug 2023 21:52:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OqXEv9EInFwkHN8QjxAS5AEGg5X+Y22wV+V36Reosg+QDFgAzG2eUJpinWoEdH5FP/+178fVDHwMtBKIMLVuExIlNo+fCCeRICcDu4Bam6hI/WcD83dqRlgoJDruXtKrcrOqOKQ48MXySddQsPq/BFrNqbtzP0jZ1C6EScQkBqSGHAIohxlfTNI+gj+Czxt6vnDbiylrlZCTh+YTsB2tMsz18fwT3OciG4CZvsX2JJfciQXlTY5MRhtMY28Q+7/7htYHRwnwdJhVzYdQ3OAiLNJfs5DvLdigoMwowQXiD6BS07hTnkrsRO4CY5+YQ3rBThGe11/veJTBqXK8s2Y5eA== 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=hwciXnO1pXo4dln6GTn9gw1Bnc9gtEBoBTQUraHsXik=; b=K+Wn72MPwY4rvYMuwV/UC9O5Omut9TjUsOL2MAIxMGf5E86PP3JITeXGMiCg3eK9bJApsFRhIP2z+PTeD8ehhNBqqhZC6CnRwbXerbh6gI7tBb0KQqDE1FlPIlj3d95KC+EZfZpEgn/FrJNDAu37Y6VGC15+MZUt8nKjpVL//zqQgSVq4ALkWvY6iSrT1mmiz9O+pb2fn7bqNDX7bRbMGkNuQoWZMsKhJCn5cMXPfrgAQCSZnVhoDe6OYaK5bHsHK/DOB930+BWs8gCf2nD4QKNfLp7Fd47mCWn/KQw9CxkfKE+0WZK4zUvxaGONBisdWAGP2FsfHDVrow+WA1wQhg== 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 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=hwciXnO1pXo4dln6GTn9gw1Bnc9gtEBoBTQUraHsXik=; b=IoE9ZmZy+VRuz6B/PhJ2dHWPq+nPKFvc5Y1Kb645UxqrMi6OS4zqoHWb7VpaROmI+7+JHxQA4LlnF5lKUaTF4WbJ4v/ftxXEXoltyR0ge++eZMrEQ3hJy/vd9yu8kXulY3Tg7Yb5hiRychVOgttcWyVFykrodVQt/uKHZZa6enE= Received: from CY5PR04CA0018.namprd04.prod.outlook.com (2603:10b6:930:1e::31) by MW3PR12MB4523.namprd12.prod.outlook.com (2603:10b6:303:5b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.34; Sat, 26 Aug 2023 04:52:33 +0000 Received: from CY4PEPF0000E9D1.namprd03.prod.outlook.com (2603:10b6:930:1e:cafe::ba) by CY5PR04CA0018.outlook.office365.com (2603:10b6:930:1e::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.30 via Frontend Transport; Sat, 26 Aug 2023 04:52:33 +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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CY4PEPF0000E9D1.mail.protection.outlook.com (10.167.241.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6699.14 via Frontend Transport; Sat, 26 Aug 2023 04:52:32 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 25 Aug 2023 23:52:31 -0500 Received: from xhdipdslab59.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Fri, 25 Aug 2023 23:52:23 -0500 From: Abhijit Gangurde To: , , CC: , , , , , Abhijit Gangurde , Nipun Gupta , "Pieter Jansen van Vuuren" Subject: [PATCH v4 3/5] cdx: add support for bus enable and disable Date: Sat, 26 Aug 2023 10:19:42 +0530 Message-ID: <20230826044944.4161017-4-abhijit.gangurde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230826044944.4161017-1-abhijit.gangurde@amd.com> References: <20230826044944.4161017-1-abhijit.gangurde@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9D1:EE_|MW3PR12MB4523:EE_ X-MS-Office365-Filtering-Correlation-Id: d361312d-0625-4359-4944-08dba5f0427d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zaRUd4IJvIquhrgqP9AxtoBZzp7g+i2jmYafChvDkCRY97tEvOe8pKMkozZuHiKkvTWrLWyBI5QbP3ue3RP36ZfxaGk7yvAhD2XX3x1N9qUSF+NieD+ucY845tJGb6Y3vFzmtr1rb0EIXEhV9ok8yGinuwoMwm61r2c23JPN/8Mqlg0juX7yT8XtH6U6E60Ix2rtajif3MW0juR5LG9/IsFJPtNEd1gG5Nf1NGgQ7T3SAwvxTvnBhRBe8jRS4w1RZbxOIiF+Nd3n0d/BMKxfR2Y3W+9KgVlwlsRj0kAhONS7vsisUCBGr9GjnyYBK4NQUHiwZXbr/yeKzNqleEKHQ6PZHRcknsWynEnbQO65ZqZVwwjZSMa6hqkMfs+B0YdaWcvn7+UvxaisncpnMcoXJg7QJq6JY2DpcJOxFvrD6ppPBi689WVkYteLBUlzKYFfisX1GuHJVt8qYm3g+PS25iqIen/gHse3ryDGK0PWYkDSLtZf/YF/7Di/u4kS5sU7SW41tOgwgFWPxHaOkBLu2t8DUcoDcWJf8Rs3ekm6+07zABsBGk/bARc4V8gfYd8houH1yHKzsrGma3/9Gr8BTliYhYsWH4mkA+O6Mj6cS3/uu8Y3xCYiz/6J3NSJEWXQ/gRWsg0Aq82ac6WunL3BiHzuNJlEk3AnMEDJGEsMzjWgzdvM/L44H5IPlNM3ZEYCYzb/VXLaH2vFMLARReG3izUnaQh4YfuWeFQ1L5Ki0bfAXke+YCjYW6kqp6Al41E5sZKeDs/prspk+fTCvHjTHQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(376002)(39860400002)(136003)(346002)(396003)(1800799009)(186009)(82310400011)(451199024)(46966006)(36840700001)(40470700004)(40460700003)(6666004)(336012)(83380400001)(426003)(82740400003)(356005)(81166007)(86362001)(47076005)(36860700001)(36756003)(40480700001)(26005)(316002)(2616005)(54906003)(2906002)(110136005)(70206006)(70586007)(41300700001)(30864003)(8936002)(4326008)(8676002)(5660300002)(44832011)(1076003)(478600001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2023 04:52:32.8360 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d361312d-0625-4359-4944-08dba5f0427d 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9D1.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4523 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" CDX bus needs to be disabled before updating/writing devices in the FPGA. Once the devices are written, the bus shall be rescanned. This change provides sysfs entry to enable/disable the CDX bus. Co-developed-by: Nipun Gupta Signed-off-by: Nipun Gupta Signed-off-by: Abhijit Gangurde Reviewed-by: Pieter Jansen van Vuuren Tested-by: Nikhil Agarwal --- Changes in v4: - Add sparse marking for lock around cdx_find_controller() function Changes in v3: - Use platform bus to locate controller Changes in v2: - Improve documentation - Split sysfs entry enable to enable and disable - sysfs entry enable and disable take bus number as an argument Documentation/ABI/testing/sysfs-bus-cdx | 27 +++++++ drivers/cdx/cdx.c | 97 +++++++++++++++++++++++++ drivers/cdx/controller/cdx_controller.c | 50 +++++++++++++ drivers/cdx/controller/mc_cdx_pcol.h | 54 ++++++++++++++ drivers/cdx/controller/mcdi_functions.c | 24 ++++++ drivers/cdx/controller/mcdi_functions.h | 18 +++++ include/linux/cdx/cdx_bus.h | 12 +++ 7 files changed, 282 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-bus-cdx b/Documentation/ABI/te= sting/sysfs-bus-cdx index 7af477f49998..04c8dfe7e201 100644 --- a/Documentation/ABI/testing/sysfs-bus-cdx +++ b/Documentation/ABI/testing/sysfs-bus-cdx @@ -11,6 +11,33 @@ Description: =20 # echo 1 > /sys/bus/cdx/rescan =20 +What: /sys/bus/cdx/enable +Date: July 2023 +Contact: nipun.gupta@amd.com +Description: + Writing bus number in hex to this file will attempt to enable + the CDX bus. The bus number for the cdx devices can be found + at /sys/bus/cdx/devices/cdx-BB:DD, where BB denotes the bus + number for the respective device. + + For example :: + + # echo 00 > /sys/bus/cdx/enable + +What: /sys/bus/cdx/disable +Date: July 2023 +Contact: nipun.gupta@amd.com +Description: + Writing bus number in hex to this file will attempt to disable + the CDX bus. CDX bus should be disabled before updating the + devices in FPGA. The bus number for the cdx devices can be + found at /sys/bus/cdx/devices/cdx-BB:DD, where BB denotes the + bus number for the respective device. + + For example :: + + # echo 00 > /sys/bus/cdx/disable + What: /sys/bus/cdx/devices/.../vendor Date: March 2023 Contact: nipun.gupta@amd.com diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c index cbfe9a2f3646..8da043756fa4 100644 --- a/drivers/cdx/cdx.c +++ b/drivers/cdx/cdx.c @@ -70,6 +70,10 @@ #define CDX_DEFAULT_DMA_MASK (~0ULL) #define MAX_CDX_CONTROLLERS 16 =20 +#define CONTROLLER_ID(X) \ + (((X) & CDX_CONTROLLER_ID_MASK) >> CDX_CONTROLLER_ID_SHIFT) +#define BUS_ID(X) ((X) & CDX_BUS_NUM_MASK) + /* IDA for CDX controllers registered with the CDX bus */ static DEFINE_IDA(cdx_controller_ida); /* Lock to protect controller ops */ @@ -384,6 +388,97 @@ static struct attribute *cdx_dev_attrs[] =3D { }; ATTRIBUTE_GROUPS(cdx_dev); =20 +/* Must be called with cdx_controller_lock acquired. + */ +static struct cdx_controller *cdx_find_controller(u8 controller_id) + __must_hold(&cdx_controller_lock) +{ + struct cdx_controller *cdx; + struct platform_device *pd; + struct device_node *np; + + for_each_compatible_node(np, NULL, compat_node_name) { + if (!np) + return NULL; + + pd =3D of_find_device_by_node(np); + if (!pd) + return NULL; + + cdx =3D platform_get_drvdata(pd); + if (cdx && cdx->controller_registered && cdx->id =3D=3D controller_id) { + put_device(&pd->dev); + return cdx; + } + + put_device(&pd->dev); + } + + return NULL; +} + +static ssize_t enable_store(const struct bus_type *bus, + const char *buf, size_t count) +{ + unsigned long controller_id; + struct cdx_controller *cdx; + u8 bus_id; + int ret; + + if (kstrtou8(buf, 16, &bus_id)) + return -EINVAL; + + controller_id =3D CONTROLLER_ID(bus_id); + bus_id =3D BUS_ID(bus_id); + + mutex_lock(&cdx_controller_lock); + + cdx =3D cdx_find_controller(controller_id); + if (cdx) + if (cdx->ops->bus_enable) + ret =3D cdx->ops->bus_enable(cdx, bus_id); + else + ret =3D -EOPNOTSUPP; + else + ret =3D -EINVAL; + + mutex_unlock(&cdx_controller_lock); + + return ret < 0 ? ret : count; +} +static BUS_ATTR_WO(enable); + +static ssize_t disable_store(const struct bus_type *bus, + const char *buf, size_t count) +{ + unsigned long controller_id; + struct cdx_controller *cdx; + u8 bus_id; + int ret; + + if (kstrtou8(buf, 16, &bus_id)) + return -EINVAL; + + controller_id =3D CONTROLLER_ID(bus_id); + bus_id =3D BUS_ID(bus_id); + + mutex_lock(&cdx_controller_lock); + + cdx =3D cdx_find_controller(controller_id); + if (cdx) + if (cdx->ops->bus_disable) + ret =3D cdx->ops->bus_disable(cdx, bus_id); + else + ret =3D -EOPNOTSUPP; + else + ret =3D -EINVAL; + + mutex_unlock(&cdx_controller_lock); + + return ret < 0 ? ret : count; +} +static BUS_ATTR_WO(disable); + static ssize_t rescan_store(const struct bus_type *bus, const char *buf, size_t count) { @@ -426,6 +521,8 @@ static ssize_t rescan_store(const struct bus_type *bus, static BUS_ATTR_WO(rescan); =20 static struct attribute *cdx_bus_attrs[] =3D { + &bus_attr_enable.attr, + &bus_attr_disable.attr, &bus_attr_rescan.attr, NULL, }; diff --git a/drivers/cdx/controller/cdx_controller.c b/drivers/cdx/controll= er/cdx_controller.c index dc52f95f8978..2e4725c872d0 100644 --- a/drivers/cdx/controller/cdx_controller.c +++ b/drivers/cdx/controller/cdx_controller.c @@ -32,6 +32,42 @@ static const struct cdx_mcdi_ops mcdi_ops =3D { .mcdi_request =3D cdx_mcdi_request, }; =20 +static int cdx_bus_enable(struct cdx_controller *cdx, u8 bus_num) +{ + int ret; + + if (test_bit(bus_num, cdx->bus_state)) + return 0; + + ret =3D cdx_mcdi_bus_enable(cdx->priv, bus_num); + if (!ret) + set_bit(bus_num, cdx->bus_state); + + return ret; +} + +static int cdx_bus_disable(struct cdx_controller *cdx, u8 bus_num) +{ + int ret; + + if (!test_bit(bus_num, cdx->bus_state)) + return 0; + + ret =3D cdx_mcdi_bus_disable(cdx->priv, bus_num); + if (!ret) + clear_bit(bus_num, cdx->bus_state); + + return ret; +} + +static void cdx_bus_disable_all(struct cdx_controller *cdx) +{ + u8 bus_num; + + for_each_set_bit(bus_num, cdx->bus_state, MAX_CDX_BUSES) + cdx_bus_disable(cdx, bus_num); +} + void cdx_rpmsg_post_probe(struct cdx_controller *cdx) { /* Register CDX controller with CDX bus driver */ @@ -42,6 +78,7 @@ void cdx_rpmsg_post_probe(struct cdx_controller *cdx) void cdx_rpmsg_pre_remove(struct cdx_controller *cdx) { cdx_unregister_controller(cdx); + cdx_bus_disable_all(cdx); cdx_mcdi_wait_for_quiescence(cdx->priv, MCDI_RPC_TIMEOUT); } =20 @@ -80,11 +117,22 @@ static int cdx_scan_devices(struct cdx_controller *cdx) for (bus_num =3D 0; bus_num < num_cdx_bus; bus_num++) { u8 num_cdx_dev; =20 + ret =3D cdx_bus_enable(cdx, bus_num); + if (ret && ret !=3D -EALREADY) { + dev_err(cdx->dev, + "CDX bus %d enable failed: %d\n", bus_num, ret); + continue; + } + /* MCDI FW Read: Fetch the number of devices present */ ret =3D cdx_mcdi_get_num_devs(cdx_mcdi, bus_num); if (ret < 0) { dev_err(cdx->dev, "Get devices on CDX bus %d failed: %d\n", bus_num, ret); + ret =3D cdx_bus_disable(cdx, bus_num); + if (ret) + dev_err(cdx->dev, + "CDX bus %d disable failed: %d\n", bus_num, ret); continue; } num_cdx_dev =3D (u8)ret; @@ -120,6 +168,8 @@ static int cdx_scan_devices(struct cdx_controller *cdx) } =20 static struct cdx_ops cdx_ops =3D { + .bus_enable =3D cdx_bus_enable, + .bus_disable =3D cdx_bus_disable, .scan =3D cdx_scan_devices, .dev_configure =3D cdx_configure_device, }; diff --git a/drivers/cdx/controller/mc_cdx_pcol.h b/drivers/cdx/controller/= mc_cdx_pcol.h index 4ccb7b52951b..2de019406b57 100644 --- a/drivers/cdx/controller/mc_cdx_pcol.h +++ b/drivers/cdx/controller/mc_cdx_pcol.h @@ -455,6 +455,60 @@ #define MC_CMD_CDX_BUS_GET_DEVICE_CONFIG_OUT_REQUESTER_ID_OFST 84 #define MC_CMD_CDX_BUS_GET_DEVICE_CONFIG_OUT_REQUESTER_ID_LEN 4 =20 +/***********************************/ +/* + * MC_CMD_CDX_BUS_DOWN + * Asserting reset on the CDX bus causes all devices on the bus to be quie= sced. + * DMA bus mastering is disabled and any pending DMA request are flushed. = Once + * the response is returned, the devices are guaranteed to no longer issue= DMA + * requests or raise MSI interrupts. Further device MMIO accesses may have + * undefined results. While the bus reset is asserted, any of the enumerat= ion + * or device configuration MCDIs will fail with EAGAIN. It is only legal to + * reload the relevant PL region containing CDX devices if the correspondi= ng CDX + * bus is in reset. Depending on the implementation, the firmware may or m= ay + * not enforce this restriction and it is up to the caller to make sure th= is + * requirement is satisfied. + */ +#define MC_CMD_CDX_BUS_DOWN 0x4 +#define MC_CMD_CDX_BUS_DOWN_MSGSET 0x4 + +/* MC_CMD_CDX_BUS_DOWN_IN msgrequest */ +#define MC_CMD_CDX_BUS_DOWN_IN_LEN 4 +/* Bus number to put in reset, in range 0 to BUS_COUNT-1 */ +#define MC_CMD_CDX_BUS_DOWN_IN_BUS_OFST 0 +#define MC_CMD_CDX_BUS_DOWN_IN_BUS_LEN 4 + +/* + * MC_CMD_CDX_BUS_DOWN_OUT msgresponse: The bus is quiesced, no further + * upstream traffic for devices on this bus. + */ +#define MC_CMD_CDX_BUS_DOWN_OUT_LEN 0 + +/***********************************/ +/* + * MC_CMD_CDX_BUS_UP + * After bus reset is de-asserted, devices are in a state which is functio= nally + * equivalent to each device having been reset with MC_CMD_CDX_DEVICE_RESE= T. In + * other words, device logic is reset in a hardware-specific way, MMIO acc= esses + * are forwarded to the device, DMA bus mastering is disabled and needs to= be + * re-enabled with MC_CMD_CDX_DEVICE_DMA_ENABLE once the driver is ready to + * start servicing DMA. If the underlying number of devices or device reso= urces + * changed (e.g. if PL was reloaded) while the bus was in reset, the bus d= river + * is expected to re-enumerate the bus. Returns EALREADY if the bus was al= ready + * up before the call. + */ +#define MC_CMD_CDX_BUS_UP 0x5 +#define MC_CMD_CDX_BUS_UP_MSGSET 0x5 + +/* MC_CMD_CDX_BUS_UP_IN msgrequest */ +#define MC_CMD_CDX_BUS_UP_IN_LEN 4 +/* Bus number to take out of reset, in range 0 to BUS_COUNT-1 */ +#define MC_CMD_CDX_BUS_UP_IN_BUS_OFST 0 +#define MC_CMD_CDX_BUS_UP_IN_BUS_LEN 4 + +/* MC_CMD_CDX_BUS_UP_OUT msgresponse: The bus can now be enumerated. */ +#define MC_CMD_CDX_BUS_UP_OUT_LEN 0 + /***********************************/ /* * MC_CMD_CDX_DEVICE_RESET diff --git a/drivers/cdx/controller/mcdi_functions.c b/drivers/cdx/controll= er/mcdi_functions.c index 0158f26533dd..0e1e35d91242 100644 --- a/drivers/cdx/controller/mcdi_functions.c +++ b/drivers/cdx/controller/mcdi_functions.c @@ -124,6 +124,30 @@ int cdx_mcdi_get_dev_config(struct cdx_mcdi *cdx, return 0; } =20 +int cdx_mcdi_bus_enable(struct cdx_mcdi *cdx, u8 bus_num) +{ + MCDI_DECLARE_BUF(inbuf, MC_CMD_CDX_BUS_UP_IN_LEN); + int ret; + + MCDI_SET_DWORD(inbuf, CDX_BUS_UP_IN_BUS, bus_num); + ret =3D cdx_mcdi_rpc(cdx, MC_CMD_CDX_BUS_UP, inbuf, sizeof(inbuf), + NULL, 0, NULL); + + return ret; +} + +int cdx_mcdi_bus_disable(struct cdx_mcdi *cdx, u8 bus_num) +{ + MCDI_DECLARE_BUF(inbuf, MC_CMD_CDX_BUS_DOWN_IN_LEN); + int ret; + + MCDI_SET_DWORD(inbuf, CDX_BUS_DOWN_IN_BUS, bus_num); + ret =3D cdx_mcdi_rpc(cdx, MC_CMD_CDX_BUS_DOWN, inbuf, sizeof(inbuf), + NULL, 0, NULL); + + return ret; +} + int cdx_mcdi_reset_device(struct cdx_mcdi *cdx, u8 bus_num, u8 dev_num) { MCDI_DECLARE_BUF(inbuf, MC_CMD_CDX_DEVICE_RESET_IN_LEN); diff --git a/drivers/cdx/controller/mcdi_functions.h b/drivers/cdx/controll= er/mcdi_functions.h index 7440ace5539a..28973d5ec3ab 100644 --- a/drivers/cdx/controller/mcdi_functions.h +++ b/drivers/cdx/controller/mcdi_functions.h @@ -47,6 +47,24 @@ int cdx_mcdi_get_dev_config(struct cdx_mcdi *cdx, u8 bus_num, u8 dev_num, struct cdx_dev_params *dev_params); =20 +/** + * cdx_mcdi_bus_enable - Enable CDX bus represented by bus_num + * @cdx: pointer to MCDI interface. + * @bus_num: Bus number. + * + * Return: 0 on success, <0 on failure + */ +int cdx_mcdi_bus_enable(struct cdx_mcdi *cdx, u8 bus_num); + +/** + * cdx_mcdi_bus_disable - Disable CDX bus represented by bus_num + * @cdx: pointer to MCDI interface. + * @bus_num: Bus number. + * + * Return: 0 on success, <0 on failure + */ +int cdx_mcdi_bus_disable(struct cdx_mcdi *cdx, u8 bus_num); + /** * cdx_mcdi_reset_device - Reset cdx device represented by bus_num:dev_num * @cdx: pointer to MCDI interface. diff --git a/include/linux/cdx/cdx_bus.h b/include/linux/cdx/cdx_bus.h index 82c27b8c94e1..ac715bc84315 100644 --- a/include/linux/cdx/cdx_bus.h +++ b/include/linux/cdx/cdx_bus.h @@ -16,6 +16,8 @@ #define MAX_CDX_DEV_RESOURCES 4 #define CDX_CONTROLLER_ID_SHIFT 4 #define CDX_BUS_NUM_MASK 0xF +#define CDX_CONTROLLER_ID_MASK 0xF0 +#define MAX_CDX_BUSES (CDX_BUS_NUM_MASK + 1) =20 /* Forward declaration for CDX controller */ struct cdx_controller; @@ -28,6 +30,10 @@ struct cdx_device_config { u8 type; }; =20 +typedef int (*cdx_bus_enable_cb)(struct cdx_controller *cdx, u8 bus_num); + +typedef int (*cdx_bus_disable_cb)(struct cdx_controller *cdx, u8 bus_num); + typedef int (*cdx_scan_cb)(struct cdx_controller *cdx); =20 typedef int (*cdx_dev_configure_cb)(struct cdx_controller *cdx, @@ -49,11 +55,15 @@ typedef int (*cdx_dev_configure_cb)(struct cdx_controll= er *cdx, =20 /** * struct cdx_ops - Callbacks supported by CDX controller. + * @bus_enable: enable bus on the controller + * @bus_disable: disable bus on the controller * @scan: scan the devices on the controller * @dev_configure: configuration like reset, master_enable, * msi_config etc for a CDX device */ struct cdx_ops { + cdx_bus_enable_cb bus_enable; + cdx_bus_disable_cb bus_disable; cdx_scan_cb scan; cdx_dev_configure_cb dev_configure; }; @@ -64,6 +74,7 @@ struct cdx_ops { * @priv: private data * @id: Controller ID * @controller_registered: controller registered with bus + * @bus_state: state of the buses(enabled/disabled) * @ops: CDX controller ops */ struct cdx_controller { @@ -71,6 +82,7 @@ struct cdx_controller { void *priv; u32 id; bool controller_registered; + DECLARE_BITMAP(bus_state, MAX_CDX_BUSES); struct cdx_ops *ops; }; =20 --=20 2.25.1 From nobody Thu Dec 18 06:22:21 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0527C83F19 for ; Sat, 26 Aug 2023 04:56:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231872AbjHZExO (ORCPT ); Sat, 26 Aug 2023 00:53:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231855AbjHZEw6 (ORCPT ); Sat, 26 Aug 2023 00:52:58 -0400 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2042.outbound.protection.outlook.com [40.107.95.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA3F2128 for ; Fri, 25 Aug 2023 21:52:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IFXRKWNlUYFf7Y6U/1wXr86jF8UwaGzVj4p9O48DokX4euEGMnRHoDQj0FyucaniB2/5kJ7hhZ/5uUQkEn6rCnmI7m4WlH+HCfJtZ/s7t0g9EckHrg1xyVxQyw0RP/WU6GhGy5rzKfXpDRNt7vgHBaZFOQ5zx69BsSbcSSv5KJQQfQBoj7GgaKwHW+5pT8k/dWmS2wf/BjF6ea67LpnZLFJqDlGxe/aGyxnj0Vj37F5to6EdeuO3eNvAdAknGEpxkWu1mdcuY+UvYXBayT61bWqZ+JXJI075k22WZluqiAYivkQ7zziULCNZ6oOyaW4jG+BLgRJvn1B2FfDojjMYvw== 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=ZETCDN1zxWuzsgQ2+mQdkzAQPjI0E8IlyLi3MIwZ/fc=; b=UrUq1FnuILzi4VBuVKqrrPaiK8JFH8R9zaG8f3vyYPih9Je5RFLoycxFe2sGFGzLij9QFKW9R0BfvEn4UiV6+UP7O4IAP43KPJfiPkvEFeSvr+hwLc+YQUZ4m0Ip07r9sPraUnFrlIcDrQPmQluEK1wOZ3OYoSOPFpd+pjN/iA61+kHDwijzPw+0b+HNtP4upc1Ot0E+5jJWV2d5Da8/ycpjSiWzKYsD8lBUsUzklUkxsmI/VWWCtsjrO0zu22z953rlPTmwt5jw6azVNljecvyuPOL5nLJbWNCX9aM+fMIpL1euDZ2GpeCwtTnoI34/gsP65cN/Mvg4RLwCGIDWcw== 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 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=ZETCDN1zxWuzsgQ2+mQdkzAQPjI0E8IlyLi3MIwZ/fc=; b=MMo6vtoWeRgrE9aexeG5EdDbfbK0hCiKm8HmCvdlV4oiYa9xbGq+d2hVey06/e5mTM5tTwAUUuQqnGLGv19E/J2hy+WM9B1Bn0slJLMwjxp2I125jKoqymiot7mqcJRPa3xZrlCvNymESO651MNQLZHsEWHSPMEIivWk5i0oNus= Received: from CY5PR15CA0007.namprd15.prod.outlook.com (2603:10b6:930:14::13) by LV3PR12MB9093.namprd12.prod.outlook.com (2603:10b6:408:19d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.30; Sat, 26 Aug 2023 04:52:53 +0000 Received: from CY4PEPF0000E9CF.namprd03.prod.outlook.com (2603:10b6:930:14:cafe::cc) by CY5PR15CA0007.outlook.office365.com (2603:10b6:930:14::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.30 via Frontend Transport; Sat, 26 Aug 2023 04:52:53 +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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CY4PEPF0000E9CF.mail.protection.outlook.com (10.167.241.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6699.15 via Frontend Transport; Sat, 26 Aug 2023 04:52:52 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 25 Aug 2023 23:52:52 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 25 Aug 2023 23:52:51 -0500 Received: from xhdipdslab59.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Fri, 25 Aug 2023 23:52:43 -0500 From: Abhijit Gangurde To: , , CC: , , , , , Abhijit Gangurde , Nipun Gupta , "Pieter Jansen van Vuuren" Subject: [PATCH v4 4/5] cdx: add sysfs for bus reset Date: Sat, 26 Aug 2023 10:19:43 +0530 Message-ID: <20230826044944.4161017-5-abhijit.gangurde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230826044944.4161017-1-abhijit.gangurde@amd.com> References: <20230826044944.4161017-1-abhijit.gangurde@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9CF:EE_|LV3PR12MB9093:EE_ X-MS-Office365-Filtering-Correlation-Id: b4d7024c-e0f4-4cf6-0747-08dba5f04e70 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RYsdICYb/B4+wOeijbELRfU4RDT7XYnctRpbNHGDRqsSdWEbTnbdkiS9ldSgoWLX3eVd8qYf8dKsJl8ayJIpOvk2VcrRXXxXXxd7MiEPCPirijPNJKyouDJzNTGWgJVNMJQTWLDohi4wKa7ewlk5IHzeA7ofRGYgld9O9/gRD44bEx9V88lSys+Ote29XS0fYj/B2sK5/CJvyTJxD8eW2UUw3YamN1Uh1SrpjUMr9YVoCkZZklS/nVUVAEERe8qlP4f6OZbcftQShzXNkc3P6CVdO8oG9DlojoirM+pq+J6kVq+uNL8jS7OUO38BJ9Q11OOHjAvr7eI+XQQvlt5CKIjJKSe5pPrsP/QtjyH1Q8IkRZRy9IZ7YqS5KLOvejCeQblcAc2pK839CY8tL8Ty55UXSKIuURru0v/++xFLhxNv/Abkxi4+Y+/oYP0h7i2pKzRy1SUPMhT5z3NWl7BA8z9VBbEPRWj4AAhK7tNofisz+QEtJFx2zXXlioQKcxcALDJQEyt6iCZaQXn3GbeGUxae1wnjzfFRrt4oj/41kxk6X96r5gg9NRY751jSd4140L/nAe31J0N7VIjpIEaqXksjFD8fiYU4DCa89MMub7VX12EcA3riVTO8e0NR1rxAH8Xw3C61WeHBKz/S2MiGZmqQSPqcil4oNj+7Q15f9TioSI7BKPoP0XO0y6ej2BX5gJ2pZIPsOCj/EPm+K3Ko6EDMdaI/upHCYEPSDe3KUplYLT/I/Au8MOHRCSbaovXJgUb7iJlZLE0Knd4/zVh9TA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(376002)(39860400002)(346002)(136003)(396003)(1800799009)(451199024)(82310400011)(186009)(36840700001)(46966006)(40470700004)(81166007)(82740400003)(356005)(40460700003)(8676002)(4326008)(8936002)(54906003)(41300700001)(316002)(36756003)(70586007)(70206006)(86362001)(110136005)(40480700001)(47076005)(26005)(478600001)(1076003)(44832011)(36860700001)(336012)(83380400001)(2906002)(2616005)(426003)(5660300002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2023 04:52:52.8662 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b4d7024c-e0f4-4cf6-0747-08dba5f04e70 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9CF.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9093 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add sysfs interface reset to reset all the devices on the CDX bus. Co-developed-by: Puneet Gupta Signed-off-by: Puneet Gupta Co-developed-by: Nipun Gupta Signed-off-by: Nipun Gupta Signed-off-by: Abhijit Gangurde Reviewed-by: Pieter Jansen van Vuuren Tested-by: Nikhil Agarwal --- Changes in v4: - None Changes in v3: - None Changes in v2: - Improve documentation - sysfs entry reset takes bus number as an argument Documentation/ABI/testing/sysfs-bus-cdx | 15 +++++++++ drivers/cdx/cdx.c | 41 +++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-bus-cdx b/Documentation/ABI/te= sting/sysfs-bus-cdx index 04c8dfe7e201..d25875359741 100644 --- a/Documentation/ABI/testing/sysfs-bus-cdx +++ b/Documentation/ABI/testing/sysfs-bus-cdx @@ -38,6 +38,21 @@ Description: =20 # echo 00 > /sys/bus/cdx/disable =20 +What: /sys/bus/cdx/reset +Date: July 2023 +Contact: puneet.gupta@amd.com +Description: + Writing bus number in hex to this file will attempt to reset + all the devices present on the bus. Resetting a device would + clear all existing configuration of the device and put the + device in default state. The bus number for the cdx devices can + be found at /sys/bus/cdx/devices/cdx-BB:DD, where BB denotes + the bus number for the respective device. + + For example :: + + # echo 00 > /sys/bus/cdx/reset + What: /sys/bus/cdx/devices/.../vendor Date: March 2023 Contact: nipun.gupta@amd.com diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c index 8da043756fa4..7687b9371210 100644 --- a/drivers/cdx/cdx.c +++ b/drivers/cdx/cdx.c @@ -114,6 +114,26 @@ int cdx_dev_reset(struct device *dev) } EXPORT_SYMBOL_GPL(cdx_dev_reset); =20 +/** + * reset_cdx_device - Reset a CDX device + * @dev: CDX device + * @data: Bus number + * If bus number matches to the device's bus then this device + * is reset else this is no op. + * + * Return: -errno on failure, 0 on success. + */ +static int reset_cdx_device(struct device *dev, void *data) +{ + struct cdx_device *cdx_dev =3D to_cdx_device(dev); + u8 bus_num =3D *((u8 *)data); + + if (cdx_dev->bus_num =3D=3D bus_num) + return cdx_dev_reset(dev); + + return 0; +} + /** * cdx_unregister_device - Unregister a CDX device * @dev: CDX device @@ -520,10 +540,31 @@ static ssize_t rescan_store(const struct bus_type *bu= s, } static BUS_ATTR_WO(rescan); =20 +static ssize_t bus_reset_store(const struct bus_type *bus, + const char *buf, size_t count) +{ + u8 bus_id; + int ret; + + if (kstrtou8(buf, 16, &bus_id)) + return -EINVAL; + + bus_id =3D BUS_ID(bus_id); + mutex_lock(&cdx_controller_lock); + /* Reset all the devices attached to cdx bus */ + ret =3D bus_for_each_dev(bus, NULL, (void *)&bus_id, reset_cdx_device); + mutex_unlock(&cdx_controller_lock); + + return ret < 0 ? ret : count; +} +static struct bus_attribute bus_attr_reset =3D __ATTR(reset, 0200, NULL, + bus_reset_store); + static struct attribute *cdx_bus_attrs[] =3D { &bus_attr_enable.attr, &bus_attr_disable.attr, &bus_attr_rescan.attr, + &bus_attr_reset.attr, NULL, }; ATTRIBUTE_GROUPS(cdx_bus); --=20 2.25.1 From nobody Thu Dec 18 06:22:21 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2C51C83F11 for ; Sat, 26 Aug 2023 04:56:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231886AbjHZExp (ORCPT ); Sat, 26 Aug 2023 00:53:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231864AbjHZExK (ORCPT ); Sat, 26 Aug 2023 00:53:10 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2049.outbound.protection.outlook.com [40.107.244.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EED9A128 for ; Fri, 25 Aug 2023 21:53:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FnzlaIdnndE+LvBSCwwZMsxsL6GnHRsLmLN+REiR7+8Nc6bh4XW75IaKJGYnVXCFOKAlYaIo03i4HUHQfB7u1xD7ZwVydMvq2VdzXNnzLS8peQjnYyotxlTPsl7bgScJqsB98j6niLm7QMJE5AI1v7NzFMRPxaytUL2UdJbISo/6SIX9pg94DGKWDiwjFu4woVVFy4lq3h7+ihQ1yskrMM0Gz3lNJlu+F2GXRYkKTTcu6OX6IbEKcSjLr4BDhaX5gbtp83HcLpxc3MjgFkdK+XRnKF4GBWqrbJ2L7HbTq3lcWUqKVcClw9U2YETV5mEKTToltUG4EJYRIVSlVAdnXg== 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=JPvxb4l5Ts8zuME4soRP/ClYcqmuXe6+FESEoKvOPVQ=; b=Cp88pjc+0VjzLQ5O9Sx8IG+fkxYeyct8CXSdB0kdQYvvd012Vc7DnuPM53SiIwdoNG61qKRGXSTnZGJUaWXM436LWSDTygQtfqwmueqttF4s6XAnYsvPCflkgHRns87E3P78boVdM4fhV8aof3cGDUcEU4jMZx/DfKfmLuIVm9rad5s3Per3g8MXzj4cGiy1hKGhFCEZt1Vkaoshf0ZZy/shas5OO/WZzxXzTgGJ5yNpzzMAZWsM/fJYinCsKoWgySu4v3pecqO0bAin6hY4wyp4GzGwTB951l7z5P1rw6tdiiCxLEcYZSJ5dFyY5CZzlDZpqgMMvTECxxwVAJkIiw== 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 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=JPvxb4l5Ts8zuME4soRP/ClYcqmuXe6+FESEoKvOPVQ=; b=Ew8xLFE5Idkjv45x76a+tmLTqxVTOQujX64XI/GlnWEDLGQO/pPB/TGugQHrOFxYwKVTqdF467N6yOKBiUqf12R3B9OqjKK5kswnwetWpQhTxKOOpSGUgqIDP337HceFsdNXl1v1GsGrjaFs8In+mDUdkncderf7Q974HLrYplY= Received: from CY5PR04CA0023.namprd04.prod.outlook.com (2603:10b6:930:1e::30) by LV3PR12MB9142.namprd12.prod.outlook.com (2603:10b6:408:198::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.29; Sat, 26 Aug 2023 04:53:03 +0000 Received: from CY4PEPF0000E9D1.namprd03.prod.outlook.com (2603:10b6:930:1e:cafe::4a) by CY5PR04CA0023.outlook.office365.com (2603:10b6:930:1e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.30 via Frontend Transport; Sat, 26 Aug 2023 04:53:03 +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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CY4PEPF0000E9D1.mail.protection.outlook.com (10.167.241.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6699.14 via Frontend Transport; Sat, 26 Aug 2023 04:53:03 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 25 Aug 2023 23:53:02 -0500 Received: from xhdipdslab59.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Fri, 25 Aug 2023 23:52:54 -0500 From: Abhijit Gangurde To: , , CC: , , , , , Abhijit Gangurde , Nipun Gupta , "Pieter Jansen van Vuuren" Subject: [PATCH v4 5/5] cdx: add sysfs for subsystem, class and revision Date: Sat, 26 Aug 2023 10:19:44 +0530 Message-ID: <20230826044944.4161017-6-abhijit.gangurde@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230826044944.4161017-1-abhijit.gangurde@amd.com> References: <20230826044944.4161017-1-abhijit.gangurde@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9D1:EE_|LV3PR12MB9142:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b0cc02a-ba52-4131-d82e-08dba5f05489 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AZnORRoZbZyFQq6Jtm9F8plkJSS0qTeHr0jvclN6ZTAYTcT02L3fhOFG/N/PtcDIVyv6F4pJSL3hdbubH3lgDRtiytNc+wyH95FhNrhZ0VflM1vu7JIDpjAEggVehIZhCqZy3PhsC5iKSy2gxBq/HDGIsPyTCGlnD1Dmg6MJAOeBkG3xywXV9C1FNALtGMCe73yJt9Xgy02TcXkJdGY6zShVWGR9AEW1/BZTc4hrR5bhNg0DPIla3KBGhlpOG73Jkm5ShIClr1ETrblotsHMHfGG3zl7jbczAMC3R+uCZ5bdIopmjCIw6DraLMsN+XQ7JC3l6IlWrHlpsGGCWnOqwJWjrpUE5GFHiaoFasiNR1vSHSUjMRKLk02Dq4OXViG9fNPDTwmZnop8mSUta+GpBHjFYsMGTRN3euNDB7AC5tI8CJU7C5jLFipkBTe9BGNT9OBl2MhhsEJv/Zq/+bhgtKoYfgdv/S0T9Bhk1xkZzJAPDYTXDaOmVa56Yop/Ih73CC28mJ/m0KyJUzwOocmlJsbBfZj9OjPdI3Pu8ESys/5JPHC4bkrgh8gibuwrRWe0mLEYkPq/LuAMsZTAON4N3hfPIWKggGTU+TdYHZBwJDPAGGkVkI4BMFrmUyOBtifDXNjTwoTH6C/mrlJ1WwUChCZ7F8knp4884Oktg4KcJeWxqFxluSt7BY3LweAkaiHxwvt9598oZ3xE7QX5aOz0XIfVgdx3cAVjhwmbJDeLBwRJKbRzqvJI59pTujW8KpyX2A3ClmG6VxDzroybjOTRGg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(39860400002)(376002)(136003)(396003)(346002)(1800799009)(451199024)(82310400011)(186009)(46966006)(36840700001)(40470700004)(82740400003)(81166007)(356005)(40460700003)(8676002)(4326008)(8936002)(54906003)(41300700001)(316002)(6666004)(36756003)(70586007)(70206006)(86362001)(110136005)(40480700001)(47076005)(26005)(478600001)(336012)(36860700001)(1076003)(44832011)(83380400001)(2906002)(30864003)(2616005)(426003)(5660300002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2023 04:53:03.1173 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9b0cc02a-ba52-4131-d82e-08dba5f05489 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9D1.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9142 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" CDX controller provides subsystem vendor, subsystem device, class and revision info of the device along with vendor and device ID in native endian format. CDX Bus system uses this information to bind the cdx device to the cdx device driver. Co-developed-by: Puneet Gupta Signed-off-by: Puneet Gupta Co-developed-by: Nipun Gupta Signed-off-by: Nipun Gupta Signed-off-by: Abhijit Gangurde Reviewed-by: Pieter Jansen van Vuuren Tested-by: Nikhil Agarwal --- Changes in v4: - None Changes in v3: - None Changes in v2: - Improve documentation and commit message Documentation/ABI/testing/sysfs-bus-cdx | 45 +++++++++++++++++++++++++ drivers/cdx/cdx.c | 29 +++++++++++++++- drivers/cdx/cdx.h | 8 +++++ drivers/cdx/controller/mcdi_functions.c | 7 ++++ include/linux/cdx/cdx_bus.h | 27 +++++++++++++-- include/linux/mod_devicetable.h | 10 ++++++ scripts/mod/devicetable-offsets.c | 4 +++ scripts/mod/file2alias.c | 8 +++++ 8 files changed, 135 insertions(+), 3 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-bus-cdx b/Documentation/ABI/te= sting/sysfs-bus-cdx index d25875359741..e71a6daccfbe 100644 --- a/Documentation/ABI/testing/sysfs-bus-cdx +++ b/Documentation/ABI/testing/sysfs-bus-cdx @@ -70,6 +70,36 @@ Description: of a device manufacturer. Combination of Vendor ID and Device ID identifies a device. =20 +What: /sys/bus/cdx/devices/.../subsystem_vendor +Date: July 2023 +Contact: puneet.gupta@amd.com +Description: + Subsystem Vendor ID for this CDX device, in hexadecimal. + Subsystem Vendor ID is 16 bit identifier specific to the + card manufacturer. + +What: /sys/bus/cdx/devices/.../subsystem_device +Date: July 2023 +Contact: puneet.gupta@amd.com +Description: + Subsystem Device ID for this CDX device, in hexadecimal + Subsystem Device ID is 16 bit identifier specific to the + card manufacturer. + +What: /sys/bus/cdx/devices/.../class +Date: July 2023 +Contact: puneet.gupta@amd.com +Description: + This file contains the class of the CDX device, in hexadecimal. + Class is 24 bit identifier specifies the functionality of the device. + +What: /sys/bus/cdx/devices/.../revision +Date: July 2023 +Contact: puneet.gupta@amd.com +Description: + This file contains the revision field of the CDX device, in hexadecimal. + Revision is 8 bit revision identifier of the device. + What: /sys/bus/cdx/devices/.../reset Date: March 2023 Contact: nipun.gupta@amd.com @@ -96,3 +126,18 @@ Description: For example:: =20 # echo 1 > /sys/bus/cdx/devices/.../remove + +What: /sys/bus/cdx/devices/.../modalias +Date: July 2023 +Contact: nipun.gupta@amd.com +Description: + This attribute indicates the CDX ID of the device. + That is in the format: + cdx:vXXXXdXXXXsvXXXXsdXXXXcXXXXXX, + where: + + - vXXXX contains the vendor ID; + - dXXXX contains the device ID; + - svXXXX contains the subsystem vendor ID; + - sdXXXX contains the subsystem device ID; + - cXXXXXX contains the device class. diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c index 7687b9371210..b7d5e1a3b410 100644 --- a/drivers/cdx/cdx.c +++ b/drivers/cdx/cdx.c @@ -181,7 +181,10 @@ cdx_match_one_device(const struct cdx_device_id *id, { /* Use vendor ID and device ID for matching */ if ((id->vendor =3D=3D CDX_ANY_ID || id->vendor =3D=3D dev->vendor) && - (id->device =3D=3D CDX_ANY_ID || id->device =3D=3D dev->device)) + (id->device =3D=3D CDX_ANY_ID || id->device =3D=3D dev->device) && + (id->subvendor =3D=3D CDX_ANY_ID || id->subvendor =3D=3D dev->subsyst= em_vendor) && + (id->subdevice =3D=3D CDX_ANY_ID || id->subdevice =3D=3D dev->subsyst= em_device) && + !((id->class ^ dev->class) & id->class_mask)) return id; return NULL; } @@ -327,6 +330,10 @@ static DEVICE_ATTR_RO(field) =20 cdx_config_attr(vendor, "0x%04x\n"); cdx_config_attr(device, "0x%04x\n"); +cdx_config_attr(subsystem_vendor, "0x%04x\n"); +cdx_config_attr(subsystem_device, "0x%04x\n"); +cdx_config_attr(revision, "0x%02x\n"); +cdx_config_attr(class, "0x%06x\n"); =20 static ssize_t remove_store(struct device *dev, struct device_attribute *attr, @@ -372,6 +379,17 @@ static ssize_t reset_store(struct device *dev, struct = device_attribute *attr, } static DEVICE_ATTR_WO(reset); =20 +static ssize_t modalias_show(struct device *dev, struct device_attribute *= attr, + char *buf) +{ + struct cdx_device *cdx_dev =3D to_cdx_device(dev); + + return sprintf(buf, "cdx:v%04Xd%04Xsv%04Xsd%04Xc%06X\n", cdx_dev->vendor, + cdx_dev->device, cdx_dev->subsystem_vendor, cdx_dev->subsystem_device, + cdx_dev->class); +} +static DEVICE_ATTR_RO(modalias); + static ssize_t driver_override_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) @@ -403,6 +421,11 @@ static struct attribute *cdx_dev_attrs[] =3D { &dev_attr_reset.attr, &dev_attr_vendor.attr, &dev_attr_device.attr, + &dev_attr_subsystem_vendor.attr, + &dev_attr_subsystem_device.attr, + &dev_attr_class.attr, + &dev_attr_revision.attr, + &dev_attr_modalias.attr, &dev_attr_driver_override.attr, NULL, }; @@ -634,6 +657,10 @@ int cdx_device_add(struct cdx_dev_params *dev_params) cdx_dev->req_id =3D dev_params->req_id; cdx_dev->vendor =3D dev_params->vendor; cdx_dev->device =3D dev_params->device; + cdx_dev->subsystem_vendor =3D dev_params->subsys_vendor; + cdx_dev->subsystem_device =3D dev_params->subsys_device; + cdx_dev->class =3D dev_params->class; + cdx_dev->revision =3D dev_params->revision; cdx_dev->bus_num =3D dev_params->bus_num; cdx_dev->dev_num =3D dev_params->dev_num; cdx_dev->cdx =3D dev_params->cdx; diff --git a/drivers/cdx/cdx.h b/drivers/cdx/cdx.h index c436ac7ac86f..d17b5a501e8d 100644 --- a/drivers/cdx/cdx.h +++ b/drivers/cdx/cdx.h @@ -16,21 +16,29 @@ * @parent: Associated CDX controller * @vendor: Vendor ID for CDX device * @device: Device ID for CDX device + * @subsys_vendor: Sub vendor ID for CDX device + * @subsys_device: Sub device ID for CDX device * @bus_num: Bus number for this CDX device * @dev_num: Device number for this device * @res: array of MMIO region entries * @res_count: number of valid MMIO regions * @req_id: Requestor ID associated with CDX device + * @class: Class of the CDX Device + * @revision: Revision of the CDX device */ struct cdx_dev_params { struct cdx_controller *cdx; u16 vendor; u16 device; + u16 subsys_vendor; + u16 subsys_device; u8 bus_num; u8 dev_num; struct resource res[MAX_CDX_DEV_RESOURCES]; u8 res_count; u32 req_id; + u32 class; + u8 revision; }; =20 /** diff --git a/drivers/cdx/controller/mcdi_functions.c b/drivers/cdx/controll= er/mcdi_functions.c index 0e1e35d91242..65dca2aa1d3f 100644 --- a/drivers/cdx/controller/mcdi_functions.c +++ b/drivers/cdx/controller/mcdi_functions.c @@ -120,6 +120,13 @@ int cdx_mcdi_get_dev_config(struct cdx_mcdi *cdx, =20 dev_params->vendor =3D MCDI_WORD(outbuf, CDX_BUS_GET_DEVICE_CONFIG_OUT_VE= NDOR_ID); dev_params->device =3D MCDI_WORD(outbuf, CDX_BUS_GET_DEVICE_CONFIG_OUT_DE= VICE_ID); + dev_params->subsys_vendor =3D MCDI_WORD(outbuf, + CDX_BUS_GET_DEVICE_CONFIG_OUT_SUBSYS_VENDOR_ID); + dev_params->subsys_device =3D MCDI_WORD(outbuf, + CDX_BUS_GET_DEVICE_CONFIG_OUT_SUBSYS_DEVICE_ID); + dev_params->class =3D MCDI_DWORD(outbuf, + CDX_BUS_GET_DEVICE_CONFIG_OUT_DEVICE_CLASS) & 0xFFFFFF; + dev_params->revision =3D MCDI_BYTE(outbuf, CDX_BUS_GET_DEVICE_CONFIG_OUT_= DEVICE_REVISION); =20 return 0; } diff --git a/include/linux/cdx/cdx_bus.h b/include/linux/cdx/cdx_bus.h index ac715bc84315..245ef7e26d5d 100644 --- a/include/linux/cdx/cdx_bus.h +++ b/include/linux/cdx/cdx_bus.h @@ -40,6 +40,19 @@ typedef int (*cdx_dev_configure_cb)(struct cdx_controlle= r *cdx, u8 bus_num, u8 dev_num, struct cdx_device_config *dev_config); =20 +/** + * CDX_DEVICE - macro used to describe a specific CDX device + * @vend: the 16 bit CDX Vendor ID + * @dev: the 16 bit CDX Device ID + * + * This macro is used to create a struct cdx_device_id that matches a + * specific device. The subvendor and subdevice fields will be set to + * CDX_ANY_ID. + */ +#define CDX_DEVICE(vend, dev) \ + .vendor =3D (vend), .device =3D (dev), \ + .subvendor =3D CDX_ANY_ID, .subdevice =3D CDX_ANY_ID + /** * CDX_DEVICE_DRIVER_OVERRIDE - macro used to describe a CDX device with * override_only flags. @@ -48,10 +61,12 @@ typedef int (*cdx_dev_configure_cb)(struct cdx_controll= er *cdx, * @driver_override: the 32 bit CDX Device override_only * * This macro is used to create a struct cdx_device_id that matches only a - * driver_override device. + * driver_override device. The subvendor and subdevice fields will be set = to + * CDX_ANY_ID. */ #define CDX_DEVICE_DRIVER_OVERRIDE(vend, dev, driver_override) \ - .vendor =3D (vend), .device =3D (dev), .override_only =3D (driver_overrid= e) + .vendor =3D (vend), .device =3D (dev), .subvendor =3D CDX_ANY_ID,\ + .subdevice =3D CDX_ANY_ID, .override_only =3D (driver_override) =20 /** * struct cdx_ops - Callbacks supported by CDX controller. @@ -92,6 +107,10 @@ struct cdx_controller { * @cdx: CDX controller associated with the device * @vendor: Vendor ID for CDX device * @device: Device ID for CDX device + * @subsystem_vendor: Subsystem Vendor ID for CDX device + * @subsystem_device: Subsystem Device ID for CDX device + * @class: Class for the CDX device + * @revision: Revision of the CDX device * @bus_num: Bus number for this CDX device * @dev_num: Device number for this device * @res: array of MMIO region entries @@ -109,6 +128,10 @@ struct cdx_device { struct cdx_controller *cdx; u16 vendor; u16 device; + u16 subsystem_vendor; + u16 subsystem_device; + u32 class; + u8 revision; u8 bus_num; u8 dev_num; struct resource res[MAX_CDX_DEV_RESOURCES]; diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetabl= e.h index b0678b093cb2..aa3c28781248 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -935,6 +935,12 @@ enum { * struct cdx_device_id - CDX device identifier * @vendor: Vendor ID * @device: Device ID + * @subvendor: Subsystem vendor ID (or CDX_ANY_ID) + * @subdevice: Subsystem device ID (or CDX_ANY_ID) + * @class: Device class + * Most drivers do not need to specify class/class_mask + * as vendor/device is normally sufficient. + * @class_mask: Limit which sub-fields of the class field are compared. * @override_only: Match only when dev->driver_override is this driver. * * Type of entries in the "device Id" table for CDX devices supported by @@ -943,6 +949,10 @@ enum { struct cdx_device_id { __u16 vendor; __u16 device; + __u16 subvendor; + __u16 subdevice; + __u32 class; + __u32 class_mask; __u32 override_only; }; =20 diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-of= fsets.c index abe65f8968dd..7a659aa3114a 100644 --- a/scripts/mod/devicetable-offsets.c +++ b/scripts/mod/devicetable-offsets.c @@ -265,6 +265,10 @@ int main(void) DEVID(cdx_device_id); DEVID_FIELD(cdx_device_id, vendor); DEVID_FIELD(cdx_device_id, device); + DEVID_FIELD(cdx_device_id, subvendor); + DEVID_FIELD(cdx_device_id, subdevice); + DEVID_FIELD(cdx_device_id, class); + DEVID_FIELD(cdx_device_id, class_mask); DEVID_FIELD(cdx_device_id, override_only); =20 return 0; diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index 38120f932b0d..abc4781d5db7 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -1458,6 +1458,10 @@ static int do_cdx_entry(const char *filename, void *= symval, { DEF_FIELD(symval, cdx_device_id, vendor); DEF_FIELD(symval, cdx_device_id, device); + DEF_FIELD(symval, cdx_device_id, subvendor); + DEF_FIELD(symval, cdx_device_id, subdevice); + DEF_FIELD(symval, cdx_device_id, class); + DEF_FIELD(symval, cdx_device_id, class_mask); DEF_FIELD(symval, cdx_device_id, override_only); =20 switch (override_only) { @@ -1475,6 +1479,10 @@ static int do_cdx_entry(const char *filename, void *= symval, =20 ADD(alias, "v", vendor !=3D CDX_ANY_ID, vendor); ADD(alias, "d", device !=3D CDX_ANY_ID, device); + ADD(alias, "sv", subvendor !=3D CDX_ANY_ID, subvendor); + ADD(alias, "sd", subdevice !=3D CDX_ANY_ID, subdevice); + ADD(alias, "c", class_mask =3D=3D 0xFFFFFF, class); + return 1; } =20 --=20 2.25.1