i3c_config: 'NumPrivIds' can be set with filtering enabled

Raise an error under other circumstances.

Signed-off-by: Wiktoria Kuna <[email protected]>

Author: robertszczepanski

i3c_core_configs.yaml

@@ -47,7 +47,6 @@ axi:
   FrontendBusUserWidth: 32
   FrontendBusIdWidth: 8
   FrontendBusIdFiltering: False
-  NumPrivIds: 4
   DisableInputFF: True
 
 axi_ff:
@@ -65,5 +64,4 @@ axi_ff:
   FrontendBusUserWidth: 32
   FrontendBusIdWidth: 8
   FrontendBusIdFiltering: False
-  NumPrivIds: 4
   DisableInputFF: False

src/i3c_defines.svh

@@ -17,7 +17,6 @@
   `define AXI_DATA_WIDTH   32
   `define AXI_USER_WIDTH   32
   `define AXI_ID_WIDTH     8
-  `define NUM_PRIV_IDS     4
   `define DISABLE_INPUT_FF 1
 
 `endif  // I3C_CONFIG

tools/i3c_config/i3c_core_config.schema.json

@@ -113,25 +113,35 @@
         }
     },
     "then": {
-        "properties": {
-            "FrontendBusUserWidth": {
-                "type": "integer"
-            },
-            "FrontendBusIdWidth": {
-                "type": "integer"
-            },
-            "NumPrivIds": {
-                "type": "integer"
+        "allOf": [
+            {
+                "required": [
+                    "FrontendBusUserWidth",
+                    "FrontendBusIdWidth",
+                    "FrontendBusIdFiltering"
+                ]
             },
-            "FrontendBusIdFiltering": {
-                "type": "boolean"
+            {
+                "if": {
+                    "properties": {
+                        "FrontendBusIdFiltering": {
+                            "const": true
+                        }
+                    }
+                },
+                "then": {
+                    "required": [
+                        "NumPrivIds"
+                    ]
+                },
+                "else": {
+                    "not": {
+                        "required": [
+                            "NumPrivIds"
+                        ]
+                    }
+                }
             }
-        },
-        "required": [
-            "FrontendBusUserWidth",
-            "FrontendBusIdWidth",
-            "NumPrivIds",
-            "FrontendBusIdFiltering"
         ]
     },
     "else": {