From patchwork Thu Aug 30 00:33:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Gupta X-Patchwork-Id: 10581097 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 9FD78174C for ; Thu, 30 Aug 2018 00:33:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82C012BCC7 for ; Thu, 30 Aug 2018 00:33:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7666C2BCCB; Thu, 30 Aug 2018 00:33:35 +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 D31432BCC7 for ; Thu, 30 Aug 2018 00:33:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727193AbeH3Ec5 (ORCPT ); Thu, 30 Aug 2018 00:32:57 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:40768 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725760AbeH3Ec5 (ORCPT ); Thu, 30 Aug 2018 00:32:57 -0400 Received: by mail-pg1-f195.google.com with SMTP id a13-v6so367906pgt.7; Wed, 29 Aug 2018 17:33:30 -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; bh=4EuKEW7wt2wIFz0llosJtMBTqQRhWIDH8pOFuXrlg8U=; b=t4lqCui/OBanXTfPb6nW8oiLhfYmQzRPm4kmassFRSOLLe/5U4KhspUax4Y/n1O7Pn JxnuWaGKEurFuJY0hXlRgtTa6PEiaLOZBlppu4GnqdG2MPUyNqUmKc4YxpjLKvHnpbQ9 8effOzEOcbGlE2uHSBE1GWW0St9u/8Z4JRp5q2bGGhZaySCRJ/WeUw5df2G+hlLsU/IV JSbnVaQYyUECqFbr0COLwGgPdy2U0yexQyZrYtDhL23ejc3ptWNAtbyRJOl7elOkjFl2 MuhdNC2c+ZBStPqbXATHicHomCoAN3Me8SynEESoiZ0uBLHDEPNkVu0lgDho4VprdyT7 Tqnw== 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; bh=4EuKEW7wt2wIFz0llosJtMBTqQRhWIDH8pOFuXrlg8U=; b=UsLH0ZsPjzC0Sca0oFHkEp/FRRVZyOAuAuhgbAOXcr0tndoA8ll5GDgmwoYyCGAnkr +VF9AjZAfJsKTcsh4OHxUSDnpca2EExpMAsRLdwfXFiqpXoaUqEqZvc1PR1PjEW2pUfa 5ZrhI+PxuxPQHSjx++iox/77XlvG1EKlK4+uh0P1kbVvWJamS5t7U+5u+qLDX2i/uEYY jAjrY4Yo7VyA6tolz2eyjSvinrYXs0zZqAa2u4sjkZ9GkvaGvV4qtrPk/+L3JIYmvR8K 5h4gt3WLObxjH2/ziy3PwnLNI5jy48MnkkDuCR7LWxWFltuaxhKQPswUSlGHA05NHNTz BSpQ== X-Gm-Message-State: APzg51DxRRzG2xifZWQpnTBA45ljTW35MVKomHJcMl7ROeg8BI53BXj5 +d02bI82wfF+S7iKsS3uyTivp17K X-Google-Smtp-Source: ANB0Vdb3V7Oq8dQra/tF32G75S0FG2PLPxzNSPP2OketS9qG0TDmDMPUFlZlJKv/vlUmEbfn2mR/Dg== X-Received: by 2002:a62:c8d2:: with SMTP id i79-v6mr8039043pfk.35.1535589210093; Wed, 29 Aug 2018 17:33:30 -0700 (PDT) Received: from ajayg.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id 5-v6sm7364411pgc.86.2018.08.29.17.33.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Aug 2018 17:33:28 -0700 (PDT) From: ajaykuee@gmail.com X-Google-Original-From: ajayg@nvidia.com To: wsa@the-dreams.de, heikki.krogerus@linux.intel.com Cc: linux-usb@vger.kernel.org, linux-i2c@vger.kernel.org, Ajay Gupta Subject: [PATCH v3 1/2] i2c: buses: add i2c bus driver for NVIDIA GPU Date: Wed, 29 Aug 2018 17:33:17 -0700 Message-Id: <1535589198-16733-1-git-send-email-ajayg@nvidia.com> X-Mailer: git-send-email 2.7.4 X-NVConfidentiality: public 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 From: Ajay Gupta Latest NVIDIA GPU card has USB Type-C interface. There is a Type-C controller which can be accessed over I2C. This driver adds I2C bus driver to communicate with Type-C controller. I2C client driver will be part of USB Type-C UCSI driver. Signed-off-by: Ajay Gupta Reviewed-by: Andy Shevchenko --- Changes from v1 -> v2 None Changes from v2 -> v3 Fixed review comments from Andy and Thierry Rename i2c-gpu.c -> i2c-nvidia-gpu.c Documentation/i2c/busses/i2c-nvidia-gpu | 18 ++ MAINTAINERS | 7 + drivers/i2c/busses/Kconfig | 9 + drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-nvidia-gpu.c | 389 ++++++++++++++++++++++++++++++++ 5 files changed, 424 insertions(+) create mode 100644 Documentation/i2c/busses/i2c-nvidia-gpu create mode 100644 drivers/i2c/busses/i2c-nvidia-gpu.c diff --git a/Documentation/i2c/busses/i2c-nvidia-gpu b/Documentation/i2c/busses/i2c-nvidia-gpu new file mode 100644 index 0000000..31884d2 --- /dev/null +++ b/Documentation/i2c/busses/i2c-nvidia-gpu @@ -0,0 +1,18 @@ +Kernel driver i2c-nvidia-gpu + +Datasheet: not publicly available. + +Authors: + Ajay Gupta + +Description +----------- + +i2c-nvidia-gpu is a driver for I2C controller included in NVIDIA Turing +and later GPUs and it is used to communicate with Type-C controller on GPUs. + +If your 'lspci -v' listing shows something like the following, + +01:00.3 Serial bus controller [0c80]: NVIDIA Corporation Device 1ad9 (rev a1) + +then this driver should support the I2C controller of your GPU. diff --git a/MAINTAINERS b/MAINTAINERS index 9ad052a..2d1c5a1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6797,6 +6797,13 @@ L: linux-acpi@vger.kernel.org S: Maintained F: drivers/i2c/i2c-core-acpi.c +I2C CONTROLLER DRIVER FOR NVIDIA GPU +M: Ajay Gupta +L: linux-i2c@vger.kernel.org +S: Maintained +F: Documentation/i2c/busses/i2c-nvidia-gpu +F: drivers/i2c/busses/i2c-nvidia-gpu.c + I2C MUXES M: Peter Rosin L: linux-i2c@vger.kernel.org diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 451d4ae..eed827b 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -224,6 +224,15 @@ config I2C_NFORCE2_S4985 This driver can also be built as a module. If so, the module will be called i2c-nforce2-s4985. +config I2C_NVIDIA_GPU + tristate "NVIDIA GPU I2C controller" + depends on PCI + help + If you say yes to this option, support will be included for the + NVIDIA GPU I2C controller which is used to communicate with the GPU's + Type-C controller. This driver can also be built as a module called + i2c-nvidia-gpu. + config I2C_SIS5595 tristate "SiS 5595" depends on PCI diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile index 18b26af..d499813 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -140,5 +140,6 @@ obj-$(CONFIG_I2C_SIBYTE) += i2c-sibyte.o obj-$(CONFIG_I2C_XGENE_SLIMPRO) += i2c-xgene-slimpro.o obj-$(CONFIG_SCx200_ACB) += scx200_acb.o obj-$(CONFIG_I2C_FSI) += i2c-fsi.o +obj-$(CONFIG_I2C_NVIDIA_GPU) += i2c-nvidia-gpu.o ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c new file mode 100644 index 0000000..fa01187 --- /dev/null +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c @@ -0,0 +1,389 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Nvidia GPU I2C controller Driver + * + * Copyright (C) 2018 NVIDIA Corporation. All rights reserved. + * Author: Ajay Gupta + * + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* I2C definitions */ +#define I2C_MST_CNTL 0x0 +#define I2C_MST_CNTL_GEN_START BIT(0) +#define I2C_MST_CNTL_GEN_STOP BIT(1) +#define I2C_MST_CNTL_CMD_NONE (0 << 2) +#define I2C_MST_CNTL_CMD_READ (1 << 2) +#define I2C_MST_CNTL_CMD_WRITE (2 << 2) +#define I2C_MST_CNTL_GEN_RAB BIT(4) +#define I2C_MST_CNTL_BURST_SIZE_SHIFT (6) +#define I2C_MST_CNTL_GEN_NACK BIT(28) +#define I2C_MST_CNTL_STATUS (3 << 29) +#define I2C_MST_CNTL_STATUS_OKAY (0 << 29) +#define I2C_MST_CNTL_STATUS_NO_ACK (1 << 29) +#define I2C_MST_CNTL_STATUS_TIMEOUT (2 << 29) +#define I2C_MST_CNTL_STATUS_BUS_BUSY (3 << 29) +#define I2C_MST_CNTL_CYCLE_TRIGGER BIT(31) + +#define I2C_MST_ADDR 0x04 +#define I2C_MST_ADDR_DAB 0 + +#define I2C_MST_I2C0_TIMING 0x08 +#define I2C_MST_I2C0_TIMING_SCL_PERIOD_100KHZ 0x10e +#define I2C_MST_I2C0_TIMING_TIMEOUT_CLK_CNT 16 +#define I2C_MST_I2C0_TIMING_TIMEOUT_CLK_CNT_MAX 255 +#define I2C_MST_I2C0_TIMING_TIMEOUT_CHECK BIT(24) + +#define I2C_MST_DATA 0x0c + +#define I2C_MST_HYBRID_PADCTL 0x20 +#define I2C_MST_HYBRID_PADCTL_MODE_I2C BIT(0) +#define I2C_MST_HYBRID_PADCTL_I2C_SCL_INPUT_RCV BIT(14) +#define I2C_MST_HYBRID_PADCTL_I2C_SDA_INPUT_RCV BIT(15) + +struct gpu_i2c_dev { + struct pci_dev *pci_dev; + void __iomem *regs; + struct i2c_adapter adapter; + struct i2c_client *client; + struct mutex mutex; /* to sync read/write */ + bool do_start; +}; + +static void enable_i2c_bus(struct gpu_i2c_dev *i2cd) +{ + u32 val; + + /* enable I2C */ + val = readl(i2cd->regs + I2C_MST_HYBRID_PADCTL); + val |= I2C_MST_HYBRID_PADCTL_MODE_I2C | + I2C_MST_HYBRID_PADCTL_I2C_SCL_INPUT_RCV | + I2C_MST_HYBRID_PADCTL_I2C_SDA_INPUT_RCV; + writel(val, i2cd->regs + I2C_MST_HYBRID_PADCTL); + + /* enable 100KHZ mode */ + val = I2C_MST_I2C0_TIMING_SCL_PERIOD_100KHZ; + val |= (I2C_MST_I2C0_TIMING_TIMEOUT_CLK_CNT_MAX + << I2C_MST_I2C0_TIMING_TIMEOUT_CLK_CNT); + val |= I2C_MST_I2C0_TIMING_TIMEOUT_CHECK; + writel(val, i2cd->regs + I2C_MST_I2C0_TIMING); +} + +static int i2c_check_status(struct gpu_i2c_dev *i2cd) +{ + unsigned long target = jiffies + msecs_to_jiffies(1000); + int status = -EIO; + u32 val; + + do { + val = readl(i2cd->regs + I2C_MST_CNTL); + if ((val & I2C_MST_CNTL_CYCLE_TRIGGER) != + I2C_MST_CNTL_CYCLE_TRIGGER) + break; + if ((val & I2C_MST_CNTL_STATUS) != + I2C_MST_CNTL_STATUS_BUS_BUSY) + break; + usleep_range(1000, 2000); + } while (time_is_after_jiffies(target)); + + if (time_is_before_jiffies(target)) + return status; + + val = readl(i2cd->regs + I2C_MST_CNTL); + switch (val & I2C_MST_CNTL_STATUS) { + case I2C_MST_CNTL_STATUS_OKAY: + status = 0; + break; + case I2C_MST_CNTL_STATUS_NO_ACK: + status = -EIO; + break; + case I2C_MST_CNTL_STATUS_TIMEOUT: + status = -ETIME; + break; + case I2C_MST_CNTL_STATUS_BUS_BUSY: + status = -EBUSY; + break; + default: + break; + } + return status; +} + +static int i2c_read(struct gpu_i2c_dev *i2cd, u8 *data, u16 len) +{ + int status; + u32 val = 0; + + val |= I2C_MST_CNTL_GEN_START | I2C_MST_CNTL_GEN_STOP | + I2C_MST_CNTL_CMD_READ | (len << I2C_MST_CNTL_BURST_SIZE_SHIFT) | + I2C_MST_CNTL_CYCLE_TRIGGER | I2C_MST_CNTL_GEN_NACK; + val &= ~I2C_MST_CNTL_GEN_RAB; + writel(val, i2cd->regs + I2C_MST_CNTL); + + status = i2c_check_status(i2cd); + if (status < 0) + return status; + + val = readl(i2cd->regs + I2C_MST_DATA); + switch (len) { + case 1: + data[0] = val; + break; + case 2: + put_unaligned_be16(val, data); + break; + case 3: + put_unaligned_be16(val >> 8, data); + data[2] = val; + break; + case 4: + put_unaligned_be32(val, data); + break; + default: + break; + } + return status; +} + +static int i2c_start(struct gpu_i2c_dev *i2cd, u16 addr) +{ + u32 val; + + val = addr << I2C_MST_ADDR_DAB; + writel(val, i2cd->regs + I2C_MST_ADDR); + + val = I2C_MST_CNTL_GEN_START | I2C_MST_CNTL_CMD_NONE | + I2C_MST_CNTL_GEN_NACK; + val &= ~(I2C_MST_CNTL_GEN_STOP | I2C_MST_CNTL_GEN_RAB); + writel(val, i2cd->regs + I2C_MST_CNTL); + + return i2c_check_status(i2cd); +} + +static int i2c_stop(struct gpu_i2c_dev *i2cd) +{ + u32 val; + + val = I2C_MST_CNTL_GEN_STOP | I2C_MST_CNTL_CMD_NONE | + I2C_MST_CNTL_GEN_NACK; + val &= ~(I2C_MST_CNTL_GEN_START | I2C_MST_CNTL_GEN_RAB); + writel(val, i2cd->regs + I2C_MST_CNTL); + + return i2c_check_status(i2cd); +} + +static int i2c_write(struct gpu_i2c_dev *i2cd, u8 data) +{ + u32 val; + + writel(data, i2cd->regs + I2C_MST_DATA); + + val = I2C_MST_CNTL_CMD_WRITE | (1 << I2C_MST_CNTL_BURST_SIZE_SHIFT) | + I2C_MST_CNTL_GEN_NACK; + val &= ~(I2C_MST_CNTL_GEN_START | I2C_MST_CNTL_GEN_STOP + | I2C_MST_CNTL_GEN_RAB); + writel(val, i2cd->regs + I2C_MST_CNTL); + + return i2c_check_status(i2cd); +} + +static int gpu_i2c_master_xfer(struct i2c_adapter *adap, + struct i2c_msg *msgs, int num) +{ + struct gpu_i2c_dev *i2cd = i2c_get_adapdata(adap); + struct device *dev = &i2cd->pci_dev->dev; + int sts; + int i, j; + + mutex_lock(&i2cd->mutex); + for (i = 0; i < num; i++) { + if (msgs[i].flags & I2C_M_RD) { + sts = i2c_read(i2cd, msgs[i].buf, msgs[i].len); + if (sts < 0) { + dev_err(dev, "i2c_read error %x", sts); + break; + } + i2cd->do_start = true; + } else if (msgs[i].flags & I2C_M_STOP) { + sts = i2c_stop(i2cd); + if (sts < 0) { + dev_err(dev, "i2c_stop error %x", sts); + goto unlock; + } + i2cd->do_start = true; + } else { + if (i2cd->do_start) { + sts = i2c_start(i2cd, msgs[i].addr); + if (sts < 0) { + dev_err(dev, "i2c_start error %x", sts); + goto unlock; + } + sts = i2c_write(i2cd, msgs[i].addr << 1); + if (sts < 0) { + dev_err(dev, "i2c_write error %x", sts); + goto stop; + } + i2cd->do_start = false; + } + for (j = 0; j < msgs[i].len; j++) { + sts = i2c_write(i2cd, *(msgs[i].buf + j)); + if (sts < 0) { + dev_err(dev, "i2c_write error %x", sts); + goto stop; + } + } + } + } + goto unlock; +stop: + sts = i2c_stop(i2cd); + if (sts < 0) + dev_err(dev, "i2c_stop error %x", sts); +unlock: + mutex_unlock(&i2cd->mutex); + return i; +} + +static u32 gpu_i2c_functionality(struct i2c_adapter *adap) +{ + return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; +} + +static const struct i2c_algorithm gpu_i2c_algorithm = { + .master_xfer = gpu_i2c_master_xfer, + .functionality = gpu_i2c_functionality, +}; + +#define PCI_CLASS_SERIAL_UNKNOWN 0x0c80 +static const struct pci_device_id gpu_i2c_ids[] = { + { PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, + PCI_CLASS_SERIAL_UNKNOWN << 8, 0xffffff00}, + { } +}; +MODULE_DEVICE_TABLE(pci, gpu_i2c_ids); + +static int gpu_i2c_probe(struct pci_dev *dev, const struct pci_device_id *id) +{ + struct i2c_board_info gpu_i2c_ucsi_board_info = { + I2C_BOARD_INFO("ccgx-ucsi", 0x8) + }; + struct gpu_i2c_dev *i2cd; + int status; + + i2cd = devm_kzalloc(&dev->dev, sizeof(struct gpu_i2c_dev), GFP_KERNEL); + if (!i2cd) + return -ENOMEM; + + i2cd->pci_dev = dev; + pci_set_drvdata(dev, i2cd); + + status = pcim_enable_device(dev); + if (status < 0) { + dev_err(&dev->dev, "pcim_enable_device failed - %d\n", status); + return status; + } + + pci_set_master(dev); + + i2cd->regs = pcim_iomap(dev, 0, 0); + if (!i2cd->regs) { + dev_err(&dev->dev, "pcim_iomap failed\n"); + return -ENOMEM; + } + + status = pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_MSI); + if (status < 0) { + dev_err(&dev->dev, "pci_alloc_irq_vectors err - %d\n", status); + return status; + } + + i2cd->do_start = true; + mutex_init(&i2cd->mutex); + enable_i2c_bus(i2cd); + + i2c_set_adapdata(&i2cd->adapter, i2cd); + i2cd->adapter.owner = THIS_MODULE; + strlcpy(i2cd->adapter.name, "NVIDIA GPU I2C adapter", + sizeof(i2cd->adapter.name)); + i2cd->adapter.algo = &gpu_i2c_algorithm; + i2cd->adapter.dev.parent = &dev->dev; + status = i2c_add_adapter(&i2cd->adapter); + if (status < 0) { + dev_err(&dev->dev, "i2c_add_adapter failed - %d\n", status); + goto del_adapter; + } + + gpu_i2c_ucsi_board_info.irq = dev->irq; + i2cd->client = i2c_new_device(&i2cd->adapter, &gpu_i2c_ucsi_board_info); + + if (!i2cd->client) { + dev_err(&dev->dev, "i2c_new_device failed - %d\n", status); + status = -ENODEV; + goto del_adapter; + } + + pm_runtime_put_noidle(&dev->dev); + pm_runtime_allow(&dev->dev); + + return 0; + +del_adapter: + i2c_del_adapter(&i2cd->adapter); + pci_free_irq_vectors(dev); + return status; +} + +static void gpu_i2c_remove(struct pci_dev *dev) +{ + struct gpu_i2c_dev *i2cd = pci_get_drvdata(dev); + + i2c_del_adapter(&i2cd->adapter); + pci_free_irq_vectors(dev); +} + +static int gpu_i2c_resume(struct device *dev) +{ + struct gpu_i2c_dev *i2cd = pci_get_drvdata(to_pci_dev(dev)); + + enable_i2c_bus(i2cd); + return 0; +} + +static int gpu_i2c_idle(struct device *dev) +{ + struct gpu_i2c_dev *i2cd = pci_get_drvdata(to_pci_dev(dev)); + + if (!mutex_trylock(&i2cd->mutex)) { + dev_info(dev, "-EBUSY\n"); + return -EBUSY; + } + mutex_unlock(&i2cd->mutex); + + return 0; +} + +UNIVERSAL_DEV_PM_OPS(gpu_i2c_driver_pm, NULL, gpu_i2c_resume, gpu_i2c_idle); + +static struct pci_driver gpu_i2c_driver = { + .name = "nvidia-gpu", + .id_table = gpu_i2c_ids, + .probe = gpu_i2c_probe, + .remove = gpu_i2c_remove, + .driver = { + .pm = &gpu_i2c_driver_pm, + }, +}; + +module_pci_driver(gpu_i2c_driver); + +MODULE_AUTHOR("Ajay Gupta "); +MODULE_DESCRIPTION("Nvidia GPU I2C controller Driver"); +MODULE_LICENSE("GPL v2"); From patchwork Thu Aug 30 00:33:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Gupta X-Patchwork-Id: 10581099 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 A6E3D1390 for ; Thu, 30 Aug 2018 00:33:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96A462BCC7 for ; Thu, 30 Aug 2018 00:33:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A75C2BCCB; Thu, 30 Aug 2018 00:33:41 +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 A40DC2BCC7 for ; Thu, 30 Aug 2018 00:33:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727197AbeH3EdF (ORCPT ); Thu, 30 Aug 2018 00:33:05 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:40431 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725760AbeH3EdF (ORCPT ); Thu, 30 Aug 2018 00:33:05 -0400 Received: by mail-pl1-f195.google.com with SMTP id s17-v6so3026607plp.7; Wed, 29 Aug 2018 17:33:38 -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=ytYxctbYXZgnl6L+kPcj3WvZiWox8CsSaXPIqMKlFkE=; b=J3oEppqzKdJrocn0GreF+bDHjQXlAhb3lRi8xEyLOfGaNPyTF4KBatlGm7Hgs/aps1 qcpOsjwNSNwDvoisbfbV53kvXim+7u/9WvQfzUOq7MRSmnqxEYIQTLWyRm+dchjTgXek z5oxfbmZ8y9VebUBOy+a3YNI+j/aJWfEtBo1Mcj9aauR5CynEvpSVkjWeBSnRug22WL9 gfxb9DIJ4k2kRF1VTZoC9ugTsAOG7eQZAk82S209HH66E/M0SkaI3mfjC3w0XMMKAV4g JvcqHb51TJjFVLbpKIIxkBRXNxEv60vHToRKjUoP6YJ+XSyI9hnF++uq5NqCqYWBONCs 2NQA== 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=ytYxctbYXZgnl6L+kPcj3WvZiWox8CsSaXPIqMKlFkE=; b=Q/Bk2wDjA3TBOP+PK9PIBLhBW/tN26k3O6vXV4PPyiAyq84/glEDYibG8ZFQhHN4be v7FW9Fv3bMF3eUpJ5Oue7NmCD+e3GPVaC6Sv8CqI2eRSfV3XOJTRYStyZI1bwTgTAz5J g1Tty+E0Of3GzGJtieIQWwocgbQYbNxFkswhuELw7XccKBmGNXMRey1SS8cHr60XtCqc /ZpKlfKCnDNIO+ehcCDtydC/UgCuhM9ihQzhacR24ug45+svNckeenO5b9bZyGagBMj1 uzaz1JQdPFrx93/4PPYWx2+EKpmjnYofbEjXTkfHWzNOYv+i8XTkaIXfOb2n2f8zfj2k icaw== X-Gm-Message-State: APzg51CWG/urkXCmvDVzrvl74sAb7F39EoCSes8PYdCkfi0kNSP1kjEs cK7Yx0S3OtpluGx6miehSY8= X-Google-Smtp-Source: ANB0Vdb7UItY1ZKd+vgwWjvDuB+vaTqn8TiDRk6+nqNmisg/fuCbqXoRTbXQ6S16yXl0zAHtsVao9g== X-Received: by 2002:a17:902:49:: with SMTP id 67-v6mr8113958pla.206.1535589218233; Wed, 29 Aug 2018 17:33:38 -0700 (PDT) Received: from ajayg.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id 5-v6sm7364411pgc.86.2018.08.29.17.33.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Aug 2018 17:33:37 -0700 (PDT) From: ajaykuee@gmail.com X-Google-Original-From: ajayg@nvidia.com To: wsa@the-dreams.de, heikki.krogerus@linux.intel.com Cc: linux-usb@vger.kernel.org, linux-i2c@vger.kernel.org, Ajay Gupta Subject: [PATCH v3 2/2] usb: typec: ucsi: add support for Cypress CCGx Date: Wed, 29 Aug 2018 17:33:18 -0700 Message-Id: <1535589198-16733-2-git-send-email-ajayg@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535589198-16733-1-git-send-email-ajayg@nvidia.com> References: <1535589198-16733-1-git-send-email-ajayg@nvidia.com> X-NVConfidentiality: public 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 From: Ajay Gupta Latest NVIDIA GPU cards have a Cypress CCGx Type-C controller over I2C interface. This UCSI I2C driver uses I2C bus driver interface for communicating with Type-C controller. Signed-off-by: Ajay Gupta --- Changes from v1 -> v2 Fixed identation in drivers/usb/typec/ucsi/Kconfig Changes from v2 -> v3 Fixed most of comments from Heikki Rename ucsi_i2c_ccg.c -> ucsi_ccg.c drivers/usb/typec/ucsi/Kconfig | 10 + drivers/usb/typec/ucsi/Makefile | 2 + drivers/usb/typec/ucsi/ucsi_ccg.c | 417 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 429 insertions(+) create mode 100644 drivers/usb/typec/ucsi/ucsi_ccg.c diff --git a/drivers/usb/typec/ucsi/Kconfig b/drivers/usb/typec/ucsi/Kconfig index e36d6c7..7811888 100644 --- a/drivers/usb/typec/ucsi/Kconfig +++ b/drivers/usb/typec/ucsi/Kconfig @@ -23,6 +23,16 @@ config TYPEC_UCSI if TYPEC_UCSI +config UCSI_CCG + tristate "UCSI Interface Driver for Cypress CCGx" + depends on I2C + help + This driver enables UCSI support on platforms that expose a + Cypress CCGx Type-C controller over I2C interface. + + To compile the driver as a module, choose M here: the module will be + called ucsi_ccg. + config UCSI_ACPI tristate "UCSI ACPI Interface Driver" depends on ACPI diff --git a/drivers/usb/typec/ucsi/Makefile b/drivers/usb/typec/ucsi/Makefile index 7afbea5..2f4900b 100644 --- a/drivers/usb/typec/ucsi/Makefile +++ b/drivers/usb/typec/ucsi/Makefile @@ -8,3 +8,5 @@ typec_ucsi-y := ucsi.o typec_ucsi-$(CONFIG_TRACING) += trace.o obj-$(CONFIG_UCSI_ACPI) += ucsi_acpi.o + +obj-$(CONFIG_UCSI_CCG) += ucsi_ccg.o diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c new file mode 100644 index 0000000..e69cc9f --- /dev/null +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c @@ -0,0 +1,417 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * UCSI driver for Cypress CCGx Type-C controller + * + * Copyright (C) 2017-2018 NVIDIA Corporation. All rights reserved. + * Author: Ajay Gupta + * + * Some code borrowed from drivers/usb/typec/ucsi/ucsi_acpi.c + */ +#include +#include +#include +#include +#include +#include +#include "ucsi.h" + +struct ucsi_ccg { + struct device *dev; + struct ucsi *ucsi; + struct ucsi_ppm ppm; + struct i2c_client *client; + int irq; +}; + +#define CCGX_I2C_RAB_DEVICE_MODE 0x0 +#define CCGX_I2C_RAB_BOOT_MODE_REASON 0x1 +#define CCGX_I2C_RAB_READ_SILICON_ID 0x2 +#define CCGX_I2C_RAB_INTR_REG 0x6 +#define CCGX_I2C_RAB_FW1_VERSION 0x28 +#define CCGX_I2C_RAB_FW2_VERSION 0x20 +#define CCGX_I2C_RAB_UCSI_CONTROL 0x39 +#define CCGX_I2C_RAB_UCSI_CONTROL_STOP 0x2 +#define CCGX_I2C_RAB_UCSI_CONTROL_START 0x1 +#define CCGX_I2C_RAB_RESPONSE_REG 0x7E +#define CCGX_I2C_RAB_UCSI_DATA_BLOCK 0xf000 +#define CCGX_I2C_RAB_RESPONSE_REG_RESET_COMPLETE 0x80 + +static int ccg_read(struct ucsi_ccg *uc, u16 rab, u8 *data, u32 len) +{ + struct device *dev = uc->dev; + struct i2c_client *client = uc->client; + unsigned char buf[2]; + struct i2c_msg msgs[] = { + { + .addr = client->addr, + .flags = 0x0, + .len = 0x2, + .buf = buf, + }, + { + .addr = client->addr, + .flags = I2C_M_RD, + .buf = data, + }, + }; + u32 rlen, rem_len = len; + int err = -EIO; + + while (rem_len > 0) { + msgs[1].buf = &data[len - rem_len]; + rlen = min_t(u16, rem_len, 4); + msgs[1].len = rlen; + buf[0] = (rab >> 0) & 0xff; + buf[1] = (rab >> 8) & 0xff; + err = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs)); + if (err == ARRAY_SIZE(msgs)) { + err = 0; + } else if (err >= 0) { + dev_err(dev, "i2c_transfer failed, err %d\n", err); + return -EIO; + } + rab += rlen; + rem_len -= rlen; + } + + return err; +} + +static int ccg_write(struct ucsi_ccg *uc, u16 rab, u8 *data, u32 len) +{ + struct device *dev = uc->dev; + struct i2c_client *client = uc->client; + unsigned char buf[2]; + struct i2c_msg msgs[] = { + { + .addr = client->addr, + .flags = 0x0, + .len = 0x2, + .buf = buf, + }, + { + .addr = client->addr, + .flags = 0x0, + .buf = data, + .len = len, + }, + { + .addr = client->addr, + .flags = I2C_M_STOP, + }, + }; + int err; + + buf[0] = (rab >> 0) & 0xff; + buf[1] = (rab >> 8) & 0xff; + err = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs)); + if (err == ARRAY_SIZE(msgs)) { + err = 0; + } else if (err >= 0) { + dev_err(dev, "i2c_transfer failed, err %d\n", err); + return -EIO; + } + + return err; +} + +static int ucsi_ccg_init(struct ucsi_ccg *uc) +{ + struct device *dev = uc->dev; + u8 data[64]; + int i, err; + + /* selectively issue device reset + * - if RESPONSE register is RESET_COMPLETE, do not issue device reset + * (will cause usb device disconnect / reconnect) + * - if RESPONSE register is not RESET_COMPLETE, issue device reset + * (causes PPC to resync device connect state by re-issuing + * set mux command) + */ + data[0] = 0x00; + data[1] = 0x00; + + err = ccg_read(uc, CCGX_I2C_RAB_RESPONSE_REG, data, 0x2); + if (err < 0) { + dev_err(dev, "ccg_read failed, err %d\n", err); + return -EIO; + } + + memset(data, 0, sizeof(data)); + err = ccg_read(uc, CCGX_I2C_RAB_DEVICE_MODE, data, sizeof(data)); + if (err < 0) { + dev_err(dev, "ccg_read failed, err %d\n", err); + return -EIO; + } + + dev_info(dev, "Silicon id %02x %02x", + data[CCGX_I2C_RAB_READ_SILICON_ID + 0], + data[CCGX_I2C_RAB_READ_SILICON_ID + 1]); + + dev_info(dev, "FW1 version %02x %02x %02x %02x %02x %02x %02x %02x\n", + data[CCGX_I2C_RAB_FW1_VERSION + 0], + data[CCGX_I2C_RAB_FW1_VERSION + 1], + data[CCGX_I2C_RAB_FW1_VERSION + 2], + data[CCGX_I2C_RAB_FW1_VERSION + 3], + data[CCGX_I2C_RAB_FW1_VERSION + 4], + data[CCGX_I2C_RAB_FW1_VERSION + 5], + data[CCGX_I2C_RAB_FW1_VERSION + 6], + data[CCGX_I2C_RAB_FW1_VERSION + 7]); + + dev_info(dev, "FW2 version %02x %02x %02x %02x %02x %02x %02x %02x\n", + data[CCGX_I2C_RAB_FW2_VERSION + 0], + data[CCGX_I2C_RAB_FW2_VERSION + 1], + data[CCGX_I2C_RAB_FW2_VERSION + 2], + data[CCGX_I2C_RAB_FW2_VERSION + 3], + data[CCGX_I2C_RAB_FW2_VERSION + 4], + data[CCGX_I2C_RAB_FW2_VERSION + 5], + data[CCGX_I2C_RAB_FW2_VERSION + 6], + data[CCGX_I2C_RAB_FW2_VERSION + 7]); + + data[0] = 0x0; + data[1] = 0x0; + err = ccg_read(uc, CCGX_I2C_RAB_RESPONSE_REG, data, 0x2); + if (err < 0) { + dev_err(dev, "ccg_read failed, err %d\n", err); + return -EIO; + } + + data[0] = CCGX_I2C_RAB_UCSI_CONTROL_STOP; + err = ccg_write(uc, CCGX_I2C_RAB_UCSI_CONTROL, data, 0x1); + if (err < 0) { + dev_err(dev, "ccg_write failed, err %d\n", err); + return -EIO; + } + + data[0] = CCGX_I2C_RAB_UCSI_CONTROL_START; + err = ccg_write(uc, CCGX_I2C_RAB_UCSI_CONTROL, data, 0x1); + if (err < 0) { + dev_err(dev, "ccg_write failed, err %d\n", err); + return -EIO; + } + + /* flush CCGx RESPONSE queue by acking interrupts + * - above ucsi control register write will push response + * which must be flushed + * - affects f/w update which reads response register + */ + data[0] = 0xff; + for (i = 0; (i < 10) && (data[0] != 0x00); i++) { + err = ccg_write(uc, CCGX_I2C_RAB_INTR_REG, data, 0x1); + if (err < 0) { + dev_err(dev, "ccg_write failed, err %d\n", err); + return -EIO; + } + + usleep_range(10000, 11000); + + err = ccg_read(uc, CCGX_I2C_RAB_INTR_REG, data, 0x1); + if (err < 0) { + dev_err(dev, "ccg_read failed, err %d\n", err); + return -EIO; + } + } + return 0; +} + +static int ucsi_ccg_send_data(struct ucsi_ccg *uc) +{ + int err; + unsigned char buf[4] = { + 0x20, (CCGX_I2C_RAB_UCSI_DATA_BLOCK >> 8), + 0x8, (CCGX_I2C_RAB_UCSI_DATA_BLOCK >> 8), + }; + unsigned char buf1[16]; + unsigned char buf2[8]; + + memcpy(&buf1[0], ((const void *)uc->ppm.data) + 0x20, sizeof(buf1)); + memcpy(&buf2[0], ((const void *)uc->ppm.data) + 0x8, sizeof(buf2)); + + err = ccg_write(uc, *(u16 *)buf, buf1, sizeof(buf1)); + if (err < 0) { + dev_err(uc->dev, "ccg_write failed, err %d\n", err); + return -EIO; + } + + err = ccg_write(uc, *(u16 *)(buf + 2), buf2, sizeof(buf2)); + if (err < 0) { + dev_err(uc->dev, "ccg_write failed, err %d\n", err); + return -EIO; + } + + return err; +} + +static int ucsi_ccg_recv_data(struct ucsi_ccg *uc) +{ + static int first = 1; + int err; + unsigned char buf[6] = { + 0x0, (CCGX_I2C_RAB_UCSI_DATA_BLOCK >> 8), + 0x4, (CCGX_I2C_RAB_UCSI_DATA_BLOCK >> 8), + 0x10, (CCGX_I2C_RAB_UCSI_DATA_BLOCK >> 8), + }; + u8 *ppm = (u8 *)uc->ppm.data; + + if (first) { + err = ccg_read(uc, *(u16 *)buf, ppm, 0x2); + if (err < 0) { + dev_err(uc->dev, "ccg_read failed, err %d\n", err); + return -EIO; + } + first = 1; + } + + err = ccg_read(uc, *(u16 *)(buf + 2), ppm + 0x4, 0x4); + if (err < 0) { + dev_err(uc->dev, "ccg_read failed, err %d\n", err); + return -EIO; + } + + err = ccg_read(uc, *(u16 *)(buf + 4), ppm + 0x10, 0x10); + if (err < 0) { + dev_err(uc->dev, "ccg_read failed, err %d\n", err); + return -EIO; + } + + return err; +} + +static int ucsi_ccg_ack_interrupt(struct ucsi_ccg *uc) +{ + int err; + unsigned char buf[3] = {(CCGX_I2C_RAB_INTR_REG & 0xff), + (CCGX_I2C_RAB_INTR_REG >> 8), 0x0}; + + err = ccg_read(uc, *(u16 *)buf, &buf[2], 0x1); + if (err < 0) { + dev_err(uc->dev, "ccg_read failed, err %d\n", err); + return -EIO; + } + + err = ccg_write(uc, *(u16 *)buf, &buf[2], 0x1); + if (err < 0) { + dev_err(uc->dev, "ccg_read failed, err %d\n", err); + return -EIO; + } + + return err; +} + +static int ucsi_ccg_sync(struct ucsi_ppm *ppm) +{ + struct ucsi_ccg *uc = container_of(ppm, + struct ucsi_ccg, ppm); + int err; + + err = ucsi_ccg_recv_data(uc); + if (err < 0) { + dev_err(uc->dev, "ucsi_ccg_recv_data() err %d\n", err); + return 0; + } + + /* ack interrupt to allow next command to run */ + err = ucsi_ccg_ack_interrupt(uc); + if (err < 0) + dev_err(uc->dev, "ucsi_ccg_ack_interrupt() err %d\n", err); + + return 0; +} + +static int ucsi_ccg_cmd(struct ucsi_ppm *ppm, struct ucsi_control *ctrl) +{ + struct ucsi_ccg *uc = container_of(ppm, + struct ucsi_ccg, ppm); + int err = 0; + + ppm->data->ctrl.raw_cmd = ctrl->raw_cmd; + err = ucsi_ccg_send_data(uc); + + return err; +} + +static irqreturn_t ccg_irq_handler(int irq, void *data) +{ + struct ucsi_ccg *uc = data; + + ucsi_notify(uc->ucsi); + + return IRQ_HANDLED; +} + +static int ucsi_ccg_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct device *dev = &client->dev; + struct ucsi_ccg *uc; + int status; + + uc = devm_kzalloc(dev, sizeof(*uc), GFP_KERNEL); + if (!uc) + return -ENOMEM; + + uc->ppm.data = devm_kzalloc(dev, sizeof(struct ucsi_data), GFP_KERNEL); + if (!uc->ppm.data) + return -ENOMEM; + + uc->ppm.cmd = ucsi_ccg_cmd; + uc->ppm.sync = ucsi_ccg_sync; + uc->dev = dev; + uc->client = client; + + /* reset ccg device and initialize ucsi */ + status = ucsi_ccg_init(uc); + if (status < 0) { + dev_err(uc->dev, "ucsi_ccg_init failed - %d\n", status); + return status; + } + + uc->irq = client->irq; + + status = devm_request_threaded_irq(dev, uc->irq, NULL, ccg_irq_handler, + IRQF_ONESHOT | IRQF_TRIGGER_HIGH, + dev_name(dev), uc); + if (status < 0) { + dev_err(uc->dev, "request_threaded_irq failed - %d\n", status); + return status; + } + + uc->ucsi = ucsi_register_ppm(dev, &uc->ppm); + if (IS_ERR(uc->ucsi)) { + dev_err(uc->dev, "ucsi_register_ppm failed\n"); + return PTR_ERR(uc->ucsi); + } + + i2c_set_clientdata(client, uc); + return 0; +} + +static int ucsi_ccg_remove(struct i2c_client *client) +{ + struct ucsi_ccg *uc = i2c_get_clientdata(client); + + ucsi_unregister_ppm(uc->ucsi); + + return 0; +} + +static const struct i2c_device_id ucsi_ccg_device_id[] = { + {"ccgx-ucsi", 0}, + {}, +}; +MODULE_DEVICE_TABLE(i2c, ucsi_ccg_device_id); + +static struct i2c_driver ucsi_ccg_driver = { + .driver = { + .name = "ucsi_ccg", + }, + .probe = ucsi_ccg_probe, + .remove = ucsi_ccg_remove, + .id_table = ucsi_ccg_device_id, +}; + +module_i2c_driver(ucsi_ccg_driver); + +MODULE_AUTHOR("Ajay Gupta "); +MODULE_DESCRIPTION("UCSI driver for Cypress CCGx Type-C controller"); +MODULE_LICENSE("GPL v2");