Skip to contentSkip to conversation

Allow selection of timestamp source for GPIO timestamps

PATCH In review François Legal 3 participants 3 messages Aug 5, 2021 – Aug 6, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Allow selection of timestamp source for GPIO timestamps

This patch allows to select which time source (monotonic/realtime) is used to timestamp GPIO events.
The time source used to be monotonic which is the opposite of what other drivers do. Now default changed to realtime, plus new API added to go back to monotonic.

---

include/rtdm/uapi/gpio.h +2 -0
index 2839f7d51..f8a93b7f7 100644
@@ -30,6 +30,8 @@ struct rtdm_gpio_readout {
 #define GPIO_RTIOC_REQS		_IO(RTDM_CLASS_GPIO, 4)
 #define GPIO_RTIOC_RELS		_IO(RTDM_CLASS_GPIO, 5)
 #define GPIO_RTIOC_TS		_IOR(RTDM_CLASS_GPIO, 7, int)
+#define GPIO_RTIOC_TS_REAL  _IOR(RTDM_CLASS_GPIO, 8, int)
+#define GPIO_RTIOC_TS_MONO  _IOR(RTDM_CLASS_GPIO, 9, int)
 
 #define GPIO_TRIGGER_NONE		0x0 /* unspecified */
 #define GPIO_TRIGGER_EDGE_RISING	0x1
kernel/drivers/gpio/gpio-core.c +12 -1
index bc283064b..3eaf425c6 100644
@@ -36,13 +36,15 @@ static LIST_HEAD(rtdm_gpio_chips);
 
 static DEFINE_MUTEX(chip_lock);
 
+static nanosecs_abs_t (*timestamp_get_func_ptr)(void) = rtdm_clock_read;
+
 static int gpio_pin_interrupt(rtdm_irq_t *irqh)
 {
 	struct rtdm_gpio_pin *pin;
 
 	pin = rtdm_irq_get_arg(irqh, struct rtdm_gpio_pin);
 
-	pin->timestamp = rtdm_clock_read_monotonic();
+	pin->timestamp = timestamp_get_func_ptr();
 	rtdm_event_signal(&pin->event);
 
 	return RTDM_IRQ_HANDLED;
@@ -192,9 +194,18 @@ static int gpio_pin_ioctl_nrt(struct rtdm_fd *fd,
 		chan->requested = false;
 		break;
 	case GPIO_RTIOC_TS:
+	case GPIO_RTIOC_TS_REAL:
+		ret = rtdm_safe_copy_from_user(fd, &val, arg, sizeof(val));
+		if (ret)
+			return ret;
+		timestamp_get_func_ptr = rtdm_clock_read;
+		chan->want_timestamp = !!val;
+		break;
+	case GPIO_RTIOC_TS_MONO:
 		ret = rtdm_safe_copy_from_user(fd, &val, arg, sizeof(val));
 		if (ret)
 			return ret;
+		timestamp_get_func_ptr = rtdm_clock_read_monotonic;
 		chan->want_timestamp = !!val;
 		break;
 	default:
#1 lore raw

Please tag the patch with the subsystem, in this case "drivers/gpio:".

Quoted 12 lines · François Legal via Xenomai

This patch allows to select which time source (monotonic/realtime) is used to timestamp GPIO events.
The time source used to be monotonic which is the opposite of what other drivers do. Now default changed to realtime, plus new API added to go back to monotonic.

---

include/rtdm/uapi/gpio.h +0 -0
index 2839f7d51..f8a93b7f7 100644

include/rtdm/uapi/gpio.h struct rtdm_gpio_readout { · line 34

Quoted 5 lines
include/rtdm/uapi/gpio.h +2 -0
@@ -30,6 +30,8 @@ struct rtdm_gpio_readout {
 #define GPIO_RTIOC_REQS		_IO(RTDM_CLASS_GPIO, 4)
 #define GPIO_RTIOC_RELS		_IO(RTDM_CLASS_GPIO, 5)
 #define GPIO_RTIOC_TS		_IOR(RTDM_CLASS_GPIO, 7, int)
+#define GPIO_RTIOC_TS_REAL  _IOR(RTDM_CLASS_GPIO, 8, int)
+#define GPIO_RTIOC_TS_MONO  _IOR(RTDM_CLASS_GPIO, 9, int)

Only one of them needs to be a new define, the other can be an alias (or GPIO_RTIOC_TS can be that).

kernel/drivers/gpio/gpio-core.c static LIST_HEAD(rtdm_gpio_chips); · line 40

Quoted 13 lines
include/rtdm/uapi/gpio.h +0 -0
 #define GPIO_TRIGGER_NONE		0x0 /* unspecified */
 #define GPIO_TRIGGER_EDGE_RISING	0x1
kernel/drivers/gpio/gpio-core.c +2 -0
index bc283064b..3eaf425c6 100644
@@ -36,13 +36,15 @@ static LIST_HEAD(rtdm_gpio_chips);
 
 static DEFINE_MUTEX(chip_lock);
 
+static nanosecs_abs_t (*timestamp_get_func_ptr)(void) = rtdm_clock_read;
+

This must be controlled per device instance, not globally for all GPIO devices.

Quoted 12 lines
kernel/drivers/gpio/gpio-core.c +1 -1
 static int gpio_pin_interrupt(rtdm_irq_t *irqh)
 {
 	struct rtdm_gpio_pin *pin;
 
 	pin = rtdm_irq_get_arg(irqh, struct rtdm_gpio_pin);
 
-	pin->timestamp = rtdm_clock_read_monotonic();
+	pin->timestamp = timestamp_get_func_ptr();
 	rtdm_event_signal(&pin->event);
 
 	return RTDM_IRQ_HANDLED;

kernel/drivers/gpio/gpio-core.c static int gpio_pin_ioctl_nrt(struct rtdm_fd *fd, · line 197

Quoted 4 lines
kernel/drivers/gpio/gpio-core.c +1 -0
@@ -192,9 +194,18 @@ static int gpio_pin_ioctl_nrt(struct rtdm_fd *fd,
 		chan->requested = false;
 		break;
 	case GPIO_RTIOC_TS:
+	case GPIO_RTIOC_TS_REAL:

This changes the default of GPIO_RTIOC_TS in way that does not allow to back-port the patch to stable.

Quoted 6 lines
kernel/drivers/gpio/gpio-core.c +4 -0
+		ret = rtdm_safe_copy_from_user(fd, &val, arg, sizeof(val));
+		if (ret)
+			return ret;
+		timestamp_get_func_ptr = rtdm_clock_read;

kernel/drivers/gpio/gpio-core.c static int gpio_pin_ioctl_nrt(struct rtdm_fd *fd, · line 211

Quoted 10 lines
kernel/drivers/gpio/gpio-core.c +4 -0
+		chan->want_timestamp = !!val;
+		break;
+	case GPIO_RTIOC_TS_MONO:
 		ret = rtdm_safe_copy_from_user(fd, &val, arg, sizeof(val));
 		if (ret)
 			return ret;
+		timestamp_get_func_ptr = rtdm_clock_read_monotonic;
 		chan->want_timestamp = !!val;
 		break;
 	default:

Thanks for the patch, but some bits still need tuning.

Jan

Signature · 2 lines
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
#2 lore raw

PATCH 1/1 drivers/gpio: Allow selection of timestamp source for GPIO timestamps

In reply to François Legal

This patch allows to select which time source (monotonic/realtime) is used to timestamp GPIO events.
The time source used to be monotonic which is the opposite of what other drivers do. Now default changed to realtime, plus new API added to go back to monotonic.

---

include/rtdm/uapi/gpio.h +2 -0
index 2839f7d51..f8a93b7f7 100644
@@ -30,6 +30,8 @@ struct rtdm_gpio_readout {
 #define GPIO_RTIOC_REQS		_IO(RTDM_CLASS_GPIO, 4)
 #define GPIO_RTIOC_RELS		_IO(RTDM_CLASS_GPIO, 5)
 #define GPIO_RTIOC_TS		_IOR(RTDM_CLASS_GPIO, 7, int)
+#define GPIO_RTIOC_TS_REAL  _IOR(RTDM_CLASS_GPIO, 8, int)
+#define GPIO_RTIOC_TS_MONO  _IOR(RTDM_CLASS_GPIO, 9, int)
 
 #define GPIO_TRIGGER_NONE		0x0 /* unspecified */
 #define GPIO_TRIGGER_EDGE_RISING	0x1
kernel/drivers/gpio/gpio-core.c +12 -1
index bc283064b..3eaf425c6 100644
@@ -36,13 +36,15 @@ static LIST_HEAD(rtdm_gpio_chips);
 
 static DEFINE_MUTEX(chip_lock);
 
+static nanosecs_abs_t (*timestamp_get_func_ptr)(void) = rtdm_clock_read;
+
 static int gpio_pin_interrupt(rtdm_irq_t *irqh)
 {
 	struct rtdm_gpio_pin *pin;
 
 	pin = rtdm_irq_get_arg(irqh, struct rtdm_gpio_pin);
 
-	pin->timestamp = rtdm_clock_read_monotonic();
+	pin->timestamp = timestamp_get_func_ptr();
 	rtdm_event_signal(&pin->event);
 
 	return RTDM_IRQ_HANDLED;
@@ -192,9 +194,18 @@ static int gpio_pin_ioctl_nrt(struct rtdm_fd *fd,
 		chan->requested = false;
 		break;
 	case GPIO_RTIOC_TS:
+	case GPIO_RTIOC_TS_REAL:
+		ret = rtdm_safe_copy_from_user(fd, &val, arg, sizeof(val));
+		if (ret)
+			return ret;
+		timestamp_get_func_ptr = rtdm_clock_read;
+		chan->want_timestamp = !!val;
+		break;
+	case GPIO_RTIOC_TS_MONO:
 		ret = rtdm_safe_copy_from_user(fd, &val, arg, sizeof(val));
 		if (ret)
 			return ret;
+		timestamp_get_func_ptr = rtdm_clock_read_monotonic;
 		chan->want_timestamp = !!val;
 		break;
 	default: