From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6A0D84618E; Tue, 4 Feb 2025 16:16:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BF87642DC7; Tue, 4 Feb 2025 16:12:24 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) by mails.dpdk.org (Postfix) with ESMTP id 7D3C8427D1 for ; Tue, 4 Feb 2025 16:12:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738681931; x=1770217931; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Lbu6Wxr54lx9BwtnkZKKiGNXzoubXdH4/8PACQ+KyxQ=; b=nCOQWyqwgH9oV1XF6y37pQ/Zxh0MwPF5q3eDcwiYnYmXsG7gCUyB48Ry kQheFYHk+r8BtviNjpdzqRwhwimvCERCr+YbPKvIprm6w+QY17Syibvlr g0PTEc0uxY6HaaXPtTT1mIPHPww+EoYwjmgUK0ZmoyZbi8/los8QeXfDj MJEFvnmCQeGIXi0lg67fgsHJZuDGUnwgbYpnv847vilDyJi4CLLD/FXwg UTEsnmN+29Td2vW1xBcdYH6b2p+nwnqfQYiGmlmMM/XWHd8D3F9KKWD4y 4J1qlvYo3Iq/0yERjMIEELFij/j++vqEjRYbG2p1iXxy2QJ2lvHCL4stQ Q==; X-CSE-ConnectionGUID: xDG1DD8xTNaa3xj3RVTf2Q== X-CSE-MsgGUID: yAgW0f00RVuYHxRXX0bvEA== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="39097155" X-IronPort-AV: E=Sophos;i="6.13,258,1732608000"; d="scan'208";a="39097155" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2025 07:12:11 -0800 X-CSE-ConnectionGUID: azzCeC4cTMy09C0+GjncgA== X-CSE-MsgGUID: ln2vcIUpRCi7HicLH5bHsA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,258,1732608000"; d="scan'208";a="110792726" Received: from silpixa00401119.ir.intel.com ([10.55.129.167]) by fmviesa008.fm.intel.com with ESMTP; 04 Feb 2025 07:12:09 -0800 From: Anatoly Burakov To: dev@dpdk.org Cc: bruce.richardson@intel.com Subject: [PATCH v2 34/54] net/e1000/base: improve code flow in ICH8LAN Date: Tue, 4 Feb 2025 15:10:40 +0000 Message-ID: X-Mailer: git-send-email 2.43.5 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Piotr Pietruszewski This change rearranges the ICH8LAN code to have less indentation levels. Signed-off-by: Piotr Pietruszewski Signed-off-by: Anatoly Burakov --- drivers/net/intel/e1000/base/e1000_ich8lan.c | 84 ++++++++++---------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/drivers/net/intel/e1000/base/e1000_ich8lan.c b/drivers/net/intel/e1000/base/e1000_ich8lan.c index 7cbbeae91c..7c89ecb623 100644 --- a/drivers/net/intel/e1000/base/e1000_ich8lan.c +++ b/drivers/net/intel/e1000/base/e1000_ich8lan.c @@ -1390,49 +1390,51 @@ s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) if (ret_val) goto release; /* CSC interrupt received due to ULP Indication */ - if ((phy_reg & I218_ULP_CONFIG1_IND) || force) { - phy_reg &= ~(I218_ULP_CONFIG1_IND | - I218_ULP_CONFIG1_STICKY_ULP | - I218_ULP_CONFIG1_RESET_TO_SMBUS | - I218_ULP_CONFIG1_WOL_HOST | - I218_ULP_CONFIG1_INBAND_EXIT | - I218_ULP_CONFIG1_EN_ULP_LANPHYPC | - I218_ULP_CONFIG1_DIS_CLR_STICKY_ON_PERST | - I218_ULP_CONFIG1_DISABLE_SMB_PERST); - e1000_write_phy_reg_hv_locked(hw, I218_ULP_CONFIG1, phy_reg); - - /* Commit ULP changes by starting auto ULP configuration */ - phy_reg |= I218_ULP_CONFIG1_START; - e1000_write_phy_reg_hv_locked(hw, I218_ULP_CONFIG1, phy_reg); - - /* Clear Disable SMBus Release on PERST# in MAC */ - mac_reg = E1000_READ_REG(hw, E1000_FEXTNVM7); - mac_reg &= ~E1000_FEXTNVM7_DISABLE_SMB_PERST; - E1000_WRITE_REG(hw, E1000_FEXTNVM7, mac_reg); - - if (!force) { - hw->phy.ops.release(hw); - - if (hw->mac.autoneg) - e1000_phy_setup_autoneg(hw); - else - e1000_setup_copper_link_generic(hw); - - e1000_sw_lcd_config_ich8lan(hw); - - e1000_oem_bits_config_ich8lan(hw, true); - - /* Set ULP state to unknown and return non-zero to - * indicate no link (yet) and re-enter on the next LSC - * to finish disabling ULP flow. - */ - hw->dev_spec.ich8lan.ulp_state = - e1000_ulp_state_unknown; - - return 1; - } + if (!((phy_reg & I218_ULP_CONFIG1_IND) || force)) + goto omit_ulp_irq_hanlder; + + phy_reg &= ~(I218_ULP_CONFIG1_IND | + I218_ULP_CONFIG1_STICKY_ULP | + I218_ULP_CONFIG1_RESET_TO_SMBUS | + I218_ULP_CONFIG1_WOL_HOST | + I218_ULP_CONFIG1_INBAND_EXIT | + I218_ULP_CONFIG1_EN_ULP_LANPHYPC | + I218_ULP_CONFIG1_DIS_CLR_STICKY_ON_PERST | + I218_ULP_CONFIG1_DISABLE_SMB_PERST); + e1000_write_phy_reg_hv_locked(hw, I218_ULP_CONFIG1, phy_reg); + + /* Commit ULP changes by starting auto ULP configuration */ + phy_reg |= I218_ULP_CONFIG1_START; + e1000_write_phy_reg_hv_locked(hw, I218_ULP_CONFIG1, phy_reg); + + /* Clear Disable SMBus Release on PERST# in MAC */ + mac_reg = E1000_READ_REG(hw, E1000_FEXTNVM7); + mac_reg &= ~E1000_FEXTNVM7_DISABLE_SMB_PERST; + E1000_WRITE_REG(hw, E1000_FEXTNVM7, mac_reg); + + if (!force) { + hw->phy.ops.release(hw); + + if (hw->mac.autoneg) + e1000_phy_setup_autoneg(hw); + else + e1000_setup_copper_link_generic(hw); + + e1000_sw_lcd_config_ich8lan(hw); + + e1000_oem_bits_config_ich8lan(hw, true); + + /* Set ULP state to unknown and return non-zero to + * indicate no link (yet) and re-enter on the next LSC + * to finish disabling ULP flow. + */ + hw->dev_spec.ich8lan.ulp_state = + e1000_ulp_state_unknown; + + return 1; } +omit_ulp_irq_hanlder: /* Re-enable Tx */ mac_reg = E1000_READ_REG(hw, E1000_TCTL); mac_reg |= E1000_TCTL_EN; -- 2.43.5