| Message ID | 20191123004347.5127-1-ajayg@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v6] usb: typec: ucsi: add support for separate DP altmode devices | expand |
Hi Heikki Please help review this change. It has been pending for some time. This is based on your suggestion at https://marc.info/?l=linux-usb&m=157355683226308&w=2 Thanks >nvpublic > -----Original Message----- > From: Ajay Gupta <ajaykuee@gmail.com> > Sent: Friday, November 22, 2019 4:44 PM > To: heikki.krogerus@linux.intel.com > Cc: linux-usb@vger.kernel.org; Ajay Gupta <ajayg@nvidia.com> > Subject: [PATCH v6] usb: typec: ucsi: add support for separate DP altmode > devices > > From: Ajay Gupta <ajayg@nvidia.com> > > CCGx controller used on NVIDIA GPU card has two separate display > altmode for two DP pin assignments. UCSI specification doesn't > prohibits using separate display altmode. > > Current UCSI Type-C framework expects only one display altmode for > all DP pin assignment. This patch squashes two separate display > altmode into single altmode to support controllers with separate > display altmode. We first read all the alternate modes of connector > and then run through it to know if there are separate display > altmodes. If so, it prepares a new port altmode set after squashing > two or more separate altmodes into one. > > Signed-off-by: Ajay Gupta <ajayg@nvidia.com> > --- > Original discussion on this issue is at [1] > > Changes frpm v5->v6 > - Rebased to Greg's latest usb-testing branch > > 1. https://marc.info/?l=linux-usb&m=154905866830998&w=2 > > drivers/usb/typec/ucsi/ucsi.c | 65 ++++++++-- > drivers/usb/typec/ucsi/ucsi.h | 10 ++ > drivers/usb/typec/ucsi/ucsi_ccg.c | 191 +++++++++++++++++++++++++++++- > 3 files changed, 253 insertions(+), 13 deletions(-) > > diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c > index 4459bc68aa33..f028658d1b1a 100644 > --- a/drivers/usb/typec/ucsi/ucsi.c > +++ b/drivers/usb/typec/ucsi/ucsi.c > @@ -323,12 +323,17 @@ static int ucsi_register_altmodes(struct > ucsi_connector *con, u8 recipient) > int max_altmodes = UCSI_MAX_ALTMODES; > struct typec_altmode_desc desc; > struct ucsi_altmode alt[2]; > + struct ucsi_altmode orig[UCSI_MAX_ALTMODES]; > + struct ucsi_altmode updated[UCSI_MAX_ALTMODES]; > + struct ucsi *ucsi = con->ucsi; > + bool multi_dp = false; > u64 command; > int num = 1; > int ret; > int len; > int j; > int i; > + int k = 0; > > if (!(con->ucsi->cap.features & UCSI_CAP_ALT_MODE_DETAILS)) > return 0; > @@ -339,6 +344,10 @@ static int ucsi_register_altmodes(struct > ucsi_connector *con, u8 recipient) > if (recipient == UCSI_RECIPIENT_CON) > max_altmodes = con->ucsi->cap.num_alt_modes; > > + memset(orig, 0, sizeof(orig)); > + memset(updated, 0, sizeof(updated)); > + > + /* First get all the alternate modes */ > for (i = 0; i < max_altmodes;) { > memset(alt, 0, sizeof(alt)); > command = UCSI_GET_ALTERNATE_MODES; > @@ -346,32 +355,66 @@ static int ucsi_register_altmodes(struct > ucsi_connector *con, u8 recipient) > command |= > UCSI_GET_ALTMODE_CONNECTOR_NUMBER(con->num); > command |= UCSI_GET_ALTMODE_OFFSET(i); > len = ucsi_run_command(con->ucsi, command, alt, sizeof(alt)); > - if (len <= 0) > + /* > + * We are collecting all altmodes first and then registering. > + * Some type-C device will return zero length data beyond last > + * alternate modes. We should not return if length is zero. > + */ > + if (len < 0) > return len; > > + /* We got all altmodes, now break out and register them */ > + if (!len) > + break; > + > /* > * This code is requesting one alt mode at a time, but some > PPMs > * may still return two. If that happens both alt modes need be > - * registered and the offset for the next alt mode has to be > + * saved and the offset for the next alt mode has to be > * incremented. > */ > num = len / sizeof(alt[0]); > i += num; > > for (j = 0; j < num; j++) { > - if (!alt[j].svid) > - return 0; > > - memset(&desc, 0, sizeof(desc)); > - desc.vdo = alt[j].mid; > - desc.svid = alt[j].svid; > - desc.roles = TYPEC_PORT_DRD; > + if (!alt[j].svid) { > + /* break out of outer loop and register */ > + i = max_altmodes; > + break; > + } > > - ret = ucsi_register_altmode(con, &desc, recipient); > - if (ret) > - return ret; > + orig[k].mid = alt[j].mid; > + orig[k].svid = alt[j].svid; > + k++; > } > } > + /* > + * Update the original altmode table as some ppms may report > + * multiple DP altmodes. > + */ > + if (recipient == UCSI_RECIPIENT_CON && ucsi->ops- > >update_altmodes) > + multi_dp = ucsi->ops->update_altmodes(ucsi, orig, updated); > + > + /* now register altmodes */ > + for (i = 0; i < max_altmodes; i++) { > + memset(&desc, 0, sizeof(desc)); > + if (multi_dp && recipient == UCSI_RECIPIENT_CON) { > + desc.svid = updated[i].svid; > + desc.vdo = updated[i].mid; > + } else { > + desc.svid = orig[i].svid; > + desc.vdo = orig[i].mid; > + } > + desc.roles = TYPEC_PORT_DRD; > + > + if (!desc.svid) > + return 0; > + > + ret = ucsi_register_altmode(con, &desc, recipient); > + if (ret) > + return ret; > + } > > return 0; > } > diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h > index 8569bbd3762f..08ecdf0dcbcc 100644 > --- a/drivers/usb/typec/ucsi/ucsi.h > +++ b/drivers/usb/typec/ucsi/ucsi.h > @@ -11,6 +11,7 @@ > /* -------------------------------------------------------------------------- */ > > struct ucsi; > +struct ucsi_altmode; > > /* UCSI offsets (Bytes) */ > #define UCSI_VERSION 0 > @@ -35,6 +36,7 @@ struct ucsi; > * @read: Read operation > * @sync_write: Blocking write operation > * @async_write: Non-blocking write operation > + * @update_altmodes: Squashes duplicate DP altmodes > * > * Read and write routines for UCSI interface. @sync_write must wait for the > * Command Completion Event from the PPM before returning, and > @async_write must > @@ -47,6 +49,8 @@ struct ucsi_operations { > const void *val, size_t val_len); > int (*async_write)(struct ucsi *ucsi, unsigned int offset, > const void *val, size_t val_len); > + bool (*update_altmodes)(struct ucsi *ucsi, struct ucsi_altmode *orig, > + struct ucsi_altmode *updated); > }; > > struct ucsi *ucsi_create(struct device *dev, const struct ucsi_operations > *ops); > @@ -82,6 +86,7 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num); > #define UCSI_GET_ERROR_STATUS 0x13 > > #define UCSI_CONNECTOR_NUMBER(_num_) ((u64)(_num_) << 16) > +#define UCSI_COMMAND(_cmd_) ((_cmd_) & 0xff) > > /* CONNECTOR_RESET command bits */ > #define UCSI_CONNECTOR_RESET_HARD BIT(23) /* Deprecated > in v1.1 */ > @@ -140,6 +145,11 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 > num); > #define UCSI_ERROR_PPM_POLICY_CONFLICT BIT(11) > #define UCSI_ERROR_SWAP_REJECTED BIT(12) > > +#define UCSI_SET_NEW_CAM_ENTER(x) (((x) >> 23) & 0x1) > +#define UCSI_SET_NEW_CAM_GET_AM(x) (((x) >> 24) & 0xff) > +#define UCSI_SET_NEW_CAM_AM_MASK (0xff << 24) > +#define UCSI_SET_NEW_CAM_SET_AM(x) (((x) & 0xff) << 24) > +#define UCSI_CMD_CONNECTOR_MASK (0x7) > /* Data structure filled by PPM in response to GET_CAPABILITY command. */ > struct ucsi_capability { > u32 attributes; > diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c > b/drivers/usb/typec/ucsi/ucsi_ccg.c > index 3370b3fc37b1..22c498688512 100644 > --- a/drivers/usb/typec/ucsi/ucsi_ccg.c > +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c > @@ -16,6 +16,7 @@ > #include <linux/platform_device.h> > #include <linux/pm.h> > #include <linux/pm_runtime.h> > +#include <linux/usb/typec_dp.h> > > #include <asm/unaligned.h> > #include "ucsi.h" > @@ -173,6 +174,15 @@ struct ccg_resp { > u8 length; > }; > > +struct ucsi_ccg_altmode { > + u16 svid; > + u32 mid; > + u8 linked_idx; > + u8 active_idx; > +#define UCSI_MULTI_DP_INDEX (0xff) > + bool checked; > +} __packed; > + > struct ucsi_ccg { > struct device *dev; > struct ucsi *ucsi; > @@ -198,6 +208,11 @@ struct ucsi_ccg { > struct work_struct pm_work; > > struct completion complete; > + > + u64 last_cmd_sent; > + bool has_multiple_dp; > + struct ucsi_ccg_altmode orig[UCSI_MAX_ALTMODES]; > + struct ucsi_ccg_altmode updated[UCSI_MAX_ALTMODES]; > }; > > static int ccg_read(struct ucsi_ccg *uc, u16 rab, u8 *data, u32 len) > @@ -319,12 +334,169 @@ static int ucsi_ccg_init(struct ucsi_ccg *uc) > return -ETIMEDOUT; > } > > +static void ucsi_ccg_update_get_current_cam_cmd(struct ucsi_ccg *uc, u8 > *data) > +{ > + u8 cam, new_cam; > + > + cam = data[0]; > + new_cam = uc->orig[cam].linked_idx; > + uc->updated[new_cam].active_idx = cam; > + data[0] = new_cam; > +} > + > +static bool ucsi_ccg_update_altmodes(struct ucsi *ucsi, > + struct ucsi_altmode *orig, > + struct ucsi_altmode *updated) > +{ > + struct ucsi_ccg *uc = ucsi_get_drvdata(ucsi); > + struct ucsi_ccg_altmode *alt, *new_alt; > + int i, j, k = 0; > + bool found = false; > + > + alt = uc->orig; > + new_alt = uc->updated; > + memset(uc->updated, 0, sizeof(uc->updated)); > + > + /* > + * Copy original connector altmodes to new structure. > + * We need this before second loop since second loop > + * checks for duplicate altmodes. > + */ > + for (i = 0; i < UCSI_MAX_ALTMODES; i++) { > + alt[i].svid = orig[i].svid; > + alt[i].mid = orig[i].mid; > + if (!alt[i].svid) > + break; > + } > + > + for (i = 0; i < UCSI_MAX_ALTMODES; i++) { > + if (!alt[i].svid) > + break; > + > + /* already checked and considered */ > + if (alt[i].checked) > + continue; > + > + if (!DP_CONF_GET_PIN_ASSIGN(alt[i].mid)) { > + /* Found Non DP altmode */ > + new_alt[k].svid = alt[i].svid; > + new_alt[k].mid |= alt[i].mid; > + new_alt[k].linked_idx = i; > + alt[i].linked_idx = k; > + updated[k].svid = new_alt[k].svid; > + updated[k].mid = new_alt[k].mid; > + k++; > + continue; > + } > + > + for (j = i + 1; j < UCSI_MAX_ALTMODES; j++) { > + if (alt[i].svid != alt[j].svid || > + !DP_CONF_GET_PIN_ASSIGN(alt[j].mid)) { > + continue; > + } else { > + /* Found duplicate DP mode */ > + new_alt[k].svid = alt[i].svid; > + new_alt[k].mid |= alt[i].mid | alt[j].mid; > + new_alt[k].linked_idx = > UCSI_MULTI_DP_INDEX; > + alt[i].linked_idx = k; > + alt[j].linked_idx = k; > + alt[j].checked = true; > + found = true; > + } > + } > + if (found) { > + uc->has_multiple_dp = true; > + } else { > + /* Didn't find any duplicate DP altmode */ > + new_alt[k].svid = alt[i].svid; > + new_alt[k].mid |= alt[i].mid; > + new_alt[k].linked_idx = i; > + alt[i].linked_idx = k; > + } > + updated[k].svid = new_alt[k].svid; > + updated[k].mid = new_alt[k].mid; > + k++; > + } > + return found; > +} > + > +static void ucsi_ccg_update_set_new_cam_cmd(struct ucsi_ccg *uc, > + struct ucsi_connector *con, > + u64 *cmd) > +{ > + struct ucsi_ccg_altmode *new_port, *port; > + struct typec_altmode *alt = NULL; > + u8 new_cam, cam, pin; > + bool enter_new_mode; > + int i, j, k = 0xff; > + > + port = uc->orig; > + new_cam = UCSI_SET_NEW_CAM_GET_AM(*cmd); > + new_port = &uc->updated[new_cam]; > + cam = new_port->linked_idx; > + enter_new_mode = UCSI_SET_NEW_CAM_ENTER(*cmd); > + > + /* > + * If CAM is UCSI_MULTI_DP_INDEX then this is DP altmode > + * with multiple DP mode. Find out CAM for best pin assignement > + * among all DP mode. Priorite pin E->D->C after making sure > + * the partner supports that pin. > + */ > + if (cam == UCSI_MULTI_DP_INDEX) { > + if (enter_new_mode) { > + for (i = 0; con->partner_altmode[i]; i++) { > + alt = con->partner_altmode[i]; > + if (alt->svid == new_port->svid) > + break; > + } > + /* > + * alt will always be non NULL since this is > + * UCSI_SET_NEW_CAM command and so there will > be > + * atleast one con->partner_altmode[i] with svid > + * matching with new_port->svid. > + */ > + for (j = 0; port[j].svid; j++) { > + pin = DP_CONF_GET_PIN_ASSIGN(port[j].mid); > + if (alt && port[j].svid == alt->svid && > + (pin & DP_CONF_GET_PIN_ASSIGN(alt- > >vdo))) { > + /* prioritize pin E->D->C */ > + if (k == 0xff || (k != 0xff && pin > > + > DP_CONF_GET_PIN_ASSIGN(port[k].mid)) > + ) { > + k = j; > + } > + } > + } > + cam = k; > + new_port->active_idx = cam; > + } else { > + cam = new_port->active_idx; > + } > + } > + *cmd &= ~UCSI_SET_NEW_CAM_AM_MASK; > + *cmd |= UCSI_SET_NEW_CAM_SET_AM(cam); > +} > + > static int ucsi_ccg_read(struct ucsi *ucsi, unsigned int offset, > void *val, size_t val_len) > { > + struct ucsi_ccg *uc = ucsi_get_drvdata(ucsi); > + int ret; > u16 reg = CCGX_RAB_UCSI_DATA_BLOCK(offset); > > - return ccg_read(ucsi_get_drvdata(ucsi), reg, val, val_len); > + ret = ccg_read(uc, reg, val, val_len); > + if (ret) > + return ret; > + > + if (offset == UCSI_MESSAGE_IN) { > + if (UCSI_COMMAND(uc->last_cmd_sent) == > UCSI_GET_CURRENT_CAM && > + uc->has_multiple_dp) { > + ucsi_ccg_update_get_current_cam_cmd(uc, (u8 > *)val); > + } > + uc->last_cmd_sent = 0; > + } > + > + return ret; > } > > static int ucsi_ccg_async_write(struct ucsi *ucsi, unsigned int offset, > @@ -339,12 +511,26 @@ static int ucsi_ccg_sync_write(struct ucsi *ucsi, > unsigned int offset, > const void *val, size_t val_len) > { > struct ucsi_ccg *uc = ucsi_get_drvdata(ucsi); > + struct ucsi_connector *con; > + int con_index; > int ret; > > mutex_lock(&uc->lock); > pm_runtime_get_sync(uc->dev); > set_bit(DEV_CMD_PENDING, &uc->flags); > > + if (offset == UCSI_CONTROL && val_len == sizeof(uc->last_cmd_sent)) > { > + uc->last_cmd_sent = *(u64 *)val; > + > + if (UCSI_COMMAND(uc->last_cmd_sent) == > UCSI_SET_NEW_CAM && > + uc->has_multiple_dp) { > + con_index = (uc->last_cmd_sent >> 16) & > + UCSI_CMD_CONNECTOR_MASK; > + con = &uc->ucsi->connector[con_index - 1]; > + ucsi_ccg_update_set_new_cam_cmd(uc, con, (u64 > *)val); > + } > + } > + > ret = ucsi_ccg_async_write(ucsi, offset, val, val_len); > if (ret) > goto err_clear_bit; > @@ -363,7 +549,8 @@ static int ucsi_ccg_sync_write(struct ucsi *ucsi, > unsigned int offset, > static const struct ucsi_operations ucsi_ccg_ops = { > .read = ucsi_ccg_read, > .sync_write = ucsi_ccg_sync_write, > - .async_write = ucsi_ccg_async_write > + .async_write = ucsi_ccg_async_write, > + .update_altmodes = ucsi_ccg_update_altmodes > }; > > static irqreturn_t ccg_irq_handler(int irq, void *data) > -- > 2.17.1
On Tue, Dec 03, 2019 at 05:45:05PM +0000, Ajay Gupta wrote: > Hi Heikki > > Please help review this change. It has been pending for some time. I will, don't worry. We are in the middle of merge window, so nothing is going to happen right now. thanks,
Hi Ajay, On Fri, Nov 22, 2019 at 04:43:47PM -0800, Ajay Gupta wrote: > From: Ajay Gupta <ajayg@nvidia.com> > > CCGx controller used on NVIDIA GPU card has two separate display > altmode for two DP pin assignments. UCSI specification doesn't > prohibits using separate display altmode. > > Current UCSI Type-C framework expects only one display altmode for > all DP pin assignment. This patch squashes two separate display > altmode into single altmode to support controllers with separate > display altmode. We first read all the alternate modes of connector > and then run through it to know if there are separate display > altmodes. If so, it prepares a new port altmode set after squashing > two or more separate altmodes into one. I didn't see any major issues with this. There were still few extra spaces etc., but I can clean those. Maybe it would have been good to mention in the commit message that the reason why we need those two separate alt modes, for what is in reality two separate pin configurations, is limitations in UCSI specification, but never mind. I still don't like the approach, but since I'm unable to explain my idea, or have time to write something for this myself, I don't want block this any longer. It does not add that much code, so once I have time, I can always try to improve it myself, right? Otherwise it's OK by me. I'll queue it up. thanks,
Hi Heikki, > -----Original Message----- > From: Heikki Krogerus <heikki.krogerus@linux.intel.com> > Sent: Thursday, December 12, 2019 5:44 AM > To: Ajay Gupta <ajaykuee@gmail.com> > Cc: linux-usb@vger.kernel.org; Ajay Gupta <ajayg@nvidia.com> > Subject: Re: [PATCH v6] usb: typec: ucsi: add support for separate DP altmode > devices > > > Hi Ajay, > > On Fri, Nov 22, 2019 at 04:43:47PM -0800, Ajay Gupta wrote: > > From: Ajay Gupta <ajayg@nvidia.com> > > > > CCGx controller used on NVIDIA GPU card has two separate display > > altmode for two DP pin assignments. UCSI specification doesn't > > prohibits using separate display altmode. > > > > Current UCSI Type-C framework expects only one display altmode for all > > DP pin assignment. This patch squashes two separate display altmode > > into single altmode to support controllers with separate display > > altmode. We first read all the alternate modes of connector and then > > run through it to know if there are separate display altmodes. If so, > > it prepares a new port altmode set after squashing two or more > > separate altmodes into one. > > I didn't see any major issues with this. There were still few extra spaces etc., > but I can clean those. Maybe it would have been good to mention in the > commit message that the reason why we need those two separate alt modes, > for what is in reality two separate pin configurations, is limitations in UCSI > specification, but never mind. > > I still don't like the approach, but since I'm unable to explain my idea, or have > time to write something for this myself, I don't want block this any longer. It > does not add that much code, so once I have time, I can always try to improve > it myself, right? > > Otherwise it's OK by me. I'll queue it up. Thanks for reviewing. Please feel free to improve the patch or commit message. Thanks >nvpublic > > thanks, > > -- > heikki
On Thu, Dec 12, 2019 at 05:42:28PM +0000, Ajay Gupta wrote: > Hi Heikki, > > > -----Original Message----- > > From: Heikki Krogerus <heikki.krogerus@linux.intel.com> > > Sent: Thursday, December 12, 2019 5:44 AM > > To: Ajay Gupta <ajaykuee@gmail.com> > > Cc: linux-usb@vger.kernel.org; Ajay Gupta <ajayg@nvidia.com> > > Subject: Re: [PATCH v6] usb: typec: ucsi: add support for separate DP altmode > > devices > > > > > > Hi Ajay, > > > > On Fri, Nov 22, 2019 at 04:43:47PM -0800, Ajay Gupta wrote: > > > From: Ajay Gupta <ajayg@nvidia.com> > > > > > > CCGx controller used on NVIDIA GPU card has two separate display > > > altmode for two DP pin assignments. UCSI specification doesn't > > > prohibits using separate display altmode. > > > > > > Current UCSI Type-C framework expects only one display altmode for all > > > DP pin assignment. This patch squashes two separate display altmode > > > into single altmode to support controllers with separate display > > > altmode. We first read all the alternate modes of connector and then > > > run through it to know if there are separate display altmodes. If so, > > > it prepares a new port altmode set after squashing two or more > > > separate altmodes into one. > > > > I didn't see any major issues with this. There were still few extra spaces etc., > > but I can clean those. Maybe it would have been good to mention in the > > commit message that the reason why we need those two separate alt modes, > > for what is in reality two separate pin configurations, is limitations in UCSI > > specification, but never mind. > > > > I still don't like the approach, but since I'm unable to explain my idea, or have > > time to write something for this myself, I don't want block this any longer. It > > does not add that much code, so once I have time, I can always try to improve > > it myself, right? > > > > Otherwise it's OK by me. I'll queue it up. > Thanks for reviewing. Please feel free to improve the patch or commit message. One thing that I do want to do is I want to isolate the changes done to ucsi.c. Can you test the attached diff? It applies on top of this patch. thanks,
Hi Heikki, > -----Original Message----- > From: linux-usb-owner@vger.kernel.org <linux-usb-owner@vger.kernel.org> > On Behalf Of Heikki Krogerus > Sent: Friday, December 13, 2019 4:38 AM > To: Ajay Gupta <ajayg@nvidia.com> > Cc: Ajay Gupta <ajaykuee@gmail.com>; linux-usb@vger.kernel.org > Subject: Re: [PATCH v6] usb: typec: ucsi: add support for separate DP altmode > devices > > External email: Use caution opening links or attachments > > > On Thu, Dec 12, 2019 at 05:42:28PM +0000, Ajay Gupta wrote: > > Hi Heikki, > > > > > -----Original Message----- > > > From: Heikki Krogerus <heikki.krogerus@linux.intel.com> > > > Sent: Thursday, December 12, 2019 5:44 AM > > > To: Ajay Gupta <ajaykuee@gmail.com> > > > Cc: linux-usb@vger.kernel.org; Ajay Gupta <ajayg@nvidia.com> > > > Subject: Re: [PATCH v6] usb: typec: ucsi: add support for separate > > > DP altmode devices > > > > > > > > > Hi Ajay, > > > > > > On Fri, Nov 22, 2019 at 04:43:47PM -0800, Ajay Gupta wrote: > > > > From: Ajay Gupta <ajayg@nvidia.com> > > > > > > > > CCGx controller used on NVIDIA GPU card has two separate display > > > > altmode for two DP pin assignments. UCSI specification doesn't > > > > prohibits using separate display altmode. > > > > > > > > Current UCSI Type-C framework expects only one display altmode for > > > > all DP pin assignment. This patch squashes two separate display > > > > altmode into single altmode to support controllers with separate > > > > display altmode. We first read all the alternate modes of > > > > connector and then run through it to know if there are separate > > > > display altmodes. If so, it prepares a new port altmode set after > > > > squashing two or more separate altmodes into one. > > > > > > I didn't see any major issues with this. There were still few extra > > > spaces etc., but I can clean those. Maybe it would have been good to > > > mention in the commit message that the reason why we need those two > > > separate alt modes, for what is in reality two separate pin > > > configurations, is limitations in UCSI specification, but never mind. > > > > > > I still don't like the approach, but since I'm unable to explain my > > > idea, or have time to write something for this myself, I don't want > > > block this any longer. It does not add that much code, so once I > > > have time, I can always try to improve it myself, right? > > > > > > Otherwise it's OK by me. I'll queue it up. > > Thanks for reviewing. Please feel free to improve the patch or commit > message. > > One thing that I do want to do is I want to isolate the changes done to ucsi.c. > Can you test the attached diff? It applies on top of this patch. Tested the diff and it looks good. Please add additional change at [A] on top of your diff.. Thanks Ajay > nvpublic ----------------------- [A] --------------------------- --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -368,11 +368,8 @@ ucsi_register_altmodes_nvidia(struct ucsi_connector *con, u8 recipient) if (!len) break; - if (!alt.svid) { - /* break out of outer loop and register */ - i = max_altmodes; + if (!alt.svid) break; - } orig[k].mid = alt.mid; orig[k].svid = alt.svid; @@ -382,7 +379,7 @@ ucsi_register_altmodes_nvidia(struct ucsi_connector *con, u8 recipient) * Update the original altmode table as some ppms may report * multiple DP altmodes. */ - if (recipient == UCSI_RECIPIENT_CON && ucsi->ops->update_altmodes) + if (recipient == UCSI_RECIPIENT_CON) multi_dp = ucsi->ops->update_altmodes(ucsi, orig, updated); /* now register altmodes */ ---------------------------------------------------------- > > thanks, > > -- > heikki
On Mon, Dec 16, 2019 at 10:49:46PM +0000, Ajay Gupta wrote: > Hi Heikki, > > > -----Original Message----- > > From: linux-usb-owner@vger.kernel.org <linux-usb-owner@vger.kernel.org> > > On Behalf Of Heikki Krogerus > > Sent: Friday, December 13, 2019 4:38 AM > > To: Ajay Gupta <ajayg@nvidia.com> > > Cc: Ajay Gupta <ajaykuee@gmail.com>; linux-usb@vger.kernel.org > > Subject: Re: [PATCH v6] usb: typec: ucsi: add support for separate DP altmode > > devices > > > > External email: Use caution opening links or attachments > > > > > > On Thu, Dec 12, 2019 at 05:42:28PM +0000, Ajay Gupta wrote: > > > Hi Heikki, > > > > > > > -----Original Message----- > > > > From: Heikki Krogerus <heikki.krogerus@linux.intel.com> > > > > Sent: Thursday, December 12, 2019 5:44 AM > > > > To: Ajay Gupta <ajaykuee@gmail.com> > > > > Cc: linux-usb@vger.kernel.org; Ajay Gupta <ajayg@nvidia.com> > > > > Subject: Re: [PATCH v6] usb: typec: ucsi: add support for separate > > > > DP altmode devices > > > > > > > > > > > > Hi Ajay, > > > > > > > > On Fri, Nov 22, 2019 at 04:43:47PM -0800, Ajay Gupta wrote: > > > > > From: Ajay Gupta <ajayg@nvidia.com> > > > > > > > > > > CCGx controller used on NVIDIA GPU card has two separate display > > > > > altmode for two DP pin assignments. UCSI specification doesn't > > > > > prohibits using separate display altmode. > > > > > > > > > > Current UCSI Type-C framework expects only one display altmode for > > > > > all DP pin assignment. This patch squashes two separate display > > > > > altmode into single altmode to support controllers with separate > > > > > display altmode. We first read all the alternate modes of > > > > > connector and then run through it to know if there are separate > > > > > display altmodes. If so, it prepares a new port altmode set after > > > > > squashing two or more separate altmodes into one. > > > > > > > > I didn't see any major issues with this. There were still few extra > > > > spaces etc., but I can clean those. Maybe it would have been good to > > > > mention in the commit message that the reason why we need those two > > > > separate alt modes, for what is in reality two separate pin > > > > configurations, is limitations in UCSI specification, but never mind. > > > > > > > > I still don't like the approach, but since I'm unable to explain my > > > > idea, or have time to write something for this myself, I don't want > > > > block this any longer. It does not add that much code, so once I > > > > have time, I can always try to improve it myself, right? > > > > > > > > Otherwise it's OK by me. I'll queue it up. > > > Thanks for reviewing. Please feel free to improve the patch or commit > > message. > > > > One thing that I do want to do is I want to isolate the changes done to ucsi.c. > > Can you test the attached diff? It applies on top of this patch. > Tested the diff and it looks good. Please add additional change at [A] on top of > your diff.. Done. > --- a/drivers/usb/typec/ucsi/ucsi.c > +++ b/drivers/usb/typec/ucsi/ucsi.c > @@ -368,11 +368,8 @@ ucsi_register_altmodes_nvidia(struct ucsi_connector *con, u8 recipient) > if (!len) > break; > > - if (!alt.svid) { > - /* break out of outer loop and register */ > - i = max_altmodes; > + if (!alt.svid) > break; > - } > > orig[k].mid = alt.mid; > orig[k].svid = alt.svid; > @@ -382,7 +379,7 @@ ucsi_register_altmodes_nvidia(struct ucsi_connector *con, u8 recipient) > * Update the original altmode table as some ppms may report > * multiple DP altmodes. > */ > - if (recipient == UCSI_RECIPIENT_CON && ucsi->ops->update_altmodes) > + if (recipient == UCSI_RECIPIENT_CON) > multi_dp = ucsi->ops->update_altmodes(ucsi, orig, updated); > > /* now register altmodes */ thanks,
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 4459bc68aa33..f028658d1b1a 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -323,12 +323,17 @@ static int ucsi_register_altmodes(struct ucsi_connector *con, u8 recipient) int max_altmodes = UCSI_MAX_ALTMODES; struct typec_altmode_desc desc; struct ucsi_altmode alt[2]; + struct ucsi_altmode orig[UCSI_MAX_ALTMODES]; + struct ucsi_altmode updated[UCSI_MAX_ALTMODES]; + struct ucsi *ucsi = con->ucsi; + bool multi_dp = false; u64 command; int num = 1; int ret; int len; int j; int i; + int k = 0; if (!(con->ucsi->cap.features & UCSI_CAP_ALT_MODE_DETAILS)) return 0; @@ -339,6 +344,10 @@ static int ucsi_register_altmodes(struct ucsi_connector *con, u8 recipient) if (recipient == UCSI_RECIPIENT_CON) max_altmodes = con->ucsi->cap.num_alt_modes; + memset(orig, 0, sizeof(orig)); + memset(updated, 0, sizeof(updated)); + + /* First get all the alternate modes */ for (i = 0; i < max_altmodes;) { memset(alt, 0, sizeof(alt)); command = UCSI_GET_ALTERNATE_MODES; @@ -346,32 +355,66 @@ static int ucsi_register_altmodes(struct ucsi_connector *con, u8 recipient) command |= UCSI_GET_ALTMODE_CONNECTOR_NUMBER(con->num); command |= UCSI_GET_ALTMODE_OFFSET(i); len = ucsi_run_command(con->ucsi, command, alt, sizeof(alt)); - if (len <= 0) + /* + * We are collecting all altmodes first and then registering. + * Some type-C device will return zero length data beyond last + * alternate modes. We should not return if length is zero. + */ + if (len < 0) return len; + /* We got all altmodes, now break out and register them */ + if (!len) + break; + /* * This code is requesting one alt mode at a time, but some PPMs * may still return two. If that happens both alt modes need be - * registered and the offset for the next alt mode has to be + * saved and the offset for the next alt mode has to be * incremented. */ num = len / sizeof(alt[0]); i += num; for (j = 0; j < num; j++) { - if (!alt[j].svid) - return 0; - memset(&desc, 0, sizeof(desc)); - desc.vdo = alt[j].mid; - desc.svid = alt[j].svid; - desc.roles = TYPEC_PORT_DRD; + if (!alt[j].svid) { + /* break out of outer loop and register */ + i = max_altmodes; + break; + } - ret = ucsi_register_altmode(con, &desc, recipient); - if (ret) - return ret; + orig[k].mid = alt[j].mid; + orig[k].svid = alt[j].svid; + k++; } } + /* + * Update the original altmode table as some ppms may report + * multiple DP altmodes. + */ + if (recipient == UCSI_RECIPIENT_CON && ucsi->ops->update_altmodes) + multi_dp = ucsi->ops->update_altmodes(ucsi, orig, updated); + + /* now register altmodes */ + for (i = 0; i < max_altmodes; i++) { + memset(&desc, 0, sizeof(desc)); + if (multi_dp && recipient == UCSI_RECIPIENT_CON) { + desc.svid = updated[i].svid; + desc.vdo = updated[i].mid; + } else { + desc.svid = orig[i].svid; + desc.vdo = orig[i].mid; + } + desc.roles = TYPEC_PORT_DRD; + + if (!desc.svid) + return 0; + + ret = ucsi_register_altmode(con, &desc, recipient); + if (ret) + return ret; + } return 0; } diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h index 8569bbd3762f..08ecdf0dcbcc 100644 --- a/drivers/usb/typec/ucsi/ucsi.h +++ b/drivers/usb/typec/ucsi/ucsi.h @@ -11,6 +11,7 @@ /* -------------------------------------------------------------------------- */ struct ucsi; +struct ucsi_altmode; /* UCSI offsets (Bytes) */ #define UCSI_VERSION 0 @@ -35,6 +36,7 @@ struct ucsi; * @read: Read operation * @sync_write: Blocking write operation * @async_write: Non-blocking write operation + * @update_altmodes: Squashes duplicate DP altmodes * * Read and write routines for UCSI interface. @sync_write must wait for the * Command Completion Event from the PPM before returning, and @async_write must @@ -47,6 +49,8 @@ struct ucsi_operations { const void *val, size_t val_len); int (*async_write)(struct ucsi *ucsi, unsigned int offset, const void *val, size_t val_len); + bool (*update_altmodes)(struct ucsi *ucsi, struct ucsi_altmode *orig, + struct ucsi_altmode *updated); }; struct ucsi *ucsi_create(struct device *dev, const struct ucsi_operations *ops); @@ -82,6 +86,7 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num); #define UCSI_GET_ERROR_STATUS 0x13 #define UCSI_CONNECTOR_NUMBER(_num_) ((u64)(_num_) << 16) +#define UCSI_COMMAND(_cmd_) ((_cmd_) & 0xff) /* CONNECTOR_RESET command bits */ #define UCSI_CONNECTOR_RESET_HARD BIT(23) /* Deprecated in v1.1 */ @@ -140,6 +145,11 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num); #define UCSI_ERROR_PPM_POLICY_CONFLICT BIT(11) #define UCSI_ERROR_SWAP_REJECTED BIT(12) +#define UCSI_SET_NEW_CAM_ENTER(x) (((x) >> 23) & 0x1) +#define UCSI_SET_NEW_CAM_GET_AM(x) (((x) >> 24) & 0xff) +#define UCSI_SET_NEW_CAM_AM_MASK (0xff << 24) +#define UCSI_SET_NEW_CAM_SET_AM(x) (((x) & 0xff) << 24) +#define UCSI_CMD_CONNECTOR_MASK (0x7) /* Data structure filled by PPM in response to GET_CAPABILITY command. */ struct ucsi_capability { u32 attributes; diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c index 3370b3fc37b1..22c498688512 100644 --- a/drivers/usb/typec/ucsi/ucsi_ccg.c +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c @@ -16,6 +16,7 @@ #include <linux/platform_device.h> #include <linux/pm.h> #include <linux/pm_runtime.h> +#include <linux/usb/typec_dp.h> #include <asm/unaligned.h> #include "ucsi.h" @@ -173,6 +174,15 @@ struct ccg_resp { u8 length; }; +struct ucsi_ccg_altmode { + u16 svid; + u32 mid; + u8 linked_idx; + u8 active_idx; +#define UCSI_MULTI_DP_INDEX (0xff) + bool checked; +} __packed; + struct ucsi_ccg { struct device *dev; struct ucsi *ucsi; @@ -198,6 +208,11 @@ struct ucsi_ccg { struct work_struct pm_work; struct completion complete; + + u64 last_cmd_sent; + bool has_multiple_dp; + struct ucsi_ccg_altmode orig[UCSI_MAX_ALTMODES]; + struct ucsi_ccg_altmode updated[UCSI_MAX_ALTMODES]; }; static int ccg_read(struct ucsi_ccg *uc, u16 rab, u8 *data, u32 len) @@ -319,12 +334,169 @@ static int ucsi_ccg_init(struct ucsi_ccg *uc) return -ETIMEDOUT; } +static void ucsi_ccg_update_get_current_cam_cmd(struct ucsi_ccg *uc, u8 *data) +{ + u8 cam, new_cam; + + cam = data[0]; + new_cam = uc->orig[cam].linked_idx; + uc->updated[new_cam].active_idx = cam; + data[0] = new_cam; +} + +static bool ucsi_ccg_update_altmodes(struct ucsi *ucsi, + struct ucsi_altmode *orig, + struct ucsi_altmode *updated) +{ + struct ucsi_ccg *uc = ucsi_get_drvdata(ucsi); + struct ucsi_ccg_altmode *alt, *new_alt; + int i, j, k = 0; + bool found = false; + + alt = uc->orig; + new_alt = uc->updated; + memset(uc->updated, 0, sizeof(uc->updated)); + + /* + * Copy original connector altmodes to new structure. + * We need this before second loop since second loop + * checks for duplicate altmodes. + */ + for (i = 0; i < UCSI_MAX_ALTMODES; i++) { + alt[i].svid = orig[i].svid; + alt[i].mid = orig[i].mid; + if (!alt[i].svid) + break; + } + + for (i = 0; i < UCSI_MAX_ALTMODES; i++) { + if (!alt[i].svid) + break; + + /* already checked and considered */ + if (alt[i].checked) + continue; + + if (!DP_CONF_GET_PIN_ASSIGN(alt[i].mid)) { + /* Found Non DP altmode */ + new_alt[k].svid = alt[i].svid; + new_alt[k].mid |= alt[i].mid; + new_alt[k].linked_idx = i; + alt[i].linked_idx = k; + updated[k].svid = new_alt[k].svid; + updated[k].mid = new_alt[k].mid; + k++; + continue; + } + + for (j = i + 1; j < UCSI_MAX_ALTMODES; j++) { + if (alt[i].svid != alt[j].svid || + !DP_CONF_GET_PIN_ASSIGN(alt[j].mid)) { + continue; + } else { + /* Found duplicate DP mode */ + new_alt[k].svid = alt[i].svid; + new_alt[k].mid |= alt[i].mid | alt[j].mid; + new_alt[k].linked_idx = UCSI_MULTI_DP_INDEX; + alt[i].linked_idx = k; + alt[j].linked_idx = k; + alt[j].checked = true; + found = true; + } + } + if (found) { + uc->has_multiple_dp = true; + } else { + /* Didn't find any duplicate DP altmode */ + new_alt[k].svid = alt[i].svid; + new_alt[k].mid |= alt[i].mid; + new_alt[k].linked_idx = i; + alt[i].linked_idx = k; + } + updated[k].svid = new_alt[k].svid; + updated[k].mid = new_alt[k].mid; + k++; + } + return found; +} + +static void ucsi_ccg_update_set_new_cam_cmd(struct ucsi_ccg *uc, + struct ucsi_connector *con, + u64 *cmd) +{ + struct ucsi_ccg_altmode *new_port, *port; + struct typec_altmode *alt = NULL; + u8 new_cam, cam, pin; + bool enter_new_mode; + int i, j, k = 0xff; + + port = uc->orig; + new_cam = UCSI_SET_NEW_CAM_GET_AM(*cmd); + new_port = &uc->updated[new_cam]; + cam = new_port->linked_idx; + enter_new_mode = UCSI_SET_NEW_CAM_ENTER(*cmd); + + /* + * If CAM is UCSI_MULTI_DP_INDEX then this is DP altmode + * with multiple DP mode. Find out CAM for best pin assignement + * among all DP mode. Priorite pin E->D->C after making sure + * the partner supports that pin. + */ + if (cam == UCSI_MULTI_DP_INDEX) { + if (enter_new_mode) { + for (i = 0; con->partner_altmode[i]; i++) { + alt = con->partner_altmode[i]; + if (alt->svid == new_port->svid) + break; + } + /* + * alt will always be non NULL since this is + * UCSI_SET_NEW_CAM command and so there will be + * atleast one con->partner_altmode[i] with svid + * matching with new_port->svid. + */ + for (j = 0; port[j].svid; j++) { + pin = DP_CONF_GET_PIN_ASSIGN(port[j].mid); + if (alt && port[j].svid == alt->svid && + (pin & DP_CONF_GET_PIN_ASSIGN(alt->vdo))) { + /* prioritize pin E->D->C */ + if (k == 0xff || (k != 0xff && pin > + DP_CONF_GET_PIN_ASSIGN(port[k].mid)) + ) { + k = j; + } + } + } + cam = k; + new_port->active_idx = cam; + } else { + cam = new_port->active_idx; + } + } + *cmd &= ~UCSI_SET_NEW_CAM_AM_MASK; + *cmd |= UCSI_SET_NEW_CAM_SET_AM(cam); +} + static int ucsi_ccg_read(struct ucsi *ucsi, unsigned int offset, void *val, size_t val_len) { + struct ucsi_ccg *uc = ucsi_get_drvdata(ucsi); + int ret; u16 reg = CCGX_RAB_UCSI_DATA_BLOCK(offset); - return ccg_read(ucsi_get_drvdata(ucsi), reg, val, val_len); + ret = ccg_read(uc, reg, val, val_len); + if (ret) + return ret; + + if (offset == UCSI_MESSAGE_IN) { + if (UCSI_COMMAND(uc->last_cmd_sent) == UCSI_GET_CURRENT_CAM && + uc->has_multiple_dp) { + ucsi_ccg_update_get_current_cam_cmd(uc, (u8 *)val); + } + uc->last_cmd_sent = 0; + } + + return ret; } static int ucsi_ccg_async_write(struct ucsi *ucsi, unsigned int offset, @@ -339,12 +511,26 @@ static int ucsi_ccg_sync_write(struct ucsi *ucsi, unsigned int offset, const void *val, size_t val_len) { struct ucsi_ccg *uc = ucsi_get_drvdata(ucsi); + struct ucsi_connector *con; + int con_index; int ret; mutex_lock(&uc->lock); pm_runtime_get_sync(uc->dev); set_bit(DEV_CMD_PENDING, &uc->flags); + if (offset == UCSI_CONTROL && val_len == sizeof(uc->last_cmd_sent)) { + uc->last_cmd_sent = *(u64 *)val; + + if (UCSI_COMMAND(uc->last_cmd_sent) == UCSI_SET_NEW_CAM && + uc->has_multiple_dp) { + con_index = (uc->last_cmd_sent >> 16) & + UCSI_CMD_CONNECTOR_MASK; + con = &uc->ucsi->connector[con_index - 1]; + ucsi_ccg_update_set_new_cam_cmd(uc, con, (u64 *)val); + } + } + ret = ucsi_ccg_async_write(ucsi, offset, val, val_len); if (ret) goto err_clear_bit; @@ -363,7 +549,8 @@ static int ucsi_ccg_sync_write(struct ucsi *ucsi, unsigned int offset, static const struct ucsi_operations ucsi_ccg_ops = { .read = ucsi_ccg_read, .sync_write = ucsi_ccg_sync_write, - .async_write = ucsi_ccg_async_write + .async_write = ucsi_ccg_async_write, + .update_altmodes = ucsi_ccg_update_altmodes }; static irqreturn_t ccg_irq_handler(int irq, void *data)