Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0d31d6b authored by David Woodhouse's avatar David Woodhouse Committed by David Woodhouse
Browse files

myri10ge: treat firmware data as const 



... which means allocating our own buffer for reading it back.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 9ad46a6a

drivers/net/myri10ge/myri10ge.c

+9 −2
Original line number Diff line number Diff line
@@ -529,6 +529,7 @@ static int myri10ge_load_hotplug_firmware(struct myri10ge_priv *mgp, u32 * size) 
	unsigned crc, reread_crc;

	const struct firmware *fw;

	struct device *dev = &mgp->pdev->dev;

	unsigned char *fw_readback;

	struct mcp_gen_header *hdr;

	size_t hdr_offset;

	int status;
@@ -571,9 +572,15 @@ static int myri10ge_load_hotplug_firmware(struct myri10ge_priv *mgp, u32 * size) 
		mb();

		readb(mgp->sram);

	}

	fw_readback = vmalloc(fw->size);

	if (!fw_readback) {

		status = -ENOMEM;

		goto abort_with_fw;

	}

	/* corruption checking is good for parity recovery and buggy chipset */

	memcpy_fromio(fw->data, mgp->sram + MYRI10GE_FW_OFFSET, fw->size);

	reread_crc = crc32(~0, fw->data, fw->size);

	memcpy_fromio(fw_readback, mgp->sram + MYRI10GE_FW_OFFSET, fw->size);

	reread_crc = crc32(~0, fw_readback, fw->size);

	vfree(fw_readback);

	if (crc != reread_crc) {

		dev_err(dev, "CRC failed(fw-len=%u), got 0x%x (expect 0x%x)\n",

			(unsigned)fw->size, reread_crc, crc);