From: Moritz Fischer <moritz.fischer@ettus.com>
To: atull@opensource.altera.com
Cc: michal.simek@xilinx.com, soren.brinkmann@xilinx.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, joshc@ni.com,
gregkh@linuxfoundation.org, mike.looijmans@topic.nl,
Moritz Fischer <moritz.fischer@ettus.com>
Subject: [PATCHv2] fpga: zynq-fpga: Change fw format to handle bin instead of bit.
Date: Tue, 20 Oct 2015 10:19:56 -0700 [thread overview]
Message-ID: <1445361596-12024-2-git-send-email-moritz.fischer@ettus.com> (raw)
In-Reply-To: <1445361596-12024-1-git-send-email-moritz.fischer@ettus.com>
This gets rid of the code to strip away the header and byteswap,
as well as the check for the sync word.
Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
---
v2:
- Removed early exit path in case synq seq is not found
---
drivers/fpga/zynq-fpga.c | 24 ++----------------------
1 file changed, 2 insertions(+), 22 deletions(-)
diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
index 617d382..31db550 100644
--- a/drivers/fpga/zynq-fpga.c
+++ b/drivers/fpga/zynq-fpga.c
@@ -287,9 +287,9 @@ static int zynq_fpga_ops_write(struct fpga_manager *mgr,
struct zynq_fpga_priv *priv;
int err;
char *kbuf;
- size_t i, in_count;
+ size_t in_count;
dma_addr_t dma_addr;
- u32 transfer_length = 0;
+ u32 transfer_length;
u32 intr_status;
in_count = count;
@@ -301,26 +301,6 @@ static int zynq_fpga_ops_write(struct fpga_manager *mgr,
memcpy(kbuf, buf, count);
- /* look for the sync word */
- for (i = 0; i < count - 4; i++) {
- if (memcmp(kbuf + i, "\xAA\x99\x55\x66", 4) == 0) {
- dev_dbg(priv->dev, "Found swapped sync word\n");
- break;
- }
- }
-
- /* remove the header, align the data on word boundary */
- if (i != count - 4) {
- count -= i;
- memmove(kbuf, kbuf + i, count);
- }
-
- /* fixup endianness of the data */
- for (i = 0; i < count; i += 4) {
- u32 *p = (u32 *)&kbuf[i];
- *p = swab32(*p);
- }
-
/* enable clock */
err = clk_enable(priv->clk);
if (err)
--
2.6.1
next prev parent reply other threads:[~2015-10-20 17:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-20 17:19 [PATCHv2] fpga: zynq-fpga: Replacing BIT with BIN format Moritz Fischer
2015-10-20 17:19 ` Moritz Fischer [this message]
2015-10-21 6:46 ` [PATCHv2] fpga: zynq-fpga: Change fw format to handle bin instead of bit Michal Simek
2015-10-21 10:32 ` Josh Cartwright
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=1445361596-12024-2-git-send-email-moritz.fischer@ettus.com \
--to=moritz.fischer@ettus.com \
--cc=atull@opensource.altera.com \
--cc=gregkh@linuxfoundation.org \
--cc=joshc@ni.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=mike.looijmans@topic.nl \
--cc=soren.brinkmann@xilinx.com \
/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
all inboxes | Powered by JetHome®