Fixup .ini file parse and add support for linux kernel HW timestamping

daemons/gptp/linux/build/Makefile

@@ -33,6 +33,19 @@ ALTERNATE_LINUX_INCPATH=$(HOME)/header/include/
 CFLAGS_G = -Wall -std=c++0x -g -I. -I../../common -I../src \
 	-I$(ALTERNATE_LINUX_INCPATH)
 
+# Check to see if PTP cross-timestamping is supported in hardware/driver
+# and, if so, add flag to compile in support
+
+PRECISE_TIME_TEST = "\#include <linux/ptp_clock.h>\\n\
+\#ifdef PTP_SYS_OFFSET_PRECISE\\nint main(){return 0;}\\n\#endif"
+
+HAS_PRECISE_TIME = $(shell echo $(PRECISE_TIME_TEST) | gcc -xc - \
+-I$(ALTERNATE_LINUX_INCPATH) -o /dev/null > /dev/null 2>&1 ; echo $$?)
+
+ifeq ($(HAS_PRECISE_TIME),0)
+       CFLAGS_G += -DPTP_HW_CROSSTSTAMP
+endif
+
 CPPFLAGS_G = $(CFLAGS_G) -Wnon-virtual-dtor
 
 LDFLAGS_G = -lpthread -lrt

daemons/gptp/linux/src/daemon_cl.cpp

@@ -363,10 +363,6 @@ int main(int argc, char **argv)
 	portInit.lock_factory = lock_factory;
 
 	pPort = new IEEE1588Port(&portInit);
-	if (!pPort->init_port(phy_delay)) {
-		printf("failed to initialize port \n");
-		return -1;
-	}
 
 	if(use_config_file)
 	{
@@ -408,6 +404,11 @@ int main(int argc, char **argv)
 
 	}
 
+	if (!pPort->init_port(phy_delay)) {
+		printf("failed to initialize port \n");
+		return -1;
+	}
+
 	if( restoredataptr != NULL ) {
 		if( !restorefailed ) {
 			restorefailed = !pPort->restoreSerializedState( restoredataptr, &restoredatacount );

daemons/gptp/linux/src/linux_hal_generic.cpp

@@ -222,7 +222,9 @@ bool LinuxTimestamperGeneric::HWTimestamper_init
 	cross_stamp_good = false;
 	int phc_index;
 	char ptp_device[] = PTP_DEVICE;
-
+#ifdef PTP_HW_CROSSTSTAMP
+	struct ptp_clock_caps ptp_capability;
+#endif
 	_private = new LinuxTimestamperGenericPrivate;
 
 	pthread_mutex_init( &_private->cross_stamp_lock, NULL );
@@ -244,6 +246,16 @@ bool LinuxTimestamperGeneric::HWTimestamper_init
 		return false;
 	}
 
+#ifdef PTP_HW_CROSSTSTAMP
+	// Query PTP stack for availability of HW cross-timestamp
+	if( ioctl( phc_fd, PTP_CLOCK_GETCAPS, &ptp_capability ) == -1 )
+	{
+		GPTP_LOG_ERROR( "Failed to query PTP clock capabilities" );
+		return false;
+	}
+	precise_timestamp_enabled = ptp_capability.cross_timestamping;
+#endif
+
 	if( !resetFrequencyAdjustment() ) {
 		GPTP_LOG_ERROR( "Failed to reset (zero) frequency adjustment" );
 		return false;
@@ -411,20 +423,39 @@ static inline Timestamp pctTimestamp( struct ptp_clock_time *t ) {
 	return result;
 }
 
+// Use HW cross-timestamp if available
 bool LinuxTimestamperGeneric::HWTimestamper_gettime
 ( Timestamp *system_time, Timestamp *device_time, uint32_t *local_clock,
   uint32_t *nominal_clock_rate ) {
-	unsigned i;
-	struct ptp_sys_offset offset;
-	struct ptp_clock_time *pct;
-	struct ptp_clock_time *system_time_l, *device_time_l;
+	if( phc_fd == -1 )
+		return false;
 
-	int64_t interval = LLONG_MAX;
+#ifdef PTP_HW_CROSSTSTAMP
+	if( precise_timestamp_enabled )
+	{
+		struct ptp_sys_offset_precise offset;
+		memset( &offset, 0, sizeof(offset));
+		if( ioctl( phc_fd, PTP_SYS_OFFSET_PRECISE, &offset ) == 0 )
+		{
+			*device_time = pctTimestamp( &offset.device );
+			*system_time = pctTimestamp( &offset.sys_realtime );
+
+			return true;
+		}
+	}
+#endif
+
+	{
+		unsigned i;
+		struct ptp_clock_time *pct;
+		struct ptp_clock_time *system_time_l, *device_time_l;
+		int64_t interval = LLONG_MAX;
+		struct ptp_sys_offset offset;
 
-	if( phc_fd != -1 ) {
 		memset( &offset, 0, sizeof(offset));
 		offset.n_samples = PTP_MAX_SAMPLES;
-		ioctl( phc_fd, PTP_SYS_OFFSET, &offset );
+		if( ioctl( phc_fd, PTP_SYS_OFFSET, &offset ) == -1 )
+			return false;
 
 		pct = &offset.ts[0];
 		for( i = 0; i < offset.n_samples; ++i ) {
@@ -439,9 +470,7 @@ bool LinuxTimestamperGeneric::HWTimestamper_gettime
 
 		*device_time = pctTimestamp( device_time_l );
 		*system_time = pctTimestamp( system_time_l );
-
-		return true;
 	}
 
-	return false;
+	return true;
 }

daemons/gptp/linux/src/linux_hal_generic.hpp

@@ -62,6 +62,9 @@ class LinuxTimestamperGeneric : public LinuxTimestamper {
 	bool cross_stamp_good;
 	std::list<Timestamp> rxTimestampList;
 	LinuxNetworkInterfaceList iface_list;
+#ifdef PTP_HW_CROSSTSTAMP
+	bool precise_timestamp_enabled;
+#endif
 
 	TicketingLock *net_lock;