Commit c1fd463d authored by Vadim Fedorenko's avatar Vadim Fedorenko Committed by David S. Miller
Browse files

ptp: ocp: remove flash image header check fallback 



Previously there was a fallback mode to flash firmware image without
proper header. But now we have different supported vendors and flashing
wrong image could destroy the hardware. Remove fallback mode and force
header check. Both vendors have published firmware images with headers.

Acked-by: default avatarJonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: default avatarVadim Fedorenko <vadfed@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ee6439aa

drivers/ptp/ptp_ocp.c

+2 −5
Original line number Diff line number Diff line
@@ -1530,11 +1530,9 @@ ptp_ocp_devlink_fw_image(struct devlink *devlink, const struct firmware *fw, 
	hdr = (const struct ptp_ocp_firmware_header *)fw->data;

	if (memcmp(hdr->magic, OCP_FIRMWARE_MAGIC_HEADER, 4)) {

		devlink_flash_update_status_notify(devlink,

			"No firmware header found, flashing raw image",

			"No firmware header found, cancel firmware upgrade",

			NULL, 0, 0);

		offset = 0;

		length = fw->size;

		goto out;

		return -EINVAL;

	}



	if (be16_to_cpu(hdr->pci_vendor_id) != bp->pdev->vendor ||
@@ -1562,7 +1560,6 @@ ptp_ocp_devlink_fw_image(struct devlink *devlink, const struct firmware *fw, 
		return -EINVAL;

	}



out:

	*data = &fw->data[offset];

	*size = length;