chao
/
linuxptp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

timemaster: check support for SW time stamping. 

When an interface doesn't support HW time stamping, before falling back
to SW time stamping, check if it's actually supported and exit with an
error message if not.

Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
master
Miroslav Lichvar 2017-01-17 14:17:41 +01:00 committed by Richard Cochran
parent e54158195b
commit 117ed5c2d0
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
timemaster.c
View File

@ -674,13 +674,15 @@ static int add_ptp_source(struct ptp_domain *source,
{ {
struct config_file *config_file; struct config_file *config_file;
char **command, *uds_path, **interfaces, *message_tag; char **command, *uds_path, **interfaces, *message_tag;
int i, j, num_interfaces, *phc, *phcs, hw_ts; int i, j, num_interfaces, *phc, *phcs, hw_ts, sw_ts;
struct sk_ts_info ts_info; struct sk_ts_info ts_info;
pr_debug("adding PTP domain %d", source->domain); pr_debug("adding PTP domain %d", source->domain);
hw_ts = SOF_TIMESTAMPING_TX_HARDWARE | SOF_TIMESTAMPING_RX_HARDWARE | hw_ts = SOF_TIMESTAMPING_TX_HARDWARE | SOF_TIMESTAMPING_RX_HARDWARE |
SOF_TIMESTAMPING_RAW_HARDWARE; SOF_TIMESTAMPING_RAW_HARDWARE;
sw_ts = SOF_TIMESTAMPING_TX_SOFTWARE | SOF_TIMESTAMPING_RX_SOFTWARE |
SOF_TIMESTAMPING_SOFTWARE;
for (num_interfaces = 0; for (num_interfaces = 0;
source->interfaces[num_interfaces]; num_interfaces++) source->interfaces[num_interfaces]; num_interfaces++)
@ -702,9 +704,14 @@ static int add_ptp_source(struct ptp_domain *source,
return 1; return 1;
} }
if (!ts_info.valid || if (((ts_info.so_timestamping & hw_ts) != hw_ts)) {
((ts_info.so_timestamping & hw_ts) != hw_ts)) {
pr_debug("interface %s: no PHC", source->interfaces[i]); pr_debug("interface %s: no PHC", source->interfaces[i]);
if ((ts_info.so_timestamping & sw_ts) != sw_ts) {
pr_err("time stamping not supported on %s",
source->interfaces[i]);
free(phcs);
return 1;
}
continue; continue;
} }