netdev - Re: [PATCHv2 net-next 1/2] net: dsa: mv88e6xxx: Add helper for accessing port registers

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, 19 Sep 2016 22:17:51 -0400
From:   Vivien Didelot <vivien.didelot@...oirfairelinux.com>
To:     Andrew Lunn <andrew@...n.ch>, David Miller <davem@...emloft.net>
Cc:     netdev <netdev@...r.kernel.org>, Andrew Lunn <andrew@...n.ch>
Subject: Re: [PATCHv2 net-next 1/2] net: dsa: mv88e6xxx: Add helper for accessing port registers

Hi Andrew,

Andrew Lunn <andrew@...n.ch> writes:

<snip>

> @@ -585,19 +601,19 @@ static void mv88e6xxx_adjust_link(struct dsa_switch *ds, int port,
>  				  struct phy_device *phydev)
>  {
>  	struct mv88e6xxx_chip *chip = ds->priv;
> -	u32 reg;
> -	int ret;
> +	u16 reg;
> +	int err;
>  
>  	if (!phy_is_pseudo_fixed_link(phydev))
>  		return;
>  
>  	mutex_lock(&chip->reg_lock);
>  
> -	ret = _mv88e6xxx_reg_read(chip, REG_PORT(port), PORT_PCS_CTRL);
> -	if (ret < 0)
> +	err = mv88e6xxx_port_read(chip, port, PORT_PCS_CTRL, &reg);
> +	if (err)
>  		goto out;
>  
> -	reg = ret & ~(PORT_PCS_CTRL_LINK_UP |
> +	reg = reg & ~(PORT_PCS_CTRL_LINK_UP |

        reg &= ~(PORT_PCS_CTRL_LINK_UP |

>  		      PORT_PCS_CTRL_FORCE_LINK |
>  		      PORT_PCS_CTRL_DUPLEX_FULL |
>  		      PORT_PCS_CTRL_FORCE_DUPLEX |

<snip>

>  	/* Wait up to one second for reset to complete. */
>  	timeout = jiffies + 1 * HZ;
>  	while (time_before(jiffies, timeout)) {
> -		ret = _mv88e6xxx_reg_read(chip, REG_GLOBAL, 0x00);
> -		if (ret < 0)
> -			return ret;
> +		err = _mv88e6xxx_reg_read(chip, REG_GLOBAL, 0x00);
> +		if (err)
> +			return err;

Ouch! Wrong s/ret/err/ here.

>  
> -		if ((ret & is_reset) == is_reset)
> +		if ((err & is_reset) == is_reset)

Here as well. Keep ret or use mv88e6xxx_read().

>  			break;
>  		usleep_range(1000, 2000);
>  	}
>  	if (time_after(jiffies, timeout))
> -		ret = -ETIMEDOUT;
> +		err = -ETIMEDOUT;
>  	else
> -		ret = 0;
> +		err = 0;
>  
> -	return ret;
> +	return err;
>  }
>  
>  static int mv88e6xxx_serdes_power_on(struct mv88e6xxx_chip *chip)

Thanks,

        Vivien