usb: chipidea: handle single role for usb role class
Subsystems (2)
PATCH 1/2 usb: chipidea: handle single role for usb role class
From: Li Jun <[email protected]>
If usb port is configed to be single role, but usb role class is trying to set unavailable role, don't try to do role change.
Signed-off-by Li Jun <[email protected]>
--- drivers/usb/chipidea/ci.h | 10 ++++++++++ drivers/usb/chipidea/core.c | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-)
drivers/usb/chipidea/ci.h +10 -0
@@ -302,6 +302,16 @@ static inline enum usb_role ci_role_to_usb_role(struct ci_hdrc *ci)return USB_ROLE_NONE ; } +static inline enum ci_role usb_role_to_ci_role (enum usb_role role) +{ +if (role ==USB_ROLE_HOST ) +return CI_ROLE_HOST ; +else if (role ==USB_ROLE_DEVICE ) +return CI_ROLE_GADGET ; +else +return CI_ROLE_END ; +} +/** * hw_read_id_reg: reads from a identification register * @ci: the controller
drivers/usb/chipidea/core.c +3 -1
@@ -618,9 +618,11 @@ static int ci_usb_role_switch_set(struct device *dev, enum usb_role role)struct ci_hdrc *ci =dev_get_drvdata (dev);struct ci_hdrc_cable *cable =NULL ;enum usb_role current_role =ci_role_to_usb_role (ci); +enum ci_role ci_role =usb_role_to_ci_role (role);unsigned long flags; -if (current_role == role) +if ((ci_role !=CI_ROLE_END && !ci->roles[ci_role]) || + (current_role == role))return 0 ;pm_runtime_get_sync (ci->dev);
Signature · 1 line
2.7.4
Quoted 3 lines · Jun Li
From: Li Jun <[email protected]>
If usb port is configed to be single role, but usb role class
%s/configed/configured
I will add above change, and apply it.
Peter
Quoted 49 lines
is trying to set unavailable role, don't try to do role change.
Signed-off-by Li Jun <[email protected]>--- drivers/usb/chipidea/ci.h | 10 ++++++++++ drivers/usb/chipidea/core.c | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-)drivers/usb/chipidea/ci.h +10
-0@@ -302,6 +302,16 @@ static inline enum usb_role ci_role_to_usb_role(struct ci_hdrc *ci)return USB_ROLE_NONE ; } +static inline enum ci_role usb_role_to_ci_role (enum usb_role role) +{ +if (role ==USB_ROLE_HOST ) +return CI_ROLE_HOST ; +else if (role ==USB_ROLE_DEVICE ) +return CI_ROLE_GADGET ; +else +return CI_ROLE_END ; +} +/** * hw_read_id_reg: reads from a identification register * @ci: the controller drivers/usb/chipidea/core.c +3
-1@@ -618,9 +618,11 @@ static int ci_usb_role_switch_set(struct device *dev, enum usb_role role)struct ci_hdrc *ci =dev_get_drvdata (dev);struct ci_hdrc_cable *cable =NULL ;enum usb_role current_role =ci_role_to_usb_role (ci); +enum ci_role ci_role =usb_role_to_ci_role (role);unsigned long flags; -if (current_role == role) +if ((ci_role !=CI_ROLE_END && !ci->roles[ci_role]) || + (current_role == role))return 0 ;pm_runtime_get_sync (ci->dev);Signature · 1 line
2.7.4
Signature · 2 lines
Thanks, Peter Chen