The driver checks the netlist for nodes indicating hardware support using
functions named "ice_is_<feature>_present" sometimes with an additional _e810t
postfix. These functions check the contents of the netlist, and don't make any
direct device ID check.
When upstreaming the functions to Linux, the name was changed to use the form
"ice_is_<feature>_in_netlist" and removed all the device postfixes. Rename this
function to match, as well as update code style.
Signed-off-by: Jacob Keller <jacob.e.kel...@intel.com>
Signed-off-by: Ian Stokes <ian.sto...@intel.com>
Signed-off-by: Anatoly Burakov <anatoly.bura...@intel.com>
---
drivers/net/ice/base/ice_common.c | 39 ++++++++++++++++++++++---------
drivers/net/ice/base/ice_common.h | 1 +
drivers/net/ice/base/ice_ptp_hw.c | 15 ------------
drivers/net/ice/base/ice_ptp_hw.h | 1 -
4 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/drivers/net/ice/base/ice_common.c
b/drivers/net/ice/base/ice_common.c
index 9a61c1357d..fed499f449 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -7,6 +7,7 @@
#include "ice_adminq_cmd.h"
#include "ice_flow.h"
+#include "ice_ptp_hw.h"
#include "ice_switch.h"
#define ICE_PF_RESET_WAIT_COUNT 500
@@ -655,20 +656,24 @@ ice_aq_get_netlist_node(struct ice_hw *hw, struct
ice_aqc_get_link_topo *cmd,
* @node_part_number: node part number to look for
* @node_handle: output parameter if node found - optional
*
- * Find and return the node handle for a given node type and part number in the
- * netlist. When found 0 is returned, ICE_ERR_DOES_NOT_EXIST
- * otherwise. If node_handle provided, it would be set to found node handle.
+ * Scan the netlist for a node handle of the given node type and part number.
+ *
+ * If node_handle is non-NULL it will be modified on function exit. It is only
+ * valid if the function returns zero, and should be ignored on any non-zero
+ * return value.
+ *
+ * Returns: 0 if the node is found, ICE_ERR_DOES_NOT_EXIST if no handle was
+ * found, and an error code on failure to access the AQ.
*/
int
ice_find_netlist_node(struct ice_hw *hw, u8 node_type_ctx, u8 node_part_number,
u16 *node_handle)
{
- struct ice_aqc_get_link_topo cmd;
- u8 rec_node_part_number;
- u16 rec_node_handle;
u8 idx;
for (idx = 0; idx < MAX_NETLIST_SIZE; idx++) {
+ struct ice_aqc_get_link_topo cmd;
+ u8 rec_node_part_number;
int status;
memset(&cmd, 0, sizeof(cmd));
@@ -679,20 +684,32 @@ ice_find_netlist_node(struct ice_hw *hw, u8
node_type_ctx, u8 node_part_number,
status = ice_aq_get_netlist_node(hw, &cmd,
&rec_node_part_number,
- &rec_node_handle);
+ node_handle);
if (status)
return status;
- if (rec_node_part_number == node_part_number) {
- if (node_handle)
- *node_handle = rec_node_handle;
+ if (rec_node_part_number == node_part_number)
return 0;
- }
}
return ICE_ERR_DOES_NOT_EXIST;
}
+/**
+ * ice_is_gps_in_netlist
+ * @hw: pointer to the hw struct
+ *
+ * Check if the GPS generic device is present in the netlist
+ */
+bool ice_is_gps_in_netlist(struct ice_hw *hw)
+{
+ if (ice_find_netlist_node(hw, ICE_AQC_LINK_TOPO_NODE_TYPE_GPS,
+ ICE_AQC_GET_LINK_TOPO_NODE_NR_GEN_GPS, NULL))
+ return false;
+
+ return true;
+}
+
/**
* ice_aq_get_link_info
* @pi: port information structure
diff --git a/drivers/net/ice/base/ice_common.h
b/drivers/net/ice/base/ice_common.h
index 51710f9c8b..684d76d9a0 100644
--- a/drivers/net/ice/base/ice_common.h
+++ b/drivers/net/ice/base/ice_common.h
@@ -169,6 +169,7 @@ ice_aq_get_netlist_node(struct ice_hw *hw, struct
ice_aqc_get_link_topo *cmd,
int
ice_find_netlist_node(struct ice_hw *hw, u8 node_type_ctx, u8 node_part_number,
u16 *node_handle);
+bool ice_is_gps_in_netlist(struct ice_hw *hw);
void
ice_update_phy_type(u64 *phy_type_low, u64 *phy_type_high,
u16 link_speeds_bitmap);
diff --git a/drivers/net/ice/base/ice_ptp_hw.c
b/drivers/net/ice/base/ice_ptp_hw.c
index 50ffa7b796..7d06287a2d 100644
--- a/drivers/net/ice/base/ice_ptp_hw.c
+++ b/drivers/net/ice/base/ice_ptp_hw.c
@@ -5253,21 +5253,6 @@ ice_get_pca9575_handle(struct ice_hw *hw, u16
*pca9575_handle)
return 0;
}
-/**
- * ice_is_gps_present_e810t
- * @hw: pointer to the hw struct
- *
- * Check if the GPS generic device is present in the netlist
- */
-bool ice_is_gps_present_e810t(struct ice_hw *hw)
-{
- if (ice_find_netlist_node(hw, ICE_AQC_LINK_TOPO_NODE_TYPE_GPS,
- ICE_AQC_GET_LINK_TOPO_NODE_NR_GEN_GPS, NULL))
- return false;
-
- return true;
-}
-
/**
* ice_read_pca9575_reg_e810t
* @hw: pointer to the hw struct
diff --git a/drivers/net/ice/base/ice_ptp_hw.h
b/drivers/net/ice/base/ice_ptp_hw.h
index c4a5c030f1..fb56d76e98 100644
--- a/drivers/net/ice/base/ice_ptp_hw.h
+++ b/drivers/net/ice/base/ice_ptp_hw.h
@@ -277,7 +277,6 @@ int
ice_phy_cfg_intr_e822(struct ice_hw *hw, u8 quad, bool ena, u8 threshold);
/* E810 family functions */
-bool ice_is_gps_present_e810t(struct ice_hw *hw);
int ice_ptp_init_phy_e810(struct ice_hw *hw);
int
ice_read_pca9575_reg_e810t(struct ice_hw *hw, u8 offset, u8 *data);
--
2.43.0
