| Message ID | 20230112221609.540754-2-pmalani@chromium.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2476de8288cc552cbe98edf3f4d4cc2846cf4b8c |
| Headers | show |
| Series | usb: typec: Add retimer support to bus code | expand |
On Thu, Jan 12, 2023 at 10:16:06PM +0000, Prashant Malani wrote: > Just like it does with muxes, the Type-C bus code can update the state > of connected retimers (especially when altmode-related transitions > occur). Add a retimer handle to the port altmode struct to enable this. > > Signed-off-by: Prashant Malani <pmalani@chromium.org> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/usb/typec/bus.h | 2 ++ > drivers/usb/typec/class.c | 15 +++++++++++++-- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/typec/bus.h b/drivers/usb/typec/bus.h > index 56dec268d4dd..c89168857417 100644 > --- a/drivers/usb/typec/bus.h > +++ b/drivers/usb/typec/bus.h > @@ -7,11 +7,13 @@ > > struct bus_type; > struct typec_mux; > +struct typec_retimer; > > struct altmode { > unsigned int id; > struct typec_altmode adev; > struct typec_mux *mux; > + struct typec_retimer *retimer; > > enum typec_port_data roles; > > diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c > index 5897905cb4f0..ed3d070b1ca4 100644 > --- a/drivers/usb/typec/class.c > +++ b/drivers/usb/typec/class.c > @@ -583,6 +583,7 @@ void typec_unregister_altmode(struct typec_altmode *adev) > { > if (IS_ERR_OR_NULL(adev)) > return; > + typec_retimer_put(to_altmode(adev)->retimer); > typec_mux_put(to_altmode(adev)->mux); > device_unregister(&adev->dev); > } > @@ -2108,16 +2109,26 @@ typec_port_register_altmode(struct typec_port *port, > { > struct typec_altmode *adev; > struct typec_mux *mux; > + struct typec_retimer *retimer; > > mux = typec_mux_get(&port->dev, desc); > if (IS_ERR(mux)) > return ERR_CAST(mux); > > + retimer = typec_retimer_get(&port->dev); > + if (IS_ERR(retimer)) { > + typec_mux_put(mux); > + return ERR_CAST(retimer); > + } > + > adev = typec_register_altmode(&port->dev, desc); > - if (IS_ERR(adev)) > + if (IS_ERR(adev)) { > + typec_retimer_put(retimer); > typec_mux_put(mux); > - else > + } else { > to_altmode(adev)->mux = mux; > + to_altmode(adev)->retimer = retimer; > + } > > return adev; > } > -- > 2.39.0.314.g84b9a713c41-goog
diff --git a/drivers/usb/typec/bus.h b/drivers/usb/typec/bus.h index 56dec268d4dd..c89168857417 100644 --- a/drivers/usb/typec/bus.h +++ b/drivers/usb/typec/bus.h @@ -7,11 +7,13 @@ struct bus_type; struct typec_mux; +struct typec_retimer; struct altmode { unsigned int id; struct typec_altmode adev; struct typec_mux *mux; + struct typec_retimer *retimer; enum typec_port_data roles; diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c index 5897905cb4f0..ed3d070b1ca4 100644 --- a/drivers/usb/typec/class.c +++ b/drivers/usb/typec/class.c @@ -583,6 +583,7 @@ void typec_unregister_altmode(struct typec_altmode *adev) { if (IS_ERR_OR_NULL(adev)) return; + typec_retimer_put(to_altmode(adev)->retimer); typec_mux_put(to_altmode(adev)->mux); device_unregister(&adev->dev); } @@ -2108,16 +2109,26 @@ typec_port_register_altmode(struct typec_port *port, { struct typec_altmode *adev; struct typec_mux *mux; + struct typec_retimer *retimer; mux = typec_mux_get(&port->dev, desc); if (IS_ERR(mux)) return ERR_CAST(mux); + retimer = typec_retimer_get(&port->dev); + if (IS_ERR(retimer)) { + typec_mux_put(mux); + return ERR_CAST(retimer); + } + adev = typec_register_altmode(&port->dev, desc); - if (IS_ERR(adev)) + if (IS_ERR(adev)) { + typec_retimer_put(retimer); typec_mux_put(mux); - else + } else { to_altmode(adev)->mux = mux; + to_altmode(adev)->retimer = retimer; + } return adev; }
Just like it does with muxes, the Type-C bus code can update the state of connected retimers (especially when altmode-related transitions occur). Add a retimer handle to the port altmode struct to enable this. Signed-off-by: Prashant Malani <pmalani@chromium.org> --- drivers/usb/typec/bus.h | 2 ++ drivers/usb/typec/class.c | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-)