From 3aa045a01b8c14eac56c61f87a2df55379132060 Mon Sep 17 00:00:00 2001
From: Rafael Silva <perigoso@riseup.net>
Date: Sat, 19 Aug 2023 00:27:24 +0100
Subject: [PATCH] adiv5: add aditional ap type check to ensure the class
 matches

---
 src/target/adiv5.c | 54 +++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/target/adiv5.c b/src/target/adiv5.c
index a13fe59dc0e..04210598253 100644
--- a/src/target/adiv5.c
+++ b/src/target/adiv5.c
@@ -279,32 +279,36 @@ static const char *adiv5_arm_ap_type_string(const uint8_t ap_type, const uint8_t
 	 * table C1-2 "AP Identification types for an AP designed by Arm"
 	 */
 
-	switch (ap_type) {
-	case 0x1U:
-		return "AHB3-AP";
-	case 0x2U:
-		return "APB2/3-AP";
-	/* 0x3 is not defined */
-	case 0x4U:
-		return "AXI3/4-AP";
-	case 0x5U:
-		return "AHB5-AP";
-	case 0x6U:
-		return "APB4/5-AP";
-	case 0x7U:
-		return "AXI5-AP";
-	case 0x8U:
-		return "AHB5-AP";
-	case 0U:
-		/* Type 0 APs are determined by the class code */
-		if (ap_class == 0U)
-			return "JTAG-AP";
-		if (ap_class == 1U)
-			return "COM-AP";
-	/* fall through */
-	default:
-		return "Unknown";
+	/* All types except 0 are only valid for ap_class == 0x8 */
+	if (ap_class == 0x8U || ap_type == 0U) {
+		switch (ap_type) {
+		case 0U:
+			/* Type 0 APs are determined by the class code */
+			if (ap_class == 0U)
+				return "JTAG-AP";
+			if (ap_class == 1U)
+				return "COM-AP";
+			break;
+		case 0x1U:
+			return "AHB3-AP";
+		case 0x2U:
+			return "APB2/3-AP";
+		/* 0x3 is not defined */
+		case 0x4U:
+			return "AXI3/4-AP";
+		case 0x5U:
+			return "AHB5-AP";
+		case 0x6U:
+			return "APB4/5-AP";
+		case 0x7U:
+			return "AXI5-AP";
+		case 0x8U:
+			return "AHB5-AP";
+		default:
+			break;
+		}
 	}
+	return "Unknown";
 }
 
 static const char *adiv5_cid_class_string(const cid_class_e cid_class)