[PATCH] rt_e1000e: Fix __bad_udelay linking error

[PATCH] rt_e1000e: Fix __bad_udelay linking error

[Vitaly Chikunov]

This is similar to upstream commit 9e6c3b63399dd ("e1000e: fix compiler
warnings" by David Ertman). Fix compile error:

  ERROR: "__bad_udelay" [drivers/xenomai/net/drivers/e1000e/rt_e1000e.ko] undefined!

Signed-off-by: Vitaly Chikunov <vt@altlinux.org>
---
 kernel/drivers/net/drivers/e1000e/phy.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/kernel/drivers/net/drivers/e1000e/phy.c b/kernel/drivers/net/drivers/e1000e/phy.c
index 66ae3891a..9ec7835bc 100644
--- a/kernel/drivers/net/drivers/e1000e/phy.c
+++ b/kernel/drivers/net/drivers/e1000e/phy.c
@@ -1787,13 +1787,17 @@ s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
 		 * it across the board.
 		 */
 		ret_val = e1e_rphy(hw, PHY_STATUS, &phy_status);
-		if (ret_val)
+		if (ret_val) {
 			/*
 			 * If the first read fails, another entity may have
 			 * ownership of the resources, wait and try again to
 			 * see if they have relinquished the resources yet.
 			 */
-			udelay(usec_interval);
+			if (usec_interval >= 1000)
+				mdelay(usec_interval/1000);
+			else
+				udelay(usec_interval);
+		}
 		ret_val = e1e_rphy(hw, PHY_STATUS, &phy_status);
 		if (ret_val)
 			break;
-- 
2.29.2

Re: [PATCH] rt_e1000e: Fix __bad_udelay linking error

[Jan Kiszka]

On 06.03.21 23:13, Vitaly Chikunov wrote:
> This is similar to upstream commit 9e6c3b63399dd ("e1000e: fix compiler
> warnings" by David Ertman). Fix compile error:
> 
>   ERROR: "__bad_udelay" [drivers/xenomai/net/drivers/e1000e/rt_e1000e.ko] undefined!
> 
> Signed-off-by: Vitaly Chikunov <vt@altlinux.org>
> ---
>  kernel/drivers/net/drivers/e1000e/phy.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/drivers/net/drivers/e1000e/phy.c b/kernel/drivers/net/drivers/e1000e/phy.c
> index 66ae3891a..9ec7835bc 100644
> --- a/kernel/drivers/net/drivers/e1000e/phy.c
> +++ b/kernel/drivers/net/drivers/e1000e/phy.c
> @@ -1787,13 +1787,17 @@ s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
>  		 * it across the board.
>  		 */
>  		ret_val = e1e_rphy(hw, PHY_STATUS, &phy_status);
> -		if (ret_val)
> +		if (ret_val) {
>  			/*
>  			 * If the first read fails, another entity may have
>  			 * ownership of the resources, wait and try again to
>  			 * see if they have relinquished the resources yet.
>  			 */
> -			udelay(usec_interval);
> +			if (usec_interval >= 1000)
> +				mdelay(usec_interval/1000);
> +			else
> +				udelay(usec_interval);
> +		}
>  		ret_val = e1e_rphy(hw, PHY_STATUS, &phy_status);
>  		if (ret_val)
>  			break;
> 

Thanks, applied.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux