From a5b22e528f0fc0332d736b428e519c6b936e9766 Mon Sep 17 00:00:00 2001
From: veega <zhuweijia@huawei.com>
Date: Thu, 13 Jul 2023 12:06:13 +0800
Subject: [PATCH] hikptool: nic_port cmd add print arb info and phy info

Add arbitration information print in port ARB LINK INFO display area, and PHY
INFO display area for print PHY config and regs.

Signed-off-by: veega <zhuweijia@huawei.com>
---
 net/nic/nic_mac/hikp_nic_port.c | 4 +++-
 net/nic/nic_mac/hikp_nic_port.h | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/net/nic/nic_mac/hikp_nic_port.c b/net/nic/nic_mac/hikp_nic_port.c
index 1ff3569..22a6467 100644
--- a/net/nic/nic_mac/hikp_nic_port.c
+++ b/net/nic/nic_mac/hikp_nic_port.c
@@ -355,6 +355,7 @@ static void mac_cmd_disp_arb_info(const struct mac_cmd_arb_dfx *arb_dfx)
 	mac_cmd_disp_port_param("Default", &arb_dfx->default_cfg);
 	mac_cmd_disp_port_param("BIOS", &arb_dfx->bios_cfg);
 	mac_cmd_disp_port_param("TOOL", &arb_dfx->user_cfg);
+	mac_cmd_disp_port_param("ARB", &arb_dfx->arb_cfg);
 	mac_cmd_disp_port_param("Final", &arb_dfx->port_cfg);
 }
 
@@ -443,7 +444,8 @@ static void mac_cmd_port_execute(struct major_cmd_ctrl *self)
 	}
 
 	port_hw = (struct mac_cmd_port_hardware *)(hw_cmd_ret->rsp_data);
-	if (port_hw->port_type == 1)
+	if (port_hw->port_type == HIKP_PORT_TYPE_PHY ||
+	    port_hw->port_type == HIKP_PORT_TYPE_PHY_SDS)
 		mask |= MAC_LSPORT_PHY;
 
 	mac_cmd_show_port_dfx(self, mask);
diff --git a/net/nic/nic_mac/hikp_nic_port.h b/net/nic/nic_mac/hikp_nic_port.h
index ac00f55..f6334d0 100644
--- a/net/nic/nic_mac/hikp_nic_port.h
+++ b/net/nic/nic_mac/hikp_nic_port.h
@@ -95,6 +95,9 @@ enum {
 #define HIKP_MAC_PHY_ABI_PAUSE          HI_BIT(13)
 #define HIKP_MAC_PHY_ABI_ASYM_PAUSE     HI_BIT(14)
 
+#define HIKP_PORT_TYPE_PHY		1
+#define HIKP_PORT_TYPE_PHY_SDS		3
+
 struct mac_item {
 	uint32_t key;
 	const char *name;
@@ -151,6 +154,7 @@ struct mac_cmd_arb_dfx {
 	struct mac_port_param bios_cfg;
 	struct mac_port_param user_cfg;
 	struct mac_port_param port_cfg;
+	struct mac_port_param arb_cfg;
 };
 
 #define MAC_PHY_DFX_REG_NUM     12
-- 
2.36.1.windows.1

