From patchwork Mon Oct 17 21:59:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadim Fedorenko X-Patchwork-Id: 13009629 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 173FBC43217 for ; Mon, 17 Oct 2022 22:00:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230102AbiJQWAt (ORCPT ); Mon, 17 Oct 2022 18:00:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230136AbiJQWAp (ORCPT ); Mon, 17 Oct 2022 18:00:45 -0400 Received: from novek.ru (unknown [213.148.174.62]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 376FF7697E for ; Mon, 17 Oct 2022 15:00:40 -0700 (PDT) Received: from nat1.ooonet.ru (gw.zelenaya.net [91.207.137.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by novek.ru (Postfix) with ESMTPSA id 94706504ECC; Tue, 18 Oct 2022 00:56:32 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 novek.ru 94706504ECC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=novek.ru; s=mail; t=1666043793; bh=YJfnpm9QMEktbfNCEhntfvETmmCOFNPX1RGTPwd4ORE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XkD0PMb03crvTxj0rCXxlDzBHCRsnhoD9w2qdZqdMluwrEl7fuUCy39Z/Kk0+f6k7 9KvQLS40ygVLidQq87Ly5uwJToCx2+h4y5ab+KiQzijab5I5b1E2uSHfQ4WUlvV46j H3GWzW8I8SJWJkYqaAbUFUULC1fGbW0dQJERcwfo= From: Vadim Fedorenko To: Richard Cochran , Jonathan Lemon , Jakub Kicinski Cc: netdev@vger.kernel.org, Vadim Fedorenko Subject: [PATCH net-next 5/5] ptp: ocp: remove flash image header check fallback Date: Tue, 18 Oct 2022 00:59:47 +0300 Message-Id: <20221017215947.7438-6-vfedorenko@novek.ru> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221017215947.7438-1-vfedorenko@novek.ru> References: <20221017215947.7438-1-vfedorenko@novek.ru> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Vadim Fedorenko 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. Signed-off-by: Vadim Fedorenko --- drivers/ptp/ptp_ocp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c index 82d17b90fe16..3788daf1e541 100644 --- a/drivers/ptp/ptp_ocp.c +++ b/drivers/ptp/ptp_ocp.c @@ -1536,11 +1536,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 ||