Merge "dsa-device-plugin: Add driver_name attribute config"

helm-charts/upstream/intel-device-plugins-dsa-helm/debian/deb_folder/patches/0002-dsa-device-plugin-Add-driver_name-attribute-config.patch

@@ -0,0 +1,92 @@
+From 79b036fe8f576ae8620efac3d05c2ee58cd30b8f Mon Sep 17 00:00:00 2001
+From: Alyson Deives Pereira <alyson.deivespereira@windriver.com>
+Date: Tue, 7 Jan 2025 15:50:22 -0300
+Subject: [PATCH] dsa-device-plugin: Add driver_name attribute config
+
+After a kernel update, the idxd driver currently requires the
+"driver_name" attribute to be present in the DSA config file [1],
+otherwise the dsa initcontainer fails to start [2].
+
+This change includes the required attribute, similar to this fix
+from upstream [3]
+
+[1] https://github.com/intel/idxd-config/commit/84f099cb012865b637401c6120c9df221b89b8c7
+[2] https://github.com/intel/intel-device-plugins-for-kubernetes/issues/1836
+[3] https://github.com/intel/intel-device-plugins-for-kubernetes/pull/1849/commits/57ed2c386473d2ea0c7c8495f26c7370e52faa1b
+
+Signed-off-by: Alyson Deives Pereira <alyson.deivespereira@windriver.com>
+---
+ templates/dsa-config.yaml | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/templates/dsa-config.yaml b/templates/dsa-config.yaml
+index e70bf9d..bcc2aef 100644
+--- a/templates/dsa-config.yaml
++++ b/templates/dsa-config.yaml
+@@ -32,6 +32,7 @@ data:
+                 "block_on_fault":1,
+                 "type":"user",
+                 "name":"appX0",
++                "driver_name":"user",
+                 "threshold":15
+               }
+             ],
+@@ -57,6 +58,7 @@ data:
+                 "block_on_fault":1,
+                 "type":"user",
+                 "name":"appX1",
++                "driver_name":"user",
+                 "threshold":15
+               }
+             ],
+@@ -82,6 +84,7 @@ data:
+                 "block_on_fault":1,
+                 "type":"user",
+                 "name":"appX2",
++                "driver_name":"user",
+                 "threshold":15
+               }
+             ],
+@@ -107,6 +110,7 @@ data:
+                 "block_on_fault":1,
+                 "type":"user",
+                 "name":"appX3",
++                "driver_name":"user",
+                 "threshold":15
+               }
+             ],
+@@ -141,6 +145,7 @@ data:
+                 "block_on_fault":1,
+                 "type":"user",
+                 "name":"appX0",
++                "driver_name":"user",
+                 "threshold":15
+               }
+             ],
+@@ -166,6 +171,7 @@ data:
+                 "block_on_fault":1,
+                 "type":"user",
+                 "name":"appX1",
++                "driver_name":"user",
+                 "threshold":15
+               }
+             ],
+@@ -191,6 +197,7 @@ data:
+                 "block_on_fault":1,
+                 "type":"user",
+                 "name":"appX2",
++                "driver_name":"user",
+                 "threshold":15
+               }
+             ],
+@@ -216,6 +223,7 @@ data:
+                 "block_on_fault":1,
+                 "type":"user",
+                 "name":"appX3",
++                "driver_name":"user",
+                 "threshold":15
+               }
+             ],
+-- 
+2.34.1
+

helm-charts/upstream/intel-device-plugins-dsa-helm/debian/deb_folder/patches/series

@@ -1 +1,2 @@
-0001-Enable-custom-DSA-configuration-via-helm-overrides.patch
+0001-Enable-custom-DSA-configuration-via-helm-overrides.patch
+0002-dsa-device-plugin-Add-driver_name-attribute-config.patch