| Message ID | 20211228052116.1748443-7-bjorn.andersson@linaro.org |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | typec: mux: Introduce support for multiple TypeC muxes | expand |
On 28/12/2021 08:21, Bjorn Andersson wrote: > In the Qualcomm platforms the USB/DP PHY handles muxing and orientation > switching of the SuperSpeed lines, but the SBU lines needs to be > connected and switched by external (to the SoC) hardware. > > It's therefor necessary to be able to have the TypeC controller operate > multiple TypeC muxes and switches. Use the newly introduced indirection > object to handle this, to avoid having to taint the TypeC controllers > with knowledge about the downstream hardware configuration. > > The max number of devs per indirection is set to 3, based on the number > of ports defined in the usb-c-connector binding. If we had the 'count' ability, we wouldn't have to put limits here. The limit 3 is a bit artificial if you consider the redriver chips. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > --- > drivers/usb/typec/mux.c | 124 +++++++++++++++++++++++++++++++--------- > 1 file changed, 98 insertions(+), 26 deletions(-) > > diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c > index d0b42c297aca..adf3681cf22d 100644 > --- a/drivers/usb/typec/mux.c > +++ b/drivers/usb/typec/mux.c > @@ -17,8 +17,11 @@ > #include "class.h" > #include "mux.h" > > +#define TYPEC_MUX_MAX_DEVS 3 > + > struct typec_switch { > - struct typec_switch_dev *sw_dev; > + struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS]; > + unsigned int num_sw_devs; > }; > > static int switch_fwnode_match(struct device *dev, const void *fwnode) > @@ -67,25 +70,48 @@ static void *typec_switch_match(struct fwnode_handle *fwnode, const char *id, > */ > struct typec_switch *fwnode_typec_switch_get(struct fwnode_handle *fwnode) > { > - struct typec_switch_dev *sw_dev; > + struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS]; > struct typec_switch *sw; > + int count; > + int err; > + int i; > > sw = kzalloc(sizeof(*sw), GFP_KERNEL); > if (!sw) > return ERR_PTR(-ENOMEM); > > - sw_dev = fwnode_connection_find_match(fwnode, "orientation-switch", NULL, > - typec_switch_match); > - if (IS_ERR_OR_NULL(sw_dev)) { > + count = fwnode_connection_find_matches(fwnode, "orientation-switch", NULL, > + typec_switch_match, > + (void **)sw_devs, > + ARRAY_SIZE(sw_devs)); > + if (count <= 0) { > kfree(sw); > - return ERR_CAST(sw_dev); > + return NULL; > } > > - WARN_ON(!try_module_get(sw_dev->dev.parent->driver->owner)); > + for (i = 0; i < count; i++) { > + if (IS_ERR(sw_devs[i])) { > + err = PTR_ERR(sw_devs[i]); > + goto put_sw_devs; > + } > + } > + > + for (i = 0; i < count; i++) { > + WARN_ON(!try_module_get(sw_devs[i]->dev.parent->driver->owner)); > + sw->sw_devs[i] = sw_devs[i]; > + } > > - sw->sw_dev = sw_dev; > + sw->num_sw_devs = count; > > return sw; > + > +put_sw_devs: > + for (i = 0; i < count; i++) { > + if (!IS_ERR(sw_devs[i])) > + put_device(&sw_devs[i]->dev); > + } > + > + return ERR_PTR(err); > } > EXPORT_SYMBOL_GPL(fwnode_typec_switch_get); > > @@ -98,14 +124,17 @@ EXPORT_SYMBOL_GPL(fwnode_typec_switch_get); > void typec_switch_put(struct typec_switch *sw) > { > struct typec_switch_dev *sw_dev; > + unsigned int i; > > if (IS_ERR_OR_NULL(sw)) > return; > > - sw_dev = sw->sw_dev; > + for (i = 0; i < sw->num_sw_devs; i++) { > + sw_dev = sw->sw_devs[i]; > > - module_put(sw_dev->dev.parent->driver->owner); > - put_device(&sw_dev->dev); > + module_put(sw_dev->dev.parent->driver->owner); > + put_device(&sw_dev->dev); > + } > kfree(sw); > } > EXPORT_SYMBOL_GPL(typec_switch_put); > @@ -170,13 +199,21 @@ int typec_switch_set(struct typec_switch *sw, > enum typec_orientation orientation) > { > struct typec_switch_dev *sw_dev; > + unsigned int i; > + int ret; > > if (IS_ERR_OR_NULL(sw)) > return 0; > > - sw_dev = sw->sw_dev; > + for (i = 0; i < sw->num_sw_devs; i++) { > + sw_dev = sw->sw_devs[i]; > + > + ret = sw_dev->set(sw_dev, orientation); > + if (ret) > + return ret; > + } > > - return sw_dev->set(sw_dev, orientation); > + return 0; > } > EXPORT_SYMBOL_GPL(typec_switch_set); > > @@ -208,7 +245,8 @@ EXPORT_SYMBOL_GPL(typec_switch_get_drvdata); > /* ------------------------------------------------------------------------- */ > > struct typec_mux { > - struct typec_mux_dev *mux_dev; > + struct typec_mux_dev *mux_devs[TYPEC_MUX_MAX_DEVS]; > + unsigned int num_mux_devs; > }; > > static int mux_fwnode_match(struct device *dev, const void *fwnode) > @@ -291,25 +329,48 @@ static void *typec_mux_match(struct fwnode_handle *fwnode, const char *id, > struct typec_mux *fwnode_typec_mux_get(struct fwnode_handle *fwnode, > const struct typec_altmode_desc *desc) > { > - struct typec_mux_dev *mux_dev; > + struct typec_mux_dev *mux_devs[TYPEC_MUX_MAX_DEVS]; > struct typec_mux *mux; > + int count; > + int err; > + int i; > > mux = kzalloc(sizeof(*mux), GFP_KERNEL); > if (!mux) > return ERR_PTR(-ENOMEM); > > - mux_dev = fwnode_connection_find_match(fwnode, "mode-switch", (void *)desc, > - typec_mux_match); > - if (IS_ERR_OR_NULL(mux_dev)) { > + count = fwnode_connection_find_matches(fwnode, "mode-switch", > + (void *)desc, typec_mux_match, > + (void **)mux_devs, > + ARRAY_SIZE(mux_devs)); > + if (count <= 0) { > kfree(mux); > - return ERR_CAST(mux_dev); > + return NULL; > } > > - WARN_ON(!try_module_get(mux_dev->dev.parent->driver->owner)); > + for (i = 0; i < count; i++) { > + if (IS_ERR(mux_devs[i])) { > + err = PTR_ERR(mux_devs[i]); > + goto put_mux_devs; > + } > + } > + > + for (i = 0; i < count; i++) { > + WARN_ON(!try_module_get(mux_devs[i]->dev.parent->driver->owner)); > + mux->mux_devs[i] = mux_devs[i]; > + } > > - mux->mux_dev = mux_dev; > + mux->num_mux_devs = count; > > return mux; > + > +put_mux_devs: > + for (i = 0; i < count; i++) { > + if (!IS_ERR(mux_devs[i])) > + put_device(&mux_devs[i]->dev); > + } > + > + return ERR_PTR(err); > } > EXPORT_SYMBOL_GPL(fwnode_typec_mux_get); > > @@ -322,13 +383,16 @@ EXPORT_SYMBOL_GPL(fwnode_typec_mux_get); > void typec_mux_put(struct typec_mux *mux) > { > struct typec_mux_dev *mux_dev; > + unsigned int i; > > if (IS_ERR_OR_NULL(mux)) > return; > > - mux_dev = mux->mux_dev; > - module_put(mux_dev->dev.parent->driver->owner); > - put_device(&mux_dev->dev); > + for (i = 0; i < mux->num_mux_devs; i++) { > + mux_dev = mux->mux_devs[i]; > + module_put(mux_dev->dev.parent->driver->owner); > + put_device(&mux_dev->dev); > + } > kfree(mux); > } > EXPORT_SYMBOL_GPL(typec_mux_put); > @@ -336,13 +400,21 @@ EXPORT_SYMBOL_GPL(typec_mux_put); > int typec_mux_set(struct typec_mux *mux, struct typec_mux_state *state) > { > struct typec_mux_dev *mux_dev; > + unsigned int i; > + int ret; > > if (IS_ERR_OR_NULL(mux)) > return 0; > > - mux_dev = mux->mux_dev; > + for (i = 0; i < mux->num_mux_devs; i++) { > + mux_dev = mux->mux_devs[i]; > + > + ret = mux_dev->set(mux_dev, state); > + if (ret) > + return ret; > + } > > - return mux_dev->set(mux_dev, state); > + return 0; > } > EXPORT_SYMBOL_GPL(typec_mux_set); >
On Tue 28 Dec 08:04 PST 2021, Dmitry Baryshkov wrote: > On 28/12/2021 08:21, Bjorn Andersson wrote: > > In the Qualcomm platforms the USB/DP PHY handles muxing and orientation > > switching of the SuperSpeed lines, but the SBU lines needs to be > > connected and switched by external (to the SoC) hardware. > > > > It's therefor necessary to be able to have the TypeC controller operate > > multiple TypeC muxes and switches. Use the newly introduced indirection > > object to handle this, to avoid having to taint the TypeC controllers > > with knowledge about the downstream hardware configuration. > > > > The max number of devs per indirection is set to 3, based on the number > > of ports defined in the usb-c-connector binding. > > If we had the 'count' ability, we wouldn't have to put limits here. > The limit 3 is a bit artificial if you consider the redriver chips. > I don't know if it's worth making it more dynamic at this point in time. I definitely don't think it's worth taking two passes here, because typec_switch_match will allocate objects that needs to be freed after the "count" pass. I.e. taking two passes is expensive (and ugly). Also in it's current state we're wasting 16 bytes per USB connector at worst and in the case of us having QMP muxing SuperSpeed signals and an external redriver we have 2. Given that we're just dealing with pointers the waste isn't that big, but we could put say 8 (16?) entries on the stack and then dynamically allocate the typec_switch and typec_mux arrays based on the actual number of items returned. Regards, Bjorn > > > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > > --- > > drivers/usb/typec/mux.c | 124 +++++++++++++++++++++++++++++++--------- > > 1 file changed, 98 insertions(+), 26 deletions(-) > > > > diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c > > index d0b42c297aca..adf3681cf22d 100644 > > --- a/drivers/usb/typec/mux.c > > +++ b/drivers/usb/typec/mux.c > > @@ -17,8 +17,11 @@ > > #include "class.h" > > #include "mux.h" > > +#define TYPEC_MUX_MAX_DEVS 3 > > + > > struct typec_switch { > > - struct typec_switch_dev *sw_dev; > > + struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS]; > > + unsigned int num_sw_devs; > > }; > > static int switch_fwnode_match(struct device *dev, const void *fwnode) > > @@ -67,25 +70,48 @@ static void *typec_switch_match(struct fwnode_handle *fwnode, const char *id, > > */ > > struct typec_switch *fwnode_typec_switch_get(struct fwnode_handle *fwnode) > > { > > - struct typec_switch_dev *sw_dev; > > + struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS]; > > struct typec_switch *sw; > > + int count; > > + int err; > > + int i; > > sw = kzalloc(sizeof(*sw), GFP_KERNEL); > > if (!sw) > > return ERR_PTR(-ENOMEM); > > - sw_dev = fwnode_connection_find_match(fwnode, "orientation-switch", NULL, > > - typec_switch_match); > > - if (IS_ERR_OR_NULL(sw_dev)) { > > + count = fwnode_connection_find_matches(fwnode, "orientation-switch", NULL, > > + typec_switch_match, > > + (void **)sw_devs, > > + ARRAY_SIZE(sw_devs)); > > + if (count <= 0) { > > kfree(sw); > > - return ERR_CAST(sw_dev); > > + return NULL; > > } > > - WARN_ON(!try_module_get(sw_dev->dev.parent->driver->owner)); > > + for (i = 0; i < count; i++) { > > + if (IS_ERR(sw_devs[i])) { > > + err = PTR_ERR(sw_devs[i]); > > + goto put_sw_devs; > > + } > > + } > > + > > + for (i = 0; i < count; i++) { > > + WARN_ON(!try_module_get(sw_devs[i]->dev.parent->driver->owner)); > > + sw->sw_devs[i] = sw_devs[i]; > > + } > > - sw->sw_dev = sw_dev; > > + sw->num_sw_devs = count; > > return sw; > > + > > +put_sw_devs: > > + for (i = 0; i < count; i++) { > > + if (!IS_ERR(sw_devs[i])) > > + put_device(&sw_devs[i]->dev); > > + } > > + > > + return ERR_PTR(err); > > } > > EXPORT_SYMBOL_GPL(fwnode_typec_switch_get); > > @@ -98,14 +124,17 @@ EXPORT_SYMBOL_GPL(fwnode_typec_switch_get); > > void typec_switch_put(struct typec_switch *sw) > > { > > struct typec_switch_dev *sw_dev; > > + unsigned int i; > > if (IS_ERR_OR_NULL(sw)) > > return; > > - sw_dev = sw->sw_dev; > > + for (i = 0; i < sw->num_sw_devs; i++) { > > + sw_dev = sw->sw_devs[i]; > > - module_put(sw_dev->dev.parent->driver->owner); > > - put_device(&sw_dev->dev); > > + module_put(sw_dev->dev.parent->driver->owner); > > + put_device(&sw_dev->dev); > > + } > > kfree(sw); > > } > > EXPORT_SYMBOL_GPL(typec_switch_put); > > @@ -170,13 +199,21 @@ int typec_switch_set(struct typec_switch *sw, > > enum typec_orientation orientation) > > { > > struct typec_switch_dev *sw_dev; > > + unsigned int i; > > + int ret; > > if (IS_ERR_OR_NULL(sw)) > > return 0; > > - sw_dev = sw->sw_dev; > > + for (i = 0; i < sw->num_sw_devs; i++) { > > + sw_dev = sw->sw_devs[i]; > > + > > + ret = sw_dev->set(sw_dev, orientation); > > + if (ret) > > + return ret; > > + } > > - return sw_dev->set(sw_dev, orientation); > > + return 0; > > } > > EXPORT_SYMBOL_GPL(typec_switch_set); > > @@ -208,7 +245,8 @@ EXPORT_SYMBOL_GPL(typec_switch_get_drvdata); > > /* ------------------------------------------------------------------------- */ > > struct typec_mux { > > - struct typec_mux_dev *mux_dev; > > + struct typec_mux_dev *mux_devs[TYPEC_MUX_MAX_DEVS]; > > + unsigned int num_mux_devs; > > }; > > static int mux_fwnode_match(struct device *dev, const void *fwnode) > > @@ -291,25 +329,48 @@ static void *typec_mux_match(struct fwnode_handle *fwnode, const char *id, > > struct typec_mux *fwnode_typec_mux_get(struct fwnode_handle *fwnode, > > const struct typec_altmode_desc *desc) > > { > > - struct typec_mux_dev *mux_dev; > > + struct typec_mux_dev *mux_devs[TYPEC_MUX_MAX_DEVS]; > > struct typec_mux *mux; > > + int count; > > + int err; > > + int i; > > mux = kzalloc(sizeof(*mux), GFP_KERNEL); > > if (!mux) > > return ERR_PTR(-ENOMEM); > > - mux_dev = fwnode_connection_find_match(fwnode, "mode-switch", (void *)desc, > > - typec_mux_match); > > - if (IS_ERR_OR_NULL(mux_dev)) { > > + count = fwnode_connection_find_matches(fwnode, "mode-switch", > > + (void *)desc, typec_mux_match, > > + (void **)mux_devs, > > + ARRAY_SIZE(mux_devs)); > > + if (count <= 0) { > > kfree(mux); > > - return ERR_CAST(mux_dev); > > + return NULL; > > } > > - WARN_ON(!try_module_get(mux_dev->dev.parent->driver->owner)); > > + for (i = 0; i < count; i++) { > > + if (IS_ERR(mux_devs[i])) { > > + err = PTR_ERR(mux_devs[i]); > > + goto put_mux_devs; > > + } > > + } > > + > > + for (i = 0; i < count; i++) { > > + WARN_ON(!try_module_get(mux_devs[i]->dev.parent->driver->owner)); > > + mux->mux_devs[i] = mux_devs[i]; > > + } > > - mux->mux_dev = mux_dev; > > + mux->num_mux_devs = count; > > return mux; > > + > > +put_mux_devs: > > + for (i = 0; i < count; i++) { > > + if (!IS_ERR(mux_devs[i])) > > + put_device(&mux_devs[i]->dev); > > + } > > + > > + return ERR_PTR(err); > > } > > EXPORT_SYMBOL_GPL(fwnode_typec_mux_get); > > @@ -322,13 +383,16 @@ EXPORT_SYMBOL_GPL(fwnode_typec_mux_get); > > void typec_mux_put(struct typec_mux *mux) > > { > > struct typec_mux_dev *mux_dev; > > + unsigned int i; > > if (IS_ERR_OR_NULL(mux)) > > return; > > - mux_dev = mux->mux_dev; > > - module_put(mux_dev->dev.parent->driver->owner); > > - put_device(&mux_dev->dev); > > + for (i = 0; i < mux->num_mux_devs; i++) { > > + mux_dev = mux->mux_devs[i]; > > + module_put(mux_dev->dev.parent->driver->owner); > > + put_device(&mux_dev->dev); > > + } > > kfree(mux); > > } > > EXPORT_SYMBOL_GPL(typec_mux_put); > > @@ -336,13 +400,21 @@ EXPORT_SYMBOL_GPL(typec_mux_put); > > int typec_mux_set(struct typec_mux *mux, struct typec_mux_state *state) > > { > > struct typec_mux_dev *mux_dev; > > + unsigned int i; > > + int ret; > > if (IS_ERR_OR_NULL(mux)) > > return 0; > > - mux_dev = mux->mux_dev; > > + for (i = 0; i < mux->num_mux_devs; i++) { > > + mux_dev = mux->mux_devs[i]; > > + > > + ret = mux_dev->set(mux_dev, state); > > + if (ret) > > + return ret; > > + } > > - return mux_dev->set(mux_dev, state); > > + return 0; > > } > > EXPORT_SYMBOL_GPL(typec_mux_set); > > > -- > With best wishes > Dmitry
Hi Bjorn,
url: https://github.com/0day-ci/linux/commits/Bjorn-Andersson/typec-mux-Introduce-support-for-multiple-TypeC-muxes/20211228-132045
base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing
config: x86_64-randconfig-m001-20211228 (https://download.01.org/0day-ci/archive/20211228/202112282331.V8Kkx4jf-lkp@intel.com/config)
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
smatch warnings:
drivers/usb/typec/mux.c:114 fwnode_typec_switch_get() warn: possible memory leak of 'sw'
drivers/usb/typec/mux.c:373 fwnode_typec_mux_get() warn: possible memory leak of 'mux'
vim +/sw +114 drivers/usb/typec/mux.c
d1c6a769cdf466 Heikki Krogerus 2020-03-02 71 struct typec_switch *fwnode_typec_switch_get(struct fwnode_handle *fwnode)
bdecb33af34f79 Heikki Krogerus 2018-03-20 72 {
8ddb6d277ef580 Bjorn Andersson 2021-12-27 73 struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS];
bdecb33af34f79 Heikki Krogerus 2018-03-20 74 struct typec_switch *sw;
8ddb6d277ef580 Bjorn Andersson 2021-12-27 75 int count;
8ddb6d277ef580 Bjorn Andersson 2021-12-27 76 int err;
8ddb6d277ef580 Bjorn Andersson 2021-12-27 77 int i;
bdecb33af34f79 Heikki Krogerus 2018-03-20 78
8d7c70bd032dda Bjorn Andersson 2021-12-27 79 sw = kzalloc(sizeof(*sw), GFP_KERNEL);
8d7c70bd032dda Bjorn Andersson 2021-12-27 80 if (!sw)
8d7c70bd032dda Bjorn Andersson 2021-12-27 81 return ERR_PTR(-ENOMEM);
8d7c70bd032dda Bjorn Andersson 2021-12-27 82
8ddb6d277ef580 Bjorn Andersson 2021-12-27 83 count = fwnode_connection_find_matches(fwnode, "orientation-switch", NULL,
8ddb6d277ef580 Bjorn Andersson 2021-12-27 84 typec_switch_match,
8ddb6d277ef580 Bjorn Andersson 2021-12-27 85 (void **)sw_devs,
8ddb6d277ef580 Bjorn Andersson 2021-12-27 86 ARRAY_SIZE(sw_devs));
8ddb6d277ef580 Bjorn Andersson 2021-12-27 87 if (count <= 0) {
8d7c70bd032dda Bjorn Andersson 2021-12-27 88 kfree(sw);
8ddb6d277ef580 Bjorn Andersson 2021-12-27 89 return NULL;
8d7c70bd032dda Bjorn Andersson 2021-12-27 90 }
8d7c70bd032dda Bjorn Andersson 2021-12-27 91
8ddb6d277ef580 Bjorn Andersson 2021-12-27 92 for (i = 0; i < count; i++) {
8ddb6d277ef580 Bjorn Andersson 2021-12-27 93 if (IS_ERR(sw_devs[i])) {
8ddb6d277ef580 Bjorn Andersson 2021-12-27 94 err = PTR_ERR(sw_devs[i]);
8ddb6d277ef580 Bjorn Andersson 2021-12-27 95 goto put_sw_devs;
"sw" not freed on this path.
8ddb6d277ef580 Bjorn Andersson 2021-12-27 96 }
8ddb6d277ef580 Bjorn Andersson 2021-12-27 97 }
8ddb6d277ef580 Bjorn Andersson 2021-12-27 98
8ddb6d277ef580 Bjorn Andersson 2021-12-27 99 for (i = 0; i < count; i++) {
8ddb6d277ef580 Bjorn Andersson 2021-12-27 100 WARN_ON(!try_module_get(sw_devs[i]->dev.parent->driver->owner));
8ddb6d277ef580 Bjorn Andersson 2021-12-27 101 sw->sw_devs[i] = sw_devs[i];
8ddb6d277ef580 Bjorn Andersson 2021-12-27 102 }
8d7c70bd032dda Bjorn Andersson 2021-12-27 103
8ddb6d277ef580 Bjorn Andersson 2021-12-27 104 sw->num_sw_devs = count;
bdecb33af34f79 Heikki Krogerus 2018-03-20 105
bdecb33af34f79 Heikki Krogerus 2018-03-20 106 return sw;
8ddb6d277ef580 Bjorn Andersson 2021-12-27 107
8ddb6d277ef580 Bjorn Andersson 2021-12-27 108 put_sw_devs:
8ddb6d277ef580 Bjorn Andersson 2021-12-27 109 for (i = 0; i < count; i++) {
8ddb6d277ef580 Bjorn Andersson 2021-12-27 110 if (!IS_ERR(sw_devs[i]))
8ddb6d277ef580 Bjorn Andersson 2021-12-27 111 put_device(&sw_devs[i]->dev);
8ddb6d277ef580 Bjorn Andersson 2021-12-27 112 }
8ddb6d277ef580 Bjorn Andersson 2021-12-27 113
8ddb6d277ef580 Bjorn Andersson 2021-12-27 @114 return ERR_PTR(err);
bdecb33af34f79 Heikki Krogerus 2018-03-20 115 }
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c index d0b42c297aca..adf3681cf22d 100644 --- a/drivers/usb/typec/mux.c +++ b/drivers/usb/typec/mux.c @@ -17,8 +17,11 @@ #include "class.h" #include "mux.h" +#define TYPEC_MUX_MAX_DEVS 3 + struct typec_switch { - struct typec_switch_dev *sw_dev; + struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS]; + unsigned int num_sw_devs; }; static int switch_fwnode_match(struct device *dev, const void *fwnode) @@ -67,25 +70,48 @@ static void *typec_switch_match(struct fwnode_handle *fwnode, const char *id, */ struct typec_switch *fwnode_typec_switch_get(struct fwnode_handle *fwnode) { - struct typec_switch_dev *sw_dev; + struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS]; struct typec_switch *sw; + int count; + int err; + int i; sw = kzalloc(sizeof(*sw), GFP_KERNEL); if (!sw) return ERR_PTR(-ENOMEM); - sw_dev = fwnode_connection_find_match(fwnode, "orientation-switch", NULL, - typec_switch_match); - if (IS_ERR_OR_NULL(sw_dev)) { + count = fwnode_connection_find_matches(fwnode, "orientation-switch", NULL, + typec_switch_match, + (void **)sw_devs, + ARRAY_SIZE(sw_devs)); + if (count <= 0) { kfree(sw); - return ERR_CAST(sw_dev); + return NULL; } - WARN_ON(!try_module_get(sw_dev->dev.parent->driver->owner)); + for (i = 0; i < count; i++) { + if (IS_ERR(sw_devs[i])) { + err = PTR_ERR(sw_devs[i]); + goto put_sw_devs; + } + } + + for (i = 0; i < count; i++) { + WARN_ON(!try_module_get(sw_devs[i]->dev.parent->driver->owner)); + sw->sw_devs[i] = sw_devs[i]; + } - sw->sw_dev = sw_dev; + sw->num_sw_devs = count; return sw; + +put_sw_devs: + for (i = 0; i < count; i++) { + if (!IS_ERR(sw_devs[i])) + put_device(&sw_devs[i]->dev); + } + + return ERR_PTR(err); } EXPORT_SYMBOL_GPL(fwnode_typec_switch_get); @@ -98,14 +124,17 @@ EXPORT_SYMBOL_GPL(fwnode_typec_switch_get); void typec_switch_put(struct typec_switch *sw) { struct typec_switch_dev *sw_dev; + unsigned int i; if (IS_ERR_OR_NULL(sw)) return; - sw_dev = sw->sw_dev; + for (i = 0; i < sw->num_sw_devs; i++) { + sw_dev = sw->sw_devs[i]; - module_put(sw_dev->dev.parent->driver->owner); - put_device(&sw_dev->dev); + module_put(sw_dev->dev.parent->driver->owner); + put_device(&sw_dev->dev); + } kfree(sw); } EXPORT_SYMBOL_GPL(typec_switch_put); @@ -170,13 +199,21 @@ int typec_switch_set(struct typec_switch *sw, enum typec_orientation orientation) { struct typec_switch_dev *sw_dev; + unsigned int i; + int ret; if (IS_ERR_OR_NULL(sw)) return 0; - sw_dev = sw->sw_dev; + for (i = 0; i < sw->num_sw_devs; i++) { + sw_dev = sw->sw_devs[i]; + + ret = sw_dev->set(sw_dev, orientation); + if (ret) + return ret; + } - return sw_dev->set(sw_dev, orientation); + return 0; } EXPORT_SYMBOL_GPL(typec_switch_set); @@ -208,7 +245,8 @@ EXPORT_SYMBOL_GPL(typec_switch_get_drvdata); /* ------------------------------------------------------------------------- */ struct typec_mux { - struct typec_mux_dev *mux_dev; + struct typec_mux_dev *mux_devs[TYPEC_MUX_MAX_DEVS]; + unsigned int num_mux_devs; }; static int mux_fwnode_match(struct device *dev, const void *fwnode) @@ -291,25 +329,48 @@ static void *typec_mux_match(struct fwnode_handle *fwnode, const char *id, struct typec_mux *fwnode_typec_mux_get(struct fwnode_handle *fwnode, const struct typec_altmode_desc *desc) { - struct typec_mux_dev *mux_dev; + struct typec_mux_dev *mux_devs[TYPEC_MUX_MAX_DEVS]; struct typec_mux *mux; + int count; + int err; + int i; mux = kzalloc(sizeof(*mux), GFP_KERNEL); if (!mux) return ERR_PTR(-ENOMEM); - mux_dev = fwnode_connection_find_match(fwnode, "mode-switch", (void *)desc, - typec_mux_match); - if (IS_ERR_OR_NULL(mux_dev)) { + count = fwnode_connection_find_matches(fwnode, "mode-switch", + (void *)desc, typec_mux_match, + (void **)mux_devs, + ARRAY_SIZE(mux_devs)); + if (count <= 0) { kfree(mux); - return ERR_CAST(mux_dev); + return NULL; } - WARN_ON(!try_module_get(mux_dev->dev.parent->driver->owner)); + for (i = 0; i < count; i++) { + if (IS_ERR(mux_devs[i])) { + err = PTR_ERR(mux_devs[i]); + goto put_mux_devs; + } + } + + for (i = 0; i < count; i++) { + WARN_ON(!try_module_get(mux_devs[i]->dev.parent->driver->owner)); + mux->mux_devs[i] = mux_devs[i]; + } - mux->mux_dev = mux_dev; + mux->num_mux_devs = count; return mux; + +put_mux_devs: + for (i = 0; i < count; i++) { + if (!IS_ERR(mux_devs[i])) + put_device(&mux_devs[i]->dev); + } + + return ERR_PTR(err); } EXPORT_SYMBOL_GPL(fwnode_typec_mux_get); @@ -322,13 +383,16 @@ EXPORT_SYMBOL_GPL(fwnode_typec_mux_get); void typec_mux_put(struct typec_mux *mux) { struct typec_mux_dev *mux_dev; + unsigned int i; if (IS_ERR_OR_NULL(mux)) return; - mux_dev = mux->mux_dev; - module_put(mux_dev->dev.parent->driver->owner); - put_device(&mux_dev->dev); + for (i = 0; i < mux->num_mux_devs; i++) { + mux_dev = mux->mux_devs[i]; + module_put(mux_dev->dev.parent->driver->owner); + put_device(&mux_dev->dev); + } kfree(mux); } EXPORT_SYMBOL_GPL(typec_mux_put); @@ -336,13 +400,21 @@ EXPORT_SYMBOL_GPL(typec_mux_put); int typec_mux_set(struct typec_mux *mux, struct typec_mux_state *state) { struct typec_mux_dev *mux_dev; + unsigned int i; + int ret; if (IS_ERR_OR_NULL(mux)) return 0; - mux_dev = mux->mux_dev; + for (i = 0; i < mux->num_mux_devs; i++) { + mux_dev = mux->mux_devs[i]; + + ret = mux_dev->set(mux_dev, state); + if (ret) + return ret; + } - return mux_dev->set(mux_dev, state); + return 0; } EXPORT_SYMBOL_GPL(typec_mux_set);
In the Qualcomm platforms the USB/DP PHY handles muxing and orientation switching of the SuperSpeed lines, but the SBU lines needs to be connected and switched by external (to the SoC) hardware. It's therefor necessary to be able to have the TypeC controller operate multiple TypeC muxes and switches. Use the newly introduced indirection object to handle this, to avoid having to taint the TypeC controllers with knowledge about the downstream hardware configuration. The max number of devs per indirection is set to 3, based on the number of ports defined in the usb-c-connector binding. Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> --- drivers/usb/typec/mux.c | 124 +++++++++++++++++++++++++++++++--------- 1 file changed, 98 insertions(+), 26 deletions(-)