* [PATCH net-next v2 0/3] net: ptp: use common defines for PTP message types in further drivers
@ 2020-11-24 7:44 Christian Eggers
2020-11-24 7:44 ` [PATCH net-next v2 1/3] net: phy: dp83640: use new PTP_MSGTYPE_SYNC define Christian Eggers
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Christian Eggers @ 2020-11-24 7:44 UTC (permalink / raw)
To: Richard Cochran, Andrew Lunn, Heiner Kallweit, Jakub Kicinski
Cc: Vladimir Oltean, Russell King, David S . Miller, netdev,
linux-kernel, Christian Eggers
Changes in v2:
----------------
- resend, as v1 was sent before the prerequisites were merged
- removed mismatch between From: and Signed-off-by:
- [2/3] Reviewed-by: Ido Schimmel <idosch@nvidia.com>
- [3/3] Reviewed-by: Antoine Tenart <atenart@kernel.org>
- [3/3] removed dead email addresses from Cc:
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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH net-next v2 1/3] net: phy: dp83640: use new PTP_MSGTYPE_SYNC define
2020-11-24 7:44 [PATCH net-next v2 0/3] net: ptp: use common defines for PTP message types in further drivers Christian Eggers
@ 2020-11-24 7:44 ` Christian Eggers
2020-11-24 8:00 ` Kurt Kanzenbach
2020-11-24 7:44 ` [PATCH net-next v2 2/3] mlxsw: spectrum_ptp: use PTP wide message type definitions Christian Eggers
` (3 subsequent siblings)
4 siblings, 1 reply; 7+ messages in thread
From: Christian Eggers @ 2020-11-24 7:44 UTC (permalink / raw)
To: Richard Cochran, Andrew Lunn, Heiner Kallweit, Jakub Kicinski
Cc: Vladimir Oltean, Russell King, David S . Miller, netdev,
linux-kernel, Christian Eggers, Kurt Kanzenbach
Replace use of magic number with recently introduced define.
Signed-off-by: Christian Eggers <ceggers@arri.de>
Cc: Kurt Kanzenbach <kurt@linutronix.de>
---
drivers/net/phy/dp83640.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index f2caccaf4408..9757ca0d9633 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -964,15 +964,12 @@ static void decode_status_frame(struct dp83640_private *dp83640,
static int is_sync(struct sk_buff *skb, int type)
{
struct ptp_header *hdr;
- u8 msgtype;
hdr = ptp_parse_header(skb, type);
if (!hdr)
return 0;
- msgtype = ptp_get_msgtype(hdr, type);
-
- return (msgtype & 0xf) == 0;
+ return ptp_get_msgtype(hdr, type) == PTP_MSGTYPE_SYNC;
}
static void dp83640_free_clocks(void)
--
Christian Eggers
Embedded software developer
Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918
Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477
Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net-next v2 2/3] mlxsw: spectrum_ptp: use PTP wide message type definitions
2020-11-24 7:44 [PATCH net-next v2 0/3] net: ptp: use common defines for PTP message types in further drivers Christian Eggers
2020-11-24 7:44 ` [PATCH net-next v2 1/3] net: phy: dp83640: use new PTP_MSGTYPE_SYNC define Christian Eggers
@ 2020-11-24 7:44 ` Christian Eggers
2020-11-24 7:44 ` [PATCH net-next v2 3/3] net: phy: mscc: use new PTP_MSGTYPE_* defines Christian Eggers
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Christian Eggers @ 2020-11-24 7:44 UTC (permalink / raw)
To: Richard Cochran, Andrew Lunn, Heiner Kallweit, Jakub Kicinski
Cc: Vladimir Oltean, Russell King, David S . Miller, netdev,
linux-kernel, Christian Eggers, Ido Schimmel, Petr Machata,
Jiri Pirko
Use recently introduced PTP wide defines instead of a driver internal
enumeration.
Signed-off-by: Christian Eggers <ceggers@arri.de>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Cc: Petr Machata <petrm@mellanox.com>
Cc: Jiri Pirko <jiri@nvidia.com>
Cc: Ido Schimmel <idosch@nvidia.com>
---
drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 8 ++++----
drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h | 7 -------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c
index ca8090a28dec..d6e9ecb14681 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c
@@ -828,10 +828,10 @@ struct mlxsw_sp_ptp_state *mlxsw_sp1_ptp_init(struct mlxsw_sp *mlxsw_sp)
goto err_hashtable_init;
/* Delive these message types as PTP0. */
- message_type = BIT(MLXSW_SP_PTP_MESSAGE_TYPE_SYNC) |
- BIT(MLXSW_SP_PTP_MESSAGE_TYPE_DELAY_REQ) |
- BIT(MLXSW_SP_PTP_MESSAGE_TYPE_PDELAY_REQ) |
- BIT(MLXSW_SP_PTP_MESSAGE_TYPE_PDELAY_RESP);
+ message_type = BIT(PTP_MSGTYPE_SYNC) |
+ BIT(PTP_MSGTYPE_DELAY_REQ) |
+ BIT(PTP_MSGTYPE_PDELAY_REQ) |
+ BIT(PTP_MSGTYPE_PDELAY_RESP);
err = mlxsw_sp_ptp_mtptpt_set(mlxsw_sp, MLXSW_REG_MTPTPT_TRAP_ID_PTP0,
message_type);
if (err)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h
index 8c386571afce..1d43a3755285 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h
@@ -11,13 +11,6 @@ struct mlxsw_sp;
struct mlxsw_sp_port;
struct mlxsw_sp_ptp_clock;
-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,
-};
-
static inline int mlxsw_sp_ptp_get_ts_info_noptp(struct ethtool_ts_info *info)
{
info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |
--
Christian Eggers
Embedded software developer
Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918
Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477
Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net-next v2 3/3] net: phy: mscc: use new PTP_MSGTYPE_* defines
2020-11-24 7:44 [PATCH net-next v2 0/3] net: ptp: use common defines for PTP message types in further drivers Christian Eggers
2020-11-24 7:44 ` [PATCH net-next v2 1/3] net: phy: dp83640: use new PTP_MSGTYPE_SYNC define Christian Eggers
2020-11-24 7:44 ` [PATCH net-next v2 2/3] mlxsw: spectrum_ptp: use PTP wide message type definitions Christian Eggers
@ 2020-11-24 7:44 ` Christian Eggers
2020-11-24 13:39 ` [PATCH net-next v2 0/3] net: ptp: use common defines for PTP message types in further drivers Richard Cochran
2020-11-25 20:24 ` Jakub Kicinski
4 siblings, 0 replies; 7+ messages in thread
From: Christian Eggers @ 2020-11-24 7:44 UTC (permalink / raw)
To: Richard Cochran, Andrew Lunn, Heiner Kallweit, Jakub Kicinski
Cc: Vladimir Oltean, Russell King, David S . Miller, netdev,
linux-kernel, Christian Eggers, Antoine Tenart
Use recently introduced PTP_MSGTYPE_SYNC and PTP_MSGTYPE_DELAY_REQ
defines instead of a driver internal enumeration.
Signed-off-by: Christian Eggers <ceggers@arri.de>
Reviewed-by: Antoine Tenart <atenart@kernel.org>
Cc: Antoine Tenart <atenart@kernel.org>
---
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
Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918
Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477
Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH net-next v2 1/3] net: phy: dp83640: use new PTP_MSGTYPE_SYNC define
2020-11-24 7:44 ` [PATCH net-next v2 1/3] net: phy: dp83640: use new PTP_MSGTYPE_SYNC define Christian Eggers
@ 2020-11-24 8:00 ` Kurt Kanzenbach
0 siblings, 0 replies; 7+ messages in thread
From: Kurt Kanzenbach @ 2020-11-24 8:00 UTC (permalink / raw)
To: Christian Eggers, Richard Cochran, Andrew Lunn, Heiner Kallweit,
Jakub Kicinski
Cc: Vladimir Oltean, Russell King, David S . Miller, netdev,
linux-kernel, Christian Eggers
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
On Tue Nov 24 2020, Christian Eggers wrote:
> Replace use of magic number with recently introduced define.
>
> Signed-off-by: Christian Eggers <ceggers@arri.de>
> Cc: Kurt Kanzenbach <kurt@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next v2 0/3] net: ptp: use common defines for PTP message types in further drivers
2020-11-24 7:44 [PATCH net-next v2 0/3] net: ptp: use common defines for PTP message types in further drivers Christian Eggers
` (2 preceding siblings ...)
2020-11-24 7:44 ` [PATCH net-next v2 3/3] net: phy: mscc: use new PTP_MSGTYPE_* defines Christian Eggers
@ 2020-11-24 13:39 ` Richard Cochran
2020-11-25 20:24 ` Jakub Kicinski
4 siblings, 0 replies; 7+ messages in thread
From: Richard Cochran @ 2020-11-24 13:39 UTC (permalink / raw)
To: Christian Eggers
Cc: Andrew Lunn, Heiner Kallweit, Jakub Kicinski, Vladimir Oltean,
Russell King, David S . Miller, netdev, linux-kernel
On Tue, Nov 24, 2020 at 08:44:15AM +0100, Christian Eggers wrote:
> Changes in v2:
> ----------------
> - resend, as v1 was sent before the prerequisites were merged
> - removed mismatch between From: and Signed-off-by:
> - [2/3] Reviewed-by: Ido Schimmel <idosch@nvidia.com>
> - [3/3] Reviewed-by: Antoine Tenart <atenart@kernel.org>
> - [3/3] removed dead email addresses from Cc:
>
>
> This series replaces further driver internal enumeration / uses of magic
> numbers with the newly introduced PTP_MSGTYPE_* defines.
For the series:
Acked-by: Richard Cochran <richardcochran@gmail.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next v2 0/3] net: ptp: use common defines for PTP message types in further drivers
2020-11-24 7:44 [PATCH net-next v2 0/3] net: ptp: use common defines for PTP message types in further drivers Christian Eggers
` (3 preceding siblings ...)
2020-11-24 13:39 ` [PATCH net-next v2 0/3] net: ptp: use common defines for PTP message types in further drivers Richard Cochran
@ 2020-11-25 20:24 ` Jakub Kicinski
4 siblings, 0 replies; 7+ messages in thread
From: Jakub Kicinski @ 2020-11-25 20:24 UTC (permalink / raw)
To: Christian Eggers
Cc: Richard Cochran, Andrew Lunn, Heiner Kallweit, Vladimir Oltean,
Russell King, David S . Miller, netdev, linux-kernel
On Tue, 24 Nov 2020 08:44:15 +0100 Christian Eggers wrote:
> Changes in v2:
> ----------------
> - resend, as v1 was sent before the prerequisites were merged
> - removed mismatch between From: and Signed-off-by:
> - [2/3] Reviewed-by: Ido Schimmel <idosch@nvidia.com>
> - [3/3] Reviewed-by: Antoine Tenart <atenart@kernel.org>
> - [3/3] removed dead email addresses from Cc:
>
>
> This series replaces further driver internal enumeration / uses of magic
> numbers with the newly introduced PTP_MSGTYPE_* defines.
Applied, thanks!
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-11-25 20:25 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-24 7:44 [PATCH net-next v2 0/3] net: ptp: use common defines for PTP message types in further drivers Christian Eggers
2020-11-24 7:44 ` [PATCH net-next v2 1/3] net: phy: dp83640: use new PTP_MSGTYPE_SYNC define Christian Eggers
2020-11-24 8:00 ` Kurt Kanzenbach
2020-11-24 7:44 ` [PATCH net-next v2 2/3] mlxsw: spectrum_ptp: use PTP wide message type definitions Christian Eggers
2020-11-24 7:44 ` [PATCH net-next v2 3/3] net: phy: mscc: use new PTP_MSGTYPE_* defines Christian Eggers
2020-11-24 13:39 ` [PATCH net-next v2 0/3] net: ptp: use common defines for PTP message types in further drivers Richard Cochran
2020-11-25 20:24 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).