ice: Extend Sideband Queue command to support flags

Current driver implementation for Sideband Queue supports a
fixed flag (ICE_AQ_FLAG_RD). To retrieve FEC statistics from
firmware, Sideband Queue command is used with a different flag.

Extend API for Sideband Queue command to use 'flags' as input
argument.

Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Anil Samal <anil.samal@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Link: https://patch.msgid.link/20240709202951.2103115-2-anthony.l.nguyen@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
index 9ae61cd8923e390d36a21a535d8d955df8733432..9fa9d914ae463ed6a462c0740c94143733a5270a 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_common.c
+++ b/drivers/net/ethernet/intel/ice/ice_common.c
@@ -1497,8 +1497,9 @@ ice_sbq_send_cmd(struct ice_hw *hw, struct ice_sbq_cmd_desc *desc,
  * ice_sbq_rw_reg - Fill Sideband Queue command
  * @hw: pointer to the HW struct
  * @in: message info to be filled in descriptor
+ * @flags: control queue descriptor flags
  */
-int ice_sbq_rw_reg(struct ice_hw *hw, struct ice_sbq_msg_input *in)
+int ice_sbq_rw_reg(struct ice_hw *hw, struct ice_sbq_msg_input *in, u16 flags)
 {
        struct ice_sbq_cmd_desc desc = {0};
        struct ice_sbq_msg_req msg = {0};
@@ -1522,7 +1523,7 @@ int ice_sbq_rw_reg(struct ice_hw *hw, struct ice_sbq_msg_input *in)
                 */
                msg_len -= sizeof(msg.data);
 
-       desc.flags = cpu_to_le16(ICE_AQ_FLAG_RD);
+       desc.flags = cpu_to_le16(flags);
        desc.opcode = cpu_to_le16(ice_sbq_opc_neigh_dev_req);
        desc.param0.cmd_len = cpu_to_le16(msg_len);
        status = ice_sbq_send_cmd(hw, &desc, &msg, msg_len, NULL);

diff --git a/drivers/net/ethernet/intel/ice/ice_common.h b/drivers/net/ethernet/intel/ice/ice_common.h
index 40dc735dc25cecc94e9bd58495fc37eb362c100d..ef9e8c23580d3b1da0f6f6d18370e54f42dd2f38 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_common.h
+++ b/drivers/net/ethernet/intel/ice/ice_common.h
@@ -201,7 +201,7 @@ int ice_replay_vsi(struct ice_hw *hw, u16 vsi_handle);
 void ice_replay_post(struct ice_hw *hw);
 struct ice_q_ctx *
 ice_get_lan_q_ctx(struct ice_hw *hw, u16 vsi_handle, u8 tc, u16 q_handle);
-int ice_sbq_rw_reg(struct ice_hw *hw, struct ice_sbq_msg_input *in);
+int ice_sbq_rw_reg(struct ice_hw *hw, struct ice_sbq_msg_input *in, u16 flag);
 int
 ice_aq_get_cgu_abilities(struct ice_hw *hw,
                         struct ice_aqc_get_cgu_abilities *abilities);

diff --git a/drivers/net/ethernet/intel/ice/ice_ptp_hw.c b/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
index 1e9a4ccd0ea2783f0c96c5c5cfd120bd89296982..3a33e6b9b313d7a645739f41a5400492b3dc10c5 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
@@ -247,7 +247,7 @@ static int ice_read_cgu_reg_e82x(struct ice_hw *hw, u32 addr, u32 *val)
        };
        int err;
 
-       err = ice_sbq_rw_reg(hw, &cgu_msg);
+       err = ice_sbq_rw_reg(hw, &cgu_msg, ICE_AQ_FLAG_RD);
        if (err) {
                ice_debug(hw, ICE_DBG_PTP, "Failed to read CGU register 0x%04x, err %d\n",
                          addr, err);
@@ -280,7 +280,7 @@ static int ice_write_cgu_reg_e82x(struct ice_hw *hw, u32 addr, u32 val)
        };
        int err;
 
-       err = ice_sbq_rw_reg(hw, &cgu_msg);
+       err = ice_sbq_rw_reg(hw, &cgu_msg, ICE_AQ_FLAG_RD);
        if (err) {
                ice_debug(hw, ICE_DBG_PTP, "Failed to write CGU register 0x%04x, err %d\n",
                          addr, err);
@@ -902,7 +902,7 @@ static int ice_write_phy_eth56g(struct ice_hw *hw, u8 phy_idx, u32 addr,
        phy_msg.data = val;
        phy_msg.dest_dev = hw->ptp.phy.eth56g.phy_addr[phy_idx];
 
-       err = ice_sbq_rw_reg(hw, &phy_msg);
+       err = ice_sbq_rw_reg(hw, &phy_msg, ICE_AQ_FLAG_RD);
 
        if (err)
                ice_debug(hw, ICE_DBG_PTP, "PTP failed to send msg to phy %d\n",
@@ -934,7 +934,7 @@ static int ice_read_phy_eth56g(struct ice_hw *hw, u8 phy_idx, u32 addr,
        phy_msg.data = 0;
        phy_msg.dest_dev = hw->ptp.phy.eth56g.phy_addr[phy_idx];
 
-       err = ice_sbq_rw_reg(hw, &phy_msg);
+       err = ice_sbq_rw_reg(hw, &phy_msg, ICE_AQ_FLAG_RD);
        if (err) {
                ice_debug(hw, ICE_DBG_PTP, "PTP failed to send msg to phy %d\n",
                          err);
@@ -2855,7 +2855,7 @@ ice_read_phy_reg_e82x(struct ice_hw *hw, u8 port, u16 offset, u32 *val)
        ice_fill_phy_msg_e82x(hw, &msg, port, offset);
        msg.opcode = ice_sbq_msg_rd;
 
-       err = ice_sbq_rw_reg(hw, &msg);
+       err = ice_sbq_rw_reg(hw, &msg, ICE_AQ_FLAG_RD);
        if (err) {
                ice_debug(hw, ICE_DBG_PTP, "Failed to send message to PHY, err %d\n",
                          err);
@@ -2933,7 +2933,7 @@ ice_write_phy_reg_e82x(struct ice_hw *hw, u8 port, u16 offset, u32 val)
        msg.opcode = ice_sbq_msg_wr;
        msg.data = val;
 
-       err = ice_sbq_rw_reg(hw, &msg);
+       err = ice_sbq_rw_reg(hw, &msg, ICE_AQ_FLAG_RD);
        if (err) {
                ice_debug(hw, ICE_DBG_PTP, "Failed to send message to PHY, err %d\n",
                          err);
@@ -3094,7 +3094,7 @@ ice_read_quad_reg_e82x(struct ice_hw *hw, u8 quad, u16 offset, u32 *val)
 
        msg.opcode = ice_sbq_msg_rd;
 
-       err = ice_sbq_rw_reg(hw, &msg);
+       err = ice_sbq_rw_reg(hw, &msg, ICE_AQ_FLAG_RD);
        if (err) {
                ice_debug(hw, ICE_DBG_PTP, "Failed to send message to PHY, err %d\n",
                          err);
@@ -3129,7 +3129,7 @@ ice_write_quad_reg_e82x(struct ice_hw *hw, u8 quad, u16 offset, u32 val)
        msg.opcode = ice_sbq_msg_wr;
        msg.data = val;
 
-       err = ice_sbq_rw_reg(hw, &msg);
+       err = ice_sbq_rw_reg(hw, &msg, ICE_AQ_FLAG_RD);
        if (err) {
                ice_debug(hw, ICE_DBG_PTP, "Failed to send message to PHY, err %d\n",
                          err);
@@ -4780,7 +4780,7 @@ static int ice_read_phy_reg_e810(struct ice_hw *hw, u32 addr, u32 *val)
        msg.opcode = ice_sbq_msg_rd;
        msg.dest_dev = rmn_0;
 
-       err = ice_sbq_rw_reg(hw, &msg);
+       err = ice_sbq_rw_reg(hw, &msg, ICE_AQ_FLAG_RD);
        if (err) {
                ice_debug(hw, ICE_DBG_PTP, "Failed to send message to PHY, err %d\n",
                          err);
@@ -4811,7 +4811,7 @@ static int ice_write_phy_reg_e810(struct ice_hw *hw, u32 addr, u32 val)
        msg.dest_dev = rmn_0;
        msg.data = val;
 
-       err = ice_sbq_rw_reg(hw, &msg);
+       err = ice_sbq_rw_reg(hw, &msg, ICE_AQ_FLAG_RD);
        if (err) {
                ice_debug(hw, ICE_DBG_PTP, "Failed to send message to PHY, err %d\n",
                          err);