The phc library currently selects whether to use PTP_PIN_SETFUNC2 over
PTP_PIN_SETFUNC based on whether the kernel headers it is compiled against
have the PTP_PIN_SETFUNC2 defined.
This means that the use of PTP_PIN_SETFUNC vs PTP_PIN_SETFUNC2 depends on
whether the headers we compiled against have the appropriate definition,
but not whether the running kernel supports the new ioctl.
Fix this to use dynamic fallback. If PTP_PIN_SETFUNC2 returns -ENOTTY, then
try PTP_PIN_SETFUNC. This approach will work on a wider range of kernels
and doesn't need the headers to be up to date.
Signed-off-by: Jacob Keller <jacob.e.kel...@intel.com>
---
missing.h | 7 ++-----
phc.c | 7 ++++---
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/missing.h b/missing.h
index 79a87d425993..9b37dc258c0f 100644
--- a/missing.h
+++ b/missing.h
@@ -244,11 +244,8 @@ struct ptp_pin_desc {
#endif /*!PTP_PIN_SETFUNC*/
-#ifdef PTP_PIN_SETFUNC2
-#define PTP_PIN_SETFUNC_FAILED "PTP_PIN_SETFUNC2 failed: %m"
-#else
-#define PTP_PIN_SETFUNC_FAILED "PTP_PIN_SETFUNC failed: %m"
-#define PTP_PIN_SETFUNC2 PTP_PIN_SETFUNC
+#ifndef PTP_PIN_SETFUNC2
+#define PTP_PIN_SETFUNC2 _IOW(PTP_CLK_MAGIC, 16, struct ptp_pin_desc)
#endif
#ifndef LIST_FOREACH_SAFE
diff --git a/phc.c b/phc.c
index 37f6b9f6db3c..49e44d1aad65 100644
--- a/phc.c
+++ b/phc.c
@@ -113,9 +113,10 @@ int phc_number_pins(clockid_t clkid)
int phc_pin_setfunc(clockid_t clkid, struct ptp_pin_desc *desc)
{
int err = ioctl(CLOCKID_TO_FD(clkid), PTP_PIN_SETFUNC2, desc);
- if (err) {
- fprintf(stderr, PTP_PIN_SETFUNC_FAILED "\n");
- }
+ if (err == -ENOTTY)
+ err = ioctl(CLOCKID_TO_FD(clkid), PTP_PIN_SETFUNC, desc);
+ if (err)
+ fprintf(stderr, "failed to set pin configuration, error: %m\n");
return err;
}
--
2.41.0.1.g9857a21e0017.dirty
_______________________________________________
Linuxptp-devel mailing list
Linuxptp-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxptp-devel
