From owner-svn-src-all@freebsd.org Tue May 26 15:44:09 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4B2922CB8E6; Tue, 26 May 2020 15:44:09 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49WdYP1Dycz4PDt; Tue, 26 May 2020 15:44:09 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 25D3825D3C; Tue, 26 May 2020 15:44:09 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04QFi9uD070213; Tue, 26 May 2020 15:44:09 GMT (envelope-from mw@FreeBSD.org) Received: (from mw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04QFi9BK070212; Tue, 26 May 2020 15:44:09 GMT (envelope-from mw@FreeBSD.org) Message-Id: <202005261544.04QFi9BK070212@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mw set sender to mw@FreeBSD.org using -f From: Marcin Wojtas Date: Tue, 26 May 2020 15:44:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361518 - head/sys/dev/ena X-SVN-Group: head X-SVN-Commit-Author: mw X-SVN-Commit-Paths: head/sys/dev/ena X-SVN-Commit-Revision: 361518 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2020 15:44:09 -0000 Author: mw Date: Tue May 26 15:44:08 2020 New Revision: 361518 URL: https://svnweb.freebsd.org/changeset/base/361518 Log: Improve indentation in ena_up() and ena_down() If the conditional check for ENA_FLAG_DEV_UP is negated, the body of the function can have smaller indentation and it makes the code cleaner. Submitted by: Michal Krawczyk Obtained from: Semihalf Sponsored by: Amazon, Inc. Modified: head/sys/dev/ena/ena.c Modified: head/sys/dev/ena/ena.c ============================================================================== --- head/sys/dev/ena/ena.c Tue May 26 15:41:53 2020 (r361517) +++ head/sys/dev/ena/ena.c Tue May 26 15:44:08 2020 (r361518) @@ -1788,71 +1788,72 @@ ena_up(struct ena_adapter *adapter) return (ENXIO); } - if (!ENA_FLAG_ISSET(ENA_FLAG_DEV_UP, adapter)) { - device_printf(adapter->pdev, "device is going UP\n"); + if (ENA_FLAG_ISSET(ENA_FLAG_DEV_UP, adapter)) + return (0); - /* setup interrupts for IO queues */ - rc = ena_setup_io_intr(adapter); - if (unlikely(rc != 0)) { - ena_trace(ENA_ALERT, "error setting up IO interrupt\n"); - goto error; - } - rc = ena_request_io_irq(adapter); - if (unlikely(rc != 0)) { - ena_trace(ENA_ALERT, "err_req_irq\n"); - goto error; - } + device_printf(adapter->pdev, "device is going UP\n"); - /* allocate transmit descriptors */ - rc = ena_setup_all_tx_resources(adapter); - if (unlikely(rc != 0)) { - ena_trace(ENA_ALERT, "err_setup_tx\n"); - goto err_setup_tx; - } + /* setup interrupts for IO queues */ + rc = ena_setup_io_intr(adapter); + if (unlikely(rc != 0)) { + ena_trace(ENA_ALERT, "error setting up IO interrupt\n"); + goto error; + } + rc = ena_request_io_irq(adapter); + if (unlikely(rc != 0)) { + ena_trace(ENA_ALERT, "err_req_irq\n"); + goto error; + } - /* allocate receive descriptors */ - rc = ena_setup_all_rx_resources(adapter); - if (unlikely(rc != 0)) { - ena_trace(ENA_ALERT, "err_setup_rx\n"); - goto err_setup_rx; - } + /* allocate transmit descriptors */ + rc = ena_setup_all_tx_resources(adapter); + if (unlikely(rc != 0)) { + ena_trace(ENA_ALERT, "err_setup_tx\n"); + goto err_setup_tx; + } - /* create IO queues for Rx & Tx */ - rc = ena_create_io_queues(adapter); - if (unlikely(rc != 0)) { - ena_trace(ENA_ALERT, - "create IO queues failed\n"); - goto err_io_que; - } + /* allocate receive descriptors */ + rc = ena_setup_all_rx_resources(adapter); + if (unlikely(rc != 0)) { + ena_trace(ENA_ALERT, "err_setup_rx\n"); + goto err_setup_rx; + } - if (ENA_FLAG_ISSET(ENA_FLAG_LINK_UP, adapter)) - if_link_state_change(adapter->ifp, LINK_STATE_UP); + /* create IO queues for Rx & Tx */ + rc = ena_create_io_queues(adapter); + if (unlikely(rc != 0)) { + ena_trace(ENA_ALERT, + "create IO queues failed\n"); + goto err_io_que; + } - rc = ena_up_complete(adapter); - if (unlikely(rc != 0)) - goto err_up_complete; + if (ENA_FLAG_ISSET(ENA_FLAG_LINK_UP, adapter)) + if_link_state_change(adapter->ifp, LINK_STATE_UP); - counter_u64_add(adapter->dev_stats.interface_up, 1); + rc = ena_up_complete(adapter); + if (unlikely(rc != 0)) + goto err_up_complete; - ena_update_hwassist(adapter); + counter_u64_add(adapter->dev_stats.interface_up, 1); - if_setdrvflagbits(adapter->ifp, IFF_DRV_RUNNING, - IFF_DRV_OACTIVE); + ena_update_hwassist(adapter); - /* Activate timer service only if the device is running. - * If this flag is not set, it means that the driver is being - * reset and timer service will be activated afterwards. - */ - if (ENA_FLAG_ISSET(ENA_FLAG_DEVICE_RUNNING, adapter)) { - callout_reset_sbt(&adapter->timer_service, SBT_1S, - SBT_1S, ena_timer_service, (void *)adapter, 0); - } + if_setdrvflagbits(adapter->ifp, IFF_DRV_RUNNING, + IFF_DRV_OACTIVE); - ENA_FLAG_SET_ATOMIC(ENA_FLAG_DEV_UP, adapter); - - ena_unmask_all_io_irqs(adapter); + /* Activate timer service only if the device is running. + * If this flag is not set, it means that the driver is being + * reset and timer service will be activated afterwards. + */ + if (ENA_FLAG_ISSET(ENA_FLAG_DEVICE_RUNNING, adapter)) { + callout_reset_sbt(&adapter->timer_service, SBT_1S, + SBT_1S, ena_timer_service, (void *)adapter, 0); } + ENA_FLAG_SET_ATOMIC(ENA_FLAG_DEV_UP, adapter); + + ena_unmask_all_io_irqs(adapter); + return (0); err_up_complete: @@ -2162,34 +2163,35 @@ ena_down(struct ena_adapter *adapter) { int rc; - if (ENA_FLAG_ISSET(ENA_FLAG_DEV_UP, adapter)) { - device_printf(adapter->pdev, "device is going DOWN\n"); + if (!ENA_FLAG_ISSET(ENA_FLAG_DEV_UP, adapter)) + return; - callout_drain(&adapter->timer_service); + device_printf(adapter->pdev, "device is going DOWN\n"); - ENA_FLAG_CLEAR_ATOMIC(ENA_FLAG_DEV_UP, adapter); - if_setdrvflagbits(adapter->ifp, IFF_DRV_OACTIVE, - IFF_DRV_RUNNING); + callout_drain(&adapter->timer_service); - ena_free_io_irq(adapter); + ENA_FLAG_CLEAR_ATOMIC(ENA_FLAG_DEV_UP, adapter); + if_setdrvflagbits(adapter->ifp, IFF_DRV_OACTIVE, + IFF_DRV_RUNNING); - if (ENA_FLAG_ISSET(ENA_FLAG_TRIGGER_RESET, adapter)) { - rc = ena_com_dev_reset(adapter->ena_dev, - adapter->reset_reason); - if (unlikely(rc != 0)) - device_printf(adapter->pdev, - "Device reset failed\n"); - } + ena_free_io_irq(adapter); - ena_destroy_all_io_queues(adapter); + if (ENA_FLAG_ISSET(ENA_FLAG_TRIGGER_RESET, adapter)) { + rc = ena_com_dev_reset(adapter->ena_dev, + adapter->reset_reason); + if (unlikely(rc != 0)) + device_printf(adapter->pdev, + "Device reset failed\n"); + } - ena_free_all_tx_bufs(adapter); - ena_free_all_rx_bufs(adapter); - ena_free_all_tx_resources(adapter); - ena_free_all_rx_resources(adapter); + ena_destroy_all_io_queues(adapter); - counter_u64_add(adapter->dev_stats.interface_down, 1); - } + ena_free_all_tx_bufs(adapter); + ena_free_all_rx_bufs(adapter); + ena_free_all_tx_resources(adapter); + ena_free_all_rx_resources(adapter); + + counter_u64_add(adapter->dev_stats.interface_down, 1); } static int