[PATCH net-next 1/2] net: dsa: mv88e6xxx: use ARRIVAL1 counter for all peer delay messages
From: Luke Howard <hidden>
Date: 2026-07-03 06:51:16
Also in:
lkml
Subsystem:
marvell 88e6xxx ethernet switch fabric driver, networking drivers, networking [dsa], the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Vladimir Oltean, Linus Torvalds
mv88e6xxx switches have two arrival timestamp counters for timestamping PTP event messages. This permits more than one arriving event message's timestamp to be captured. This is useful for the case where event messages from a grandmaster arrive at the same time as PDelayReq/PDelayResp messages from a peer. Previously only PDelayResp messages were assigned to the second arrival counter; this patch does so for PDelayReq messages as well. Signed-off-by: Luke Howard <redacted> --- drivers/net/dsa/mv88e6xxx/hwtstamp.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/net/dsa/mv88e6xxx/hwtstamp.c b/drivers/net/dsa/mv88e6xxx/hwtstamp.c
index 6e6472a3b75ad..57ff77496864f 100644
--- a/drivers/net/dsa/mv88e6xxx/hwtstamp.c
+++ b/drivers/net/dsa/mv88e6xxx/hwtstamp.c@@ -319,9 +319,16 @@ static void mv88e6xxx_rxtstamp_work(struct mv88e6xxx_chip *chip, &ps->rx_queue2); } -static int is_pdelay_resp(const struct ptp_header *hdr) +static bool is_pdelay_msg(const struct ptp_header *hdr) { - return (hdr->tsmt & 0xf) == 3; + switch (ptp_get_msgtype(hdr, PTP_CLASS_V2)) { + case PTP_MSGTYPE_PDELAY_REQ: + fallthrough; + case PTP_MSGTYPE_PDELAY_RESP: + return true; + default: + return false; + } } bool mv88e6xxx_port_rxtstamp(struct dsa_switch *ds, int port,
@@ -343,7 +350,7 @@ bool mv88e6xxx_port_rxtstamp(struct dsa_switch *ds, int port, SKB_PTP_TYPE(skb) = type; - if (is_pdelay_resp(hdr)) + if (is_pdelay_msg(hdr)) skb_queue_tail(&ps->rx_queue2, skb); else skb_queue_tail(&ps->rx_queue, skb);
@@ -584,8 +591,9 @@ int mv88e6xxx_hwtstamp_setup(struct mv88e6xxx_chip *chip) if (err) return err; - /* Use ARRIVAL1 for peer delay response messages. */ + /* Use ARRIVAL1 for peer delay messages. */ err = mv88e6xxx_ptp_write(chip, MV88E6XXX_PTP_TS_ARRIVAL_PTR, + MV88E6XXX_PTP_MSGTYPE_PDLAY_REQ | MV88E6XXX_PTP_MSGTYPE_PDLAY_RES); if (err) return err;
--
2.43.0