[PATCH] net/ice: fix DCF init for E830 devices

[Ian Stokes]

From: Bruce Richardson <bruce.richardson at intel.com>

E830 introduces a new version of Get Link Status Data
which increases the size of struct ice_aqc_get_link_status_data
from 32 bytes to 56. When initializing DCF, attempt to get
link status data using both formats of the command, by overriding
the mac type to E830 on failure with the default setting.

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Signed-off-by: Ian Stokes <ian.stokes at intel.com>
---
 drivers/net/ice/ice_dcf_parent.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ice/ice_dcf_parent.c b/drivers/net/ice/ice_dcf_parent.c
index 4e4a63fdd0..f92bd5e726 100644
--- a/drivers/net/ice/ice_dcf_parent.c
+++ b/drivers/net/ice/ice_dcf_parent.c
@@ -346,8 +346,19 @@ ice_dcf_init_parent_hw(struct ice_hw *hw)
 
 	/* Initialize port_info struct with link information */
 	status = ice_aq_get_link_info(hw->port_info, true, NULL, NULL);
-	if (status)
-		goto err_unroll_alloc;
+	if (status) {
+		enum ice_mac_type type = hw->mac_type;
+
+		/* DCF uses ICE_MAC_GENERIC which can be talking to either
+		 * E810 or E830. Retry with E830 mac type to ensure correct
+		 * data length is used for IAVF communication with PF.
+		 */
+		hw->mac_type = ICE_MAC_E830;
+		status = ice_aq_get_link_info(hw->port_info, true, NULL, NULL);
+		hw->mac_type = type;
+		if (status)
+			goto err_unroll_alloc;
+	}
 
 	status = ice_init_fltr_mgmt_struct(hw);
 	if (status)
-- 
2.34.1