netdev - Re: [PATCHv3] Fixed PHY: Add fixed_phy_change

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:   Thu, 13 Dec 2018 10:48:03 -0800
From:   Florian Fainelli <f.fainelli@...il.com>
To:     Joakim Tjernlund <joakim.tjernlund@...inera.com>,
        "netdev @ vger . kernel . org" <netdev@...r.kernel.org>,
        Andrew Lunn <andrew@...n.ch>,
        "claudiu . manoil @ nxp . com" <claudiu.manoil@....com>
Subject: Re: [PATCHv3] Fixed PHY: Add fixed_phy_change_carrier()

Le 12/13/18 à 9:47 AM, Joakim Tjernlund a écrit :
> Drivers can use this as .ndo_change_carrier() to change carrier
> via /sys/class/net/ethX/carrier.
> 
> Signed-off-by: Joakim Tjernlund <joakim.tjernlund@...inera.com>

Other than a few

> ---
> 
>  v3 - Moved the logic into fixed PHY to minimize eth driver
>       impact
> 
>  v2 - Only allow carrier changes for Fixed PHYs
> 
>  I will follow up with drivers using this next.

You might as well post them as a patch series that way we can review the
function and its user(s) in one go. Few nitpicks below, but looking good
otherwise.

>  
>  drivers/net/phy/fixed_phy.c | 23 ++++++++++++++++++++++-
>  include/linux/phy_fixed.h   |  5 +++++
>  2 files changed, 27 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
> index eb5167210681..aedebc251997 100644
> --- a/drivers/net/phy/fixed_phy.c
> +++ b/drivers/net/phy/fixed_phy.c
> @@ -25,6 +25,7 @@
>  #include <linux/gpio.h>
>  #include <linux/seqlock.h>
>  #include <linux/idr.h>
> +#include <linux/netdevice.h>
>  
>  #include "swphy.h"
>  
> @@ -38,6 +39,7 @@ struct fixed_phy {
>  	struct phy_device *phydev;
>  	seqcount_t seqcount;
>  	struct fixed_phy_status status;
> +	bool no_carrier;

Any reason why this is used with negative logic instead of positive
logic and calling that just "carrier"?

>  	int (*link_update)(struct net_device *, struct fixed_phy_status *);
>  	struct list_head node;
>  	int link_gpio;
> @@ -48,9 +50,27 @@ static struct fixed_mdio_bus platform_fmb = {
>  	.phys = LIST_HEAD_INIT(platform_fmb.phys),
>  };
>  
> +int
> +fixed_phy_change_carrier(struct net_device *dev, bool new_carrier)

Can you put the return type and function name on the same line?

> +{
> +	struct fixed_mdio_bus *fmb = &platform_fmb;
> +	struct phy_device *phydev = dev->phydev;
> +	struct fixed_phy *fp;
> +
> +	if (!phydev || !phydev->mdio.bus)
> +		return -EINVAL;
> +
> +	list_for_each_entry(fp, &fmb->phys, node) {
> +		if (fp->addr == phydev->mdio.addr) {
> +			fp->no_carrier = !new_carrier;
> +			return 0;
> +		}
> +	}
> +	return -EINVAL;
> +}

Missing newline and EXPORT_SYMBOL_GPL() here to make that visible to
modules.

>  static void fixed_phy_update(struct fixed_phy *fp)
>  {
> -	if (gpio_is_valid(fp->link_gpio))
> +	if (!fp->no_carrier && gpio_is_valid(fp->link_gpio))
>  		fp->status.link = !!gpio_get_value_cansleep(fp->link_gpio);
>  }
>  
> @@ -66,6 +86,7 @@ static int fixed_mdio_read(struct mii_bus *bus, int phy_addr, int reg_num)
>  
>  			do {
>  				s = read_seqcount_begin(&fp->seqcount);
> +				fp->status.link = !fp->no_carrier;
>  				/* Issue callback if user registered it. */
>  				if (fp->link_update) {
>  					fp->link_update(fp->phydev->attached_dev,
> diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h
> index cf6392de6eb0..a711b41f3e20 100644
> --- a/include/linux/phy_fixed.h
> +++ b/include/linux/phy_fixed.h
> @@ -13,6 +13,7 @@ struct fixed_phy_status {
>  struct device_node;
>  
>  #if IS_ENABLED(CONFIG_FIXED_PHY)
> +extern int fixed_phy_change_carrier(struct net_device *dev, bool new_carrier);
>  extern int fixed_phy_add(unsigned int irq, int phy_id,
>  			 struct fixed_phy_status *status,
>  			 int link_gpio);
> @@ -56,6 +57,10 @@ static inline int fixed_phy_update_state(struct phy_device *phydev,
>  {
>  	return -ENODEV;
>  }
> +static inline int fixed_phy_change_carrier(struct net_device *dev, bool new_carrier)
> +{
> +	return -EINVAL;
> +}
>  #endif /* CONFIG_FIXED_PHY */
>  
>  #endif /* __PHY_FIXED_H */
> 


-- 
Florian