Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d589d81 authored by Robin Murphy's avatar Robin Murphy Committed by Rob Herring
Browse files

of/irq: Fix msi-map calculation for nonzero rid-base 



The existing msi-map code is fine for shifting the entire RID space
upwards, but attempting finer-grained remapping reveals a bug. It turns
out that we are mistakenly treating the msi-base part as an offset, not
as a new base to remap onto, so things get squiffy when rid-base is
nonzero. Fix this, and at the same time add a sanity check against
having msi-map-mask clash with a nonzero rid-base, as that's another
thing one can easily get wrong.

CC: <stable@vger.kernel.org>
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Tested-by: default avatarStuart Yoder <stuart.yoder@nxp.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarDavid Daney <david.daney@cavium.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 388f7b1d

drivers/of/irq.c

+8 −1
Original line number Diff line number Diff line
@@ -635,6 +635,13 @@ static u32 __of_msi_map_rid(struct device *dev, struct device_node **np, 
		msi_base = be32_to_cpup(msi_map + 2);

		rid_len = be32_to_cpup(msi_map + 3);



		if (rid_base & ~map_mask) {

			dev_err(parent_dev,

				"Invalid msi-map translation - msi-map-mask (0x%x) ignores rid-base (0x%x)\n",

				map_mask, rid_base);

			return rid_out;

		}



		msi_controller_node = of_find_node_by_phandle(phandle);



		matched = (masked_rid >= rid_base &&
@@ -654,7 +661,7 @@ static u32 __of_msi_map_rid(struct device *dev, struct device_node **np, 
	if (!matched)

		return rid_out;



	rid_out = masked_rid + msi_base;

	rid_out = masked_rid - rid_base + msi_base;

	dev_dbg(dev,

		"msi-map at: %s, using mask %08x, rid-base: %08x, msi-base: %08x, length: %08x, rid: %08x -> %08x\n",

		dev_name(parent_dev), map_mask, rid_base, msi_base,