From bb7296d77f171c7bfbafab30ed51e9be29660e39 Mon Sep 17 00:00:00 2001
From: Federico Serafini <federico.serafini@bugseng.com>
Date: Tue, 29 Oct 2024 11:05:00 +0100
Subject: [PATCH] automation/eclair: monitor Rules 11.2 and 18.1 and update
 configuration

Add Rule 11.2 and Rule 18.1 to the monitored set.

Tag Rule 7.3 as clean.
Tag Rule 11.2 and Rule 20.7 as clean only for arm.

Rule 2.2, Rule 9.5 and Directive 4.12 are not accepted: do not enable
them and do not tag them as clean. Same for D4.3.

Signed-off-by: Federico Serafini <federico.serafini@bugseng.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---
 automation/eclair_analysis/ECLAIR/monitored.ecl | 5 ++---
 automation/eclair_analysis/ECLAIR/tagging.ecl   | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/automation/eclair_analysis/ECLAIR/monitored.ecl b/automation/eclair_analysis/ECLAIR/monitored.ecl
index 4d9ef1bd83d6..4e1deef7a7d9 100644
--- a/automation/eclair_analysis/ECLAIR/monitored.ecl
+++ b/automation/eclair_analysis/ECLAIR/monitored.ecl
@@ -6,13 +6,11 @@
 -enable=MC3R1.D4.7
 -enable=MC3R1.D4.10
 -enable=MC3R1.D4.11
--enable=MC3R1.D4.12
 -enable=MC3R1.D4.14
 -enable=MC3R1.R1.1
 -enable=MC3R1.R1.3
 -enable=MC3R1.R1.4
 -enable=MC3R1.R2.1
--enable=MC3R1.R2.2
 -enable=MC3R1.R2.6
 -enable=MC3R1.R3.1
 -enable=MC3R1.R3.2
@@ -43,10 +41,10 @@
 -enable=MC3R1.R9.2
 -enable=MC3R1.R9.3
 -enable=MC3R1.R9.4
--enable=MC3R1.R9.5
 -enable=MC3R1.R10.1
 -enable=MC3R1.R10.2
 -enable=MC3R1.R11.1
+-enable=MC3R1.R11.2
 -enable=MC3R1.R11.7
 -enable=MC3R1.R11.8
 -enable=MC3R1.R11.9
@@ -66,6 +64,7 @@
 -enable=MC3R1.R17.4
 -enable=MC3R1.R17.5
 -enable=MC3R1.R17.6
+-enable=MC3R1.R18.1
 -enable=MC3R1.R18.2
 -enable=MC3R1.R18.6
 -enable=MC3R1.R18.8
diff --git a/automation/eclair_analysis/ECLAIR/tagging.ecl b/automation/eclair_analysis/ECLAIR/tagging.ecl
index 76032b1fe1a6..e1d4ed012a0d 100644
--- a/automation/eclair_analysis/ECLAIR/tagging.ecl
+++ b/automation/eclair_analysis/ECLAIR/tagging.ecl
@@ -28,7 +28,6 @@ MC3R1.D4.14||
 MC3R1.R1.1||
 MC3R1.R1.3||
 MC3R1.R1.4||
-MC3R1.R2.2||
 MC3R1.R2.6||
 MC3R1.R3.1||
 MC3R1.R3.2||
@@ -42,6 +41,7 @@ MC3R1.R6.1||
 MC3R1.R6.2||
 MC3R1.R7.1||
 MC3R1.R7.2||
+MC3R1.R7.3||
 MC3R1.R7.4||
 MC3R1.R8.1||
 MC3R1.R8.2||
@@ -54,7 +54,6 @@ MC3R1.R8.14||
 MC3R1.R9.2||
 MC3R1.R9.3||
 MC3R1.R9.4||
-MC3R1.R9.5||
 MC3R1.R10.2||
 MC3R1.R11.6||
 MC3R1.R11.7||
@@ -109,11 +108,11 @@ MC3R1.R22.10"
 -setq=target,getenv("XEN_TARGET_ARCH")
 
 if(string_equal(target,"x86_64"),
-    service_selector({"additional_clean_guidelines","MC3R1.D4.3"})
+    service_selector({"additional_clean_guidelines","none()"})
 )
 
 if(string_equal(target,"arm64"),
-    service_selector({"additional_clean_guidelines","MC3R1.R2.1||MC3R1.R5.3||MC3R1.R7.3||MC3R1.R16.3||MC3R1.R16.6"})
+    service_selector({"additional_clean_guidelines","MC3R1.R2.1||MC3R1.R5.3||MC3.R11.2||MC3R1.R16.3||MC3R1.R16.6||MC3R1.R20.7"})
 )
 
 -reports+={clean:added,"service(clean_guidelines_common||additional_clean_guidelines)"}