diff options
author | Richard Cochran <richardcochran@gmail.com> | 2011-04-22 06:03:08 -0400 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-05-23 16:01:00 -0400 |
commit | d94ba80ebbea17f036cecb104398fbcd788aa742 (patch) | |
tree | 7fe40228c5ea2bb77f2892b722d27155df8c1157 /include/linux | |
parent | caebc160ce3f76761cc62ad96ef6d6f30f54e3dd (diff) |
ptp: Added a brand new class driver for ptp clocks.
This patch adds an infrastructure for hardware clocks that implement
IEEE 1588, the Precision Time Protocol (PTP). A class driver offers a
registration method to particular hardware clock drivers. Each clock is
presented as a standard POSIX clock.
The ancillary clock features are exposed in two different ways, via
the sysfs and by a character device.
Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/Kbuild | 1 | ||||
-rw-r--r-- | include/linux/ptp_classify.h | 7 | ||||
-rw-r--r-- | include/linux/ptp_clock.h | 84 | ||||
-rw-r--r-- | include/linux/ptp_clock_kernel.h | 139 |
4 files changed, 231 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 75cf611641e6..4585836ba664 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
@@ -302,6 +302,7 @@ header-y += ppp-comp.h | |||
302 | header-y += ppp_defs.h | 302 | header-y += ppp_defs.h |
303 | header-y += pps.h | 303 | header-y += pps.h |
304 | header-y += prctl.h | 304 | header-y += prctl.h |
305 | header-y += ptp_clock.h | ||
305 | header-y += ptrace.h | 306 | header-y += ptrace.h |
306 | header-y += qnx4_fs.h | 307 | header-y += qnx4_fs.h |
307 | header-y += qnxtypes.h | 308 | header-y += qnxtypes.h |
diff --git a/include/linux/ptp_classify.h b/include/linux/ptp_classify.h index 943a85ab0020..e07e2742a865 100644 --- a/include/linux/ptp_classify.h +++ b/include/linux/ptp_classify.h | |||
@@ -25,6 +25,7 @@ | |||
25 | 25 | ||
26 | #include <linux/if_ether.h> | 26 | #include <linux/if_ether.h> |
27 | #include <linux/if_vlan.h> | 27 | #include <linux/if_vlan.h> |
28 | #include <linux/ip.h> | ||
28 | #include <linux/filter.h> | 29 | #include <linux/filter.h> |
29 | #ifdef __KERNEL__ | 30 | #ifdef __KERNEL__ |
30 | #include <linux/in.h> | 31 | #include <linux/in.h> |
@@ -58,6 +59,12 @@ | |||
58 | #define OFF_NEXT 6 | 59 | #define OFF_NEXT 6 |
59 | #define OFF_UDP_DST 2 | 60 | #define OFF_UDP_DST 2 |
60 | 61 | ||
62 | #define OFF_PTP_SOURCE_UUID 22 /* PTPv1 only */ | ||
63 | #define OFF_PTP_SEQUENCE_ID 30 | ||
64 | #define OFF_PTP_CONTROL 32 /* PTPv1 only */ | ||
65 | |||
66 | #define IPV4_HLEN(data) (((struct iphdr *)(data + OFF_IHL))->ihl << 2) | ||
67 | |||
61 | #define IP6_HLEN 40 | 68 | #define IP6_HLEN 40 |
62 | #define UDP_HLEN 8 | 69 | #define UDP_HLEN 8 |
63 | 70 | ||
diff --git a/include/linux/ptp_clock.h b/include/linux/ptp_clock.h new file mode 100644 index 000000000000..94e981f810a2 --- /dev/null +++ b/include/linux/ptp_clock.h | |||
@@ -0,0 +1,84 @@ | |||
1 | /* | ||
2 | * PTP 1588 clock support - user space interface | ||
3 | * | ||
4 | * Copyright (C) 2010 OMICRON electronics GmbH | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
19 | */ | ||
20 | |||
21 | #ifndef _PTP_CLOCK_H_ | ||
22 | #define _PTP_CLOCK_H_ | ||
23 | |||
24 | #include <linux/ioctl.h> | ||
25 | #include <linux/types.h> | ||
26 | |||
27 | /* PTP_xxx bits, for the flags field within the request structures. */ | ||
28 | #define PTP_ENABLE_FEATURE (1<<0) | ||
29 | #define PTP_RISING_EDGE (1<<1) | ||
30 | #define PTP_FALLING_EDGE (1<<2) | ||
31 | |||
32 | /* | ||
33 | * struct ptp_clock_time - represents a time value | ||
34 | * | ||
35 | * The sign of the seconds field applies to the whole value. The | ||
36 | * nanoseconds field is always unsigned. The reserved field is | ||
37 | * included for sub-nanosecond resolution, should the demand for | ||
38 | * this ever appear. | ||
39 | * | ||
40 | */ | ||
41 | struct ptp_clock_time { | ||
42 | __s64 sec; /* seconds */ | ||
43 | __u32 nsec; /* nanoseconds */ | ||
44 | __u32 reserved; | ||
45 | }; | ||
46 | |||
47 | struct ptp_clock_caps { | ||
48 | int max_adj; /* Maximum frequency adjustment in parts per billon. */ | ||
49 | int n_alarm; /* Number of programmable alarms. */ | ||
50 | int n_ext_ts; /* Number of external time stamp channels. */ | ||
51 | int n_per_out; /* Number of programmable periodic signals. */ | ||
52 | int pps; /* Whether the clock supports a PPS callback. */ | ||
53 | int rsv[15]; /* Reserved for future use. */ | ||
54 | }; | ||
55 | |||
56 | struct ptp_extts_request { | ||
57 | unsigned int index; /* Which channel to configure. */ | ||
58 | unsigned int flags; /* Bit field for PTP_xxx flags. */ | ||
59 | unsigned int rsv[2]; /* Reserved for future use. */ | ||
60 | }; | ||
61 | |||
62 | struct ptp_perout_request { | ||
63 | struct ptp_clock_time start; /* Absolute start time. */ | ||
64 | struct ptp_clock_time period; /* Desired period, zero means disable. */ | ||
65 | unsigned int index; /* Which channel to configure. */ | ||
66 | unsigned int flags; /* Reserved for future use. */ | ||
67 | unsigned int rsv[4]; /* Reserved for future use. */ | ||
68 | }; | ||
69 | |||
70 | #define PTP_CLK_MAGIC '=' | ||
71 | |||
72 | #define PTP_CLOCK_GETCAPS _IOR(PTP_CLK_MAGIC, 1, struct ptp_clock_caps) | ||
73 | #define PTP_EXTTS_REQUEST _IOW(PTP_CLK_MAGIC, 2, struct ptp_extts_request) | ||
74 | #define PTP_PEROUT_REQUEST _IOW(PTP_CLK_MAGIC, 3, struct ptp_perout_request) | ||
75 | #define PTP_ENABLE_PPS _IOW(PTP_CLK_MAGIC, 4, int) | ||
76 | |||
77 | struct ptp_extts_event { | ||
78 | struct ptp_clock_time t; /* Time event occured. */ | ||
79 | unsigned int index; /* Which channel produced the event. */ | ||
80 | unsigned int flags; /* Reserved for future use. */ | ||
81 | unsigned int rsv[2]; /* Reserved for future use. */ | ||
82 | }; | ||
83 | |||
84 | #endif | ||
diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h new file mode 100644 index 000000000000..dd2e44fba63e --- /dev/null +++ b/include/linux/ptp_clock_kernel.h | |||
@@ -0,0 +1,139 @@ | |||
1 | /* | ||
2 | * PTP 1588 clock support | ||
3 | * | ||
4 | * Copyright (C) 2010 OMICRON electronics GmbH | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
19 | */ | ||
20 | |||
21 | #ifndef _PTP_CLOCK_KERNEL_H_ | ||
22 | #define _PTP_CLOCK_KERNEL_H_ | ||
23 | |||
24 | #include <linux/ptp_clock.h> | ||
25 | |||
26 | |||
27 | struct ptp_clock_request { | ||
28 | enum { | ||
29 | PTP_CLK_REQ_EXTTS, | ||
30 | PTP_CLK_REQ_PEROUT, | ||
31 | PTP_CLK_REQ_PPS, | ||
32 | } type; | ||
33 | union { | ||
34 | struct ptp_extts_request extts; | ||
35 | struct ptp_perout_request perout; | ||
36 | }; | ||
37 | }; | ||
38 | |||
39 | /** | ||
40 | * struct ptp_clock_info - decribes a PTP hardware clock | ||
41 | * | ||
42 | * @owner: The clock driver should set to THIS_MODULE. | ||
43 | * @name: A short name to identify the clock. | ||
44 | * @max_adj: The maximum possible frequency adjustment, in parts per billon. | ||
45 | * @n_alarm: The number of programmable alarms. | ||
46 | * @n_ext_ts: The number of external time stamp channels. | ||
47 | * @n_per_out: The number of programmable periodic signals. | ||
48 | * @pps: Indicates whether the clock supports a PPS callback. | ||
49 | * | ||
50 | * clock operations | ||
51 | * | ||
52 | * @adjfreq: Adjusts the frequency of the hardware clock. | ||
53 | * parameter delta: Desired period change in parts per billion. | ||
54 | * | ||
55 | * @adjtime: Shifts the time of the hardware clock. | ||
56 | * parameter delta: Desired change in nanoseconds. | ||
57 | * | ||
58 | * @gettime: Reads the current time from the hardware clock. | ||
59 | * parameter ts: Holds the result. | ||
60 | * | ||
61 | * @settime: Set the current time on the hardware clock. | ||
62 | * parameter ts: Time value to set. | ||
63 | * | ||
64 | * @enable: Request driver to enable or disable an ancillary feature. | ||
65 | * parameter request: Desired resource to enable or disable. | ||
66 | * parameter on: Caller passes one to enable or zero to disable. | ||
67 | * | ||
68 | * Drivers should embed their ptp_clock_info within a private | ||
69 | * structure, obtaining a reference to it using container_of(). | ||
70 | * | ||
71 | * The callbacks must all return zero on success, non-zero otherwise. | ||
72 | */ | ||
73 | |||
74 | struct ptp_clock_info { | ||
75 | struct module *owner; | ||
76 | char name[16]; | ||
77 | s32 max_adj; | ||
78 | int n_alarm; | ||
79 | int n_ext_ts; | ||
80 | int n_per_out; | ||
81 | int pps; | ||
82 | int (*adjfreq)(struct ptp_clock_info *ptp, s32 delta); | ||
83 | int (*adjtime)(struct ptp_clock_info *ptp, s64 delta); | ||
84 | int (*gettime)(struct ptp_clock_info *ptp, struct timespec *ts); | ||
85 | int (*settime)(struct ptp_clock_info *ptp, const struct timespec *ts); | ||
86 | int (*enable)(struct ptp_clock_info *ptp, | ||
87 | struct ptp_clock_request *request, int on); | ||
88 | }; | ||
89 | |||
90 | struct ptp_clock; | ||
91 | |||
92 | /** | ||
93 | * ptp_clock_register() - register a PTP hardware clock driver | ||
94 | * | ||
95 | * @info: Structure describing the new clock. | ||
96 | */ | ||
97 | |||
98 | extern struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info); | ||
99 | |||
100 | /** | ||
101 | * ptp_clock_unregister() - unregister a PTP hardware clock driver | ||
102 | * | ||
103 | * @ptp: The clock to remove from service. | ||
104 | */ | ||
105 | |||
106 | extern int ptp_clock_unregister(struct ptp_clock *ptp); | ||
107 | |||
108 | |||
109 | enum ptp_clock_events { | ||
110 | PTP_CLOCK_ALARM, | ||
111 | PTP_CLOCK_EXTTS, | ||
112 | PTP_CLOCK_PPS, | ||
113 | }; | ||
114 | |||
115 | /** | ||
116 | * struct ptp_clock_event - decribes a PTP hardware clock event | ||
117 | * | ||
118 | * @type: One of the ptp_clock_events enumeration values. | ||
119 | * @index: Identifies the source of the event. | ||
120 | * @timestamp: When the event occured. | ||
121 | */ | ||
122 | |||
123 | struct ptp_clock_event { | ||
124 | int type; | ||
125 | int index; | ||
126 | u64 timestamp; | ||
127 | }; | ||
128 | |||
129 | /** | ||
130 | * ptp_clock_event() - notify the PTP layer about an event | ||
131 | * | ||
132 | * @ptp: The clock obtained from ptp_clock_register(). | ||
133 | * @event: Message structure describing the event. | ||
134 | */ | ||
135 | |||
136 | extern void ptp_clock_event(struct ptp_clock *ptp, | ||
137 | struct ptp_clock_event *event); | ||
138 | |||
139 | #endif | ||