From e5374427280c42c325fe38bbd46de1c28c6a7de2 Mon Sep 17 00:00:00 2001
From: Kuniyuki Iwashima <kuniyu@amazon.com>
Date: Wed, 29 May 2024 16:23:14 +0000
Subject: [PATCH] Add symlink for ENA PTP device.

ENA PTP device does not have the unique symlink unlike other clock devices:

  $ sudo rmmod ena && sudo modprobe ena phc_enable=1
  $ ls -al /dev/*ptp*
  crw-------. 1 root root 245, 0 May 29 17:34 /dev/ptp0

  $ sudo modprobe ptp_kvm
  $ ls -al /dev/*ptp*
  crw-------. 1 root root 245, 0 May 29 17:34 /dev/ptp0
  crw-------. 1 root root 245, 1 May 29 17:35 /dev/ptp1
  lrwxrwxrwx. 1 root root      4 May 29 17:35 /dev/ptp_kvm -> ptp1

This could lead customers to use a wrong device.

Let's add a udev rule to create the unique symlink for ENA PTP as ena-ptp.

With the new rule:

  $ sudo rmmod ena && sudo modprobe ena phc_enable=1
  $ ls -al /dev/*ptp*
  lrwxrwxrwx. 1 root root      4 May 29 17:37 /dev/ena-ptp -> ptp0
  crw-------. 1 root root 245, 0 May 29 17:37 /dev/ptp0
  crw-------. 1 root root 245, 1 May 29 17:35 /dev/ptp1
  lrwxrwxrwx. 1 root root      4 May 29 17:35 /dev/ptp_kvm -> ptp1

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
---
 51-ec2-ena-ptp-device.rules | 1 +
 amazon-ec2-utils.spec       | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 51-ec2-ena-ptp-device.rules

diff --git a/51-ec2-ena-ptp-device.rules b/51-ec2-ena-ptp-device.rules
new file mode 100644
index 0000000..c5fb454
--- /dev/null
+++ b/51-ec2-ena-ptp-device.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="ptp", ATTR{clock_name}=="ena-ptp-*", SYMLINK += "ena-ptp"
diff --git a/amazon-ec2-utils.spec b/amazon-ec2-utils.spec
index c80de69..0a22509 100644
--- a/amazon-ec2-utils.spec
+++ b/amazon-ec2-utils.spec
@@ -14,6 +14,7 @@ Source23:  ec2nvme-nsid
 Source24:  ebsnvme-id
 Source25:  51-ec2-xen-vbd-devices.rules
 Source26:  53-ec2-read-ahead-kb.rules
+Source27:  51-ec2-ena-ptp-device.rules
 
 URL:       https://github.com/aws/amazon-ec2-utils
 BuildArch: noarch
@@ -47,6 +48,7 @@ install -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sbindir}
 install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_udevrulesdir}
 install -m644 %{SOURCE25} $RPM_BUILD_ROOT%{_udevrulesdir}
 install -m644 %{SOURCE26} $RPM_BUILD_ROOT%{_udevrulesdir}
+install -m644 %{SOURCE27} $RPM_BUILD_ROOT%{_udevrulesdir}
 # Install 60-cdrom_id.rules to /etc rather than %{_udevrulesdir}
 # because it is intended as an override of a systemd-provided rules
 # file:
@@ -68,6 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/ec2nvme-nsid
 %{_sbindir}/ebsnvme-id
 %{_sbindir}/ec2udev-vbd
+/usr/lib/udev/rules.d/51-ec2-ena-ptp-device.rules
 /usr/lib/udev/rules.d/51-ec2-hvm-devices.rules
 /usr/lib/udev/rules.d/51-ec2-xen-vbd-devices.rules
 /usr/lib/udev/rules.d/53-ec2-read-ahead-kb.rules
@@ -75,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 /etc/udev/rules.d/60-cdrom_id.rules
 
 %changelog
+* Wed May 29 2024 Kuniyuki Iwashima <kuniyu@amazon.com> - 2.2.1
+- Add symlink for ENA PTP device.
+
 * Thu Jan 18 2024 Keith Gable <gablk@amazon.com> - 2.2.0-1
 - Corrected issue where an ec2-metadata error was written to stdout
 - Change ec2nvme-nsid to use Bash string manipulation to improve