From patchwork Fri Jan 18 01:12:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Gupta X-Patchwork-Id: 10769267 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E5DCF6C2 for ; Fri, 18 Jan 2019 01:13:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B6E542EBB0 for ; Fri, 18 Jan 2019 01:13:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A56662EBC5; Fri, 18 Jan 2019 01:13:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BDEFF2EBB0 for ; Fri, 18 Jan 2019 01:12:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726366AbfARBM7 (ORCPT ); Thu, 17 Jan 2019 20:12:59 -0500 Received: from hqemgate15.nvidia.com ([216.228.121.64]:11349 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726182AbfARBM6 (ORCPT ); Thu, 17 Jan 2019 20:12:58 -0500 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Thu, 17 Jan 2019 17:12:35 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Thu, 17 Jan 2019 17:12:56 -0800 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Thu, 17 Jan 2019 17:12:56 -0800 Received: from ajayg.nvidia.com (172.17.174.172) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 18 Jan 2019 01:12:54 +0000 From: Ajay Gupta To: CC: , Ajay Gupta Subject: [PATCH 5/7] usb: typec: ucsi: add fw update needed check Date: Thu, 17 Jan 2019 17:12:38 -0800 Message-ID: <20190118011238.16210-1-ajayg@nvidia.com> X-Mailer: git-send-email 2.17.1 X-NVConfidentiality: public MIME-Version: 1.0 X-Originating-IP: [172.17.174.172] X-ClientProxiedBy: DRBGMAIL102.nvidia.com (10.18.16.21) To HQMAIL101.nvidia.com (172.20.187.10) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1547773955; bh=r94cYJfY/B9CqqgjZfPMkRVlE2oG4de8lrV6jOfBdJ4=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: X-NVConfidentiality:MIME-Version:X-Originating-IP: X-ClientProxiedBy:Content-Type; b=VMRw2f72aH/KNWWGfzJWY4bUpIdtpCSQRUS5Vcwu2PL6IeBwvVv9cb2JdU4z4d9Zs CMaqlKbGnk1iOtgc1msIy8Doeoxb/KXiEtI9uOnTjHP5y21t5QQLy3erCs/e7JqSBC P3TQn361X1BssQ3utw2cfqKLrgjlHMOM2jDRq4a4qRvkPXsZT/tPoGPIzO+wBCevEz t9NGFHTayElqMjus59Orgg5wzw3gHbJxIj2uL/kWTFLSKMvfTVoHrrkcMbE5Lu0xSk /7tZYcgkVa+qRGPekIYLg6ThOlI1DpwZpSK7FbCnSfkv+YoRA1xZbSO1YppttrsXgZ TTUcwx3EaIHhA== Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This will be needed to check if latest fw is already flashed. Signed-off-by: Ajay Gupta --- drivers/usb/typec/ucsi/ucsi_ccg.c | 139 ++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c index 5f341934a5af..6069a9f60d1e 100644 --- a/drivers/usb/typec/ucsi/ucsi_ccg.c +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c @@ -9,6 +9,7 @@ */ #include #include +#include #include #include #include @@ -17,6 +18,8 @@ #include #include "ucsi.h" +static int secondary_fw_min_ver = 41; +module_param(secondary_fw_min_ver, int, 0660); #define CCGX_RAB_DEVICE_MODE 0x0000 #define CCGX_RAB_INTR_REG 0x0006 #define DEV_INT BIT(0) @@ -68,6 +71,27 @@ #define FW2_METADATA_ROW 0x1FE #define FW_CFG_TABLE_SIG_SIZE 256 +enum enum_fw_mode { + BOOT, /* bootloader */ + FW1, /* FW partition-1 */ + FW2, /* FW partition-2 */ + FW_INVALID, +}; + +enum enum_flash_mode { + SECONDARY_BL, /* update secondary using bootloader */ + SECONDARY, /* update secondary using primary */ + PRIMARY, /* update primary */ + FLASH_NOT_NEEDED, /* update not required */ + FLASH_INVALID, +}; + +static const char * const ccg_fw_names[] = { + /* 0x00 */ "ccg_boot.cyacd", + /* 0x01 */ "ccg_2.cyacd", + /* 0x02 */ "ccg_1.cyacd", +}; + struct ccg_dev_info { u8 fw_mode:2; u8 two_pd_ports:2; @@ -95,6 +119,20 @@ struct version_info { struct version_format app; }; +struct fw_config_table { + u32 identity; + u16 table_size; + u8 fwct_version; + u8 is_key_change; + u8 guid[16]; + struct version_format base; + struct version_format app; + u8 primary_fw_digest[32]; + u32 key_exp_length; + u8 key_modulus[256]; + u8 key_exp[4]; +}; + /* CCGx response codes */ enum ccg_resp_code { CMD_NO_RESP = 0x00, @@ -737,6 +775,107 @@ static int ccg_cmd_validate_fw(struct ucsi_ccg *uc, unsigned int fwid) return 0; } +static bool ccg_check_fw_version(struct ucsi_ccg *uc, const char *fw_name, + struct version_format *app) +{ + const struct firmware *fw = NULL; + struct device *dev = uc->dev; + struct fw_config_table fw_cfg; + u32 cur_version, new_version; + bool is_later = false; + + if (request_firmware(&fw, fw_name, dev) != 0) { + dev_err(dev, "error: Failed to open cyacd file %s\n", fw_name); + return false; + } + + /* + * check if signed fw + * last part of fw image is fw cfg table and signature + */ + if (fw->size < sizeof(fw_cfg) + FW_CFG_TABLE_SIG_SIZE) + goto not_signed_fw; + + memcpy((uint8_t *)&fw_cfg, fw->data + fw->size - + sizeof(fw_cfg) - FW_CFG_TABLE_SIG_SIZE, sizeof(fw_cfg)); + + if (fw_cfg.identity != ('F' | ('W' << 8) | ('C' << 16) | ('T' << 24))) { + dev_info(dev, "not a signed image\n"); + goto not_signed_fw; + } + + /* compare input version with FWCT version */ + cur_version = app->build | (app->patch << 16) | + ((app->min | (app->maj << 4)) << 24); + + new_version = fw_cfg.app.build | (fw_cfg.app.patch << 16) | + ((fw_cfg.app.min | (fw_cfg.app.maj << 4)) << 24); + + dev_dbg(dev, "compare current %08x and new version %08x\n", + cur_version, new_version); + + if (new_version > cur_version) { + dev_dbg(dev, "new firmware file version is later\n"); + is_later = true; + } else { + dev_dbg(dev, "new firmware file version is same or earlier\n"); + } + +not_signed_fw: + release_firmware(fw); + return is_later; +} + +static int ccg_fw_update_needed(struct ucsi_ccg *uc, + enum enum_flash_mode *mode) +{ + struct device *dev = uc->dev; + int err; + struct version_info version[3]; + + err = ccg_read(uc, CCGX_RAB_DEVICE_MODE, (u8 *)(&uc->info), + sizeof(uc->info)); + if (err) { + dev_err(dev, "read device mode failed\n"); + return err; + } + + err = ccg_read(uc, CCGX_RAB_READ_ALL_VER, (u8 *)version, + sizeof(version)); + if (err) { + dev_err(dev, "read device mode failed\n"); + return err; + } + + dev_dbg(dev, "check if fw upgrade required %x %x %x %x %x %x %x %x\n", + version[FW1].base.build, version[FW1].base.patch, + version[FW1].base.min, version[FW1].base.maj, + version[FW2].app.build, version[FW2].app.patch, + version[FW2].app.min, version[FW2].app.maj); + + if (memcmp(&version[FW1], "\0\0\0\0\0\0\0\0", + sizeof(struct version_info)) == 0) { + dev_info(dev, "secondary fw is not flashed\n"); + *mode = SECONDARY_BL; + } else if (version[FW1].base.build < secondary_fw_min_ver) { + dev_info(dev, "secondary fw version is too low (< %d)\n", + secondary_fw_min_ver); + *mode = SECONDARY; + } else if (memcmp(&version[FW2], "\0\0\0\0\0\0\0\0", + sizeof(struct version_info)) == 0) { + dev_info(dev, "primary fw is not flashed\n"); + *mode = PRIMARY; + } else if (ccg_check_fw_version(uc, ccg_fw_names[PRIMARY], + &version[FW2].app)) { + dev_info(dev, "found primary fw with later version\n"); + *mode = PRIMARY; + } else { + dev_info(dev, "secondary and primary fw are the latest\n"); + *mode = FLASH_NOT_NEEDED; + } + return 0; +} + static int ucsi_ccg_probe(struct i2c_client *client, const struct i2c_device_id *id) {