[Fix] Fix several VF PCI device IDs in NFD rule (#1006)

Author: yansun1996

docs/installation/openshift-olm.md

@@ -159,10 +159,11 @@ spec:
                       "75a3", # MI355X
                       "75a0", # MI350X
                       "74a5", # MI325X
+                      "74a2", # MI308X
+                      "74a8", # MI308X-HF
                       "74a0", # MI300A
                       "74a1", # MI300X
                       "74a9", # MI300X-HF
-                      "74bd", # MI300X-HF
                       "740f", # MI210
                       "7408", # MI250X
                       "740c", # MI250/MI250X
@@ -181,8 +182,11 @@ spec:
                       "75b3", # MI355X VF
                       "75b0", # MI350X VF
                       "74b9", # MI325X VF
+                      "74b6", # MI308X VF
+                      "74bc", # MI308X-HF VF
                       "74b5", # MI300X VF
-                      "7410", # MI210 VF
+                      "74bd", # MI300X-HF VF
+                      "7410"  # MI210 VF
                     ]}
 ```
 
@@ -210,15 +214,16 @@ spec:
                   "75a3", # MI355X
                   "75a0", # MI350X
                   "74a5", # MI325X
+                  "74a2", # MI308X
+                  "74a8", # MI308X-HF
                   "74a0", # MI300A
                   "74a1", # MI300X
                   "74a9", # MI300X-HF
-                  "74bd", # MI300X-HF
                   "740f", # MI210
                   "7408", # MI250X
                   "740c", # MI250/MI250X
                   "738c", # MI100
-                  "738e" # MI100
+                  "738e"  # MI100
                 ]}
     - name: amd-vgpu
       labels:
@@ -232,8 +237,11 @@ spec:
                   "75b3", # MI355X VF
                   "75b0", # MI350X VF
                   "74b9", # MI325X VF
+                  "74b6", # MI308X VF
+                  "74bc", # MI308X-HF VF
                   "74b5", # MI300X VF
-                  "7410", # MI210 VF
+                  "74bd", # MI300X-HF VF
+                  "7410"  # MI210 VF
                 ]}
 ```
 

docs/releasenotes.md

@@ -12,6 +12,10 @@ The AMD GPU Operator v1.4.1 release extends platform support to OpenShift v4.20
   - **Enhanced Test Result Events**
     - Test runner Kubernetes events now include additional information: pod UID and test framework name (e.g., RVS, AGFHC) as event labels, providing more comprehensive test run information for improved tracking and diagnostics.
 
+### Fixes
+  1. **Node Feature Discovery rule fix**
+     * Fix the PCI device ID for the Virtual Function (VF) of these GPU: MI308X and MI300X-HF
+
 ## GPU Operator v1.4.0 Release Notes
 
 The AMD GPU Operator v1.4.0 adds MI35X platform support and updates all managed operands to ROCm 7 runtime libraries, aligning the full stack with the ROCm 7 release.

hack/k8s-patch/template-patch/gpu-nfd-default-rule.yaml

@@ -23,6 +23,21 @@ spec:
             matchExpressions:
                 vendor: {op: In, value: ["1002"]}
                 device: {op: In, value: ["74b5"]} # MI300X VF
+      - matchFeatures:
+          - feature: pci.device
+            matchExpressions:
+                vendor: {op: In, value: ["1002"]}
+                device: {op: In, value: ["74bd"]} # MI300X HF VF
+      - matchFeatures:
+          - feature: pci.device
+            matchExpressions:
+                vendor: {op: In, value: ["1002"]}
+                device: {op: In, value: ["74b6"]} # MI308X VF
+      - matchFeatures:
+          - feature: pci.device
+            matchExpressions:
+                vendor: {op: In, value: ["1002"]}
+                device: {op: In, value: ["74bc"]} # MI308X HF VF
       - matchFeatures:
           - feature: pci.device
             matchExpressions:
@@ -74,11 +89,6 @@ spec:
             matchExpressions:
               vendor: {op: In, value: ["1002"]}
               device: {op: In, value: ["74a2"]} # MI308X
-      - matchFeatures:
-          - feature: pci.device
-            matchExpressions:
-              vendor: {op: In, value: ["1002"]}
-              device: {op: In, value: ["74b6"]} # MI308X
       - matchFeatures:
           - feature: pci.device
             matchExpressions:
@@ -99,11 +109,6 @@ spec:
             matchExpressions:
               vendor: {op: In, value: ["1002"]}
               device: {op: In, value: ["74a9"]} # MI300X HF
-      - matchFeatures:
-          - feature: pci.device
-            matchExpressions:
-              vendor: {op: In, value: ["1002"]}
-              device: {op: In, value: ["74bd"]} # MI300X HF
       - matchFeatures:
           - feature: pci.device
             matchExpressions:

helm-charts-k8s/templates/gpu-nfd-default-rule.yaml

@@ -23,6 +23,21 @@ spec:
             matchExpressions:
                 vendor: {op: In, value: ["1002"]}
                 device: {op: In, value: ["74b5"]} # MI300X VF
+      - matchFeatures:
+          - feature: pci.device
+            matchExpressions:
+                vendor: {op: In, value: ["1002"]}
+                device: {op: In, value: ["74bd"]} # MI300X HF VF
+      - matchFeatures:
+          - feature: pci.device
+            matchExpressions:
+                vendor: {op: In, value: ["1002"]}
+                device: {op: In, value: ["74b6"]} # MI308X VF
+      - matchFeatures:
+          - feature: pci.device
+            matchExpressions:
+                vendor: {op: In, value: ["1002"]}
+                device: {op: In, value: ["74bc"]} # MI308X HF VF
       - matchFeatures:
           - feature: pci.device
             matchExpressions:
@@ -74,11 +89,6 @@ spec:
             matchExpressions:
               vendor: {op: In, value: ["1002"]}
               device: {op: In, value: ["74a2"]} # MI308X
-      - matchFeatures:
-          - feature: pci.device
-            matchExpressions:
-              vendor: {op: In, value: ["1002"]}
-              device: {op: In, value: ["74b6"]} # MI308X
       - matchFeatures:
           - feature: pci.device
             matchExpressions:
@@ -99,11 +109,6 @@ spec:
             matchExpressions:
               vendor: {op: In, value: ["1002"]}
               device: {op: In, value: ["74a9"]} # MI300X HF
-      - matchFeatures:
-          - feature: pci.device
-            matchExpressions:
-              vendor: {op: In, value: ["1002"]}
-              device: {op: In, value: ["74bd"]} # MI300X HF
       - matchFeatures:
           - feature: pci.device
             matchExpressions: