From patchwork Fri Jan 27 09:46:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ratheesh Kannoth X-Patchwork-Id: 49142 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp747079wrn; Fri, 27 Jan 2023 01:55:40 -0800 (PST) X-Google-Smtp-Source: AMrXdXtU7tc+X1qBpmmbrLfthP0mmccIpf3WcmSGjYVQA0bg+0kDtdJf+kgNQopyP7nyADGXwLhL X-Received: by 2002:a17:906:8d0f:b0:870:b950:18d4 with SMTP id rv15-20020a1709068d0f00b00870b95018d4mr44747170ejc.5.1674813340198; Fri, 27 Jan 2023 01:55:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674813340; cv=none; d=google.com; s=arc-20160816; b=non6pVMEomwTkNw8aMmlgkKEe75ZDqV6vc3VAKZuaZMmbkXAfGNUQKT457uUzlarF0 KqmiKlZIS547CX0jBdz6DH/Ic7iMVacgWgTkVKORApwgbbVI9xJ+n4/Mz3aurFj0hp4J LWPPjRJLN4Vsft/hFwwng7uBONz8n47UdHWPDqy9HPFRD214+ybkdqtMnmoT42l+bBsi wzJlHUQXIpb3miGM6AHR9tbK4A3Ut2Mw0wdaQn/NZJqZwPX7EFxGg1HqHsYtvNsK6oAl nmLofbWGStxfBeVMTYlUosW5IsfMs7S+vr5tRwkqYUFsk7xZSlB3HzwitXZV8PBjdikG SfbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=dWEQlKD2N/GWjzPpyA6igcLD4DJYmaN1imBKpCSJ7KY=; b=EEAMIE6/4mIQTAUqsNO7vzNMhIqsSB3iFhDiI1/J8NFcpYS2q7csL8tNFQeQGVBqCz HuC9cZNDWhO7K36hNeU2CIpU/alE7OkMq3Jgd+reGyQ3y1zW3k23PzeInX+rwuHk1usu J9Xi5i8OOSmclA0mKzz7Mk7GRRJgiyPrGZupB3HaotU26p0iVfmkw2TPJtH9KJmzlpkS yx5ZRXNSzypqEY9AT/NQoFSJL4Ny1oScT51qy4Fg5EqVsQOGzuENZBmLS1xCh31O14ua Dcu42+NUnke99q+degOiujBMBiAidG9Axrbdf0iUd94kpOz5BaMzzddo91b3Fx1KGBcX TNCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=VB10rQ1X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id eq20-20020a170907291400b0087bd412d77csi1305085ejc.768.2023.01.27.01.55.16; Fri, 27 Jan 2023 01:55:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=VB10rQ1X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232509AbjA0Jrb (ORCPT + 99 others); Fri, 27 Jan 2023 04:47:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233249AbjA0Jr0 (ORCPT ); Fri, 27 Jan 2023 04:47:26 -0500 Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8691F820D5; Fri, 27 Jan 2023 01:47:15 -0800 (PST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30R8DXKb008739; Fri, 27 Jan 2023 01:47:01 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=dWEQlKD2N/GWjzPpyA6igcLD4DJYmaN1imBKpCSJ7KY=; b=VB10rQ1XIKfCp7EDu6WvVo3kkNCP7Cu/8hOkorOfza2EPSALoc7uQ//qUNUyquo7PgE8 v7XEKVVaw7UJYCYzsu6wYbW+qoDRY7labuzS1g1xo4SQym8UzL2/H0ZWvFBPFl/Z27bN oucmHk/Xc7K+0Bb6qUzgCDS9vUF042BythYdx10l3vyrclIGm2Te2qbVizlxlin/MOb8 1luGdp8iOQXbrMNrTMknybAowodbORW6C35xTjSZR/8SvVHfnrRWp1VVKReMjs/yaJKp XWTnaQJq5+fe7lq047WkTZ+mzPXNDiokQ6jQOfZMihjz76U5yrwuLhj/CLS1HpZWuTZq GA== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3nbpc93xrk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 27 Jan 2023 01:47:01 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Fri, 27 Jan 2023 01:47:00 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Fri, 27 Jan 2023 01:47:00 -0800 Received: from localhost.localdomain (unknown [10.28.36.165]) by maili.marvell.com (Postfix) with ESMTP id 827443F704B; Fri, 27 Jan 2023 01:46:57 -0800 (PST) From: Ratheesh Kannoth To: , , , , , CC: , Ratheesh Kannoth Subject: [net PATCH] octeontx2-af: Fix devlink unregister Date: Fri, 27 Jan 2023 15:16:51 +0530 Message-ID: <20230127094652.666693-1-rkannoth@marvell.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Proofpoint-GUID: ZSjgpadXWnJ85W3thCSE0MEvhqANkmRj X-Proofpoint-ORIG-GUID: ZSjgpadXWnJ85W3thCSE0MEvhqANkmRj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-27_05,2023-01-27_01,2022-06-22_01 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_NONE autolearn=ham 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756169073282432090?= X-GMAIL-MSGID: =?utf-8?q?1756169073282432090?= Exact match devlink entry is only for CN10K-B. Unregistration devlink should subtract this entry before invoking devlink unregistration Fixes: 87e4ea29b030 ("octeontx2-af: Debugsfs support for exact match.") Signed-off-by: Ratheesh Kannoth Reviewed-by: Leon Romanovsky --- .../net/ethernet/marvell/octeontx2/af/rvu_devlink.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c index bda1a6fa2ec4..d058eeadb23f 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c @@ -1603,10 +1603,16 @@ void rvu_unregister_dl(struct rvu *rvu) { struct rvu_devlink *rvu_dl = rvu->rvu_dl; struct devlink *dl = rvu_dl->dl; + size_t size; devlink_unregister(dl); - devlink_params_unregister(dl, rvu_af_dl_params, - ARRAY_SIZE(rvu_af_dl_params)); + /* Unregister exact match devlink only for CN10K-B */ + size = ARRAY_SIZE(rvu_af_dl_params); + if (!rvu_npc_exact_has_match_table(rvu)) + size -= 1; + + devlink_params_unregister(dl, rvu_af_dl_params, size); + rvu_health_reporters_destroy(rvu); devlink_free(dl); }