Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: micrel: Fix PTP frame parsing for lan8814

The HW has the capability to check each frame if it is a PTP frame,
which domain it is, which ptp frame type it is, different ip address in
the frame. And if one of these checks fail then the frame is not
timestamp. Most of these checks were disabled except checking the field
minorVersionPTP inside the PTP header. Meaning that once a partner sends
a frame compliant to 8021AS which has minorVersionPTP set to 1, then the
frame was not timestamp because the HW expected by default a value of 0
in minorVersionPTP. This is exactly the same issue as on lan8841.
Fix this issue by removing this check so the userspace can decide on this.

Fixes: ece19502834d ("net: phy: micrel: 1588 support for LAN8814 phy")
Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: Divya Koppera <divya.koppera@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Horatiu Vultur and committed by
David S. Miller
aaf632f7 94fa82b0

+11
+11
drivers/net/phy/micrel.c
··· 120 120 */ 121 121 #define LAN8814_1PPM_FORMAT 17179 122 122 123 + #define PTP_RX_VERSION 0x0248 124 + #define PTP_TX_VERSION 0x0288 125 + #define PTP_MAX_VERSION(x) (((x) & GENMASK(7, 0)) << 8) 126 + #define PTP_MIN_VERSION(x) ((x) & GENMASK(7, 0)) 127 + 123 128 #define PTP_RX_MOD 0x024F 124 129 #define PTP_RX_MOD_BAD_UDPV4_CHKSUM_FORCE_FCS_DIS_ BIT(3) 125 130 #define PTP_RX_TIMESTAMP_EN 0x024D ··· 3154 3149 lanphy_write_page_reg(phydev, 5, PTP_RX_PARSE_L2_ADDR_EN, 0); 3155 3150 lanphy_write_page_reg(phydev, 5, PTP_TX_PARSE_IP_ADDR_EN, 0); 3156 3151 lanphy_write_page_reg(phydev, 5, PTP_RX_PARSE_IP_ADDR_EN, 0); 3152 + 3153 + /* Disable checking for minorVersionPTP field */ 3154 + lanphy_write_page_reg(phydev, 5, PTP_RX_VERSION, 3155 + PTP_MAX_VERSION(0xff) | PTP_MIN_VERSION(0x0)); 3156 + lanphy_write_page_reg(phydev, 5, PTP_TX_VERSION, 3157 + PTP_MAX_VERSION(0xff) | PTP_MIN_VERSION(0x0)); 3157 3158 3158 3159 skb_queue_head_init(&ptp_priv->tx_queue); 3159 3160 skb_queue_head_init(&ptp_priv->rx_queue);