From patchwork Thu Apr 11 20:03:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Gupta X-Patchwork-Id: 10896759 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 64D111800 for ; Thu, 11 Apr 2019 20:03:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F1DB28D13 for ; Thu, 11 Apr 2019 20:03:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4365A28DB4; Thu, 11 Apr 2019 20:03:27 +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,FREEMAIL_FROM,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 C679528D13 for ; Thu, 11 Apr 2019 20:03:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726667AbfDKUD0 (ORCPT ); Thu, 11 Apr 2019 16:03:26 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:35681 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726577AbfDKUDZ (ORCPT ); Thu, 11 Apr 2019 16:03:25 -0400 Received: by mail-pf1-f193.google.com with SMTP id t21so3973500pfh.2 for ; Thu, 11 Apr 2019 13:03:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v+Tgxfcou92wUpCjGv9PntjB0Kbc9s02uFIb05N0kyM=; b=J6rHDzm+eH+52RXJ/u9AvCG4hduyWEqwyLxUBjM7i+lUSKlGIJ7naLyc8wcvHjBQeY b6CiMGVAk1e+b0SqFnpv3Tu3ZiLwQQ+83XYw/Z/bMXinpGtQv5zrzytgXr4LAmpt+R/P 6/T9K6GdNiLbSdrtVISTKfnopStK+QVyAT36Nlg6GI6S+9H9NBcQHRgBjwXBry/qFP9k k2cfqrLYHqtEctGYVNitN/aWUL/jXqvZqWuPl/k6mmtSeDuCAKmObPk/TtA3lTVDYuJ+ no6+9dk0JMcsLMFbTjayHNEecyoGjxCTaG+f9w+gjk4blGACajiotWcMx5dIquc05xDE Qxlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=v+Tgxfcou92wUpCjGv9PntjB0Kbc9s02uFIb05N0kyM=; b=Rcy0ahKt5wa47Wtb91TBtgFK8Fsmlkr3b047bqcAuoXJalap6lNWt6weJ+oKc7Ku2Y 0Evqv8n/DqbQXb+AmWedfx/e0fFfkGVaGk/hMYkh+XTBm7Wmd+YzTdBbmcOrwQ5Z2wSA HlZCjC3AD4M5cjSsYHUtq82RNyVNM10ljzS3XjSHNPFdGss/slH8I3G3EGQXUv2rHwOu 98otUn1YhnRfXRo2XP+P4fPIEyPtY5CktU44T8PqIdtOcMQxjXSOQAP++qEWaPygOKKH BsjHTOiKy3nGeJTjg0a96kXYsQ0WtZhHfTsUzv10N/6zyY9oQRQ1G6p4E6FgWTkPCi2k Cb+A== X-Gm-Message-State: APjAAAX4yt2Z0iid+EccN350jxHJ8xCjZhovyYa6epPXjor7Cyj38K8Y Djz2Rb2yE+qO4F4gFgpE7Bk= X-Google-Smtp-Source: APXvYqwDWQZwu3xAng7gn0xPpmm/6slVQbRSJtSlnMhCTn10hZeUEJYB5gFRrtWTGKahDO5TplezoQ== X-Received: by 2002:a63:744b:: with SMTP id e11mr48573395pgn.327.1555013005042; Thu, 11 Apr 2019 13:03:25 -0700 (PDT) Received: from ajayg.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id n26sm107920326pfi.165.2019.04.11.13.03.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Apr 2019 13:03:24 -0700 (PDT) From: Ajay Gupta X-Google-Original-From: Ajay Gupta To: heikki.krogerus@linux.intel.com Cc: linux-usb@vger.kernel.org, Ajay Gupta Subject: [PATCH v6 1/2] usb: typec: ucsi: ccg: add get_fw_info function Date: Thu, 11 Apr 2019 13:03:09 -0700 Message-Id: <20190411200310.9775-2-ajayg@nvidia.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190411200310.9775-1-ajayg@nvidia.com> References: <20190411200310.9775-1-ajayg@nvidia.com> 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 Function is to get the details of ccg firmware and device version. It will be useful in debugging and also during firmware update. Signed-off-by: Ajay Gupta Signed-off-by: Heikki Krogerus --- Changes from v5 to v6 - None drivers/usb/typec/ucsi/ucsi_ccg.c | 66 ++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c index de8a43bdff68..3884fb41c72e 100644 --- a/drivers/usb/typec/ucsi/ucsi_ccg.c +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c @@ -17,15 +17,54 @@ #include #include "ucsi.h" +enum enum_fw_mode { + BOOT, /* bootloader */ + FW1, /* FW partition-1 (contains secondary fw) */ + FW2, /* FW partition-2 (contains primary fw) */ + FW_INVALID, +}; + +struct ccg_dev_info { +#define CCG_DEVINFO_FWMODE_SHIFT (0) +#define CCG_DEVINFO_FWMODE_MASK (0x3 << CCG_DEVINFO_FWMODE_SHIFT) +#define CCG_DEVINFO_PDPORTS_SHIFT (2) +#define CCG_DEVINFO_PDPORTS_MASK (0x3 << CCG_DEVINFO_PDPORTS_SHIFT) + u8 mode; + u8 bl_mode; + __le16 silicon_id; + __le16 bl_last_row; +} __packed; + +struct version_format { + __le16 build; + u8 patch; + u8 ver; +#define CCG_VERSION_MIN_SHIFT (0) +#define CCG_VERSION_MIN_MASK (0xf << CCG_VERSION_MIN_SHIFT) +#define CCG_VERSION_MAJ_SHIFT (4) +#define CCG_VERSION_MAJ_MASK (0xf << CCG_VERSION_MAJ_SHIFT) +} __packed; + +struct version_info { + struct version_format base; + struct version_format app; +}; + struct ucsi_ccg { struct device *dev; struct ucsi *ucsi; struct ucsi_ppm ppm; struct i2c_client *client; + struct ccg_dev_info info; + /* version info for boot, primary and secondary */ + struct version_info version[FW2 + 1]; }; -#define CCGX_RAB_INTR_REG 0x06 -#define CCGX_RAB_UCSI_CONTROL 0x39 +#define CCGX_RAB_DEVICE_MODE 0x0000 +#define CCGX_RAB_INTR_REG 0x0006 +#define CCGX_RAB_READ_ALL_VER 0x0010 +#define CCGX_RAB_READ_FW2_VER 0x0020 +#define CCGX_RAB_UCSI_CONTROL 0x0039 #define CCGX_RAB_UCSI_CONTROL_START BIT(0) #define CCGX_RAB_UCSI_CONTROL_STOP BIT(1) #define CCGX_RAB_UCSI_DATA_BLOCK(offset) (0xf000 | ((offset) & 0xff)) @@ -220,6 +259,23 @@ static irqreturn_t ccg_irq_handler(int irq, void *data) return IRQ_HANDLED; } +static int get_fw_info(struct ucsi_ccg *uc) +{ + int err; + + err = ccg_read(uc, CCGX_RAB_READ_ALL_VER, (u8 *)(&uc->version), + sizeof(uc->version)); + if (err < 0) + return err; + + err = ccg_read(uc, CCGX_RAB_DEVICE_MODE, (u8 *)(&uc->info), + sizeof(uc->info)); + if (err < 0) + return err; + + return 0; +} + static int ucsi_ccg_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -248,6 +304,12 @@ static int ucsi_ccg_probe(struct i2c_client *client, return status; } + status = get_fw_info(uc); + if (status < 0) { + dev_err(uc->dev, "get_fw_info failed - %d\n", status); + return status; + } + status = devm_request_threaded_irq(dev, client->irq, NULL, ccg_irq_handler, IRQF_ONESHOT | IRQF_TRIGGER_HIGH,