openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ptp: Add adjust_phase to ptp_clock_caps capability. 

Add adjust_phase to ptp_clock_caps capability to allow
user to query if a PHC driver supports adjust phase with
ioctl PTP_CLOCK_GETCAPS command.

Signed-off-by: Vincent Cheng <vincent.cheng.xh@renesas.com>
Reviewed-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vincent Cheng 2020-05-01 23:35:37 -04:00 committed by David S. Miller
parent 184ecc9eb2
commit d3f1cbd29f
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/ptp/ptp_chardev.c
View File

@ -136,6 +136,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
caps.pps = ptp->info->pps; caps.pps = ptp->info->pps;
caps.n_pins = ptp->info->n_pins; caps.n_pins = ptp->info->n_pins;
caps.cross_timestamping = ptp->info->getcrosststamp != NULL; caps.cross_timestamping = ptp->info->getcrosststamp != NULL;
caps.adjust_phase = ptp->info->adjphase != NULL;
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;

4
include/uapi/linux/ptp_clock.h
View File

@ -89,7 +89,9 @@ struct ptp_clock_caps {
int n_pins; /* Number of input/output pins. */ int n_pins; /* Number of input/output pins. */
/* Whether the clock supports precise system-device cross timestamps */ /* Whether the clock supports precise system-device cross timestamps */
int cross_timestamping; int cross_timestamping;
int rsv[13]; /* Reserved for future use. */ /* Whether the clock supports adjust phase */
int adjust_phase;
int rsv[12]; /* Reserved for future use. */
}; };
struct ptp_extts_request { struct ptp_extts_request {

6
tools/testing/selftests/ptp/testptp.c
View File

@ -269,14 +269,16 @@ int main(int argc, char *argv[])
" %d programmable periodic signals\n" " %d programmable periodic signals\n"
" %d pulse per second\n" " %d pulse per second\n"
" %d programmable pins\n" " %d programmable pins\n"
" %d cross timestamping\n", " %d cross timestamping\n"
" %d adjust_phase\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, caps.n_pins,
caps.cross_timestamping); caps.cross_timestamping,
caps.adjust_phase);
} }
} }