Merge pull request #693 from jongwu/ptp

kernel: enable kvm_ptp for arm64
kata-containers · Oct 8, 2019 · f195f7f · f195f7f
2 parents 949d763 + 5c43c96
commit f195f7f
Show file tree

Hide file tree

Showing 3 changed files with 472 additions and 4 deletions.
diff --git a/kernel/configs/arm64_kata_kvm_4.19.x b/kernel/configs/arm64_kata_kvm_4.19.x
@@ -1572,13 +1572,24 @@ CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_SPI is not set
 # CONFIG_SPMI is not set
 # CONFIG_HSI is not set
-# CONFIG_PPS is not set
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
 
 #
-# PTP clock support
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_GPIO is not set
+#
+# PPS generators support
 #
-# CONFIG_PTP_1588_CLOCK is not set
 
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_PTP_1588_CLOCK_KVM=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #

diff --git a/kernel/kata_config_version b/kernel/kata_config_version
@@ -1 +1 @@
-53
+54