commit 7f5912d7bae0fa6044323c650986ec4e9da48467
author Madhukar Pappireddy <madhukar.pappireddy@arm.com> Mon Dec 06 20:30:31 2021 +0100
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Mon Dec 06 20:30:31 2021 +0100
tree 62f32bc283794a30aaf92e8847a9febc86bc604e
parent b78180b0a381a9888de1e8e1e6c3389caf05c163
parent ddb0b94bd2924148e7c224a248cb0d9795ebbffa

Merge "fix(gicv3): fix iroute value wrong issue" into integration

drivers/arm/gic/v3/gicv3_private.h

diff --git a/drivers/arm/gic/v3/gicv3_private.h b/drivers/arm/gic/v3/gicv3_private.h
index 93ee1a1..3af0500 100644
--- a/drivers/arm/gic/v3/gicv3_private.h
+++ b/drivers/arm/gic/v3/gicv3_private.h
@@ -171,7 +171,7 @@
 static inline u_register_t gicd_irouter_val_from_mpidr(u_register_t mpidr,
 						       unsigned int irm)
 {
-	return (mpidr & ~(U(0xff) << 24)) |
+	return (mpidr & MPIDR_AFFINITY_MASK) |
 		((irm & IROUTER_IRM_MASK) << IROUTER_IRM_SHIFT);
 }