From: ddaney@caviumnetworks•com (David Daney)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] of/irq: Fix msi-map calculation for nonzero rid-base
Date: Tue, 9 Feb 2016 09:03:11 -0800 [thread overview]
Message-ID: <56BA1BCF.8080309@caviumnetworks.com> (raw)
In-Reply-To: <9f6845195d03b0e0b0d187bb510fbf7bd497e836.1455015344.git.robin.murphy@arm.com>
On 02/09/2016 03:04 AM, Robin Murphy wrote:
> 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: Robin Murphy <robin.murphy@arm•com>
This is equivalent to what I tested yesterday. Thanks for fixing it...
Acked-by: David Daney <david.daney@cavium•com>
> ---
> drivers/of/irq.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/of/irq.c b/drivers/of/irq.c
> index 7ee21ae..e7bfc17 100644
> --- a/drivers/of/irq.c
> +++ b/drivers/of/irq.c
> @@ -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,
>
next prev parent reply other threads:[~2016-02-09 17:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-09 11:04 [PATCH] of/irq: Fix msi-map calculation for nonzero rid-base Robin Murphy
2016-02-09 12:06 ` Marc Zyngier
2016-02-09 15:56 ` Stuart Yoder
2016-02-09 16:08 ` Mark Rutland
2016-02-09 16:17 ` Robin Murphy
2016-02-09 18:19 ` Mark Rutland
2016-02-09 16:53 ` Stuart Yoder
2016-02-09 17:03 ` David Daney [this message]
2016-02-09 18:12 ` Stuart Yoder
2016-02-11 11:04 ` Marc Zyngier
2016-02-11 18:10 ` Frank Rowand
2016-02-11 23:15 ` Rob Herring
2016-02-12 8:32 ` Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56BA1BCF.8080309@caviumnetworks.com \
--to=ddaney@caviumnetworks$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox