| Message ID | 20230923073959.86660-1-alkuor@gmail.com |
|---|---|
| Headers | show |
| Series | Add TPS25750 USB type-C PD controller support | expand |
On Sat, Sep 23, 2023 at 03:39:47AM -0400, Abdel Alkuor wrote: > Some commands in tps25750 take longer than 1 second > to complete, and some responses need some delay before > the result becomes available. > > Signed-off-by: Abdel Alkuor <alkuor@gmail.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > Changes in v6: > - Use tps6598x_exec_cmd as a wrapper > Changes in v5: > - Incorporating tps25750 into tps6598x driver > > drivers/usb/typec/tipd/core.c | 19 +++++++++++++++---- > 1 file changed, 15 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c > index 37b56ce75f39..32420c61660d 100644 > --- a/drivers/usb/typec/tipd/core.c > +++ b/drivers/usb/typec/tipd/core.c > @@ -282,9 +282,10 @@ static void tps6598x_disconnect(struct tps6598x *tps, u32 status) > power_supply_changed(tps->psy); > } > > -static int tps6598x_exec_cmd(struct tps6598x *tps, const char *cmd, > +static int tps6598x_exec_cmd_tmo(struct tps6598x *tps, const char *cmd, > size_t in_len, u8 *in_data, > - size_t out_len, u8 *out_data) > + size_t out_len, u8 *out_data, > + u32 cmd_timeout_ms, u32 res_delay_ms) > { > unsigned long timeout; > u32 val; > @@ -307,8 +308,7 @@ static int tps6598x_exec_cmd(struct tps6598x *tps, const char *cmd, > if (ret < 0) > return ret; > > - /* XXX: Using 1s for now, but it may not be enough for every command. */ > - timeout = jiffies + msecs_to_jiffies(1000); > + timeout = jiffies + msecs_to_jiffies(cmd_timeout_ms); > > do { > ret = tps6598x_read32(tps, TPS_REG_CMD1, &val); > @@ -321,6 +321,9 @@ static int tps6598x_exec_cmd(struct tps6598x *tps, const char *cmd, > return -ETIMEDOUT; > } while (val); > > + /* some commands require delay for the result to be available */ > + mdelay(res_delay_ms); > + > if (out_len) { > ret = tps6598x_block_read(tps, TPS_REG_DATA1, > out_data, out_len); > @@ -345,6 +348,14 @@ static int tps6598x_exec_cmd(struct tps6598x *tps, const char *cmd, > return 0; > } > > +static int tps6598x_exec_cmd(struct tps6598x *tps, const char *cmd, > + size_t in_len, u8 *in_data, > + size_t out_len, u8 *out_data) > +{ > + return tps6598x_exec_cmd_tmo(tps, cmd, in_len, in_data, > + out_len, out_data, 1000, 0); > +} > + > static int tps6598x_dr_set(struct typec_port *port, enum typec_data_role role) > { > const char *cmd = (role == TYPEC_DEVICE) ? "SWUF" : "SWDF"; > -- > 2.34.1
On Wed, Sep 27, 2023 at 10:18:04AM +0300, Heikki Krogerus wrote: > On Wed, Sep 27, 2023 at 10:00:50AM +0300, Heikki Krogerus wrote: > > On Sat, Sep 23, 2023 at 03:39:47AM -0400, Abdel Alkuor wrote: > > > Some commands in tps25750 take longer than 1 second > > > to complete, and some responses need some delay before > > > the result becomes available. > > > > > > Signed-off-by: Abdel Alkuor <alkuor@gmail.com> > > > > Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > > Hold on! > > You are not specifying the driver in the subject. You need to fix > that. > I will send new patches with their subject updated. Thanks, Abdel
From: Abdel Alkuor <abdelalkuor@geotab.com> TPS25750 USB type-C PD controller has the same register offsets as tps6598x. The following is a summary of incorporating TPS25750 into TPS6598x driver: - Only Check VID register (0x00) for TPS6598x and cd321x, as TPS25750 doesn't have VID register. - TypeC port registration will be registered differently for each PD controller. TPS6598x uses system configuration register (0x28) to get pr/dr capabilities. On the other hand, TPS25750 will use data role property and PD status register (0x40) to get pr/dr capabilities as TPS25750 doesn't have register 0x28 supported. - TPS25750 requires writing a binary configuration to switch PD controller from PTCH mode to APP mode which needs the following changes: - Add PTCH mode to the modes list. - Add an argument to tps6598x_check_mode to return the current mode. - Currently, tps6598x_exec_cmd has cmd timeout hardcoded to 1 second, and doesn't wait before checking DATA_OUT response. In TPS25750, patch 4CCs take longer than 1 second to execute and some requires a delay before checking DATA_OUT. To accommodate that, cmd_timeout and response_delay will be added as arguments to tps6598x_exec_cmd. - Implement applying patch sequence for TPS25750. - In pm suspend callback, patch mode needs to be checked and the binary configuration should be applied if needed. - For interrupt, TPS25750 has only one event register (0x14) and one mask register (0x16) of 11 bytes each, where TPS6598x has two event and two mask registers of 8 bytes each. Both TPS25750 and TPS65986x shares the same bit field offsets for events/masks/clear but many of there fields are reserved in TPS25750, the following needs to be done in tps6598x_interrupt: - Read EVENT1 register as a block of 11 bytes when tps25750 is present - Write CLEAR1 register as a block of 11 bytes when tps25750 is present - Add trace_tps25750_irq - During testing, I noticed that when a cable is plugged into the PD controller and before PD controller switches to APP mode, there is a lag between dr/pr updates and PlugInsertOrRemoval Event, so a check for dr/pr change needs to be added along TPS_REG_INT_PLUG_EVENT check - Add TPS25750 traces for status and power status registers. Trace for data register won't be added as it doesn't exist in the device. - Configure sleep mode for TPS25750. v6: - PATCH 1: Use reg property for patch address - PATCH 2: Use tps6598x_exec_cmd as a wrapper - PATCH 3: Return current mode and check it directly - PATCH 4: - Don't check VID for tps25750 as the VID register doesn't exist - Remove is_tps25750 flag from tps6598x struct - Get patch address from reg property - PATCH 5: Update eeprom macro to use TPS instead - PATCH 6: No changes - PATCH 7: Check tps25750 using is_compatiable device node - PATCH 8: Create tipd callbacks factory - PATCH 9: No changes - PATCH 10: Add port registration to tipd data factory - PATCH 11: Use tps25750_init instead of tps25750_apply_patch in resume as it initializes sleep mode - PATCH 12: Add trace irq to tipd callbacks factory - PATCH 13: Add trace power status to tipd data factory - PATCH 14: Add trace status to tipd data factory v5: - PATCH 1: Add tps25750 bindings to tps6598x - PATCH 2: Remove tps25750 driver and incorperate tps25750 into tps6598x driver - PATCH [3..15]: Incorporating tps25750 into tps6598x driver v4: - PATCH 1: No change - PATCH 2: Fix comments style and drop of_match_ptr v3: - PATCH 1: Fix node name - PATCH 2: Upload tps25750 driver patch v2: - PATCH 1: General properties clean up Abdel Alkuor (14): dt-bindings: usb: tps6598x: Add tps25750 USB: typec: Add cmd timeout and response delay USB: typec: Add patch mode to tps6598x USB: typec: Load TPS25750 patch bundle USB: typec: Check for EEPROM present USB: typec: Clear dead battery flag USB: typec: Apply patch again after power resume USB: typec: Add interrupt support for TPS25750 USB: typec: Refactor tps6598x port registration USB: typec: Add port registration for tps25750 USB: typec: Enable sleep mode for tps25750 USB: typec: Add trace for tps25750 irq USB: typec: Add power status trace for tps25750 USB: typec: Add status trace for tps25750 .../devicetree/bindings/usb/ti,tps6598x.yaml | 70 ++ drivers/usb/typec/tipd/core.c | 632 +++++++++++++++--- drivers/usb/typec/tipd/tps6598x.h | 36 + drivers/usb/typec/tipd/trace.h | 92 +++ 4 files changed, 749 insertions(+), 81 deletions(-)