netdev - Re: [PATCH] net/fsl: remove func xgmac_wait_until

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 08 May 2017 15:34:14 -0400 (EDT)
From:   David Miller <davem@...emloft.net>
To:     ardeleanalex@...il.com
Cc:     netdev@...r.kernel.org, Shaohui.Xie@....com
Subject: Re: [PATCH] net/fsl: remove func xgmac_wait_until_free() as
 duplicate

From: Alexandru Ardelean <ardeleanalex@...il.com>
Date: Mon,  8 May 2017 14:31:18 +0300

> Looking at xgmac_wait_until_done() and xgmac_wait_until_free()
> functions, they seem to have turned out completely identical.
> 
> Though, judging from the git history it seems they
> initially weren't.
> 
> Remove xgmac_wait_until_free() in favor of xgmac_wait_until_done().
> 
> Signed-off-by: Alexandru Ardelean <ardeleanalex@...il.com>

This situation got created by the commit below, I wonder if it
is even correct.

Certainly the original author of this code intended the MDIO
_data_ rather than the _status_ register to be polled.

Otherwise, why in the world have two functions which are in
every other regard identical?

commit 26eee0210ad72a29eb4a70b34320bda266f91a0d
Author: Shaohui Xie <Shaohui.Xie@...escale.com>
Date:   Mon Mar 16 18:55:50 2015 +0800

    net/fsl: fix a bug in xgmac_mdio
    
    There is a bug in xgmac_wait_until_done() which mdio_stat should be used
    instead of mdio_data when checking if busy bit is cleared.
    
    Signed-off-by: Shaohui Xie <Shaohui.Xie@...escale.com>
    Signed-off-by: David S. Miller <davem@...emloft.net>

diff --git a/drivers/net/ethernet/freescale/xgmac_mdio.c b/drivers/net/ethernet/freescale/xgmac_mdio.c
index 3a83bc2..5f691f2 100644
--- a/drivers/net/ethernet/freescale/xgmac_mdio.c
+++ b/drivers/net/ethernet/freescale/xgmac_mdio.c
@@ -79,7 +79,7 @@ static int xgmac_wait_until_done(struct device *dev,
 
 	/* Wait till the MDIO write is complete */
 	timeout = TIMEOUT;
-	while ((ioread32be(&regs->mdio_data) & MDIO_DATA_BSY) && timeout) {
+	while ((ioread32be(&regs->mdio_stat) & MDIO_STAT_BSY) && timeout) {
 		cpu_relax();
 		timeout--;
 	}