From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Lunn Subject: [PATCH net-next 7/8] net: dsa: mv88e6xxx: Set PTP Ethertype Date: Tue, 17 Jul 2018 23:48:59 +0200 Message-ID: <1531864140-31233-8-git-send-email-andrew@lunn.ch> References: <1531864140-31233-1-git-send-email-andrew@lunn.ch> Cc: richardcochran@gmail.com, Vivien Didelot , netdev , Andrew Lunn To: David Miller Return-path: Received: from vps0.lunn.ch ([185.16.172.187]:37599 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730249AbeGQWZP (ORCPT ); Tue, 17 Jul 2018 18:25:15 -0400 In-Reply-To: <1531864140-31233-1-git-send-email-andrew@lunn.ch> Sender: netdev-owner@vger.kernel.org List-ID: For the 6352 and newer switches, the PTP Ethertype defaults to ETH_P_1588. Hence it was not explicitly set. The 6165 however defaults to 0. So explicitly set the EtherType. Signed-off-by: Andrew Lunn --- drivers/net/dsa/mv88e6xxx/hwtstamp.c | 5 +++++ drivers/net/dsa/mv88e6xxx/ptp.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/hwtstamp.c b/drivers/net/dsa/mv88e6xxx/hwtstamp.c index 01e60a8c97fb..ac71910c63c0 100644 --- a/drivers/net/dsa/mv88e6xxx/hwtstamp.c +++ b/drivers/net/dsa/mv88e6xxx/hwtstamp.c @@ -606,6 +606,11 @@ int mv88e6xxx_hwtstamp_setup(struct mv88e6xxx_chip *chip) return err; } + /* Set the ethertype of L2 PTP messages */ + err = mv88e6xxx_ptp_write(chip, MV88E6XXX_PTP_GC_ETYPE, ETH_P_1588); + if (err) + return err; + /* MV88E6XXX_PTP_MSG_TYPE is a mask of PTP message types to * timestamp. This affects all ports that have timestamping enabled, * but the timestamp config is per-port; thus we configure all events diff --git a/drivers/net/dsa/mv88e6xxx/ptp.h b/drivers/net/dsa/mv88e6xxx/ptp.h index 747f90bb9393..28a030840517 100644 --- a/drivers/net/dsa/mv88e6xxx/ptp.h +++ b/drivers/net/dsa/mv88e6xxx/ptp.h @@ -82,6 +82,9 @@ #define MV88E6XXX_PTP_GC_ETYPE 0x00 /* 6165 Global Control Registers */ +/* Offset 0x00: Ether Type */ +#define MV88E6XXX_PTP_GC_ETYPE 0x00 + /* Offset 0x01: Message ID */ #define MV88E6XXX_PTP_GC_MESSAGE_ID 0x01 -- 2.18.0