diff mbox series

[V2,net,2/2] net: hns: fix fake link up on xge port

Message ID 20231204011051.4055031-3-shaojijie@huawei.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series There are some bugfix for the HNS ethernet driver | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net
netdev/ynl success SINGLE THREAD; Generated files up to date; no warnings/errors;
netdev/fixes_present success Fixes tag present in non-next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 1115 this patch: 1115
netdev/cc_maintainers success CCed 8 of 9 maintainers
netdev/build_clang success Errors and warnings before: 1142 this patch: 1142
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 1142 this patch: 1142
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 41 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Jijie Shao Dec. 4, 2023, 1:10 a.m. UTC 
From: Yonglong Liu <liuyonglong@huawei.com>

If a xge port just connect with an optical module and no fiber,
it may have a fake link up because there may be interference on
the hardware. This patch adds an anti-shake to avoid the problem.
And the time of anti-shake is base on tests.

Fixes: b917078c1c10 ("net: hns: Add ACPI support to check SFP present")
Signed-off-by: Yonglong Liu <liuyonglong@huawei.com>
Signed-off-by: Jijie Shao <shaojijie@huawei.com>
---
 .../net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

Comments

Wojciech Drewek Dec. 4, 2023, 10:19 a.m. UTC | #1 
On 04.12.2023 02:10, Jijie Shao wrote:
> From: Yonglong Liu <liuyonglong@huawei.com>
> 
> If a xge port just connect with an optical module and no fiber,
> it may have a fake link up because there may be interference on
> the hardware. This patch adds an anti-shake to avoid the problem.
> And the time of anti-shake is base on tests.
> 
> Fixes: b917078c1c10 ("net: hns: Add ACPI support to check SFP present")
> Signed-off-by: Yonglong Liu <liuyonglong@huawei.com>
> Signed-off-by: Jijie Shao <shaojijie@huawei.com>
> ---
>  .../net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 29 +++++++++++++++++++
>  1 file changed, 29 insertions(+)
> 
> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
> index 928d934cb21a..c3abb14edd51 100644
> --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
> +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
> @@ -66,6 +66,27 @@ static enum mac_mode hns_get_enet_interface(const struct hns_mac_cb *mac_cb)
>  	}
>  }
>  
> +static void hns_mac_link_anti_shake(struct mac_driver *mac_ctrl_drv,
> +				    u32 *link_status)
> +{

It would be cleaner to return the link status than using output arg IMO

> +#define HNS_MAC_LINK_WAIT_TIME 5
> +#define HNS_MAC_LINK_WAIT_CNT 40
> +
> +	int i;
> +
> +	if (!mac_ctrl_drv->get_link_status) {
> +		*link_status = 0;
> +		return;
> +	}
> +
> +	for (i = 0; i < HNS_MAC_LINK_WAIT_CNT; i++) {
> +		msleep(HNS_MAC_LINK_WAIT_TIME);
> +		mac_ctrl_drv->get_link_status(mac_ctrl_drv, link_status);
> +		if (!*link_status)
> +			break;
> +	}
> +}
> +
>  void hns_mac_get_link_status(struct hns_mac_cb *mac_cb, u32 *link_status)
>  {
>  	struct mac_driver *mac_ctrl_drv;
> @@ -83,6 +104,14 @@ void hns_mac_get_link_status(struct hns_mac_cb *mac_cb, u32 *link_status)
>  							       &sfp_prsnt);
>  		if (!ret)
>  			*link_status = *link_status && sfp_prsnt;
> +
> +		/* for FIBER port, it may have a fake link up.
> +		 * when the link status changes from down to up, we need to do
> +		 * anti-shake. the anti-shake time is base on tests.
> +		 * only FIBER port need to do this.
> +		 */
> +		if (*link_status && !mac_cb->link)
> +			hns_mac_link_anti_shake(mac_ctrl_drv, link_status);
>  	}
>  
>  	mac_cb->link = *link_status;
Jijie Shao Dec. 4, 2023, 2:43 p.m. UTC | #2 
on 2023/12/4 18:19, Wojciech Drewek wrote:
>
> On 04.12.2023 02:10, Jijie Shao wrote:
>>   
>> +static void hns_mac_link_anti_shake(struct mac_driver *mac_ctrl_drv,
>> +				    u32 *link_status)
>> +{
> It would be cleaner to return the link status than using output arg IMO
>
Yes, it's a good suggestion, and this is modified in v3
diff mbox series

Patch

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
index 928d934cb21a..c3abb14edd51 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
@@ -66,6 +66,27 @@  static enum mac_mode hns_get_enet_interface(const struct hns_mac_cb *mac_cb)
 	}
 }
 
+static void hns_mac_link_anti_shake(struct mac_driver *mac_ctrl_drv,
+				    u32 *link_status)
+{
+#define HNS_MAC_LINK_WAIT_TIME 5
+#define HNS_MAC_LINK_WAIT_CNT 40
+
+	int i;
+
+	if (!mac_ctrl_drv->get_link_status) {
+		*link_status = 0;
+		return;
+	}
+
+	for (i = 0; i < HNS_MAC_LINK_WAIT_CNT; i++) {
+		msleep(HNS_MAC_LINK_WAIT_TIME);
+		mac_ctrl_drv->get_link_status(mac_ctrl_drv, link_status);
+		if (!*link_status)
+			break;
+	}
+}
+
 void hns_mac_get_link_status(struct hns_mac_cb *mac_cb, u32 *link_status)
 {
 	struct mac_driver *mac_ctrl_drv;
@@ -83,6 +104,14 @@  void hns_mac_get_link_status(struct hns_mac_cb *mac_cb, u32 *link_status)
 							       &sfp_prsnt);
 		if (!ret)
 			*link_status = *link_status && sfp_prsnt;
+
+		/* for FIBER port, it may have a fake link up.
+		 * when the link status changes from down to up, we need to do
+		 * anti-shake. the anti-shake time is base on tests.
+		 * only FIBER port need to do this.
+		 */
+		if (*link_status && !mac_cb->link)
+			hns_mac_link_anti_shake(mac_ctrl_drv, link_status);
 	}
 
 	mac_cb->link = *link_status;