michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: ethernet: mcux: generalize gPTP code to support PTP L2

Browse source 
Update eth_mcux.c to use CONFIG_NET_L2_PTP instead of CONFIG_NET_GPTP.

Signed-off-by: Alex Sergeev <asergeev@carbonrobotics.com>
This commit is contained in:
Alex Sergeev 2021-09-08 20:37:39 -07:00 • committed by Christopher Friedt
commit 851cccb67e
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/ethernet/Kconfig.mcux
View file

@ -71,7 +71,7 @@ config ETH_MCUX_HW_ACCELERATION
config PTP_CLOCK_MCUX config PTP_CLOCK_MCUX
bool "MCUX PTP clock driver support" bool "MCUX PTP clock driver support"
default y default y
depends on PTP_CLOCK || (NET_PKT_TIMESTAMP && NET_GPTP) depends on PTP_CLOCK || NET_L2_PTP
help help
Enable MCUX PTP clock support. Enable MCUX PTP clock support.

13
drivers/ethernet/eth_mcux.c
View file

@ -33,7 +33,6 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
#if defined(CONFIG_PTP_CLOCK_MCUX) #if defined(CONFIG_PTP_CLOCK_MCUX)
#include <drivers/ptp_clock.h> #include <drivers/ptp_clock.h>
#include <net/gptp.h>
#endif #endif
#if IS_ENABLED(CONFIG_NET_DSA) #if IS_ENABLED(CONFIG_NET_DSA)
@ -831,7 +830,7 @@ error:
eth_stats_update_errors_rx(get_iface(context, vlan_tag)); eth_stats_update_errors_rx(get_iface(context, vlan_tag));
} }
#if defined(CONFIG_PTP_CLOCK_MCUX) && defined(CONFIG_NET_GPTP) #if defined(CONFIG_PTP_CLOCK_MCUX) && defined(CONFIG_NET_L2_PTP)
static inline void ts_register_tx_event(struct eth_context *context, static inline void ts_register_tx_event(struct eth_context *context,
enet_frame_info_t *frameinfo) enet_frame_info_t *frameinfo)
{ {
@ -863,7 +862,7 @@ static inline void ts_register_tx_event(struct eth_context *context,
ts_tx_rd = 0; ts_tx_rd = 0;
} }
} }
#endif /* CONFIG_PTP_CLOCK_MCUX && CONFIG_NET_PKT_TIMESTAMP */ #endif /* CONFIG_PTP_CLOCK_MCUX && CONFIG_NET_L2_PTP */
static void eth_callback(ENET_Type *base, enet_handle_t *handle, static void eth_callback(ENET_Type *base, enet_handle_t *handle,
#if FSL_FEATURE_ENET_QUEUE > 1 #if FSL_FEATURE_ENET_QUEUE > 1
@ -878,10 +877,10 @@ static void eth_callback(ENET_Type *base, enet_handle_t *handle,
eth_rx(context); eth_rx(context);
break; break;
case kENET_TxEvent: case kENET_TxEvent:
#if defined(CONFIG_PTP_CLOCK_MCUX) && defined(CONFIG_NET_GPTP) #if defined(CONFIG_PTP_CLOCK_MCUX) && defined(CONFIG_NET_L2_PTP)
/* Register event */ /* Register event */
ts_register_tx_event(context, frameinfo); ts_register_tx_event(context, frameinfo);
#endif /* CONFIG_PTP_CLOCK_MCUX && CONFIG_NET_GPTP */ #endif /* CONFIG_PTP_CLOCK_MCUX && CONFIG_NET_L2_PTP */
/* Free the TX buffer. */ /* Free the TX buffer. */
k_sem_give(&context->tx_buf_sem); k_sem_give(&context->tx_buf_sem);
@ -910,7 +909,8 @@ static void eth_mcux_init(const struct device *dev)
enet_config_t enet_config; enet_config_t enet_config;
uint32_t sys_clock; uint32_t sys_clock;
#if defined(CONFIG_PTP_CLOCK_MCUX) #if defined(CONFIG_PTP_CLOCK_MCUX)
uint8_t ptp_multicast[6] = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x0E }; uint8_t ptp_multicast[6] = { 0x01, 0x1B, 0x19, 0x00, 0x00, 0x00 };
uint8_t ptp_peer_multicast[6] = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x0E };
#endif #endif
#if defined(CONFIG_MDNS_RESPONDER) || defined(CONFIG_MDNS_RESOLVER) #if defined(CONFIG_MDNS_RESPONDER) || defined(CONFIG_MDNS_RESOLVER)
/* standard multicast MAC address */ /* standard multicast MAC address */
@ -960,6 +960,7 @@ static void eth_mcux_init(const struct device *dev)
#if defined(CONFIG_PTP_CLOCK_MCUX) #if defined(CONFIG_PTP_CLOCK_MCUX)
ENET_AddMulticastGroup(context->base, ptp_multicast); ENET_AddMulticastGroup(context->base, ptp_multicast);
ENET_AddMulticastGroup(context->base, ptp_peer_multicast);
context->ptp_config.channel = kENET_PtpTimerChannel1; context->ptp_config.channel = kENET_PtpTimerChannel1;
context->ptp_config.ptp1588ClockSrc_Hz = context->ptp_config.ptp1588ClockSrc_Hz =