From patchwork Fri Aug 11 20:15:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thinh Tran X-Patchwork-Id: 13351404 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DAA18468 for ; Fri, 11 Aug 2023 20:16:01 +0000 (UTC) Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E27B30FF for ; Fri, 11 Aug 2023 13:15:57 -0700 (PDT) Received: from pps.filterd (m0353724.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37BJrXSF030954; Fri, 11 Aug 2023 20:15:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=aT9XyFRCmB1ZtjU/J9/eTBqJZzl6gwRi12F8O0ksQjA=; b=Q0KMoXxJ606fo1K6g1wa9EqL2s+HLYR5LPE8a985SLr3EtpJm6pbOa0bl4kCyy+iCTEx XKosM56Y8HBFWpoQTqJRmexbA9kBCvhtZwUtqVjrfrvC6eeodZ8jQLZ8s8aehKjGKrct MViRNP6JWemd3QaWR9+MPzy3yaOK6+Ilv8UbtIUq2kwg6BxknZB73oOdBkWEkQV/kwfI p536/itxebNlSBGWSPIcHH2uE52SyHxduiyzA49d+f44xCn4qgvKJHIDyrkQpJ0RLnBx Ksh5cK/kx4I+CWrE6CE2eRKlscqdz3XjEKDViROb4EoxGpjFdjBpb9Z6L2Y5b//fCNvC jg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3sduhtrhnr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 11 Aug 2023 20:15:50 +0000 Received: from m0353724.ppops.net (m0353724.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 37BJvx1d010757; Fri, 11 Aug 2023 20:15:49 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3sduhtrhn9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 11 Aug 2023 20:15:49 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 37BIq7n8007573; Fri, 11 Aug 2023 20:15:49 GMT Received: from smtprelay07.wdc07v.mail.ibm.com ([172.16.1.74]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3sa15066xp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 11 Aug 2023 20:15:49 +0000 Received: from smtpav05.dal12v.mail.ibm.com (smtpav05.dal12v.mail.ibm.com [10.241.53.104]) by smtprelay07.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 37BKFml164749918 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Aug 2023 20:15:48 GMT Received: from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4575F58056; Fri, 11 Aug 2023 20:15:48 +0000 (GMT) Received: from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1896158052; Fri, 11 Aug 2023 20:15:48 +0000 (GMT) Received: from linux.vnet.ibm.com (unknown [9.53.174.71]) by smtpav05.dal12v.mail.ibm.com (Postfix) with ESMTP; Fri, 11 Aug 2023 20:15:48 +0000 (GMT) From: Thinh Tran To: kuba@kernel.org Cc: aelior@marvell.com, davem@davemloft.net, edumazet@google.com, manishc@marvell.com, netdev@vger.kernel.org, pabeni@redhat.com, skalluru@marvell.com, VENKATA.SAI.DUGGI@ibm.com, Thinh Tran Subject: [Patch v5 2/4] bnx2x: factor out common code to bnx2x_stop_nic() Date: Fri, 11 Aug 2023 15:15:10 -0500 Message-Id: <20230811201512.461657-3-thinhtr@linux.vnet.ibm.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230811201512.461657-1-thinhtr@linux.vnet.ibm.com> References: <20230728211133.2240873-1-thinhtr@linux.vnet.ibm.com> <20230811201512.461657-1-thinhtr@linux.vnet.ibm.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: I3nU1kC_9sI9yiI-MJwtC55ycHEE6v-M X-Proofpoint-ORIG-GUID: BsErb9T-Eq867yT1JHX-rFMJbvDuYElN X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-11_12,2023-08-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=976 spamscore=0 phishscore=0 clxscore=1015 suspectscore=0 malwarescore=0 bulkscore=0 priorityscore=1501 adultscore=0 impostorscore=0 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308110184 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 X-Patchwork-Delegate: kuba@kernel.org Refactoring common code into a new function named bnx2x_stop_nic() Signed-off-by: Thinh Tran --- .../net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 27 +++++++++++-------- .../net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 1 + .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 26 +++--------------- .../net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 12 ++------- 4 files changed, 23 insertions(+), 43 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index feb0c23788ab..5296f5b8426b 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -3085,17 +3085,8 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link) if (!CHIP_IS_E1x(bp)) bnx2x_pf_disable(bp); - if (!bp->nic_stopped) { - /* Disable HW interrupts, NAPI */ - bnx2x_netif_stop(bp, 1); - /* Delete all NAPI objects */ - bnx2x_del_all_napi(bp); - if (CNIC_LOADED(bp)) - bnx2x_del_all_napi_cnic(bp); - /* Release IRQs */ - bnx2x_free_irq(bp); - bp->nic_stopped = true; - } + /* Disable HW interrupts, delete NAPIs, Release IRQs */ + bnx2x_stop_nic(bp, 1); /* Report UNLOAD_DONE to MCP */ bnx2x_send_unload_done(bp, false); @@ -5127,3 +5118,17 @@ void bnx2x_schedule_sp_rtnl(struct bnx2x *bp, enum sp_rtnl_flag flag, flag); schedule_delayed_work(&bp->sp_rtnl_task, 0); } +void bnx2x_stop_nic(struct bnx2x *bp, int disable_hw) +{ + if (!bp->nic_stopped) { + /* Disable HW interrupts, NAPI */ + bnx2x_netif_stop(bp, disable_hw); + /* Delete all NAPI objects */ + bnx2x_del_all_napi(bp); + if (CNIC_LOADED(bp)) + bnx2x_del_all_napi_cnic(bp); + /* Release IRQs */ + bnx2x_free_irq(bp); + bp->nic_stopped = true; + } +} diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h index d8b1824c334d..0ad879a5af95 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h @@ -553,6 +553,7 @@ void bnx2x_free_skbs(struct bnx2x *bp); void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw); void bnx2x_netif_start(struct bnx2x *bp); int bnx2x_load_cnic(struct bnx2x *bp); +void bnx2x_stop_nic(struct bnx2x *bp, int disable_hw); /** * bnx2x_enable_msix - set msix configuration. diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 755e3bf8f44a..7add3a420534 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -9475,18 +9475,8 @@ unload_error: } } - if (!bp->nic_stopped) { - /* Disable HW interrupts, NAPI */ - bnx2x_netif_stop(bp, 1); - /* Delete all NAPI objects */ - bnx2x_del_all_napi(bp); - if (CNIC_LOADED(bp)) - bnx2x_del_all_napi_cnic(bp); - - /* Release IRQs */ - bnx2x_free_irq(bp); - bp->nic_stopped = true; - } + /* Disable HW interrupts, delete NAPIs, Release IRQs */ + bnx2x_stop_nic(bp, 1); /* Reset the chip, unless PCI function is offline. If we reach this * point following a PCI error handling, it means device is really @@ -14259,16 +14249,8 @@ static pci_ers_result_t bnx2x_io_slot_reset(struct pci_dev *pdev) } bnx2x_drain_tx_queues(bp); bnx2x_send_unload_req(bp, UNLOAD_RECOVERY); - if (!bp->nic_stopped) { - bnx2x_netif_stop(bp, 1); - bnx2x_del_all_napi(bp); - - if (CNIC_LOADED(bp)) - bnx2x_del_all_napi_cnic(bp); - - bnx2x_free_irq(bp); - bp->nic_stopped = true; - } + /* Disable HW interrupts, delete NAPIs, Release IRQs */ + bnx2x_stop_nic(bp,1); /* Report UNLOAD_DONE to MCP */ bnx2x_send_unload_done(bp, true); diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c index 0802462b4d16..651bb40f3443 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c @@ -529,16 +529,8 @@ void bnx2x_vfpf_close_vf(struct bnx2x *bp) bnx2x_vfpf_finalize(bp, &req->first_tlv); free_irq: - if (!bp->nic_stopped) { - /* Disable HW interrupts, NAPI */ - bnx2x_netif_stop(bp, 0); - /* Delete all NAPI objects */ - bnx2x_del_all_napi(bp); - - /* Release IRQs */ - bnx2x_free_irq(bp); - bp->nic_stopped = true; - } + /* Disable HW interrupts, delete NAPIs, Release IRQs */ + bnx2x_stop_nic(bp, 0); } static void bnx2x_leading_vfq_init(struct bnx2x *bp, struct bnx2x_virtf *vf,