Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Ilkka Koskinen <ilkka@os.amperecomputing.com>
To:     Will Deacon <will@kernel.org>, Mark Rutland <mark.rutland@arm.com>,
        Robin Murphy <robin.murphy@arm.com>
Cc:     linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        Ilkka Koskinen <ilkka@os.amperecomputing.com>,
        patches@amperecomputing.com
Subject: [PATCH 1/1] perf/arm-cmn: Add more bits to child node address offset field
Date:   Mon,  8 Aug 2022 12:54:55 -0700
Message-Id: <20220808195455.79277-1-ilkka@os.amperecomputing.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zQsHamR7bz/zmujCvSHe2TNLrPbt7y84wpAGr1nLaNPstxoEaYENa04zRw7/?=
 =?us-ascii?Q?ok66vUAO7piticRqctnp2OLXvLUU9vHczQQ0cUosxUl/6+mJrfi3nZyEibLz?=
 =?us-ascii?Q?iOTGsND3ZE6J83PpN9fmTz7uZQNeuhjvQLp5qXirV4SyIZSyj3xdUCs5r5JS?=
 =?us-ascii?Q?EsSdphvQF329dpbYcgkgXjGgbwh83vIeiYDqxqZ5IHgYST2Bh1D7su7ejJZ9?=
 =?us-ascii?Q?/BsvgJKp78+9HAKtbtZv1ctktoe+KkpNWGuA6vQbjew7gOtsEyBko9k59bKq?=
 =?us-ascii?Q?/Az4nSJdHZwUEbRvY3M+dp+tzlBrj5VTC46J/xnjJESVIDqasu6vGUfJdzIW?=
 =?us-ascii?Q?Ka639izWSvjGqJmF7gz6P+tAppdunuMu9cretEyIuHpQUS2HMIjsm9UTz4MD?=
 =?us-ascii?Q?tQ8autdTTxGHDrpGAnmFZtC8F3f2puTSqDp9ucwoIAuq6TqAxu5hp3OJJeEM?=
 =?us-ascii?Q?ok5M/RNw/ET0stoVzook9f+GO150nO/uX0wbwXH6flUYjAjjbXol1AOtEr/i?=
 =?us-ascii?Q?b+7iL2vaODGBZkQ5MmYYe8ApQAcGBGdd0bSw6LQRDi+QLA9ecbz2wp2PN8k6?=
 =?us-ascii?Q?K+kLIPJ3yauLX3/mgQKLQTpaoKIEWyOsEcLER2QlQv2WOcvwcmNp60eClFrL?=
 =?us-ascii?Q?8P76mLS05enJIlDIgKe9CpyMP7kMIkQaWCshwCOZ57xd82tutFQB5kbLrVxg?=
 =?us-ascii?Q?s+M+gODcCMN/moKLO/u9Ouo0QPXu/IVMgQyHNUxdN+LYv7C/JOVrHDbtIDR3?=
 =?us-ascii?Q?wBVO5nug4uxcWi2vBuJzP5m133OoMGH8iTq38rKBuziU0pgrsgCUYiRJxlE6?=
 =?us-ascii?Q?fSXhPEhepvP7RGXgv+bJoGU7pQmmc//PVT6a1RjhYK94JqF8ccaISzKQXadD?=
 =?us-ascii?Q?utFlV8m/JoVoPtHMx/XFjs6lE0NCdTUwW3yCrmc7+nXFeilhvjGTl/AhKVTT?=
 =?us-ascii?Q?0KqwT0ZHmx3afb77/0JBMIDFvgmKFBnMktFOC+beQw+nXu/tPWRVV9kcGdEb?=
 =?us-ascii?Q?As4aFi/q6BIrOsf9jkIcgtLny5eQaFVHzlMD31nGZr5Uy1Mk0SfAvGOMiqM2?=
 =?us-ascii?Q?x+FwKc56jhsyyAOS7eK5daWpatQCKm3qXgf0ZbrXfFMpGbDca51IMb1tsWtB?=
 =?us-ascii?Q?btF17GmMxpWcoA66r8DOApF3tpO25hBKXFVj4tZkmhg+UR/HZ/EIJxLzUUeF?=
 =?us-ascii?Q?MHD4wigwLAl6LTBhzQIFMJK0BgaAh+k1Icj1KFl8pbpDvESMY9itr8ALcGIR?=
 =?us-ascii?Q?NQzIQq89lwoBuWXkljnMo9L936KPn+2XDygmy20i67jC5g6IC2ynFCkD+DL1?=
 =?us-ascii?Q?8x30UMAW4k/DeGtiTyPy4QCiQJ0MLcjvoJlFNFBdWwGBXetxonGeU8iDFKzA?=
 =?us-ascii?Q?a4w+4h1youekCmS5aVrF4WBWbe665uhE/9tYQNMUEOlg8IagAO8clcJcbPBb?=
 =?us-ascii?Q?ftRaSU3SN9Shqb/OjgaDigXDswBJzpM3htAH57N6jCfiZ48A0eXBwu0JqOru?=
 =?us-ascii?Q?kcSLgy0wxvOFhnKtu9nEVEcVm1LutzLmHt0qMtAvA4x5RkPxLCbq9gDvSXqt?=
 =?us-ascii?Q?HpJbAkALWYSWp9zhtHXbIIGbMIVy9A5nTUAWEwTMzKehbbFkFyUlR2Unlpkl?=
 =?us-ascii?Q?ew=3D=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6afbe557-4c77-4c76-f19c-08da7977eb94
X-MS-Exchange-CrossTenant-AuthSource: DM5PR0102MB3590.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2022 19:55:18.9634
 (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: kbzOWNmGz1WPorYNLZPqbN/gXoteTfO1oRCjJAm2SBMPt+e9Y/LNXmD9qkuPf/tNVj7gQ8Y4tSY7NgKlzNm16hK8q9EEj33EBJ4iXHZZ70lcMYrYRv8GHDN01A072TmD
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR01MB5096
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

CMN-600 uses bits [27:0] for child node address offset while bits [30:28]
are required to be zero.

For CMN-650, the child node address offset field has been increased
to include bits [29:0] while leaving only bit 30 set to zero.

Let's include the missing two bits and assume older implementations
comply with the spec and set bits [29:28] to 0.

Signed-off-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>
---

I have tested this patch on CMN-600 and CMN-650.

drivers/perf/arm-cmn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
index 80d8309652a4..b80a9b74662b 100644
--- a/drivers/perf/arm-cmn.c
+++ b/drivers/perf/arm-cmn.c
@@ -36,7 +36,7 @@
 #define CMN_CI_CHILD_COUNT		GENMASK_ULL(15, 0)
 #define CMN_CI_CHILD_PTR_OFFSET		GENMASK_ULL(31, 16)
 
-#define CMN_CHILD_NODE_ADDR		GENMASK(27, 0)
+#define CMN_CHILD_NODE_ADDR		GENMASK(29, 0)
 #define CMN_CHILD_NODE_EXTERNAL		BIT(31)
 
 #define CMN_MAX_DIMENSION		12
-- 
2.17.1