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: Jonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: Vadim Fedorenko <vadfed@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
index d2d486ccd714c80a89d5ac93e5c968c41a99768d..154d58cbd9cebd5c145d983956f1a993b3e25b2e 100644 (file)
--- a/drivers/ptp/ptp_ocp.c
+++ b/drivers/ptp/ptp_ocp.c
@@ -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;