mbox series

[net-next,0/3] net: ptp: use common defines for PTP message types in further drivers

Message ID 20201122082636.12451-1-ceggers@arri.de
Headers show
Series net: ptp: use common defines for PTP message types in further drivers | expand

Message

Christian Eggers Nov. 22, 2020, 8:26 a.m. UTC 
This series replaces further driver internal enumeration / uses of magic
numbers with the newly introduced PTP_MSGTYPE_* defines.

On Friday, 20 November 2020, 23:39:10 CET, Vladimir Oltean wrote:
> On Fri, Nov 20, 2020 at 09:41:03AM +0100, Christian Eggers wrote:
> > This series introduces commen defines for PTP event messages. Driver
> > internal defines are removed and some uses of magic numbers are replaced
> > by the new defines.
> > [...]
> 
> I understand that you don't want to spend a lifetime on this, but I see
> that there are more drivers which you did not touch.
> 
> is_sync() in drivers/net/phy/dp83640.c can be made to
> 	return ptp_get_msgtype(hdr, type) == PTP_MSGTYPE_SYNC;
> 
> this can be removed from drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h:
> enum {
> 	MLXSW_SP_PTP_MESSAGE_TYPE_SYNC,
> 	MLXSW_SP_PTP_MESSAGE_TYPE_DELAY_REQ,
> 	MLXSW_SP_PTP_MESSAGE_TYPE_PDELAY_REQ,
> 	MLXSW_SP_PTP_MESSAGE_TYPE_PDELAY_RESP,
> };
I think that I have found an addtional one in the Microsemi VSC85xx PHY driver.

Comments

Antoine Tenart Nov. 23, 2020, 9:05 a.m. UTC | #1 
Hello Christian,

Quoting Christian Eggers (2020-11-22 09:26:36)
> Use recently introduced PTP_MSGTYPE_SYNC and PTP_MSGTYPE_DELAY_REQ

> defines instead of a driver internal enumeration.

> 

> Signed-off-by: Christian Eggers <ceggers@gmx.de>


Reviewed-by: Antoine Tenart <atenart@kernel.org>


Thanks!
Antoine

> Cc: Quentin Schulz <quentin.schulz@bootlin.com>

> Cc: Antoine Tenart <atenart@kernel.org>

> Cc: Antoine Tenart <antoine.tenart@bootlin.com>

> ---

>  drivers/net/phy/mscc/mscc_ptp.c | 14 +++++++-------

>  drivers/net/phy/mscc/mscc_ptp.h |  5 -----

>  2 files changed, 7 insertions(+), 12 deletions(-)

> 

> diff --git a/drivers/net/phy/mscc/mscc_ptp.c b/drivers/net/phy/mscc/mscc_ptp.c

> index d8a61456d1ce..924ed5b034a4 100644

> --- a/drivers/net/phy/mscc/mscc_ptp.c

> +++ b/drivers/net/phy/mscc/mscc_ptp.c

> @@ -506,9 +506,9 @@ static int vsc85xx_ptp_cmp_init(struct phy_device *phydev, enum ts_blk blk)

>  {

>         struct vsc8531_private *vsc8531 = phydev->priv;

>         bool base = phydev->mdio.addr == vsc8531->ts_base_addr;

> -       enum vsc85xx_ptp_msg_type msgs[] = {

> -               PTP_MSG_TYPE_SYNC,

> -               PTP_MSG_TYPE_DELAY_REQ

> +       u8 msgs[] = {

> +               PTP_MSGTYPE_SYNC,

> +               PTP_MSGTYPE_DELAY_REQ

>         };

>         u32 val;

>         u8 i;

> @@ -847,9 +847,9 @@ static int vsc85xx_ts_ptp_action_flow(struct phy_device *phydev, enum ts_blk blk

>  static int vsc85xx_ptp_conf(struct phy_device *phydev, enum ts_blk blk,

>                             bool one_step, bool enable)

>  {

> -       enum vsc85xx_ptp_msg_type msgs[] = {

> -               PTP_MSG_TYPE_SYNC,

> -               PTP_MSG_TYPE_DELAY_REQ

> +       u8 msgs[] = {

> +               PTP_MSGTYPE_SYNC,

> +               PTP_MSGTYPE_DELAY_REQ

>         };

>         u32 val;

>         u8 i;

> @@ -858,7 +858,7 @@ static int vsc85xx_ptp_conf(struct phy_device *phydev, enum ts_blk blk,

>                 if (blk == INGRESS)

>                         vsc85xx_ts_ptp_action_flow(phydev, blk, msgs[i],

>                                                    PTP_WRITE_NS);

> -               else if (msgs[i] == PTP_MSG_TYPE_SYNC && one_step)

> +               else if (msgs[i] == PTP_MSGTYPE_SYNC && one_step)

>                         /* no need to know Sync t when sending in one_step */

>                         vsc85xx_ts_ptp_action_flow(phydev, blk, msgs[i],

>                                                    PTP_WRITE_1588);

> diff --git a/drivers/net/phy/mscc/mscc_ptp.h b/drivers/net/phy/mscc/mscc_ptp.h

> index 3ea163af0f4f..da3465360e90 100644

> --- a/drivers/net/phy/mscc/mscc_ptp.h

> +++ b/drivers/net/phy/mscc/mscc_ptp.h

> @@ -436,11 +436,6 @@ enum ptp_cmd {

>         PTP_SAVE_IN_TS_FIFO = 11, /* invalid when writing in reg */

>  };

>  

> -enum vsc85xx_ptp_msg_type {

> -       PTP_MSG_TYPE_SYNC,

> -       PTP_MSG_TYPE_DELAY_REQ,

> -};

> -

>  struct vsc85xx_ptphdr {

>         u8 tsmt; /* transportSpecific | messageType */

>         u8 ver;  /* reserved0 | versionPTP */

> -- 

> Christian Eggers

> Embedded software developer

>