diff mbox series

[23/28] net/ice/base: support PHY persistent feature

Message ID	20200309114357.31800-24-qi.z.zhang@intel.com (mailing list archive)
State	Superseded, archived
Delegated to:	xiaolong ye
Headers	From: Qi Zhang <qi.z.zhang@intel.com> To: qiming.yang@intel.com, beilei.xing@intel.com Cc: xiaolong.ye@intel.com, dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>, Chinh T Cao <chinh.t.cao@intel.com>, Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com> Date: Mon, 9 Mar 2020 19:43:52 +0800 Message-Id: <20200309114357.31800-24-qi.z.zhang@intel.com> In-Reply-To: <20200309114357.31800-1-qi.z.zhang@intel.com> References: <20200309114357.31800-1-qi.z.zhang@intel.com> Subject: [dpdk-dev] [PATCH 23/28] net/ice/base: support PHY persistent feature Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	update ice base code \| [00/28] update ice base code [01/28] net/ice/base: fix uninitialized stack variables [02/28] net/ice/base: add and update E822 device IDs [03/28] net/ice/base: fix removing MAC rule [04/28] net/ice/base: read PSM clock frequency from register [05/28] net/ice/base: allow VLAN and ethertype filter for port [06/28] net/ice/base: replace u16 with enum [07/28] net/ice/base: use struct size helper [08/28] net/ice/base: use descriptive vairiable name than type [09/28] net/ice/base: refactor a function [10/28] net/ice/base: add NVM netlist macros [11/28] net/ice/base: minor fixes [12/28] net/ice/base: support GTPU uplink and downlink [13/28] net/ice/base: add link default override support [14/28] net/ice/base: add dedicate MAC type for E810 [15/28] net/ice/base: capitalize abbreviations [16/28] net/ice/base: add PHY number definition values [17/28] net/ice/base: add shared driver parameter command [18/28] net/ice/bse: add AN masks to Get PHY Caps [19/28] net/ice/base: xtract logic of flat NVM read to function [20/28] net/ice/base: add macro specifying max NVM offset [21/28] net/ice/base: implement new sr read functions [22/28] net/ice/base: couple casting issue fixes [23/28] net/ice/base: support PHY persistent feature [24/28] net/ice/base: store NVM version info in extracted format [25/28] net/ice/base: add ACL module [26/28] net/ice/base: update copyright date [27/28] net/ice/base: add the hook to send AdminQ command [28/28] net/ice/base: don't access some hardware registers in DCF

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK
ci/Intel-compilation	success	Compilation OK

Commit Message

Qi Zhang March 9, 2020, 11:43 a.m. UTC

  In this patch, we will modify the ice_copy_phy_caps_to_cfg(...) function
to conditionally fill up the
ice_aqc_set_phy_cfg_data.module_compliance_enforcement with correct
value, based on the PHY persistent feature.

Apply the ice_copy_phy_caps_to_cfg() function inside ice_set_fc()

Signed-off-by: Chinh T Cao <chinh.t.cao@intel.com>
Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/base/ice_common.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/ice/base/ice_common.c b/drivers/net/ice/base/ice_common.c
index 25e205944..afc0bb413 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -2583,9 +2583,11 @@  ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, bool ena_auto_link_update)
 		goto out;
 	}
 
+	ice_copy_phy_caps_to_cfg(pcaps, &cfg);
+
 	/* clear the old pause settings */
-	cfg.caps = pcaps->caps & ~(ICE_AQC_PHY_EN_TX_LINK_PAUSE |
-				   ICE_AQC_PHY_EN_RX_LINK_PAUSE);
+	cfg.caps &= ~(ICE_AQC_PHY_EN_TX_LINK_PAUSE |
+		      ICE_AQC_PHY_EN_RX_LINK_PAUSE);
 
 	/* set the new capabilities */
 	if (pi->fc.req_mode == ICE_FC_AUTO &&
@@ -2608,13 +2610,6 @@  ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, bool ena_auto_link_update)
 		/* Auto restart link so settings take effect */
 		if (ena_auto_link_update)
 			cfg.caps |= ICE_AQ_PHY_ENA_AUTO_LINK_UPDT;
-		/* Copy over all the old settings */
-		cfg.phy_type_high = pcaps->phy_type_high;
-		cfg.phy_type_low = pcaps->phy_type_low;
-		cfg.low_power_ctrl_an = pcaps->low_power_ctrl_an;
-		cfg.eee_cap = pcaps->eee_cap;
-		cfg.eeer_value = pcaps->eeer_value;
-		cfg.link_fec_opt = pcaps->link_fec_options;
 
 		status = ice_aq_set_phy_cfg(hw, pi, &cfg, NULL);
 		if (status) {