From patchwork Thu Feb 17 13:59:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marciniszyn, Mike" X-Patchwork-Id: 12750191 X-Patchwork-Delegate: jgg@ziepe.ca 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 94C3AC433F5 for ; Thu, 17 Feb 2022 13:59:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241558AbiBQN7z (ORCPT ); Thu, 17 Feb 2022 08:59:55 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:60026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240516AbiBQN7y (ORCPT ); Thu, 17 Feb 2022 08:59:54 -0500 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2122.outbound.protection.outlook.com [40.107.94.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B67572B100A; Thu, 17 Feb 2022 05:59:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BiyO3vUzwUDgKBx/rimX9N7md6q+G6SM1CML3jX7i9LS+1G/gt9/eTLRn4GAuQbGEOgJRBCxhxujaTzKQLNdu3WGY1B8r3/Lc/Pxq70PsKgxigMcOAQEMZ81WtrkXUnmDwDu8bHPPgIrMn6eZZ2HerS/w/WHa5yWUicqgBRKESonfButXvdyH2NnVoVk1KIbOraUAukb+LduNMQdUAH/PLKmhtEjXZXXFXR2QYU68zO/xdyLNbCGUOuM7gsDodt6uKN5advKOIr3mm2nMoLUigxvmO5VmFYhHgy7QPJm9xWr4iHJV6tbAp/AkU47GXdDNbtvvcR5EmPOKHUK9omJGw== 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=PCcUVX7UBLxJgJcjhtpPOkc7vV1wAWf7jfNUPetjIO8=; b=iScSPA36xYWyC3zJPSyc6nVXAG3BKbwEpJ30wVyTKgO3begUBisN8mIZtvoO0XKC5tNInGJOXikh1/cP/vIheU7Y2zQcc4+yjyNqezLTcPEZV/VYbaJkpSfbm01eVlHjG9TG37+rvJW7N9SGxd5rLHeF1edVDguP514FpyIQC8Js6XMtdV/D8PPaTl3UQ6nt8RCkr+PzcEcmSWVQiBgfMQiVqm5gisRq+DAb3Bnn5ExK5HGp/DwirpMTgQ20SDYtw1zamyOjT1DZX4S62rhPeKjOw24NQSn5GrtJleczLygBVNRxYcFg8K0SKg7w/phz4mPOKwSOXkbmuzl7kIwE4Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cornelisnetworks.com; dmarc=pass action=none header.from=cornelisnetworks.com; dkim=pass header.d=cornelisnetworks.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cornelisnetworks.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PCcUVX7UBLxJgJcjhtpPOkc7vV1wAWf7jfNUPetjIO8=; b=CQqE6q4TOGpfIUa6rmheTRxU/EFT6XIxUpCMx84ZDpy8JePKO0AbjLkXtdphKkH+xGcz2MFTB1Hzv9AgXDNawyci8fPyisq0fUdK3/ZFEz79/kM2u7zAATvwdtX1VVZCufXtVeWnZmMtUAlYOdQMkTPPiHkOJEFUquXcDsKf2fKyMaWhslbm3q3KLOxBo8TKf1g67SuDLeZPQVlAWxCDjECNuBtSjlfgKkqwOFT++O4nIq2LSqTTDeV8StbS/z9+9FJc9cGa4/PrOAs4y8E0SV0njf3G5PHdKapUKoBRPWml7tOQYYcoiM50h1iQohohE5m4NxBeV5/UKgXEf29ONg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=cornelisnetworks.com; Received: from PH7PR01MB7800.prod.exchangelabs.com (2603:10b6:510:1db::11) by DM5PR0101MB3129.prod.exchangelabs.com (2603:10b6:4:2d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.16; Thu, 17 Feb 2022 13:59:38 +0000 Received: from PH7PR01MB7800.prod.exchangelabs.com ([fe80::f182:8810:c22c:a1ce]) by PH7PR01MB7800.prod.exchangelabs.com ([fe80::f182:8810:c22c:a1ce%5]) with mapi id 15.20.4995.016; Thu, 17 Feb 2022 13:59:37 +0000 From: mike.marciniszyn@cornelisnetworks.com To: jgg@ziepe.ca Cc: linux-rdma@vger.kernel.org, Mike Marciniszyn , Subject: [PATCH for-rc] IB/qib: Fix duplicate sysfs directory name Date: Thu, 17 Feb 2022 08:59:32 -0500 Message-Id: <1645106372-23004-1-git-send-email-mike.marciniszyn@cornelisnetworks.com> X-Mailer: git-send-email 1.8.3.1 X-ClientProxiedBy: BL0PR03CA0006.namprd03.prod.outlook.com (2603:10b6:208:2d::19) To PH7PR01MB7800.prod.exchangelabs.com (2603:10b6:510:1db::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 33ad06a0-1a5b-4401-a2f7-08d9f21dbc0f X-MS-TrafficTypeDiagnostic: DM5PR0101MB3129:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8EM582EE765mWUESM1c1E25WthftAvnbb7K/65zoIFxelwzbZSjZRwqXBah+cTd1bsAi/0gJboR8YYN6MSmglh20+MVbhJcjW5MY0pj7pwEHYkFTtY11nXY272bKKhtIu8SXleWGrfXgj4XjU00An4qwlJMH0EeZH9uoSALXHNibXqXYrtB0929NQO2L2tTM4L1JqGluE/ZaddoOHCX3T9mxzYipcm2MxwS4W+rK6qxcQ343vRiHGcJq2+DsqqBAFSyXVgf3DTA0KlxnceLbAEn7XM3UN8zlU20V9XZcq55f9+Q5rF030OtPEbOErocqQMmKW3ioL3lhco8WwR2EZOPfPttSTmk3b6hXSbAIqA+6cx7H2Q6A7Xcy8wS9bPZNa6rq9SAboAZveIidJeMe5sPOfjmiATEuRcT2o8dMsNC49pX9+3TFlB6Qht++lyrvi7st21d21QKT4s59qkv58WAZI40wPCzMOO/FIWNgR3QmXU3xhQSIP0UmTGwWwFa1DiD4WZWFhTYHogbnVPjn8HVKOfrLDsB/Vm/chBKG7utAJbc7VGo6+fjhH6SnKofbUnGoUx5SCV/LdROXDyisEzbeWBUE9w7Nc+Higp0CvI9vN4JgiBozhI/6HoIf1Zp2uvLuBx7ZHnw/0UX+GeuvfDpXlohGTBYc/ep2taD2BOA65lZ3YUBchz2f8DOpXT+Zsrm3HtUG5zIiRFJ2Q/EEFA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH7PR01MB7800.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(39840400004)(366004)(136003)(396003)(346002)(376002)(316002)(66556008)(66476007)(66946007)(186003)(6486002)(8676002)(4326008)(26005)(508600001)(52116002)(6506007)(9686003)(6512007)(36756003)(2906002)(6666004)(2616005)(8936002)(54906003)(6916009)(86362001)(83380400001)(38100700002)(38350700002)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: D5ovSq8n0H8TObxGRxsVDV2y900X1OADgGTODDR+DkPDa0pLOK7ea23Qa1pNIhP+sERkBoz+OXx07J2l6Yg/pVxItGUVRyNZdpriSI/jh11qxmL/9blTfughOhiCqKPoveZ92UIobN3ESy0xXn9C5nKglP4njMZlX/QkCnA7Xx1D9bICa4EHUQoYMtxiv11CAutVU4e9GPER8bV75lP8FHGEKFjAyih0oJpPTFUg0+h7hWO2Ghn8UpV8EyfoQmWt5d4oVZW4D4Ocfl491HetXxUD7+FSE0+U45XQ9JH3kuNanWcfWrpj0gmBAZA/+bcnhUIAziOxHY3OPSTVi1GTLbG2UGAWgMjKMHZnjuYwGjmMhxQSrIyTLA0hEF5jDXTdCURSg3Aj8Wl7bDlkJ3H0oLFctjlGWfoSKy0sBaXZQK8VvBANl/cmF1fi8l3SphOMcHvHxGwi9simhfbJt7ao5fbS8HzUXRru6LCPzTOUv/IQmiVkjKuE3L8ArB/Phvb3K6yW0wf+AyvEqdyk/mOsf/2minHdFUBOZXyV2HUS+Q/JTrmOoU/hZB7qpybvCXLfBaC9LUwJ16re+SSaIIOh91DV1qGh9xfXDNLrIH1hl2mMswLoCj0it/PIKXh1UGm3k7brf/AYNUZ4QJfxOB6AEIhJ+SHFOrPs7/TYYnoYvs3XN3f/XncLorOI500MDJbLXHUKijCUM72hrwXomsnWsHLOWlmZ9x7stUGdy9f6lEtHCxmO6vXByk86gESWjyKem6ycQd0hVpGy6nS22FwFRcXPuEV1MqcYhgZXfdnZKyAaDNY7VYInQRKYcoUfOTB8VTNuB2piVeyduJIms11LVyieAj5tyWilNNR6iqw/T/Duc8p2lBr7VqDdp7QdXNjseb0HhTrX1oC9s4mWHta7FE6dLCcGbGmpR1j62nOzHYIeEDygMDlkEn2SyNa+5npWUH5HsUdnzoh/3/jxf7bGa0xbI3XJ0Q7PQGzPwmir6naiGHp813I72GegMkXLZaXeRshTQKdrNPf0fFqt7ndgUYQqc5Dq//Kq80lIZfpwAeoLezYyex/JbY2Ep1UjCWUkGy+KngVNhfV8KU1kZGHsQVHQyH50Da/aRXFwlfTBZCPovPpmoFl9rC52tciHPMuf7y6cC7oFCzlFUw1jYN4co9iRfzozBfFNkohjjvh0zCHwp1HLgHKsK6F/4028vcMbGMZHX1G7gB3hw9jr0Qo4Qr1QeQgtO+J2tNB8T4CLr5mhkVKXpScA79QbaLjDGdkoR80HoocmZ0GQjDZCJUj5lFUSEmHssYoqIBznTaoxGUYJ+6CuYa1U5t46nrpZdQmBTTZdzRUGq70UY0V5yTfOBtxS8aefqPQ+Kqhe4pyUag110+Ek/lo0mwx3+xIh4kVhQjAqab0YopbWHrP8HrI9cDxDPZpFPuvv6brrhEr7v8dAD16aspggveICFunZ7PgCEVzqprndbG9gWgNs8n+798GDFVtf6fm2N+Xif4GDvgDEIAXI45VdqxbjkTgHtO7sIBceUh35qHStWLbcatUxbSXDnzNRhv32zXirkZplShTziL+SPTbRr8Keu+EaxjHqT8VEuncjWUR3uu2zoo0j8adPK+RkdKd9+bN+Axcjicpk37jizzS0x4HP1rS/GBMMp6agjP+l1SbG3Pbs6LkfF5ZHQfwWRAgUrUR8CP3ALta+VTrbe2jey+Kf+VPP7MIRZAtcoazMuaUYE8Ro3GQMbw== X-OriginatorOrg: cornelisnetworks.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33ad06a0-1a5b-4401-a2f7-08d9f21dbc0f X-MS-Exchange-CrossTenant-AuthSource: PH7PR01MB7800.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2022 13:59:37.5250 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4dbdb7da-74ee-4b45-8747-ef5ce5ebe68a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jhKCSKN4qcwr2nC8bhyiIqFcPDLR2HNUnNMaZzSjtzlYyMLW2+J8Fb4tsH2dp7wyW+36ls2wDNnv0YI3/phBP8SNG8rLbxlbAwCM9eyH9t7mzEejGU6FINHGwk/Q0Ei5 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR0101MB3129 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Mike Marciniszyn The qib driver load has been failing with the following message: [ 21.186138] sysfs: cannot create duplicate filename '/devices/pci0000:80/0000:80:02.0/0000:81:00.0/infiniband/qib0/ports/1/linkcontrol' The patch below has two "linkcontrol" names causing the duplication. Fix by using the correct "diag_counters" name on the second instance. Fixes: 4a7aaf88c89f ("RDMA/qib: Use attributes for the port sysfs") Cc: Reviewed-by: Dennis Dalessandro Signed-off-by: Mike Marciniszyn --- drivers/infiniband/hw/qib/qib_sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/qib/qib_sysfs.c b/drivers/infiniband/hw/qib/qib_sysfs.c index 0a3b281..41c2729 100644 --- a/drivers/infiniband/hw/qib/qib_sysfs.c +++ b/drivers/infiniband/hw/qib/qib_sysfs.c @@ -541,7 +541,7 @@ static ssize_t rc_delayed_comp_store(struct ib_device *ibdev, u32 port_num, }; static const struct attribute_group port_diagc_group = { - .name = "linkcontrol", + .name = "diag_counters", .attrs = port_diagc_attributes, };