Commit a1a87fa3 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab

[media] coda: add support for native order firmware files with Freescale header

Freescale distribute their VPU firmware files with a 16 byte header
in BIT processor native order. This patch allows to detect the header
and to reorder the firmware on the fly.
With this patch it should be possible to use the distributed
vpu_fw_imx{53,6q,6d}.bin files directly after renaming them to
v4l-coda*-imx{53,6q,6dl}.bin.
Signed-off-by: default avatarPhilipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 5eba1726
...@@ -1950,6 +1950,38 @@ static int coda_register_device(struct coda_dev *dev, int i) ...@@ -1950,6 +1950,38 @@ static int coda_register_device(struct coda_dev *dev, int i)
return video_register_device(vfd, VFL_TYPE_GRABBER, 0); return video_register_device(vfd, VFL_TYPE_GRABBER, 0);
} }
static void coda_copy_firmware(struct coda_dev *dev, const u8 * const buf,
size_t size)
{
u32 *src = (u32 *)buf;
/* Check if the firmware has a 16-byte Freescale header, skip it */
if (buf[0] == 'M' && buf[1] == 'X')
src += 4;
/*
* Check whether the firmware is in native order or pre-reordered for
* memory access. The first instruction opcode always is 0xe40e.
*/
if (__le16_to_cpup((__le16 *)src) == 0xe40e) {
u32 *dst = dev->codebuf.vaddr;
int i;
/* Firmware in native order, reorder while copying */
if (dev->devtype->product == CODA_DX6) {
for (i = 0; i < (size - 16) / 4; i++)
dst[i] = (src[i] << 16) | (src[i] >> 16);
} else {
for (i = 0; i < (size - 16) / 4; i += 2) {
dst[i] = (src[i + 1] << 16) | (src[i + 1] >> 16);
dst[i + 1] = (src[i] << 16) | (src[i] >> 16);
}
}
} else {
/* Copy the already reordered firmware image */
memcpy(dev->codebuf.vaddr, src, size);
}
}
static void coda_fw_callback(const struct firmware *fw, void *context) static void coda_fw_callback(const struct firmware *fw, void *context)
{ {
struct coda_dev *dev = context; struct coda_dev *dev = context;
...@@ -1967,8 +1999,7 @@ static void coda_fw_callback(const struct firmware *fw, void *context) ...@@ -1967,8 +1999,7 @@ static void coda_fw_callback(const struct firmware *fw, void *context)
if (ret < 0) if (ret < 0)
goto put_pm; goto put_pm;
/* Copy the whole firmware image to the code buffer */ coda_copy_firmware(dev, fw->data, fw->size);
memcpy(dev->codebuf.vaddr, fw->data, fw->size);
release_firmware(fw); release_firmware(fw);
ret = coda_hw_init(dev); ret = coda_hw_init(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment