Commit ec56d2a6 authored Apr 02, 2015 by Pawel Moll Committed by Sasha Levin Jul 03, 2015

bus: arm-ccn: Fix node->XP config conversion



[ Upstream commit a18f8e97fe69195823d7fb5c68a8d6565f39db4b ]

Events defined as watchpoints on nodes must have their config values
converted so that they apply to the respective node's XP. The
function setting new values was using wrong mask for the "port" field,
resulting in corrupted value. Fixed now.

Cc: stable@vger.kernel.org # 3.17+
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent b5bc42d3

drivers/bus/arm-ccn.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -212,7 +212,7 @@ static int arm_ccn_node_to_xp_port(int node)

		static void arm_ccn_pmu_config_set(u64 *config, u32 node_xp, u32 type, u32 port)
		{
		*config &= ~((0xff << 0) \| (0xff << 8) \| (0xff << 24));
		*config &= ~((0xff << 0) \| (0xff << 8) \| (0x3 << 24));
		*config \|= (node_xp << 0) \| (type << 8) \| (port << 24);
		}