From: Stuart Yoder <stuart.yoder@xxxxxxx> The binding for msi-map specifies that the output requester id should be computed as: (r - rid-base + msi-base) ...update the code accordingly. Signed-off-by: Stuart Yoder <stuart.yoder@xxxxxxx> --- drivers/of/irq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/of/irq.c b/drivers/of/irq.c index 706e3ff..3f5e5fd 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -589,6 +589,7 @@ static u32 __of_msi_map_rid(struct device *dev, struct device_node **np, struct device_node *msi_controller_node; struct device_node *msi_np = *np; u32 map_mask, masked_rid, rid_base, msi_base, rid_len, phandle; + u32 masked_rid_base; int msi_map_len; bool matched; u32 rid_out = rid_in; @@ -654,7 +655,8 @@ static u32 __of_msi_map_rid(struct device *dev, struct device_node **np, if (!matched) return rid_out; - rid_out = masked_rid + msi_base; + masked_rid_base = map_mask & rid_base; + rid_out = msi_base + (masked_rid - masked_rid_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, -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
