linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: jgunthorpe@obsidianresearch.com (Jason Gunthorpe)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] fpga zynq: Check the bitstream for validity
Date: Tue, 8 Nov 2016 09:24:51 -0700	[thread overview]
Message-ID: <20161108162451.GA31453@obsidianresearch.com> (raw)
In-Reply-To: <2e0ed43b-9a3e-48d4-4e8a-60d6f25ca4ee@suse.com>

On Tue, Nov 08, 2016 at 10:59:43AM +0100, Matthias Brugger wrote:

> > 	/* don't globally reset PL if we're doing partial reconfig */
> > 	if (!(flags & FPGA_MGR_PARTIAL_RECONFIG)) {
> >+		if (!zynq_fpga_has_sync(buf, count)) {
> 
> Maybe we should add an error message here to let the user know what went
> wrong, as I think this error path could easily be hit by an user.

Sure, happy with this wording:

diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
index de475a6a1882..2f3da4c6e2e6 100644
--- a/drivers/fpga/zynq-fpga.c
+++ b/drivers/fpga/zynq-fpga.c
@@ -181,7 +181,7 @@ static irqreturn_t zynq_fpga_isr(int irq, void *data)
  */
 static bool zynq_fpga_has_sync(const char *buf, size_t count)
 {
-	for (; count > 4; buf += 4, --count)
+	for (; count > 4; buf += 4, count -= 4)
 		if (buf[0] == 0x66 && buf[1] == 0x55 && buf[2] == 0x99 &&
 		    buf[3] == 0xaa)
 			return true;
@@ -200,8 +200,11 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr, u32 flags,
 	/* The hardware can only DMA multiples of 4 bytes, and we need at
 	 * least the sync word and something else to do anything.
 	 */
-	if (count <= 4 || (count % 4) != 0)
+	if (count <= 4 || (count % 4) != 0) {
+		dev_err(priv->dev,
+			"Invalid bitstream size, must be multiples of 4 bytes");
 		return -EINVAL;
+	}
 
 	err = clk_enable(priv->clk);
 	if (err)
@@ -210,6 +213,8 @@ static int zynq_fpga_ops_write_init(struct fpga_manager *mgr, u32 flags,
 	/* don't globally reset PL if we're doing partial reconfig */
 	if (!(flags & FPGA_MGR_PARTIAL_RECONFIG)) {
 		if (!zynq_fpga_has_sync(buf, count)) {
+			dev_err(priv->dev,
+				"Invalid bitstream, could not find a sync word. Bitstream must be a byte swaped .bin file");
 			err = -EINVAL;
 			goto out_err;
 		}

  reply	other threads:[~2016-11-08 16:24 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-26 22:54 [PATCH] fpga zynq: Check the bitstream for validity Jason Gunthorpe
2016-10-27  7:42 ` Michal Simek
2016-10-27 14:32   ` Jason Gunthorpe
2016-10-27  8:50 ` Matthias Brugger
2016-10-27 14:39   ` Jason Gunthorpe
2016-10-28 11:06     ` Matthias Brugger
2016-10-28 15:47       ` Jason Gunthorpe
2016-10-28 16:36         ` Matthias Brugger
2016-10-28 16:55           ` Jason Gunthorpe
2016-10-28 18:23             ` Moritz Fischer
2016-10-28 20:26               ` Jason Gunthorpe
2016-10-28 21:00                 ` Moritz Fischer
2016-10-28 22:05                   ` Jason Gunthorpe
2016-10-29  0:09                     ` Moritz Fischer
2016-10-31 16:23                       ` Jason Gunthorpe
2016-11-01  6:39                         ` Michal Simek
2016-11-01 15:33                           ` Jason Gunthorpe
2016-11-01 17:48                             ` Michal Simek
2016-11-08  0:05                               ` Jason Gunthorpe
2016-11-09 14:21                                 ` Mike Looijmans
2016-11-09 15:18                                   ` Matthias Brugger
2016-11-09 16:00                                     ` Jason Gunthorpe
2016-11-09 15:56                                   ` Jason Gunthorpe
2016-11-09 17:31                                     ` Mike Looijmans
2016-11-28 18:00                                   ` Jason Gunthorpe
2016-11-08  0:46                       ` Jason Gunthorpe
2016-11-08  9:59                         ` Matthias Brugger
2016-11-08 16:24                           ` Jason Gunthorpe [this message]
2016-10-28 11:12 ` Matthias Brugger
2016-10-28 15:48   ` Jason Gunthorpe
2016-10-28 16:37     ` Matthias Brugger

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=20161108162451.GA31453@obsidianresearch.com \
    --to=jgunthorpe@obsidianresearch.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).