UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: renesas_usbhs: Avoid to write platform_data's value 

The very old commit 482982062f ("usb: gadget: renesas_usbhs:
bugfix: don't modify platform data") changed to use copied whole
structures values to fix the "hung-up" issue. However, we also
can fix the issue if the driver copies the get_vbus function
pointer to the driver's value.

So, this patch adds get_vbus member into struct usbhs_mod_info and
use the pointer instead of struct renesas_usbhs_platform_callback.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Yoshihiro Shimoda 2019-06-25 14:38:48 +09:00 committed by Greg Kroah-Hartman
parent edcf2b2c66
commit ccc3264c24
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/renesas_usbhs/common.c
View File

@ -448,7 +448,7 @@ static void usbhsc_hotplug(struct usbhs_priv *priv)
/* /*
* get vbus status from platform * get vbus status from platform
*/ */
enable = usbhs_platform_call(priv, get_vbus, pdev); enable = usbhs_mod_info_call(priv, get_vbus, pdev);
/* /*
* get id from platform * get id from platform
@ -809,6 +809,8 @@ static int usbhs_probe(struct platform_device *pdev)
if (!usbhs_get_dparam(priv, runtime_pwctrl)) { if (!usbhs_get_dparam(priv, runtime_pwctrl)) {
usbhsc_power_ctrl(priv, 1); usbhsc_power_ctrl(priv, 1);
usbhs_mod_autonomy_mode(priv); usbhs_mod_autonomy_mode(priv);
} else {
usbhs_mod_non_autonomy_mode(priv);
} }
/* /*

11
drivers/usb/renesas_usbhs/mod.c
View File

@ -42,12 +42,19 @@ void usbhs_mod_autonomy_mode(struct usbhs_priv *priv)
{ {
struct usbhs_mod_info *info = usbhs_priv_to_modinfo(priv); struct usbhs_mod_info *info = usbhs_priv_to_modinfo(priv);
info->irq_vbus = usbhsm_autonomy_irq_vbus; info->irq_vbus = usbhsm_autonomy_irq_vbus;
priv->pfunc.get_vbus = usbhsm_autonomy_get_vbus; info->get_vbus = usbhsm_autonomy_get_vbus;
usbhs_irq_callback_update(priv, NULL); usbhs_irq_callback_update(priv, NULL);
} }
void usbhs_mod_non_autonomy_mode(struct usbhs_priv *priv)
{
struct usbhs_mod_info *info = usbhs_priv_to_modinfo(priv);
info->get_vbus = priv->pfunc.get_vbus;
}
/* /*
* host / gadget functions * host / gadget functions
* *

7
drivers/usb/renesas_usbhs/mod.h
View File

@ -93,6 +93,12 @@ struct usbhs_mod_info {
*/ */
int (*irq_vbus)(struct usbhs_priv *priv, int (*irq_vbus)(struct usbhs_priv *priv,
struct usbhs_irq_state *irq_state); struct usbhs_irq_state *irq_state);
/*
* This function will be used on any gadget mode. To simplify the code,
* this member is in here.
*/
int (*get_vbus)(struct platform_device *pdev);
}; };
/* /*
@ -107,6 +113,7 @@ int usbhs_mod_probe(struct usbhs_priv *priv);
void usbhs_mod_remove(struct usbhs_priv *priv); void usbhs_mod_remove(struct usbhs_priv *priv);
void usbhs_mod_autonomy_mode(struct usbhs_priv *priv); void usbhs_mod_autonomy_mode(struct usbhs_priv *priv);
void usbhs_mod_non_autonomy_mode(struct usbhs_priv *priv);
/* /*
* status functions * status functions

4
drivers/usb/renesas_usbhs/mod_gadget.c
View File

@ -915,8 +915,8 @@ static void usbhs_mod_phy_mode(struct usbhs_priv *priv)
{ {
struct usbhs_mod_info *info = &priv->mod_info; struct usbhs_mod_info *info = &priv->mod_info;
info->irq_vbus = NULL; info->irq_vbus = NULL;
priv->pfunc.get_vbus = usbhsm_phy_get_vbus; info->get_vbus = usbhsm_phy_get_vbus;
usbhs_irq_callback_update(priv, NULL); usbhs_irq_callback_update(priv, NULL);
} }