Commit 65025079 authored by David S. Miller's avatar David S. Miller

Merge branch 'ptp-next'

Richard Cochran says:

====================
ptp: dynamic pin control

This patch series introduces a way of changing the auxiliary PTP
Hardware Clock functions (periodic output signals and time stamping
external signals) at run time. In the past on the netdev list, we have
discussed other ways to handle this, such as module parameters and
ethtool. This series implements a new PHC ioctl because that is the
most natural way. Users already activate the auxiliary functions via
the ioctls. The sysfs interface has also been expanded so that the pin
configuration can be programmed using shell scripts.

The first patch adds the new ioctls. The PHC subsystem does most of
the work of maintaining the function-to-pin mapping. Drivers will only
need to allocate and initialize a pin configuration table and also
provide a new method that validates a particular assignment.

Patches 5 and 6 just clean up a couple of issues in the phyter driver,
and the remaining patches actually hook the phyter's pins into the new
system.

* ChangeLog
** V3
   - simplify locking in the set pin logic
** V2
   - fix bug in sysfs code on init error path
   - rename ptp_setpin() to ptp_set_pinfunc()
   - rename .setpin() to .verify() in the driver interface
   - simplify ptp_find_pin() logic
   - use correct test when checking whether the pin with the
     calibration function is being reprogrammed
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a85ae0e9 621bdecc
...@@ -54,6 +54,26 @@ Description: ...@@ -54,6 +54,26 @@ Description:
This file contains the number of programmable periodic This file contains the number of programmable periodic
output channels offered by the PTP hardware clock. output channels offered by the PTP hardware clock.
What: /sys/class/ptp/ptpN/n_pins
Date: March 2014
Contact: Richard Cochran <richardcochran@gmail.com>
Description:
This file contains the number of programmable pins
offered by the PTP hardware clock.
What: /sys/class/ptp/ptpN/pins
Date: March 2014
Contact: Richard Cochran <richardcochran@gmail.com>
Description:
This directory contains one file for each programmable
pin offered by the PTP hardware clock. The file name
is the hardware dependent pin name. Reading from this
file produces two numbers, the assigned function (see
the PTP_PF_ enumeration values in linux/ptp_clock.h)
and the channel number. The function and channel
assignment may be changed by two writing numbers into
the file.
What: /sys/class/ptp/ptpN/pps_avaiable What: /sys/class/ptp/ptpN/pps_avaiable
Date: September 2010 Date: September 2010
Contact: Richard Cochran <richardcochran@gmail.com> Contact: Richard Cochran <richardcochran@gmail.com>
......
...@@ -120,6 +120,13 @@ static void usage(char *progname) ...@@ -120,6 +120,13 @@ static void usage(char *progname)
" -i val index for event/trigger\n" " -i val index for event/trigger\n"
" -k val measure the time offset between system and phc clock\n" " -k val measure the time offset between system and phc clock\n"
" for 'val' times (Maximum 25)\n" " for 'val' times (Maximum 25)\n"
" -l list the current pin configuration\n"
" -L pin,val configure pin index 'pin' with function 'val'\n"
" the channel index is taken from the '-i' option\n"
" 'val' specifies the auxiliary function:\n"
" 0 - none\n"
" 1 - external time stamp\n"
" 2 - periodic output\n"
" -p val enable output with a period of 'val' nanoseconds\n" " -p val enable output with a period of 'val' nanoseconds\n"
" -P val enable or disable (val=1|0) the system clock PPS\n" " -P val enable or disable (val=1|0) the system clock PPS\n"
" -s set the ptp clock time from the system time\n" " -s set the ptp clock time from the system time\n"
...@@ -134,6 +141,7 @@ int main(int argc, char *argv[]) ...@@ -134,6 +141,7 @@ int main(int argc, char *argv[])
struct ptp_extts_event event; struct ptp_extts_event event;
struct ptp_extts_request extts_request; struct ptp_extts_request extts_request;
struct ptp_perout_request perout_request; struct ptp_perout_request perout_request;
struct ptp_pin_desc desc;
struct timespec ts; struct timespec ts;
struct timex tx; struct timex tx;
...@@ -156,11 +164,13 @@ int main(int argc, char *argv[]) ...@@ -156,11 +164,13 @@ int main(int argc, char *argv[])
int extts = 0; int extts = 0;
int gettime = 0; int gettime = 0;
int index = 0; int index = 0;
int list_pins = 0;
int oneshot = 0; int oneshot = 0;
int pct_offset = 0; int pct_offset = 0;
int n_samples = 0; int n_samples = 0;
int periodic = 0; int periodic = 0;
int perout = -1; int perout = -1;
int pin_index = -1, pin_func;
int pps = -1; int pps = -1;
int settime = 0; int settime = 0;
...@@ -169,7 +179,7 @@ int main(int argc, char *argv[]) ...@@ -169,7 +179,7 @@ int main(int argc, char *argv[])
progname = strrchr(argv[0], '/'); progname = strrchr(argv[0], '/');
progname = progname ? 1+progname : argv[0]; progname = progname ? 1+progname : argv[0];
while (EOF != (c = getopt(argc, argv, "a:A:cd:e:f:ghi:k:p:P:sSt:v"))) { while (EOF != (c = getopt(argc, argv, "a:A:cd:e:f:ghi:k:lL:p:P:sSt:v"))) {
switch (c) { switch (c) {
case 'a': case 'a':
oneshot = atoi(optarg); oneshot = atoi(optarg);
...@@ -199,6 +209,16 @@ int main(int argc, char *argv[]) ...@@ -199,6 +209,16 @@ int main(int argc, char *argv[])
pct_offset = 1; pct_offset = 1;
n_samples = atoi(optarg); n_samples = atoi(optarg);
break; break;
case 'l':
list_pins = 1;
break;
case 'L':
cnt = sscanf(optarg, "%d,%d", &pin_index, &pin_func);
if (cnt != 2) {
usage(progname);
return -1;
}
break;
case 'p': case 'p':
perout = atoi(optarg); perout = atoi(optarg);
break; break;
...@@ -245,12 +265,14 @@ int main(int argc, char *argv[]) ...@@ -245,12 +265,14 @@ int main(int argc, char *argv[])
" %d programmable alarms\n" " %d programmable alarms\n"
" %d external time stamp channels\n" " %d external time stamp channels\n"
" %d programmable periodic signals\n" " %d programmable periodic signals\n"
" %d pulse per second\n", " %d pulse per second\n"
" %d programmable pins\n",
caps.max_adj, caps.max_adj,
caps.n_alarm, caps.n_alarm,
caps.n_ext_ts, caps.n_ext_ts,
caps.n_per_out, caps.n_per_out,
caps.pps); caps.pps,
caps.n_pins);
} }
} }
...@@ -331,6 +353,24 @@ int main(int argc, char *argv[]) ...@@ -331,6 +353,24 @@ int main(int argc, char *argv[])
} }
} }
if (list_pins) {
int n_pins = 0;
if (ioctl(fd, PTP_CLOCK_GETCAPS, &caps)) {
perror("PTP_CLOCK_GETCAPS");
} else {
n_pins = caps.n_pins;
}
for (i = 0; i < n_pins; i++) {
desc.index = i;
if (ioctl(fd, PTP_PIN_GETFUNC, &desc)) {
perror("PTP_PIN_GETFUNC");
break;
}
printf("name %s index %u func %u chan %u\n",
desc.name, desc.index, desc.func, desc.chan);
}
}
if (oneshot) { if (oneshot) {
install_handler(SIGALRM, handle_alarm); install_handler(SIGALRM, handle_alarm);
/* Create a timer. */ /* Create a timer. */
...@@ -392,6 +432,18 @@ int main(int argc, char *argv[]) ...@@ -392,6 +432,18 @@ int main(int argc, char *argv[])
} }
} }
if (pin_index >= 0) {
memset(&desc, 0, sizeof(desc));
desc.index = pin_index;
desc.func = pin_func;
desc.chan = index;
if (ioctl(fd, PTP_PIN_SETFUNC, &desc)) {
perror("PTP_PIN_SETFUNC");
} else {
puts("set pin function okay");
}
}
if (pps != -1) { if (pps != -1) {
int enable = pps ? 1 : 0; int enable = pps ? 1 : 0;
if (ioctl(fd, PTP_ENABLE_PPS, enable)) { if (ioctl(fd, PTP_ENABLE_PPS, enable)) {
......
...@@ -1040,6 +1040,7 @@ static struct ptp_clock_info bfin_ptp_caps = { ...@@ -1040,6 +1040,7 @@ static struct ptp_clock_info bfin_ptp_caps = {
.n_alarm = 0, .n_alarm = 0,
.n_ext_ts = 0, .n_ext_ts = 0,
.n_per_out = 0, .n_per_out = 0,
.n_pins = 0,
.pps = 0, .pps = 0,
.adjfreq = bfin_ptp_adjfreq, .adjfreq = bfin_ptp_adjfreq,
.adjtime = bfin_ptp_adjtime, .adjtime = bfin_ptp_adjtime,
......
...@@ -6322,6 +6322,7 @@ static const struct ptp_clock_info tg3_ptp_caps = { ...@@ -6322,6 +6322,7 @@ static const struct ptp_clock_info tg3_ptp_caps = {
.n_alarm = 0, .n_alarm = 0,
.n_ext_ts = 0, .n_ext_ts = 0,
.n_per_out = 1, .n_per_out = 1,
.n_pins = 0,
.pps = 0, .pps = 0,
.adjfreq = tg3_ptp_adjfreq, .adjfreq = tg3_ptp_adjfreq,
.adjtime = tg3_ptp_adjtime, .adjtime = tg3_ptp_adjtime,
......
...@@ -372,6 +372,7 @@ void fec_ptp_init(struct platform_device *pdev) ...@@ -372,6 +372,7 @@ void fec_ptp_init(struct platform_device *pdev)
fep->ptp_caps.n_alarm = 0; fep->ptp_caps.n_alarm = 0;
fep->ptp_caps.n_ext_ts = 0; fep->ptp_caps.n_ext_ts = 0;
fep->ptp_caps.n_per_out = 0; fep->ptp_caps.n_per_out = 0;
fep->ptp_caps.n_pins = 0;
fep->ptp_caps.pps = 0; fep->ptp_caps.pps = 0;
fep->ptp_caps.adjfreq = fec_ptp_adjfreq; fep->ptp_caps.adjfreq = fec_ptp_adjfreq;
fep->ptp_caps.adjtime = fec_ptp_adjtime; fep->ptp_caps.adjtime = fec_ptp_adjtime;
......
...@@ -414,6 +414,7 @@ static struct ptp_clock_info ptp_gianfar_caps = { ...@@ -414,6 +414,7 @@ static struct ptp_clock_info ptp_gianfar_caps = {
.n_alarm = 0, .n_alarm = 0,
.n_ext_ts = N_EXT_TS, .n_ext_ts = N_EXT_TS,
.n_per_out = 0, .n_per_out = 0,
.n_pins = 0,
.pps = 1, .pps = 1,
.adjfreq = ptp_gianfar_adjfreq, .adjfreq = ptp_gianfar_adjfreq,
.adjtime = ptp_gianfar_adjtime, .adjtime = ptp_gianfar_adjtime,
......
...@@ -189,6 +189,7 @@ static const struct ptp_clock_info e1000e_ptp_clock_info = { ...@@ -189,6 +189,7 @@ static const struct ptp_clock_info e1000e_ptp_clock_info = {
.n_alarm = 0, .n_alarm = 0,
.n_ext_ts = 0, .n_ext_ts = 0,
.n_per_out = 0, .n_per_out = 0,
.n_pins = 0,
.pps = 0, .pps = 0,
.adjfreq = e1000e_phc_adjfreq, .adjfreq = e1000e_phc_adjfreq,
.adjtime = e1000e_phc_adjtime, .adjtime = e1000e_phc_adjtime,
......
...@@ -276,6 +276,7 @@ static const struct ptp_clock_info mlx4_en_ptp_clock_info = { ...@@ -276,6 +276,7 @@ static const struct ptp_clock_info mlx4_en_ptp_clock_info = {
.n_alarm = 0, .n_alarm = 0,
.n_ext_ts = 0, .n_ext_ts = 0,
.n_per_out = 0, .n_per_out = 0,
.n_pins = 0,
.pps = 0, .pps = 0,
.adjfreq = mlx4_en_phc_adjfreq, .adjfreq = mlx4_en_phc_adjfreq,
.adjtime = mlx4_en_phc_adjtime, .adjtime = mlx4_en_phc_adjtime,
......
...@@ -1194,6 +1194,7 @@ static const struct ptp_clock_info efx_phc_clock_info = { ...@@ -1194,6 +1194,7 @@ static const struct ptp_clock_info efx_phc_clock_info = {
.n_alarm = 0, .n_alarm = 0,
.n_ext_ts = 0, .n_ext_ts = 0,
.n_per_out = 0, .n_per_out = 0,
.n_pins = 0,
.pps = 1, .pps = 1,
.adjfreq = efx_phc_adjfreq, .adjfreq = efx_phc_adjfreq,
.adjtime = efx_phc_adjtime, .adjtime = efx_phc_adjtime,
......
...@@ -164,6 +164,7 @@ static struct ptp_clock_info stmmac_ptp_clock_ops = { ...@@ -164,6 +164,7 @@ static struct ptp_clock_info stmmac_ptp_clock_ops = {
.n_alarm = 0, .n_alarm = 0,
.n_ext_ts = 0, .n_ext_ts = 0,
.n_per_out = 0, .n_per_out = 0,
.n_pins = 0,
.pps = 0, .pps = 0,
.adjfreq = stmmac_adjust_freq, .adjfreq = stmmac_adjust_freq,
.adjtime = stmmac_adjust_time, .adjtime = stmmac_adjust_time,
......
...@@ -217,6 +217,7 @@ static struct ptp_clock_info cpts_info = { ...@@ -217,6 +217,7 @@ static struct ptp_clock_info cpts_info = {
.name = "CTPS timer", .name = "CTPS timer",
.max_adj = 1000000, .max_adj = 1000000,
.n_ext_ts = 0, .n_ext_ts = 0,
.n_pins = 0,
.pps = 0, .pps = 0,
.adjfreq = cpts_ptp_adjfreq, .adjfreq = cpts_ptp_adjfreq,
.adjtime = cpts_ptp_adjtime, .adjtime = cpts_ptp_adjtime,
......
...@@ -873,6 +873,7 @@ static struct ptp_clock_info ptp_mpipe_caps = { ...@@ -873,6 +873,7 @@ static struct ptp_clock_info ptp_mpipe_caps = {
.name = "mPIPE clock", .name = "mPIPE clock",
.max_adj = 999999999, .max_adj = 999999999,
.n_ext_ts = 0, .n_ext_ts = 0,
.n_pins = 0,
.pps = 0, .pps = 0,
.adjfreq = ptp_mpipe_adjfreq, .adjfreq = ptp_mpipe_adjfreq,
.adjtime = ptp_mpipe_adjtime, .adjtime = ptp_mpipe_adjtime,
......
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#define CAL_EVENT 7 #define CAL_EVENT 7
#define CAL_TRIGGER 7 #define CAL_TRIGGER 7
#define PER_TRIGGER 6 #define PER_TRIGGER 6
#define DP83640_N_PINS 12
#define MII_DP83640_MICR 0x11 #define MII_DP83640_MICR 0x11
#define MII_DP83640_MISR 0x12 #define MII_DP83640_MISR 0x12
...@@ -173,6 +174,37 @@ MODULE_PARM_DESC(chosen_phy, \ ...@@ -173,6 +174,37 @@ MODULE_PARM_DESC(chosen_phy, \
MODULE_PARM_DESC(gpio_tab, \ MODULE_PARM_DESC(gpio_tab, \
"Which GPIO line to use for which purpose: cal,perout,extts1,...,extts6"); "Which GPIO line to use for which purpose: cal,perout,extts1,...,extts6");
static void dp83640_gpio_defaults(struct ptp_pin_desc *pd)
{
int i, index;
for (i = 0; i < DP83640_N_PINS; i++) {
snprintf(pd[i].name, sizeof(pd[i].name), "GPIO%d", 1 + i);
pd[i].index = i;
}
for (i = 0; i < GPIO_TABLE_SIZE; i++) {
if (gpio_tab[i] < 1 || gpio_tab[i] > DP83640_N_PINS) {
pr_err("gpio_tab[%d]=%hu out of range", i, gpio_tab[i]);
return;
}
}
index = gpio_tab[CALIBRATE_GPIO] - 1;
pd[index].func = PTP_PF_PHYSYNC;
pd[index].chan = 0;
index = gpio_tab[PEROUT_GPIO] - 1;
pd[index].func = PTP_PF_PEROUT;
pd[index].chan = 0;
for (i = EXTTS0_GPIO; i < GPIO_TABLE_SIZE; i++) {
index = gpio_tab[i] - 1;
pd[index].func = PTP_PF_EXTTS;
pd[index].chan = i - EXTTS0_GPIO;
}
}
/* a list of clocks and a mutex to protect it */ /* a list of clocks and a mutex to protect it */
static LIST_HEAD(phyter_clocks); static LIST_HEAD(phyter_clocks);
static DEFINE_MUTEX(phyter_clocks_lock); static DEFINE_MUTEX(phyter_clocks_lock);
...@@ -266,15 +298,22 @@ static u64 phy2txts(struct phy_txts *p) ...@@ -266,15 +298,22 @@ static u64 phy2txts(struct phy_txts *p)
return ns; return ns;
} }
static void periodic_output(struct dp83640_clock *clock, static int periodic_output(struct dp83640_clock *clock,
struct ptp_clock_request *clkreq, bool on) struct ptp_clock_request *clkreq, bool on)
{ {
struct dp83640_private *dp83640 = clock->chosen; struct dp83640_private *dp83640 = clock->chosen;
struct phy_device *phydev = dp83640->phydev; struct phy_device *phydev = dp83640->phydev;
u32 sec, nsec, period; u32 sec, nsec, pwidth;
u16 gpio, ptp_trig, trigger, val; u16 gpio, ptp_trig, trigger, val;
gpio = on ? gpio_tab[PEROUT_GPIO] : 0; if (on) {
gpio = 1 + ptp_find_pin(clock->ptp_clock, PTP_PF_PEROUT, 0);
if (gpio < 1)
return -EINVAL;
} else {
gpio = 0;
}
trigger = PER_TRIGGER; trigger = PER_TRIGGER;
ptp_trig = TRIG_WR | ptp_trig = TRIG_WR |
...@@ -291,13 +330,14 @@ static void periodic_output(struct dp83640_clock *clock, ...@@ -291,13 +330,14 @@ static void periodic_output(struct dp83640_clock *clock,
ext_write(0, phydev, PAGE5, PTP_TRIG, ptp_trig); ext_write(0, phydev, PAGE5, PTP_TRIG, ptp_trig);
ext_write(0, phydev, PAGE4, PTP_CTL, val); ext_write(0, phydev, PAGE4, PTP_CTL, val);
mutex_unlock(&clock->extreg_lock); mutex_unlock(&clock->extreg_lock);
return; return 0;
} }
sec = clkreq->perout.start.sec; sec = clkreq->perout.start.sec;
nsec = clkreq->perout.start.nsec; nsec = clkreq->perout.start.nsec;
period = clkreq->perout.period.sec * 1000000000UL; pwidth = clkreq->perout.period.sec * 1000000000UL;
period += clkreq->perout.period.nsec; pwidth += clkreq->perout.period.nsec;
pwidth /= 2;
mutex_lock(&clock->extreg_lock); mutex_lock(&clock->extreg_lock);
...@@ -310,8 +350,8 @@ static void periodic_output(struct dp83640_clock *clock, ...@@ -310,8 +350,8 @@ static void periodic_output(struct dp83640_clock *clock,
ext_write(0, phydev, PAGE4, PTP_TDR, nsec >> 16); /* ns[31:16] */ ext_write(0, phydev, PAGE4, PTP_TDR, nsec >> 16); /* ns[31:16] */
ext_write(0, phydev, PAGE4, PTP_TDR, sec & 0xffff); /* sec[15:0] */ ext_write(0, phydev, PAGE4, PTP_TDR, sec & 0xffff); /* sec[15:0] */
ext_write(0, phydev, PAGE4, PTP_TDR, sec >> 16); /* sec[31:16] */ ext_write(0, phydev, PAGE4, PTP_TDR, sec >> 16); /* sec[31:16] */
ext_write(0, phydev, PAGE4, PTP_TDR, period & 0xffff); /* ns[15:0] */ ext_write(0, phydev, PAGE4, PTP_TDR, pwidth & 0xffff); /* ns[15:0] */
ext_write(0, phydev, PAGE4, PTP_TDR, period >> 16); /* ns[31:16] */ ext_write(0, phydev, PAGE4, PTP_TDR, pwidth >> 16); /* ns[31:16] */
/*enable trigger*/ /*enable trigger*/
val &= ~TRIG_LOAD; val &= ~TRIG_LOAD;
...@@ -319,6 +359,7 @@ static void periodic_output(struct dp83640_clock *clock, ...@@ -319,6 +359,7 @@ static void periodic_output(struct dp83640_clock *clock,
ext_write(0, phydev, PAGE4, PTP_CTL, val); ext_write(0, phydev, PAGE4, PTP_CTL, val);
mutex_unlock(&clock->extreg_lock); mutex_unlock(&clock->extreg_lock);
return 0;
} }
/* ptp clock methods */ /* ptp clock methods */
...@@ -424,18 +465,21 @@ static int ptp_dp83640_enable(struct ptp_clock_info *ptp, ...@@ -424,18 +465,21 @@ static int ptp_dp83640_enable(struct ptp_clock_info *ptp,
struct dp83640_clock *clock = struct dp83640_clock *clock =
container_of(ptp, struct dp83640_clock, caps); container_of(ptp, struct dp83640_clock, caps);
struct phy_device *phydev = clock->chosen->phydev; struct phy_device *phydev = clock->chosen->phydev;
int index; unsigned int index;
u16 evnt, event_num, gpio_num; u16 evnt, event_num, gpio_num;
switch (rq->type) { switch (rq->type) {
case PTP_CLK_REQ_EXTTS: case PTP_CLK_REQ_EXTTS:
index = rq->extts.index; index = rq->extts.index;
if (index < 0 || index >= N_EXT_TS) if (index >= N_EXT_TS)
return -EINVAL; return -EINVAL;
event_num = EXT_EVENT + index; event_num = EXT_EVENT + index;
evnt = EVNT_WR | (event_num & EVNT_SEL_MASK) << EVNT_SEL_SHIFT; evnt = EVNT_WR | (event_num & EVNT_SEL_MASK) << EVNT_SEL_SHIFT;
if (on) { if (on) {
gpio_num = gpio_tab[EXTTS0_GPIO + index]; gpio_num = 1 + ptp_find_pin(clock->ptp_clock,
PTP_PF_EXTTS, index);
if (gpio_num < 1)
return -EINVAL;
evnt |= (gpio_num & EVNT_GPIO_MASK) << EVNT_GPIO_SHIFT; evnt |= (gpio_num & EVNT_GPIO_MASK) << EVNT_GPIO_SHIFT;
if (rq->extts.flags & PTP_FALLING_EDGE) if (rq->extts.flags & PTP_FALLING_EDGE)
evnt |= EVNT_FALL; evnt |= EVNT_FALL;
...@@ -448,8 +492,7 @@ static int ptp_dp83640_enable(struct ptp_clock_info *ptp, ...@@ -448,8 +492,7 @@ static int ptp_dp83640_enable(struct ptp_clock_info *ptp,
case PTP_CLK_REQ_PEROUT: case PTP_CLK_REQ_PEROUT:
if (rq->perout.index != 0) if (rq->perout.index != 0)
return -EINVAL; return -EINVAL;
periodic_output(clock, rq, on); return periodic_output(clock, rq, on);
return 0;
default: default:
break; break;
...@@ -458,6 +501,12 @@ static int ptp_dp83640_enable(struct ptp_clock_info *ptp, ...@@ -458,6 +501,12 @@ static int ptp_dp83640_enable(struct ptp_clock_info *ptp,
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
static int ptp_dp83640_verify(struct ptp_clock_info *ptp, unsigned int pin,
enum ptp_pin_function func, unsigned int chan)
{
return 0;
}
static u8 status_frame_dst[6] = { 0x01, 0x1B, 0x19, 0x00, 0x00, 0x00 }; static u8 status_frame_dst[6] = { 0x01, 0x1B, 0x19, 0x00, 0x00, 0x00 };
static u8 status_frame_src[6] = { 0x08, 0x00, 0x17, 0x0B, 0x6B, 0x0F }; static u8 status_frame_src[6] = { 0x08, 0x00, 0x17, 0x0B, 0x6B, 0x0F };
...@@ -875,6 +924,7 @@ static void dp83640_free_clocks(void) ...@@ -875,6 +924,7 @@ static void dp83640_free_clocks(void)
mutex_destroy(&clock->extreg_lock); mutex_destroy(&clock->extreg_lock);
mutex_destroy(&clock->clock_lock); mutex_destroy(&clock->clock_lock);
put_device(&clock->bus->dev); put_device(&clock->bus->dev);
kfree(clock->caps.pin_config);
kfree(clock); kfree(clock);
} }
...@@ -894,12 +944,18 @@ static void dp83640_clock_init(struct dp83640_clock *clock, struct mii_bus *bus) ...@@ -894,12 +944,18 @@ static void dp83640_clock_init(struct dp83640_clock *clock, struct mii_bus *bus)
clock->caps.n_alarm = 0; clock->caps.n_alarm = 0;
clock->caps.n_ext_ts = N_EXT_TS; clock->caps.n_ext_ts = N_EXT_TS;
clock->caps.n_per_out = 1; clock->caps.n_per_out = 1;
clock->caps.n_pins = DP83640_N_PINS;
clock->caps.pps = 0; clock->caps.pps = 0;
clock->caps.adjfreq = ptp_dp83640_adjfreq; clock->caps.adjfreq = ptp_dp83640_adjfreq;
clock->caps.adjtime = ptp_dp83640_adjtime; clock->caps.adjtime = ptp_dp83640_adjtime;
clock->caps.gettime = ptp_dp83640_gettime; clock->caps.gettime = ptp_dp83640_gettime;
clock->caps.settime = ptp_dp83640_settime; clock->caps.settime = ptp_dp83640_settime;
clock->caps.enable = ptp_dp83640_enable; clock->caps.enable = ptp_dp83640_enable;
clock->caps.verify = ptp_dp83640_verify;
/*
* Convert the module param defaults into a dynamic pin configuration.
*/
dp83640_gpio_defaults(clock->caps.pin_config);
/* /*
* Get a reference to this bus instance. * Get a reference to this bus instance.
*/ */
...@@ -950,6 +1006,13 @@ static struct dp83640_clock *dp83640_clock_get_bus(struct mii_bus *bus) ...@@ -950,6 +1006,13 @@ static struct dp83640_clock *dp83640_clock_get_bus(struct mii_bus *bus)
if (!clock) if (!clock)
goto out; goto out;
clock->caps.pin_config = kzalloc(sizeof(struct ptp_pin_desc) *
DP83640_N_PINS, GFP_KERNEL);
if (!clock->caps.pin_config) {
kfree(clock);
clock = NULL;
goto out;
}
dp83640_clock_init(clock, bus); dp83640_clock_init(clock, bus);
list_add_tail(&phyter_clocks, &clock->list); list_add_tail(&phyter_clocks, &clock->list);
out: out:
...@@ -1363,7 +1426,7 @@ static void __exit dp83640_exit(void) ...@@ -1363,7 +1426,7 @@ static void __exit dp83640_exit(void)
} }
MODULE_DESCRIPTION("National Semiconductor DP83640 PHY driver"); MODULE_DESCRIPTION("National Semiconductor DP83640 PHY driver");
MODULE_AUTHOR("Richard Cochran <richardcochran@gmail.at>"); MODULE_AUTHOR("Richard Cochran <richardcochran@gmail.com>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_init(dp83640_init); module_init(dp83640_init);
......
...@@ -25,6 +25,96 @@ ...@@ -25,6 +25,96 @@
#include "ptp_private.h" #include "ptp_private.h"
static int ptp_disable_pinfunc(struct ptp_clock_info *ops,
enum ptp_pin_function func, unsigned int chan)
{
struct ptp_clock_request rq;
int err = 0;
memset(&rq, 0, sizeof(rq));
switch (func) {
case PTP_PF_NONE:
break;
case PTP_PF_EXTTS:
rq.type = PTP_CLK_REQ_EXTTS;
rq.extts.index = chan;
err = ops->enable(ops, &rq, 0);
break;
case PTP_PF_PEROUT:
rq.type = PTP_CLK_REQ_PEROUT;
rq.perout.index = chan;
err = ops->enable(ops, &rq, 0);
break;
case PTP_PF_PHYSYNC:
break;
default:
return -EINVAL;
}
return err;
}
int ptp_set_pinfunc(struct ptp_clock *ptp, unsigned int pin,
enum ptp_pin_function func, unsigned int chan)
{
struct ptp_clock_info *info = ptp->info;
struct ptp_pin_desc *pin1 = NULL, *pin2 = &info->pin_config[pin];
unsigned int i;
/* Check to see if any other pin previously had this function. */
for (i = 0; i < info->n_pins; i++) {
if (info->pin_config[i].func == func &&
info->pin_config[i].chan == chan) {
pin1 = &info->pin_config[i];
break;
}
}
if (pin1 && i == pin)
return 0;
/* Check the desired function and channel. */
switch (func) {
case PTP_PF_NONE:
break;
case PTP_PF_EXTTS:
if (chan >= info->n_ext_ts)
return -EINVAL;
break;
case PTP_PF_PEROUT:
if (chan >= info->n_per_out)
return -EINVAL;
break;
case PTP_PF_PHYSYNC:
pr_err("sorry, cannot reassign the calibration pin\n");
return -EINVAL;
default:
return -EINVAL;
}
if (pin2->func == PTP_PF_PHYSYNC) {
pr_err("sorry, cannot reprogram the calibration pin\n");
return -EINVAL;
}
if (info->verify(info, pin, func, chan)) {
pr_err("driver cannot use function %u on pin %u\n", func, chan);
return -EOPNOTSUPP;
}
/* Disable whatever function was previously assigned. */
if (pin1) {
ptp_disable_pinfunc(info, func, chan);
pin1->func = PTP_PF_NONE;
pin1->chan = 0;
}
ptp_disable_pinfunc(info, pin2->func, pin2->chan);
pin2->func = func;
pin2->chan = chan;
return 0;
}
int ptp_open(struct posix_clock *pc, fmode_t fmode) int ptp_open(struct posix_clock *pc, fmode_t fmode)
{ {
return 0; return 0;
...@@ -35,12 +125,13 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) ...@@ -35,12 +125,13 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
struct ptp_clock_caps caps; struct ptp_clock_caps caps;
struct ptp_clock_request req; struct ptp_clock_request req;
struct ptp_sys_offset *sysoff = NULL; struct ptp_sys_offset *sysoff = NULL;
struct ptp_pin_desc pd;
struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock); struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
struct ptp_clock_info *ops = ptp->info; struct ptp_clock_info *ops = ptp->info;
struct ptp_clock_time *pct; struct ptp_clock_time *pct;
struct timespec ts; struct timespec ts;
int enable, err = 0; int enable, err = 0;
unsigned int i; unsigned int i, pin_index;
switch (cmd) { switch (cmd) {
...@@ -51,6 +142,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) ...@@ -51,6 +142,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
caps.n_ext_ts = ptp->info->n_ext_ts; caps.n_ext_ts = ptp->info->n_ext_ts;
caps.n_per_out = ptp->info->n_per_out; caps.n_per_out = ptp->info->n_per_out;
caps.pps = ptp->info->pps; caps.pps = ptp->info->pps;
caps.n_pins = ptp->info->n_pins;
if (copy_to_user((void __user *)arg, &caps, sizeof(caps))) if (copy_to_user((void __user *)arg, &caps, sizeof(caps)))
err = -EFAULT; err = -EFAULT;
break; break;
...@@ -126,6 +218,40 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) ...@@ -126,6 +218,40 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
err = -EFAULT; err = -EFAULT;
break; break;
case PTP_PIN_GETFUNC:
if (copy_from_user(&pd, (void __user *)arg, sizeof(pd))) {
err = -EFAULT;
break;
}
pin_index = pd.index;
if (pin_index >= ops->n_pins) {
err = -EINVAL;
break;
}
if (mutex_lock_interruptible(&ptp->pincfg_mux))
return -ERESTARTSYS;
pd = ops->pin_config[pin_index];
mutex_unlock(&ptp->pincfg_mux);
if (!err && copy_to_user((void __user *)arg, &pd, sizeof(pd)))
err = -EFAULT;
break;
case PTP_PIN_SETFUNC:
if (copy_from_user(&pd, (void __user *)arg, sizeof(pd))) {
err = -EFAULT;
break;
}
pin_index = pd.index;
if (pin_index >= ops->n_pins) {
err = -EINVAL;
break;
}
if (mutex_lock_interruptible(&ptp->pincfg_mux))
return -ERESTARTSYS;
err = ptp_set_pinfunc(ptp, pin_index, pd.func, pd.chan);
mutex_unlock(&ptp->pincfg_mux);
break;
default: default:
err = -ENOTTY; err = -ENOTTY;
break; break;
......
...@@ -169,6 +169,7 @@ static void delete_ptp_clock(struct posix_clock *pc) ...@@ -169,6 +169,7 @@ static void delete_ptp_clock(struct posix_clock *pc)
struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock); struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
mutex_destroy(&ptp->tsevq_mux); mutex_destroy(&ptp->tsevq_mux);
mutex_destroy(&ptp->pincfg_mux);
ida_simple_remove(&ptp_clocks_map, ptp->index); ida_simple_remove(&ptp_clocks_map, ptp->index);
kfree(ptp); kfree(ptp);
} }
...@@ -203,6 +204,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, ...@@ -203,6 +204,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
ptp->index = index; ptp->index = index;
spin_lock_init(&ptp->tsevq.lock); spin_lock_init(&ptp->tsevq.lock);
mutex_init(&ptp->tsevq_mux); mutex_init(&ptp->tsevq_mux);
mutex_init(&ptp->pincfg_mux);
init_waitqueue_head(&ptp->tsev_wq); init_waitqueue_head(&ptp->tsev_wq);
/* Create a new device in our class. */ /* Create a new device in our class. */
...@@ -249,6 +251,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, ...@@ -249,6 +251,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
device_destroy(ptp_class, ptp->devid); device_destroy(ptp_class, ptp->devid);
no_device: no_device:
mutex_destroy(&ptp->tsevq_mux); mutex_destroy(&ptp->tsevq_mux);
mutex_destroy(&ptp->pincfg_mux);
no_slot: no_slot:
kfree(ptp); kfree(ptp);
no_memory: no_memory:
...@@ -305,6 +308,26 @@ int ptp_clock_index(struct ptp_clock *ptp) ...@@ -305,6 +308,26 @@ int ptp_clock_index(struct ptp_clock *ptp)
} }
EXPORT_SYMBOL(ptp_clock_index); EXPORT_SYMBOL(ptp_clock_index);
int ptp_find_pin(struct ptp_clock *ptp,
enum ptp_pin_function func, unsigned int chan)
{
struct ptp_pin_desc *pin = NULL;
int i;
mutex_lock(&ptp->pincfg_mux);
for (i = 0; i < ptp->info->n_pins; i++) {
if (ptp->info->pin_config[i].func == func &&
ptp->info->pin_config[i].chan == chan) {
pin = &ptp->info->pin_config[i];
break;
}
}
mutex_unlock(&ptp->pincfg_mux);
return pin ? i : -1;
}
EXPORT_SYMBOL(ptp_find_pin);
/* module operations */ /* module operations */
static void __exit ptp_exit(void) static void __exit ptp_exit(void)
......
...@@ -244,6 +244,7 @@ static struct ptp_clock_info ptp_ixp_caps = { ...@@ -244,6 +244,7 @@ static struct ptp_clock_info ptp_ixp_caps = {
.name = "IXP46X timer", .name = "IXP46X timer",
.max_adj = 66666655, .max_adj = 66666655,
.n_ext_ts = N_EXT_TS, .n_ext_ts = N_EXT_TS,
.n_pins = 0,
.pps = 0, .pps = 0,
.adjfreq = ptp_ixp_adjfreq, .adjfreq = ptp_ixp_adjfreq,
.adjtime = ptp_ixp_adjtime, .adjtime = ptp_ixp_adjtime,
......
...@@ -514,6 +514,7 @@ static struct ptp_clock_info ptp_pch_caps = { ...@@ -514,6 +514,7 @@ static struct ptp_clock_info ptp_pch_caps = {
.name = "PCH timer", .name = "PCH timer",
.max_adj = 50000000, .max_adj = 50000000,
.n_ext_ts = N_EXT_TS, .n_ext_ts = N_EXT_TS,
.n_pins = 0,
.pps = 0, .pps = 0,
.adjfreq = ptp_pch_adjfreq, .adjfreq = ptp_pch_adjfreq,
.adjtime = ptp_pch_adjtime, .adjtime = ptp_pch_adjtime,
......
...@@ -48,8 +48,12 @@ struct ptp_clock { ...@@ -48,8 +48,12 @@ struct ptp_clock {
long dialed_frequency; /* remembers the frequency adjustment */ long dialed_frequency; /* remembers the frequency adjustment */
struct timestamp_event_queue tsevq; /* simple fifo for time stamps */ struct timestamp_event_queue tsevq; /* simple fifo for time stamps */
struct mutex tsevq_mux; /* one process at a time reading the fifo */ struct mutex tsevq_mux; /* one process at a time reading the fifo */
struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
wait_queue_head_t tsev_wq; wait_queue_head_t tsev_wq;
int defunct; /* tells readers to go away when clock is being removed */ int defunct; /* tells readers to go away when clock is being removed */
struct device_attribute *pin_dev_attr;
struct attribute **pin_attr;
struct attribute_group pin_attr_group;
}; };
/* /*
...@@ -69,6 +73,10 @@ static inline int queue_cnt(struct timestamp_event_queue *q) ...@@ -69,6 +73,10 @@ static inline int queue_cnt(struct timestamp_event_queue *q)
* see ptp_chardev.c * see ptp_chardev.c
*/ */
/* caller must hold pincfg_mux */
int ptp_set_pinfunc(struct ptp_clock *ptp, unsigned int pin,
enum ptp_pin_function func, unsigned int chan);
long ptp_ioctl(struct posix_clock *pc, long ptp_ioctl(struct posix_clock *pc,
unsigned int cmd, unsigned long arg); unsigned int cmd, unsigned long arg);
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <linux/capability.h> #include <linux/capability.h>
#include <linux/slab.h>
#include "ptp_private.h" #include "ptp_private.h"
...@@ -42,6 +43,7 @@ PTP_SHOW_INT(max_adjustment, max_adj); ...@@ -42,6 +43,7 @@ PTP_SHOW_INT(max_adjustment, max_adj);
PTP_SHOW_INT(n_alarms, n_alarm); PTP_SHOW_INT(n_alarms, n_alarm);
PTP_SHOW_INT(n_external_timestamps, n_ext_ts); PTP_SHOW_INT(n_external_timestamps, n_ext_ts);
PTP_SHOW_INT(n_periodic_outputs, n_per_out); PTP_SHOW_INT(n_periodic_outputs, n_per_out);
PTP_SHOW_INT(n_programmable_pins, n_pins);
PTP_SHOW_INT(pps_available, pps); PTP_SHOW_INT(pps_available, pps);
static struct attribute *ptp_attrs[] = { static struct attribute *ptp_attrs[] = {
...@@ -50,6 +52,7 @@ static struct attribute *ptp_attrs[] = { ...@@ -50,6 +52,7 @@ static struct attribute *ptp_attrs[] = {
&dev_attr_n_alarms.attr, &dev_attr_n_alarms.attr,
&dev_attr_n_external_timestamps.attr, &dev_attr_n_external_timestamps.attr,
&dev_attr_n_periodic_outputs.attr, &dev_attr_n_periodic_outputs.attr,
&dev_attr_n_programmable_pins.attr,
&dev_attr_pps_available.attr, &dev_attr_pps_available.attr,
NULL, NULL,
}; };
...@@ -175,6 +178,63 @@ static ssize_t pps_enable_store(struct device *dev, ...@@ -175,6 +178,63 @@ static ssize_t pps_enable_store(struct device *dev,
return err; return err;
} }
static int ptp_pin_name2index(struct ptp_clock *ptp, const char *name)
{
int i;
for (i = 0; i < ptp->info->n_pins; i++) {
if (!strcmp(ptp->info->pin_config[i].name, name))
return i;
}
return -1;
}
static ssize_t ptp_pin_show(struct device *dev, struct device_attribute *attr,
char *page)
{
struct ptp_clock *ptp = dev_get_drvdata(dev);
unsigned int func, chan;
int index;
index = ptp_pin_name2index(ptp, attr->attr.name);
if (index < 0)
return -EINVAL;
if (mutex_lock_interruptible(&ptp->pincfg_mux))
return -ERESTARTSYS;
func = ptp->info->pin_config[index].func;
chan = ptp->info->pin_config[index].chan;
mutex_unlock(&ptp->pincfg_mux);
return snprintf(page, PAGE_SIZE, "%u %u\n", func, chan);
}
static ssize_t ptp_pin_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
struct ptp_clock *ptp = dev_get_drvdata(dev);
unsigned int func, chan;
int cnt, err, index;
cnt = sscanf(buf, "%u %u", &func, &chan);
if (cnt != 2)
return -EINVAL;
index = ptp_pin_name2index(ptp, attr->attr.name);
if (index < 0)
return -EINVAL;
if (mutex_lock_interruptible(&ptp->pincfg_mux))
return -ERESTARTSYS;
err = ptp_set_pinfunc(ptp, index, func, chan);
mutex_unlock(&ptp->pincfg_mux);
if (err)
return err;
return count;
}
static DEVICE_ATTR(extts_enable, 0220, NULL, extts_enable_store); static DEVICE_ATTR(extts_enable, 0220, NULL, extts_enable_store);
static DEVICE_ATTR(fifo, 0444, extts_fifo_show, NULL); static DEVICE_ATTR(fifo, 0444, extts_fifo_show, NULL);
static DEVICE_ATTR(period, 0220, NULL, period_store); static DEVICE_ATTR(period, 0220, NULL, period_store);
...@@ -195,9 +255,56 @@ int ptp_cleanup_sysfs(struct ptp_clock *ptp) ...@@ -195,9 +255,56 @@ int ptp_cleanup_sysfs(struct ptp_clock *ptp)
if (info->pps) if (info->pps)
device_remove_file(dev, &dev_attr_pps_enable); device_remove_file(dev, &dev_attr_pps_enable);
if (info->n_pins) {
sysfs_remove_group(&dev->kobj, &ptp->pin_attr_group);
kfree(ptp->pin_attr);
kfree(ptp->pin_dev_attr);
}
return 0; return 0;
} }
static int ptp_populate_pins(struct ptp_clock *ptp)
{
struct device *dev = ptp->dev;
struct ptp_clock_info *info = ptp->info;
int err = -ENOMEM, i, n_pins = info->n_pins;
ptp->pin_dev_attr = kzalloc(n_pins * sizeof(*ptp->pin_dev_attr),
GFP_KERNEL);
if (!ptp->pin_dev_attr)
goto no_dev_attr;
ptp->pin_attr = kzalloc((1 + n_pins) * sizeof(struct attribute *),
GFP_KERNEL);
if (!ptp->pin_attr)
goto no_pin_attr;
for (i = 0; i < n_pins; i++) {
struct device_attribute *da = &ptp->pin_dev_attr[i];
sysfs_attr_init(&da->attr);
da->attr.name = info->pin_config[i].name;
da->attr.mode = 0644;
da->show = ptp_pin_show;
da->store = ptp_pin_store;
ptp->pin_attr[i] = &da->attr;
}
ptp->pin_attr_group.name = "pins";
ptp->pin_attr_group.attrs = ptp->pin_attr;
err = sysfs_create_group(&dev->kobj, &ptp->pin_attr_group);
if (err)
goto no_group;
return 0;
no_group:
kfree(ptp->pin_attr);
no_pin_attr:
kfree(ptp->pin_dev_attr);
no_dev_attr:
return err;
}
int ptp_populate_sysfs(struct ptp_clock *ptp) int ptp_populate_sysfs(struct ptp_clock *ptp)
{ {
struct device *dev = ptp->dev; struct device *dev = ptp->dev;
...@@ -222,7 +329,15 @@ int ptp_populate_sysfs(struct ptp_clock *ptp) ...@@ -222,7 +329,15 @@ int ptp_populate_sysfs(struct ptp_clock *ptp)
if (err) if (err)
goto out4; goto out4;
} }
if (info->n_pins) {
err = ptp_populate_pins(ptp);
if (err)
goto out5;
}
return 0; return 0;
out5:
if (info->pps)
device_remove_file(dev, &dev_attr_pps_enable);
out4: out4:
if (info->n_per_out) if (info->n_per_out)
device_remove_file(dev, &dev_attr_period); device_remove_file(dev, &dev_attr_period);
......
...@@ -49,7 +49,11 @@ struct ptp_clock_request { ...@@ -49,7 +49,11 @@ struct ptp_clock_request {
* @n_alarm: The number of programmable alarms. * @n_alarm: The number of programmable alarms.
* @n_ext_ts: The number of external time stamp channels. * @n_ext_ts: The number of external time stamp channels.
* @n_per_out: The number of programmable periodic signals. * @n_per_out: The number of programmable periodic signals.
* @n_pins: The number of programmable pins.
* @pps: Indicates whether the clock supports a PPS callback. * @pps: Indicates whether the clock supports a PPS callback.
* @pin_config: Array of length 'n_pins'. If the number of
* programmable pins is nonzero, then drivers must
* allocate and initialize this array.
* *
* clock operations * clock operations
* *
...@@ -70,6 +74,18 @@ struct ptp_clock_request { ...@@ -70,6 +74,18 @@ struct ptp_clock_request {
* parameter request: Desired resource to enable or disable. * parameter request: Desired resource to enable or disable.
* parameter on: Caller passes one to enable or zero to disable. * parameter on: Caller passes one to enable or zero to disable.
* *
* @verify: Confirm that a pin can perform a given function. The PTP
* Hardware Clock subsystem maintains the 'pin_config'
* array on behalf of the drivers, but the PHC subsystem
* assumes that every pin can perform every function. This
* hook gives drivers a way of telling the core about
* limitations on specific pins. This function must return
* zero if the function can be assigned to this pin, and
* nonzero otherwise.
* parameter pin: index of the pin in question.
* parameter func: the desired function to use.
* parameter chan: the function channel index to use.
*
* Drivers should embed their ptp_clock_info within a private * Drivers should embed their ptp_clock_info within a private
* structure, obtaining a reference to it using container_of(). * structure, obtaining a reference to it using container_of().
* *
...@@ -83,13 +99,17 @@ struct ptp_clock_info { ...@@ -83,13 +99,17 @@ struct ptp_clock_info {
int n_alarm; int n_alarm;
int n_ext_ts; int n_ext_ts;
int n_per_out; int n_per_out;
int n_pins;
int pps; int pps;
struct ptp_pin_desc *pin_config;
int (*adjfreq)(struct ptp_clock_info *ptp, s32 delta); int (*adjfreq)(struct ptp_clock_info *ptp, s32 delta);
int (*adjtime)(struct ptp_clock_info *ptp, s64 delta); int (*adjtime)(struct ptp_clock_info *ptp, s64 delta);
int (*gettime)(struct ptp_clock_info *ptp, struct timespec *ts); int (*gettime)(struct ptp_clock_info *ptp, struct timespec *ts);
int (*settime)(struct ptp_clock_info *ptp, const struct timespec *ts); int (*settime)(struct ptp_clock_info *ptp, const struct timespec *ts);
int (*enable)(struct ptp_clock_info *ptp, int (*enable)(struct ptp_clock_info *ptp,
struct ptp_clock_request *request, int on); struct ptp_clock_request *request, int on);
int (*verify)(struct ptp_clock_info *ptp, unsigned int pin,
enum ptp_pin_function func, unsigned int chan);
}; };
struct ptp_clock; struct ptp_clock;
...@@ -156,4 +176,17 @@ extern void ptp_clock_event(struct ptp_clock *ptp, ...@@ -156,4 +176,17 @@ extern void ptp_clock_event(struct ptp_clock *ptp,
extern int ptp_clock_index(struct ptp_clock *ptp); extern int ptp_clock_index(struct ptp_clock *ptp);
/**
* ptp_find_pin() - obtain the pin index of a given auxiliary function
*
* @ptp: The clock obtained from ptp_clock_register().
* @func: One of the ptp_pin_function enumerated values.
* @chan: The particular functional channel to find.
* Return: Pin index in the range of zero to ptp_clock_caps.n_pins - 1,
* or -1 if the auxiliary function cannot be found.
*/
int ptp_find_pin(struct ptp_clock *ptp,
enum ptp_pin_function func, unsigned int chan);
#endif #endif
...@@ -50,7 +50,8 @@ struct ptp_clock_caps { ...@@ -50,7 +50,8 @@ struct ptp_clock_caps {
int n_ext_ts; /* Number of external time stamp channels. */ int n_ext_ts; /* Number of external time stamp channels. */
int n_per_out; /* Number of programmable periodic signals. */ int n_per_out; /* Number of programmable periodic signals. */
int pps; /* Whether the clock supports a PPS callback. */ int pps; /* Whether the clock supports a PPS callback. */
int rsv[15]; /* Reserved for future use. */ int n_pins; /* Number of input/output pins. */
int rsv[14]; /* Reserved for future use. */
}; };
struct ptp_extts_request { struct ptp_extts_request {
...@@ -80,6 +81,40 @@ struct ptp_sys_offset { ...@@ -80,6 +81,40 @@ struct ptp_sys_offset {
struct ptp_clock_time ts[2 * PTP_MAX_SAMPLES + 1]; struct ptp_clock_time ts[2 * PTP_MAX_SAMPLES + 1];
}; };
enum ptp_pin_function {
PTP_PF_NONE,
PTP_PF_EXTTS,
PTP_PF_PEROUT,
PTP_PF_PHYSYNC,
};
struct ptp_pin_desc {
/*
* Hardware specific human readable pin name. This field is
* set by the kernel during the PTP_PIN_GETFUNC ioctl and is
* ignored for the PTP_PIN_SETFUNC ioctl.
*/
char name[64];
/*
* Pin index in the range of zero to ptp_clock_caps.n_pins - 1.
*/
unsigned int index;
/*
* Which of the PTP_PF_xxx functions to use on this pin.
*/
unsigned int func;
/*
* The specific channel to use for this function.
* This corresponds to the 'index' field of the
* PTP_EXTTS_REQUEST and PTP_PEROUT_REQUEST ioctls.
*/
unsigned int chan;
/*
* Reserved for future use.
*/
unsigned int rsv[5];
};
#define PTP_CLK_MAGIC '=' #define PTP_CLK_MAGIC '='
#define PTP_CLOCK_GETCAPS _IOR(PTP_CLK_MAGIC, 1, struct ptp_clock_caps) #define PTP_CLOCK_GETCAPS _IOR(PTP_CLK_MAGIC, 1, struct ptp_clock_caps)
...@@ -87,6 +122,8 @@ struct ptp_sys_offset { ...@@ -87,6 +122,8 @@ struct ptp_sys_offset {
#define PTP_PEROUT_REQUEST _IOW(PTP_CLK_MAGIC, 3, struct ptp_perout_request) #define PTP_PEROUT_REQUEST _IOW(PTP_CLK_MAGIC, 3, struct ptp_perout_request)
#define PTP_ENABLE_PPS _IOW(PTP_CLK_MAGIC, 4, int) #define PTP_ENABLE_PPS _IOW(PTP_CLK_MAGIC, 4, int)
#define PTP_SYS_OFFSET _IOW(PTP_CLK_MAGIC, 5, struct ptp_sys_offset) #define PTP_SYS_OFFSET _IOW(PTP_CLK_MAGIC, 5, struct ptp_sys_offset)
#define PTP_PIN_GETFUNC _IOWR(PTP_CLK_MAGIC, 6, struct ptp_pin_desc)
#define PTP_PIN_SETFUNC _IOW(PTP_CLK_MAGIC, 7, struct ptp_pin_desc)
struct ptp_extts_event { struct ptp_extts_event {
struct ptp_clock_time t; /* Time event occured. */ struct ptp_clock_time t; /* Time event occured. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment