scripts: sysfw_boardcfg_validator: Update to validate resasg entries

Update the sysfw_boardcfg_validator to the latest version to validate
the number of resasg entries using the 'max_resource_entries' constraint.
The sysfw_boardcfg_rules file is also updated to add the constraint
value for each of the existing AM65x, AM65x SR2.0 and J721E SoCs.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
[s-anna@ti.com: refactor patch]
Signed-off-by: Suman Anna <s-anna@ti.com>

2 files changed, 60 insertions, 27 deletions

diff --git a/scripts/sysfw_boardcfg_rules.json b/scripts/sysfw_boardcfg_rules.json
index 09da3d8aa..f11da6eb8 100644
--- a/scripts/sysfw_boardcfg_rules.json
+++ b/scripts/sysfw_boardcfg_rules.json
@@ -621,6 +621,11 @@
                         "start_resource": 0,
                         "num_resource": 32
                     }
+                ],
+                "constraints": [
+                    {
+                        "max_resource_entries": 104
+                    }
                 ]
             },
             "am65x_sr2": {
@@ -943,6 +948,11 @@
                         "start_resource": 0,
                         "num_resource": 32
                     }
+                ],
+                "constraints": [
+                    {
+                        "max_resource_entries": 104
+                    }
                 ]
             },
             "j721e": {
@@ -1349,6 +1359,11 @@
                         "start_resource": 36,
                         "num_resource": 28
                     }
+                ],
+                "constraints": [
+                    {
+                        "max_resource_entries": 420
+                    }
                 ]
             }
         }
diff --git a/scripts/sysfw_boardcfg_validator.py b/scripts/sysfw_boardcfg_validator.py
index 1cc2a6b41..6f9f37d05 100755
--- a/scripts/sysfw_boardcfg_validator.py
+++ b/scripts/sysfw_boardcfg_validator.py
@@ -145,40 +145,58 @@ class sysfw_boardcfg_rules:
 
     def validate_rm_resources(self, resources, validator):
         r_dict = [r._asdict() for r in resources]
+        num_entries = len(r_dict)
+        max_entries = 0
 
-        for entry in r_dict:
+        for constraint in validator['constraints']:
+            for k, v in constraint.items():
+                if k == 'max_resource_entries':
+                    max_entries = v
+                    break
+            if max_entries:
+                break
+
+        if num_entries > max_entries:
+            self.output_class.send_next_line(
+                'ERROR: Found %s resource entries when only %s allowed!' % (num_entries, max_entries))
             valid = False
-            closest_matches = list()
-            e_start = entry['start_resource']
-            e_end = entry['start_resource'] + entry['num_resource'] - 1
+        else:
+            self.output_class.send_next_line(
+                'Found %s resource entries' % num_entries)
 
-            for v_entry in validator['values']:
-                if entry['type'] == v_entry['type']:
-                    v_start = v_entry['start_resource']
-                    v_end = v_entry['start_resource'] + \
-                        v_entry['num_resource'] - 1
-                    closest_matches.append(v_entry)
+            for entry in r_dict:
+                valid = False
+                closest_matches = list()
+                e_start = entry['start_resource']
+                e_end = entry['start_resource'] + entry['num_resource'] - 1
 
-                    if e_start >= v_start and e_end <= v_end:
-                        valid = True
+                for v_entry in validator['values']:
+                    if entry['type'] == v_entry['type']:
+                        v_start = v_entry['start_resource']
+                        v_end = v_entry['start_resource'] + \
+                            v_entry['num_resource'] - 1
+                        closest_matches.append(v_entry)
 
-            if not valid:
-                self.output_class.send_next_line(
-                    'ERROR: Entry does not match any valid entries!')
-                for k, v in entry.items():
-                    self.output_class.send_next_line('%s - %s' % (k, v))
+                        if e_start >= v_start and e_end <= v_end:
+                            valid = True
 
-                self.output_class.send_next_line(
-                    'Closest validation matches...')
-                if closest_matches:
-                    for cm in closest_matches:
-                        for k, v in cm.items():
-                            self.output_class.send_next_line(
-                                '%s - %s' % (k, v))
-                else:
-                    self.output_class.send_next_line('None')
+                if not valid:
+                    self.output_class.send_next_line(
+                        'ERROR: Entry does not match any valid entries!')
+                    for k, v in entry.items():
+                        self.output_class.send_next_line('%s - %s' % (k, v))
 
-                break
+                    self.output_class.send_next_line(
+                        'Closest validation matches...')
+                    if closest_matches:
+                        for cm in closest_matches:
+                            for k, v in cm.items():
+                                self.output_class.send_next_line(
+                                    '%s - %s' % (k, v))
+                    else:
+                        self.output_class.send_next_line('None')
+
+                    break
 
         if valid:
             host_id_all = 128