Received-SPF: pass (google.com: domain of linux-kernel+bounces-53862-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Ilkka Koskinen <ilkka@os.amperecomputing.com>
To: Robin Murphy <robin.murphy@arm.com>,
	Will Deacon <will@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>
Cc: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Ilkka Koskinen <ilkka@os.amperecomputing.com>
Subject: [PATCH] perf/arm-cmn: Workaround AmpereOneX errata AC04_MESH_1 (incorrect child count)
Date: Mon,  5 Feb 2024 11:46:55 -0800
Message-Id: <20240205194655.1567434-1-ilkka@os.amperecomputing.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?okzNUD0mPUDIbPPP2dQJJmLhuzkCB7pHpHXpuwr0ZGzZW1SkBoQhS4EUk7/N?=
 =?us-ascii?Q?N8XaSVb+KpNZ1Pazq48X7uMGtnruxe7ydwhCFnGRuoEiHU7egFr5qwCqILYj?=
 =?us-ascii?Q?0LHvaLNy4lid5i8xRUumqOHcAQBGsz7aBZ5M9wPZX7rY+8qv7kGrSye8G3X9?=
 =?us-ascii?Q?ag9u0eUp7W+zLJGAm0HT6Js6qMJRlYo1VUheInHeSJBJXZ1EzWeYakpjWMxv?=
 =?us-ascii?Q?ABQr7JNETXLHBowaT06GZ3IFX4AOrHytYMBINfooACZT7jWS/XzMHF7d2Wdn?=
 =?us-ascii?Q?8WXK7wkOZf3SrqNXKMLwHZvfc6EUgpX/erFj6kzpReWZRHllrmH1G9OdtcFI?=
 =?us-ascii?Q?W7/oLWW/GsvOhkWfjW4Lv+yHXQ/L5WQzoMFADZWcBlaluWzPMlyTeqcBXLJg?=
 =?us-ascii?Q?+XFfvT6Jt8Ryg7hR/2FVqNkMC7/nQOqozn9BpOy6AorBjtu4VzbDZggMqurn?=
 =?us-ascii?Q?rbuJ2bUUwIieVpgtPxauTDy5fJAzvcOIF4BZe1jqdL4R637IhYjKLAm8vyrk?=
 =?us-ascii?Q?hB7OH5Sefunju0+v2JOSxic0anJk2aXECIjLNTYdWPQQlMWrhvtAhHLUogNL?=
 =?us-ascii?Q?1zK6RVdXZNgJ/MnmPdSSByLgbccYA2IT/Ug3HNJXLJzayac70AwTFO0/0V0u?=
 =?us-ascii?Q?TaprGmUqduMwNv6SC5F2NUJ6CHPfsoGFatMo/1z+TZqMQ4eJtTIr46WVZ3Hr?=
 =?us-ascii?Q?cfRj8vbN5wEZ8WWmUB+zhsEUUzHYwAqvVPFHzExG3GPELsPIrvIo/ZQcgcSH?=
 =?us-ascii?Q?fZJbXiCRJSTYxlVJhxyI+xKKbwK0xrNHqhZ57kmTuhtl56uBAa2NQ0HWQmxd?=
 =?us-ascii?Q?W4Zb4C5dK+MQFecPBBtzNXiVNRu9U+ZeFf3GbdPETi/fT/AWiSCTPCK16dBp?=
 =?us-ascii?Q?gwzR+zu4z2Ev0r/UYgxi5a6rhk+54mZw5k+ULVzecLBYRJXD4KeiTQ9myee4?=
 =?us-ascii?Q?pApJ2X3gyB1LlTF76velHvQFwpIkoW3afN+1cfvzqOjfVdd1hTsGjEnw+qKX?=
 =?us-ascii?Q?rdx3jYlk9r7V4Ds5y5weeUC2X8jLyqPBUUfaqeLt7bhLTmfTnD6OeB2NfW1F?=
 =?us-ascii?Q?5BVwIipE7AqFcQ1WN/yaq8lCOsmhrcW5KqCchtwK+Dw8pKHz/4myzMAVwm0I?=
 =?us-ascii?Q?koYX/DuzIUBHD55bJWLRZXN7tSEecwXIpqpYkMKOKoar9p8SvRnNYUS9Izbt?=
 =?us-ascii?Q?sl7HEKQ7EOMBw/dQd2tS+TVhK8Vs+Qcxn8usGz3uSwCvNW4cvnroSRny7MCz?=
 =?us-ascii?Q?K4HWAHFjdKZisNijJdNzNVlJfa//cdFrVymD7LYjCgMvHoZQzQQ5moKlwTYu?=
 =?us-ascii?Q?wcZxXbL0GrtF2+n0o+BuSFGQvlX1LqNTpquSSHHLt6naprZWbihwK5MZrkSX?=
 =?us-ascii?Q?ls1DwZIFYpEeS5haSi4oEB5HPcyUGPGxgDHwQuHP4ZBDIDhczVS9laLtxxcZ?=
 =?us-ascii?Q?uWO0byhAse3hiGZInyYK6T0xt5ZujUqFhD0ye1St2JnaMIt4LYuRMEKkk7BC?=
 =?us-ascii?Q?jnA1sufy6iH2QgrZAKW7pnIko2Hxt332YHGdJg4+bY/sLOsBKar1X/q9jD6O?=
 =?us-ascii?Q?qbzCeBSWeRqxunJvGnykmyIp4uxuNOdyo3qr/oAMOiDDCk1g++yFR94oY56L?=
 =?us-ascii?Q?7srRpuDfl8zqtJXkhvGO7ws=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f88ca737-3e30-47fd-91a0-08dc268342c4
X-MS-Exchange-CrossTenant-AuthSource: PH0PR01MB8166.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 19:47:18.3798
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: RbsPPKVG0b8UuVd/1usqZ1vpJDBHY+scA5HPPwEXNsY02bbWClvXYNHHuiye1GTdfgJgVXqrrPW5LlEI3VKk7vAMu6Ftb+fBm7EeXxX5hf2HD5hltMGAWvFCho5sxF0I
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR01MB6696

AmpereOneX mesh implementation has a bug in HN-P nodes that makes them
report incorrect child count. The failing crosspoints report 8 children
while they only have two.

When the driver tries to access the inexistent child nodes, it believes it
has reached an invalid node type and probing fails. The workaround is to
ignore those incorrect child nodes and continue normally.

Signed-off-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>
---
 drivers/perf/arm-cmn.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
index c584165b13ba..97fed8ec3693 100644
--- a/drivers/perf/arm-cmn.c
+++ b/drivers/perf/arm-cmn.c
@@ -2168,6 +2168,23 @@ static enum cmn_node_type arm_cmn_subtype(enum cmn_node_type type)
 	}
 }
 
+static inline bool arm_cmn_is_ampereonex_bug(const struct arm_cmn *cmn,
+					     struct arm_cmn_node *dn,
+					     u16 child_count, int child)
+{
+	/*
+	 * The bug occurs only when a crosspoint reports 8 children
+	 * while it only has two HN-P child nodes.
+	 */
+	dn -= 2;
+
+	if (arm_cmn_model(cmn) == CMN650 && child_count == 8 &&
+	    child == 2 && dn->type == CMN_TYPE_HNP)
+		return true;
+
+	return false;
+}
+
 static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
 {
 	void __iomem *cfg_region;
@@ -2292,6 +2309,14 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
 
 		for (j = 0; j < child_count; j++) {
 			reg = readq_relaxed(xp_region + child_poff + j * 8);
+			if (reg == 0)
+				if (arm_cmn_is_ampereonex_bug(cmn, dn, child_count, j))
+					/*
+					 * We know there are only two real children and the rest 6
+					 * are inexistent. Thus, we can skip the rest of the loop
+					 */
+					break;
+
 			/*
 			 * Don't even try to touch anything external, since in general
 			 * we haven't a clue how to power up arbitrary CHI requesters.
-- 
2.40.1