Re: [net-next, 2/2] enetc: update TSN Qbv PSPEED set according to adjust link speed

[Simon Horman <simon.horman@netronome.com>]

On Mon, Nov 11, 2019 at 04:41:39AM +0000, Po Liu wrote:
> ENETC has a register PSPEED to indicate the link speed of hardware.
> It is need to update accordingly. PSPEED field needs to be updated
> with the port speed for QBV scheduling purposes. Or else there is
> chance for gate slot not free by frame taking the MAC if PSPEED and
> phy speed not match. So update PSPEED when link adjust. This is
> implement by the adjust_link.
> 
> Signed-off-by: Po Liu <Po.Liu@nxp.com>
> Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
> Singed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
> ---
>  drivers/net/ethernet/freescale/enetc/enetc.c  | 13 +++++--
>  drivers/net/ethernet/freescale/enetc/enetc.h  |  7 ++++
>  .../net/ethernet/freescale/enetc/enetc_pf.c   |  3 ++
>  .../net/ethernet/freescale/enetc/enetc_qos.c  | 34 +++++++++++++++++++
>  4 files changed, 55 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
> index d58dbc2c4270..f6b00c68451b 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc.c
> @@ -742,9 +742,14 @@ void enetc_get_si_caps(struct enetc_si *si)
>  	si->num_rss = 0;
>  	val = enetc_rd(hw, ENETC_SIPCAPR0);
>  	if (val & ENETC_SIPCAPR0_RSS) {
> -		val = enetc_rd(hw, ENETC_SIRSSCAPR);
> -		si->num_rss = ENETC_SIRSSCAPR_GET_NUM_RSS(val);
> +		u32 rss;
> +
> +		rss = enetc_rd(hw, ENETC_SIRSSCAPR);
> +		si->num_rss = ENETC_SIRSSCAPR_GET_NUM_RSS(rss);
>  	}
> +
> +	if (val & ENETC_SIPCAPR0_QBV)
> +		si->hw_features |= ENETC_SI_F_QBV;
>  }
>  
>  static int enetc_dma_alloc_bdr(struct enetc_bdr *r, size_t bd_size)
> @@ -1314,8 +1319,12 @@ static void enetc_disable_interrupts(struct enetc_ndev_priv *priv)
>  
>  static void adjust_link(struct net_device *ndev)
>  {
> +	struct enetc_ndev_priv *priv = netdev_priv(ndev);
>  	struct phy_device *phydev = ndev->phydev;
>  
> +	if (priv->active_offloads & ENETC_F_QBV)
> +		enetc_sched_speed_set(ndev);
> +
>  	phy_print_status(phydev);
>  }
>  
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h b/drivers/net/ethernet/freescale/enetc/enetc.h
> index 8676631041d5..e85e5301c578 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc.h
> +++ b/drivers/net/ethernet/freescale/enetc/enetc.h
> @@ -118,6 +118,8 @@ enum enetc_errata {
>  	ENETC_ERR_UCMCSWP	= BIT(2),
>  };
>  
> +#define ENETC_SI_F_QBV  (1<<0)
> +
>  /* PCI IEP device data */
>  struct enetc_si {
>  	struct pci_dev *pdev;
> @@ -133,6 +135,7 @@ struct enetc_si {
>  	int num_fs_entries;
>  	int num_rss; /* number of RSS buckets */
>  	unsigned short pad;
> +	int hw_features;
>  };
>  
>  #define ENETC_SI_ALIGN	32
> @@ -173,6 +176,7 @@ struct enetc_cls_rule {
>  enum enetc_active_offloads {
>  	ENETC_F_RX_TSTAMP	= BIT(0),
>  	ENETC_F_TX_TSTAMP	= BIT(1),
> +	ENETC_F_QBV             = BIT(2),
>  };
>  
>  struct enetc_ndev_priv {
> @@ -188,6 +192,8 @@ struct enetc_ndev_priv {
>  	u16 msg_enable;
>  	int active_offloads;
>  
> +	u32 speed; /* store speed for compare update pspeed */

struct phy_device seems to use int for speed.
Perhaps that would be a more appropriate type here,
and likewise in enetc_sched_speed_set().

> +
>  	struct enetc_bdr *tx_ring[16];
>  	struct enetc_bdr *rx_ring[16];
>  
> @@ -246,3 +252,4 @@ int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count);
>  int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count);
>  int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
>  int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
> +void enetc_sched_speed_set(struct net_device *ndev);
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
> index 7da79b816416..e7482d483b28 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
> @@ -742,6 +742,9 @@ static void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
>  
>  	ndev->priv_flags |= IFF_UNICAST_FLT;
>  
> +	if (si->hw_features & ENETC_SI_F_QBV)
> +		priv->active_offloads |= ENETC_F_QBV;
> +
>  	/* pick up primary MAC address from SI */
>  	enetc_get_primary_mac_addr(&si->hw, ndev->dev_addr);
>  }
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc_qos.c b/drivers/net/ethernet/freescale/enetc/enetc_qos.c
> index 036bb39c7a0b..801104dd2ba6 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc_qos.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc_qos.c
> @@ -11,6 +11,40 @@ static u16 enetc_get_max_gcl_len(struct enetc_hw *hw)
>  		& ENETC_QBV_MAX_GCL_LEN_MASK;
>  }
>  
> +void enetc_sched_speed_set(struct net_device *ndev)
> +{
> +	struct enetc_ndev_priv *priv = netdev_priv(ndev);
> +	struct phy_device *phydev = ndev->phydev;
> +	u32 old_speed = priv->speed;
> +	u32 speed, pspeed;
> +
> +	if (phydev->speed == old_speed)
> +		return;
> +
> +	speed = phydev->speed;
> +	switch (speed) {
> +	case SPEED_1000:
> +		pspeed = ENETC_PMR_PSPEED_1000M;
> +		break;
> +	case SPEED_2500:
> +		pspeed = ENETC_PMR_PSPEED_2500M;
> +		break;
> +	case SPEED_100:
> +		pspeed = ENETC_PMR_PSPEED_100M;
> +		break;
> +	case SPEED_10:
> +	default:
> +		pspeed = ENETC_PMR_PSPEED_10M;
> +		netdev_err(ndev, "Qbv PSPEED set speed link down.\n");
> +	}
> +
> +	priv->speed = speed;
> +	enetc_port_wr(&priv->si->hw, ENETC_PMR,
> +		      (enetc_port_rd(&priv->si->hw, ENETC_PMR)
> +		      & (~ENETC_PMR_PSPEED_MASK))
> +		      | pspeed);

The above two lines could be combined.

Also, the parentheses seem unnecessary.

> +}
> +
>  static int enetc_setup_taprio(struct net_device *ndev,
>  			      struct tc_taprio_qopt_offload *admin_conf)
>  {
> -- 
> 2.17.1
>