On 32 bit platforms, a PHC driver might allow a larger adjustment than can fit into the 'long' type used in the clock_adjtime interface. This patch fixes the issue by using the smaller of the two maxima. Signed-off-by: Richard Cochran <richardcochran@gmail.com>
		
			
				
	
	
		
			71 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			71 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/**
 | 
						|
 * @file phc.c
 | 
						|
 * @note Copyright (C) 2011 Richard Cochran <richardcochran@gmail.com>
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License as published by
 | 
						|
 * the Free Software Foundation; either version 2 of the License, or
 | 
						|
 * (at your option) any later version.
 | 
						|
 *
 | 
						|
 * This program is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
 * GNU General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU General Public License along
 | 
						|
 * with this program; if not, write to the Free Software Foundation, Inc.,
 | 
						|
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 | 
						|
 */
 | 
						|
#include <stdio.h>
 | 
						|
#include <sys/ioctl.h>
 | 
						|
#include <sys/types.h>
 | 
						|
#include <sys/stat.h>
 | 
						|
#include <fcntl.h>
 | 
						|
#include <unistd.h>
 | 
						|
 | 
						|
#include <linux/ptp_clock.h>
 | 
						|
 | 
						|
#include "phc.h"
 | 
						|
 | 
						|
/*
 | 
						|
 * On 32 bit platforms, the PHC driver's maximum adjustment (type
 | 
						|
 * 'int' in units of ppb) can overflow the timex.freq field (type
 | 
						|
 * 'long'). So in this case we clamp the maximum to the largest
 | 
						|
 * possible adjustment that fits into a 32 bit long.
 | 
						|
 */
 | 
						|
#define BITS_PER_LONG	(sizeof(long)*8)
 | 
						|
#define MAX_PPB_32	32767999	/* 2^31 - 1 / 65.536 */
 | 
						|
 | 
						|
clockid_t phc_open(char *phc)
 | 
						|
{
 | 
						|
	int fd = open(phc, O_RDWR);
 | 
						|
 | 
						|
	return fd < 0 ? CLOCK_INVALID : FD_TO_CLOCKID(fd);
 | 
						|
}
 | 
						|
 | 
						|
void phc_close(clockid_t clkid)
 | 
						|
{
 | 
						|
	if (clkid == CLOCK_INVALID)
 | 
						|
		return;
 | 
						|
 | 
						|
	close(CLOCKID_TO_FD(clkid));
 | 
						|
}
 | 
						|
 | 
						|
int phc_max_adj(clockid_t clkid)
 | 
						|
{
 | 
						|
	int fd = CLOCKID_TO_FD(clkid), max;
 | 
						|
	struct ptp_clock_caps caps;
 | 
						|
 | 
						|
	if (ioctl(fd, PTP_CLOCK_GETCAPS, &caps)) {
 | 
						|
		perror("PTP_CLOCK_GETCAPS");
 | 
						|
		return 0;
 | 
						|
	}
 | 
						|
 | 
						|
	max = caps.max_adj;
 | 
						|
 | 
						|
	if (BITS_PER_LONG == 32 && max > MAX_PPB_32)
 | 
						|
		max = MAX_PPB_32;
 | 
						|
 | 
						|
	return max;
 | 
						|
}
 |