* [v5,2/2] usb: typec: ucsi: add support for Cypress CCGx
@ 2018-09-05 18:04 Ajay Gupta
0 siblings, 0 replies; 6+ messages in thread
From: Ajay Gupta @ 2018-09-05 18:04 UTC (permalink / raw)
To: Greg KH; +Cc: wsa, heikki.krogerus, linux-usb, linux-i2c
Hi Greg,
> On Fri, Aug 31, 2018 at 01:22:21PM -0700, Ajay Gupta wrote:
> > + dev_info(dev, "Silicon id %2ph", data +
> CCGX_I2C_RAB_READ_SILICON_ID);
> > + dev_info(dev, "FW1 version %8ph\n", data +
> CCGX_I2C_RAB_FW1_VERSION);
> > + dev_info(dev, "FW2 version %8ph\n", data +
> > +CCGX_I2C_RAB_FW2_VERSION);
>
> Drivers should be totally quiet when initialized, unless something goes wrong.
> Please don't spam the kernel log with this type of stuff.
>
> You can use dev_dbg() if it helps with debugging the code, that might be a
> better idea here.
Ok, will use dev_dbg().
> Also, a pointer? Are you sure about that? That looks really odd...
Yes, FW version is 8 byte hex code at address
data + CCGX_I2C_RAB_FWx_VERSION
Thanks
Ajay
---
nvpublic
--
^ permalink raw reply [flat|nested] 6+ messages in thread
* [v5,2/2] usb: typec: ucsi: add support for Cypress CCGx
@ 2018-09-05 22:31 Wolfram Sang
0 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2018-09-05 22:31 UTC (permalink / raw)
To: Ajay Gupta; +Cc: Greg KH, heikki.krogerus, linux-usb, linux-i2c
On Wed, Sep 05, 2018 at 10:17:26PM +0000, Ajay Gupta wrote:
> Hi Greg,
>
> > > +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,
> > > + },
> > > + };
> >
> > Are you sure you are allowed to do i2c messages off of the stack like this?
> > Will that work on all platforms?
DMA is optional with I2C. These messages do not set the I2C_M_DMASAFE
flag, so it should be OK.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [v5,2/2] usb: typec: ucsi: add support for Cypress CCGx
@ 2018-09-05 22:17 Ajay Gupta
0 siblings, 0 replies; 6+ messages in thread
From: Ajay Gupta @ 2018-09-05 22:17 UTC (permalink / raw)
To: Greg KH; +Cc: wsa, heikki.krogerus, linux-usb, linux-i2c
Hi Greg,
> > +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,
> > + },
> > + };
>
> Are you sure you are allowed to do i2c messages off of the stack like this?
> Will that work on all platforms?
Most of the drivers in kernel today seem to use stack memory for
i2c_transfer() but I will fix it in next version.
> > + u32 rlen, rem_len = len;
> > + int err;
> > +
> > + while (rem_len > 0) {
> > + msgs[1].buf = &data[len - rem_len];
> > + rlen = min_t(u16, rem_len, 4);
> > + msgs[1].len = rlen;
> > + put_unaligned_le16(rab, buf);
> > + err = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
> > + if (err < 0) {
> > + dev_err(dev, "i2c_transfer failed, err %d\n", err);
>
> You are printing out an error here, no need to print out another error every
> time you call this function and it fails, right? Only do it in one place, otherwise
> it is extra noisy when things fail.
I will fix and add error print in only one location. I think better to keep it here
only and remove error print line from all the caller of this function.
> > + return err;
> > + }
> > + rab += rlen;
> > + rem_len -= rlen;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +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;
>
> Same question here, i2c message off of the stack?
>
> > +
> > + put_unaligned_le16(rab, buf);
> > + err = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
> > + if (err < 0) {
> > + dev_err(dev, "i2c_transfer failed, err %d\n", err);
> > + return err;
>
> And again, only print an error in one place please.
Ok.
> This can be simplified to just:
> return i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs)); right?
Only issue is that i2c_transfer() return number of messages on success but ucsi
APIs sync() and cmd() at drivers/usb/typec/ucsi/ucsi.h expects return
value of '0' on success.
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static int ucsi_ccg_init(struct ucsi_ccg *uc) {
> > + struct device *dev = uc->dev;
> > + unsigned int count = 10;
> > + u8 data[64];
> > + int 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;
>
> Again, it's ok to do messages off of the stack?
Will fix.
Thanks
Ajay
---
nvpublic
--
>
> thanks,
>
> greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* [v5,2/2] usb: typec: ucsi: add support for Cypress CCGx
@ 2018-09-05 12:31 Greg Kroah-Hartman
0 siblings, 0 replies; 6+ messages in thread
From: Greg Kroah-Hartman @ 2018-09-05 12:31 UTC (permalink / raw)
To: Ajay Gupta; +Cc: wsa, heikki.krogerus, linux-usb, linux-i2c
On Fri, Aug 31, 2018 at 01:22:21PM -0700, Ajay Gupta wrote:
> 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 <ajayg@nvidia.com>
> ---
> 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
> Changes from v3 -> v4
> Fixed comments from Andy
> Changes from v4 -> v5
> Fixed comments from Andy
>
> drivers/usb/typec/ucsi/Kconfig | 10 +
> drivers/usb/typec/ucsi/Makefile | 2 +
> drivers/usb/typec/ucsi/ucsi_ccg.c | 390 ++++++++++++++++++++++++++++++++++++++
> 3 files changed, 402 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..1e7c3b2
> --- /dev/null
> +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
> @@ -0,0 +1,390 @@
> +// 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 <ajayg@nvidia.com>
> + *
> + * Some code borrowed from drivers/usb/typec/ucsi/ucsi_acpi.c
> + */
> +#include <linux/acpi.h>
> +#include <linux/delay.h>
> +#include <linux/i2c.h>
> +#include <linux/module.h>
> +#include <linux/pci.h>
> +#include <linux/platform_device.h>
> +
> +#include <asm/unaligned.h>
> +#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 0x00
> +#define CCGX_I2C_RAB_READ_SILICON_ID 0x2
> +#define CCGX_I2C_RAB_INTR_REG 0x06
> +#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_START BIT(0)
> +#define CCGX_I2C_RAB_UCSI_CONTROL_STOP BIT(1)
> +#define CCGX_I2C_RAB_RESPONSE_REG 0x7E
> +#define CCGX_I2C_RAB_UCSI_DATA_BLOCK 0xf000
> +
> +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,
> + },
> + };
Are you sure you are allowed to do i2c messages off of the stack like
this? Will that work on all platforms?
> + u32 rlen, rem_len = len;
> + int err;
> +
> + while (rem_len > 0) {
> + msgs[1].buf = &data[len - rem_len];
> + rlen = min_t(u16, rem_len, 4);
> + msgs[1].len = rlen;
> + put_unaligned_le16(rab, buf);
> + err = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
> + if (err < 0) {
> + dev_err(dev, "i2c_transfer failed, err %d\n", err);
You are printing out an error here, no need to print out another
error every time you call this function and it fails, right? Only do it
in one place, otherwise it is extra noisy when things fail.
> + return err;
> + }
> + rab += rlen;
> + rem_len -= rlen;
> + }
> +
> + return 0;
> +}
> +
> +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;
Same question here, i2c message off of the stack?
> +
> + put_unaligned_le16(rab, buf);
> + err = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
> + if (err < 0) {
> + dev_err(dev, "i2c_transfer failed, err %d\n", err);
> + return err;
And again, only print an error in one place please.
This can be simplified to just:
return i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
right?
> + }
> +
> + return 0;
> +}
> +
> +static int ucsi_ccg_init(struct ucsi_ccg *uc)
> +{
> + struct device *dev = uc->dev;
> + unsigned int count = 10;
> + u8 data[64];
> + int 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;
Again, it's ok to do messages off of the stack?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* [v5,2/2] usb: typec: ucsi: add support for Cypress CCGx
@ 2018-09-05 12:26 Greg Kroah-Hartman
0 siblings, 0 replies; 6+ messages in thread
From: Greg Kroah-Hartman @ 2018-09-05 12:26 UTC (permalink / raw)
To: Ajay Gupta; +Cc: wsa, heikki.krogerus, linux-usb, linux-i2c
On Fri, Aug 31, 2018 at 01:22:21PM -0700, Ajay Gupta wrote:
> + dev_info(dev, "Silicon id %2ph", data + CCGX_I2C_RAB_READ_SILICON_ID);
> + dev_info(dev, "FW1 version %8ph\n", data + CCGX_I2C_RAB_FW1_VERSION);
> + dev_info(dev, "FW2 version %8ph\n", data + CCGX_I2C_RAB_FW2_VERSION);
Drivers should be totally quiet when initialized, unless something goes
wrong. Please don't spam the kernel log with this type of stuff.
You can use dev_dbg() if it helps with debugging the code, that might be
a better idea here.
Also, a pointer? Are you sure about that? That looks really odd...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* [v5,2/2] usb: typec: ucsi: add support for Cypress CCGx
@ 2018-08-31 20:22 Ajay Gupta
0 siblings, 0 replies; 6+ messages in thread
From: Ajay Gupta @ 2018-08-31 20:22 UTC (permalink / raw)
To: wsa, heikki.krogerus; +Cc: linux-usb, linux-i2c, 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 <ajayg@nvidia.com>
---
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
Changes from v3 -> v4
Fixed comments from Andy
Changes from v4 -> v5
Fixed comments from Andy
drivers/usb/typec/ucsi/Kconfig | 10 +
drivers/usb/typec/ucsi/Makefile | 2 +
drivers/usb/typec/ucsi/ucsi_ccg.c | 390 ++++++++++++++++++++++++++++++++++++++
3 files changed, 402 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..1e7c3b2
--- /dev/null
+++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
@@ -0,0 +1,390 @@
+// 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 <ajayg@nvidia.com>
+ *
+ * Some code borrowed from drivers/usb/typec/ucsi/ucsi_acpi.c
+ */
+#include <linux/acpi.h>
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/platform_device.h>
+
+#include <asm/unaligned.h>
+#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 0x00
+#define CCGX_I2C_RAB_READ_SILICON_ID 0x2
+#define CCGX_I2C_RAB_INTR_REG 0x06
+#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_START BIT(0)
+#define CCGX_I2C_RAB_UCSI_CONTROL_STOP BIT(1)
+#define CCGX_I2C_RAB_RESPONSE_REG 0x7E
+#define CCGX_I2C_RAB_UCSI_DATA_BLOCK 0xf000
+
+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;
+
+ while (rem_len > 0) {
+ msgs[1].buf = &data[len - rem_len];
+ rlen = min_t(u16, rem_len, 4);
+ msgs[1].len = rlen;
+ put_unaligned_le16(rab, buf);
+ err = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
+ if (err < 0) {
+ dev_err(dev, "i2c_transfer failed, err %d\n", err);
+ return err;
+ }
+ rab += rlen;
+ rem_len -= rlen;
+ }
+
+ return 0;
+}
+
+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;
+
+ put_unaligned_le16(rab, buf);
+ err = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
+ if (err < 0) {
+ dev_err(dev, "i2c_transfer failed, err %d\n", err);
+ return err;
+ }
+
+ return 0;
+}
+
+static int ucsi_ccg_init(struct ucsi_ccg *uc)
+{
+ struct device *dev = uc->dev;
+ unsigned int count = 10;
+ u8 data[64];
+ int 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 err;
+ }
+
+ 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 err;
+ }
+
+ dev_info(dev, "Silicon id %2ph", data + CCGX_I2C_RAB_READ_SILICON_ID);
+ dev_info(dev, "FW1 version %8ph\n", data + CCGX_I2C_RAB_FW1_VERSION);
+ dev_info(dev, "FW2 version %8ph\n", data + CCGX_I2C_RAB_FW2_VERSION);
+
+ 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 err;
+ }
+
+ 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 err;
+ }
+
+ 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 err;
+ }
+
+ /*
+ * 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;
+ do {
+ 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 err;
+ }
+
+ 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 err;
+ }
+ } while ((data[0] != 0x00) && count--);
+
+ 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, ((const void *)uc->ppm.data) + 0x20, sizeof(buf1));
+ memcpy(buf2, ((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 err;
+ }
+
+ 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 err;
+ }
+
+ return err;
+}
+
+static int ucsi_ccg_recv_data(struct ucsi_ccg *uc)
+{
+ u8 *ppm = (u8 *)uc->ppm.data;
+ 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,
+ };
+
+ err = ccg_read(uc, *(u16 *)buf, ppm, 0x2);
+ if (err < 0) {
+ dev_err(uc->dev, "ccg_read failed, err %d\n", err);
+ return err;
+ }
+
+ 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 err;
+ }
+
+ 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 err;
+ }
+
+ return err;
+}
+
+static int ucsi_ccg_ack_interrupt(struct ucsi_ccg *uc)
+{
+ int err;
+ unsigned char buf[2] = {
+ CCGX_I2C_RAB_INTR_REG, CCGX_I2C_RAB_INTR_REG >> 8};
+ unsigned char buf2[1] = {0x0};
+
+ err = ccg_read(uc, *(u16 *)buf, buf2, 0x1);
+ if (err < 0) {
+ dev_err(uc->dev, "ccg_read failed, err %d\n", err);
+ return err;
+ }
+
+ err = ccg_write(uc, *(u16 *)buf, buf2, 0x1);
+ if (err < 0) {
+ dev_err(uc->dev, "ccg_read failed, err %d\n", err);
+ return err;
+ }
+
+ 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;
+
+ 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 <ajayg@nvidia.com>");
+MODULE_DESCRIPTION("UCSI driver for Cypress CCGx Type-C controller");
+MODULE_LICENSE("GPL v2");
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-09-05 22:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-05 18:04 [v5,2/2] usb: typec: ucsi: add support for Cypress CCGx Ajay Gupta
-- strict thread matches above, loose matches on Subject: below --
2018-09-05 22:31 Wolfram Sang
2018-09-05 22:17 Ajay Gupta
2018-09-05 12:31 Greg Kroah-Hartman
2018-09-05 12:26 Greg Kroah-Hartman
2018-08-31 20:22 Ajay Gupta
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.