MUSB fix for disabled multipoint and generic phy
cover MUSB fix for disabled multipoint and generic phy
Hi,
Here are two fixes, the first one probably should be Cc stable.
Regards,
Tony
Tony Lindgren (2):
usb: musb: Fix use for of_property_read_bool for disabled multipoint
usb: musb: Fix getting a generic phy for musb_dsps
drivers/usb/musb/musb_dsps.c | 24 ++++++++++++++++++++++-- drivers/usb/musb/omap2430.c | 7 +++++-- 2 files changed, 27 insertions(+), 4 deletions(-)
Signature · 1 line
2.1.4
PATCH 1/2 usb: musb: Fix use for of_property_read_bool for disabled multipoint
The value for the multipoint dts property is ignored when parsing with of_property_read_bool, so we currently have multipoint always set as 1 even if value 0 is specified in the dts file.
Let's fix this to read the value too instead of just the property like the binding documentation says as otherwise MUSB will fail to work on devices with Mentor configuration that does not support multipoint.
--- drivers/usb/musb/musb_dsps.c | 7 +++++-- drivers/usb/musb/omap2430.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/usb/musb/musb_dsps.c +5 -2
@@ -687,7 +687,7 @@ static int dsps_create_musb_pdev(struct dsps_glue *glue,struct musb_hdrc_config *config;struct platform_device *musb;struct device_node *dn = parent->dev.of_node; -int ret; +int ret, val;memset (resources,0 ,sizeof (resources)); res =platform_get_resource_byname (parent,IORESOURCE_MEM ,"mc" );
@@ -739,7 +739,10 @@ static int dsps_create_musb_pdev(struct dsps_glue *glue, pdata.mode =get_musb_port_mode (dev);/* DT keeps this entry in mA, musb expects it as per USB spec */ pdata.power =get_int_prop (dn,"mentor,power" ) /2 ; - config->multipoint =of_property_read_bool (dn,"mentor,multipoint" ); + + ret =of_property_read_u8 (dn,"mentor,multipoint" , &val); +if (!ret && val) + config->multipoint = true; ret =platform_device_add_data (musb, &pdata,sizeof (pdata));if (ret) {
drivers/usb/musb/omap2430.c +5 -2
@@ -516,7 +516,7 @@ static int omap2430_probe(struct platform_device *pdev)struct omap2430_glue *glue;struct device_node *np = pdev->dev.of_node;struct musb_hdrc_config *config; -int ret = -ENOMEM ; +int ret = -ENOMEM , val; glue =devm_kzalloc (&pdev->dev,sizeof (*glue),GFP_KERNEL );if (!glue)
@@ -559,7 +559,10 @@ static int omap2430_probe(struct platform_device *pdev)of_property_read_u32 (np,"num-eps" , (u32 *)&config->num_eps);of_property_read_u32 (np,"ram-bits" , (u32 *)&config->ram_bits);of_property_read_u32 (np,"power" , (u32 *)&pdata->power); - config->multipoint =of_property_read_bool (np,"multipoint" ); + + ret =of_property_read_u8 (np,"multipoint" , &val); +if (!ret && val) + config->multipoint = true; pdata->board_data = data; pdata->config = config;
Signature · 1 line
2.1.4
Re: [PATCH 1/2] usb: musb: Fix use for of_property_read_bool for disabled multipoint
Quoted 10 lines · Tony Lindgren
The value for the multipoint dts property is ignored when parsing with
of_property_read_bool, so we currently have multipoint always set as 1 even if value 0 is specified in the dts file.Let's fix this to read the value too instead of just the property like the binding documentation says as otherwise MUSB will fail to work on devices with Mentor configuration that does not support multipoint.
Cc Brian Hutchinson <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
do you mind waiting a little bit to see if my boolean properties with value patch is accepted ?
http://marc.info/?l=linux-omap&m=142315930232743&w=2
At least let's see where the discussion moves.
Signature · 1 line
balbi
Re: [PATCH 1/2] usb: musb: Fix use for of_property_read_bool for disabled multipoint
Quoted 9 lines · Felipe Balbi
Quoted 8 lines · Tony Lindgren
The value for the multipoint dts property is ignored when parsing with
of_property_read_bool, so we currently have multipoint always set as 1 even if value 0 is specified in the dts file.Let's fix this to read the value too instead of just the property like the binding documentation says as otherwise MUSB will fail to work on devices with Mentor configuration that does not support multipoint.
Quoted 5 lines
Quoted 2 lines
Cc Brian Hutchinson <[email protected]>Signed-off-by Tony Lindgren <[email protected]>do you mind waiting a little bit to see if my boolean properties with value patch is accepted ?
This can wait for v3.20-rc1 for sure but cc stable would be nice to avoid more pointless debugging by somebody else.
Quoted 3 lines
http://marc.info/?l=linux-omap&m=142315930232743&w=2
At least let's see where the discussion moves.
Cool yeah at least a warning should be printed, sounds like it may not be usable for fixing $subject though.
I also noticed that a last minute change I did from read_u32 to read_u8 in $subject patch broke things and introduced new build warnings. Here's a fixed version back to using read_u32 instead of read_u8 so we don't need to specify the storage size with /bits/ 8 values in the dts files.
Regards,
Tony
8< ------------------------
From: Tony Lindgren <[email protected]>
Date: Wed, 4 Feb 2015 06:28:49 -0800
Subject: [PATCH] usb: musb: Fix use for of_property_read_bool for disabled multipoint
The value for the multipoint dts property is ignored when parsing with of_property_read_bool, so we currently have multipoint always set as 1 even if value 0 is specified in the dts file.
Let's fix this to read the value too instead of just the property like the binding documentation says as otherwise MUSB will fail to work on devices with Mentor configuration that does not support multipoint.
drivers/usb/musb/musb_dsps.c +5 -2
@@ -687,7 +687,7 @@ static int dsps_create_musb_pdev(struct dsps_glue *glue,struct musb_hdrc_config *config;struct platform_device *musb;struct device_node *dn = parent->dev.of_node; -int ret; +int ret, val;memset (resources,0 ,sizeof (resources)); res =platform_get_resource_byname (parent,IORESOURCE_MEM ,"mc" );
@@ -739,7 +739,10 @@ static int dsps_create_musb_pdev(struct dsps_glue *glue, pdata.mode =get_musb_port_mode (dev);/* DT keeps this entry in mA, musb expects it as per USB spec */ pdata.power =get_int_prop (dn,"mentor,power" ) /2 ; - config->multipoint =of_property_read_bool (dn,"mentor,multipoint" ); + + ret =of_property_read_u32 (dn,"mentor,multipoint" , &val); +if (!ret && val) + config->multipoint = true; ret =platform_device_add_data (musb, &pdata,sizeof (pdata));if (ret) {
drivers/usb/musb/omap2430.c +5 -2
@@ -516,7 +516,7 @@ static int omap2430_probe(struct platform_device *pdev)struct omap2430_glue *glue;struct device_node *np = pdev->dev.of_node;struct musb_hdrc_config *config; -int ret = -ENOMEM ; +int ret = -ENOMEM , val; glue =devm_kzalloc (&pdev->dev,sizeof (*glue),GFP_KERNEL );if (!glue)
@@ -559,7 +559,10 @@ static int omap2430_probe(struct platform_device *pdev)of_property_read_u32 (np,"num-eps" , (u32 *)&config->num_eps);of_property_read_u32 (np,"ram-bits" , (u32 *)&config->ram_bits);of_property_read_u32 (np,"power" , (u32 *)&pdata->power); - config->multipoint =of_property_read_bool (np,"multipoint" ); + + ret =of_property_read_u32 (np,"multipoint" , &val); +if (!ret && val) + config->multipoint = true; pdata->board_data = data; pdata->config = config;
PATCH 2/2 usb: musb: Fix getting a generic phy for musb_dsps
In reply to Tony LindgrenWe still have a combination of legacy phys and generic phys in use so we need to support both types of phy for musb_dsps.c.
--- drivers/usb/musb/musb_dsps.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/usb/musb/musb_dsps.c +17 -0
@@ -457,12 +457,25 @@ static int dsps_musb_init(struct musb *musb)if (IS_ERR (musb->xceiv))return PTR_ERR (musb->xceiv); + musb->phy =devm_phy_get (dev->parent,"usb2-phy" ); +/* Returns zero if e.g. not clocked */ rev =dsps_readl (reg_base, wrp->revision);if (!rev)return -ENODEV ;usb_phy_init (musb->xceiv); +if (IS_ERR (musb->phy)) { + musb->phy =NULL ; + }else { + ret =phy_init (musb->phy); +if (ret <0 ) +return ret; + ret =phy_power_on (musb->phy); +if (ret) +return ret; + } +setup_timer (&glue->timer, otg_timer, (unsigned long ) musb);/* Reset the musb */
@@ -502,6 +515,10 @@ static int dsps_musb_exit(struct musb *musb)del_timer_sync (&glue->timer);usb_phy_shutdown (musb->xceiv); +if (musb->phy) { +phy_power_off (musb->phy); +phy_exit (musb->phy); + }debugfs_remove_recursive (glue->dbgfs_root);return 0 ;
Signature · 1 line
2.1.4
A message that is not in the archive (sent off-list or not yet received): 1423154113-23463-3-git-send-email-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org
Re: [PATCH 2/2] usb: musb: Fix getting a generic phy for musb_dsps
Hi Tony,
You also need to add similar things in dsps_musb_reset();
Otherwise you might not recover from a BABBLE condition.
Quoted 38 lines · Tony Lindgren
We still have a combination of legacy phys and generic phys in use so we need to support both types of phy for
musb_dsps.c.Cc Brian Hutchinson <[email protected]>Signed-off-by Tony Lindgren <[email protected]>--- drivers/usb/musb/musb_dsps.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)drivers/usb/musb/musb_dsps.c +13
-0@@ -457,12 +457,25 @@ static int dsps_musb_init(struct musb *musb)if (IS_ERR (musb->xceiv))return PTR_ERR (musb->xceiv); + musb->phy =devm_phy_get (dev->parent,"usb2-phy" ); +/* Returns zero if e.g. not clocked */ rev =dsps_readl (reg_base, wrp->revision);if (!rev)return -ENODEV ;usb_phy_init (musb->xceiv); +if (IS_ERR (musb->phy)) { + musb->phy =NULL ; + }else { + ret =phy_init (musb->phy); +if (ret <0 ) +return ret; + ret =phy_power_on (musb->phy); +if (ret) +return ret; + } +setup_timer (&glue->timer, otg_timer, (unsigned long ) musb);/* Reset the musb */
drivers/usb/musb/musb_dsps.c static int dsps_musb_exit(struct musb *musb) · line 524
Quoted 10 lines
drivers/usb/musb/musb_dsps.c +4
-0@@ -502,6 +515,10 @@ static int dsps_musb_exit(struct musb *musb)del_timer_sync (&glue->timer);usb_phy_shutdown (musb->xceiv); +if (musb->phy) { +phy_power_off (musb->phy); +phy_exit (musb->phy); + }debugfs_remove_recursive (glue->dbgfs_root);return 0 ;
-George
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] usb: musb: Fix getting a generic phy for musb_dsps
Quoted 5 lines · George Cherian
Hi Tony,
You also need to add similar things in
dsps_musb_reset();Otherwise you might not recover from a BABBLE condition.
Thank I totally missed that, updated patch below.
Do you have some testcase that easily triggers BABBLE on MUSB?
Regards,
Tony
8< ----------------------
From: Tony Lindgren <[email protected]>
Date: Wed, 4 Feb 2015 06:28:49 -0800
Subject: [PATCH] usb: musb: Fix getting a generic phy for musb_dsps
We still have a combination of legacy phys and generic phys in use so we need to support both types of phy for musb_dsps.c.
drivers/usb/musb/musb_dsps.c +24 -1
@@ -457,12 +457,27 @@ static int dsps_musb_init(struct musb *musb)if (IS_ERR (musb->xceiv))return PTR_ERR (musb->xceiv); + musb->phy =devm_phy_get (dev->parent,"usb2-phy" ); +/* Returns zero if e.g. not clocked */ rev =dsps_readl (reg_base, wrp->revision);if (!rev)return -ENODEV ;usb_phy_init (musb->xceiv); +if (IS_ERR (musb->phy)) { + musb->phy =NULL ; + }else { + ret =phy_init (musb->phy); +if (ret <0 ) +return ret; + ret =phy_power_on (musb->phy); +if (ret) { +phy_exit (musb->phy); +return ret; + } + } +setup_timer (&glue->timer, otg_timer, (unsigned long ) musb);/* Reset the musb */
@@ -502,6 +517,8 @@ static int dsps_musb_exit(struct musb *musb)del_timer_sync (&glue->timer);usb_phy_shutdown (musb->xceiv); +phy_power_off (musb->phy); +phy_exit (musb->phy);debugfs_remove_recursive (glue->dbgfs_root);return 0 ;
@@ -610,7 +627,7 @@ static int dsps_musb_reset(struct musb *musb)struct device *dev = musb->controller;struct dsps_glue *glue =dev_get_drvdata (dev->parent);const struct dsps_musb_wrapper *wrp = glue->wrp; -int session_restart =0 ; +int session_restart =0 , error;if (glue->sw_babble_enabled) session_restart =sw_babble_control (musb);
@@ -624,8 +641,14 @@ static int dsps_musb_reset(struct musb *musb)dsps_writel (musb->ctrl_base, wrp->control, (1 << wrp->reset));usleep_range (100 ,200 );usb_phy_shutdown (musb->xceiv); + error =phy_power_off (musb->phy); +if (error) +dev_err (dev,"phy shutdown failed: %i\n" , error);usleep_range (100 ,200 );usb_phy_init (musb->xceiv); + error =phy_power_on (musb->phy); +if (error) +dev_err (dev,"phy powerup failed: %i\n" , error); session_restart =1 ; }
Re: [PATCH 2/2] usb: musb: Fix getting a generic phy for musb_dsps
Tony,
Quoted 11 lines · Tony Lindgren
Quoted 5 lines · George Cherian
Hi Tony,
You also need to add similar things in
dsps_musb_reset();Otherwise you might not recover from a BABBLE condition.
Thank I totally missed that, updated patch below.
Do you have some testcase that easily triggers BABBLE on MUSB?
I normally just shorten DP or DM to VBUS to trigger babble. No device is connected to the port, if I remembered correctly.
Regards,
-Bin.
Quoted 83 lines
Regards,
Tony
8< ----------------------
From: Tony Lindgren <[email protected]>
Date: Wed, 4 Feb 2015 06:28:49 -0800
Subject: [PATCH] usb: musb: Fix getting a generic phy formusb_dspsWe still have a combination of legacy phys and generic phys in use so we need to support both types of phy for
musb_dsps.c.Cc Brian Hutchinson <[email protected]>Signed-off-by Tony Lindgren <[email protected]>drivers/usb/musb/musb_dsps.c +24
-2@@ -457,12 +457,27 @@ static int dsps_musb_init(struct musb *musb)if (IS_ERR (musb->xceiv))return PTR_ERR (musb->xceiv); + musb->phy =devm_phy_get (dev->parent,"usb2-phy" ); +/* Returns zero if e.g. not clocked */ rev =dsps_readl (reg_base, wrp->revision);if (!rev)return -ENODEV ;usb_phy_init (musb->xceiv); +if (IS_ERR (musb->phy)) { + musb->phy =NULL ; + }else { + ret =phy_init (musb->phy); +if (ret <0 ) +return ret; + ret =phy_power_on (musb->phy); +if (ret) { +phy_exit (musb->phy); +return ret; + } + } +setup_timer (&glue->timer, otg_timer, (unsigned long ) musb);/* Reset the musb */ @@ -502,6 +517,8 @@ static int dsps_musb_exit(struct musb *musb)del_timer_sync (&glue->timer);usb_phy_shutdown (musb->xceiv); +phy_power_off (musb->phy); +phy_exit (musb->phy);debugfs_remove_recursive (glue->dbgfs_root);return 0 ;@@ -610,7 +627,7 @@ static int dsps_musb_reset(struct musb *musb)struct device *dev = musb->controller;struct dsps_glue *glue =dev_get_drvdata (dev->parent);const struct dsps_musb_wrapper *wrp = glue->wrp; -int session_restart =0 ; +int session_restart =0 , error;if (glue->sw_babble_enabled) session_restart =sw_babble_control (musb);@@ -624,8 +641,14 @@ static int dsps_musb_reset(struct musb *musb)dsps_writel (musb->ctrl_base, wrp->control, (1 << wrp->reset));usleep_range (100 ,200 );usb_phy_shutdown (musb->xceiv); + error =phy_power_off (musb->phy); +if (error) +dev_err (dev,"phy shutdown failed: %i\n" , error);usleep_range (100 ,200 );usb_phy_init (musb->xceiv); + error =phy_power_on (musb->phy); +if (error) +dev_err (dev,"phy powerup failed: %i\n" , error); session_restart =1 ; } --To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): CADYTM3brwenr4706Xqp91Vg7OVxT0CENy8aHhyzJ+vOGxxvRVw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [PATCH 2/2] usb: musb: Fix getting a generic phy for musb_dsps
Quoted 10 lines · Bin Liu
Tony,
Quoted 7 lines · Tony Lindgren
Quoted 5 lines · George Cherian
Hi Tony,
You also need to add similar things in
dsps_musb_reset();Otherwise you might not recover from a BABBLE condition.
Quoted 7 lines
Quoted 4 lines
Thank I totally missed that, updated patch below.
Do you have some testcase that easily triggers BABBLE on MUSB?
I normally just shorten DP or DM to VBUS to trigger babble. No device is connected to the port, if I remembered correctly.
Oh OK, that sounds a bit risky with 5V on the VBUS if a device is detected? I think I'll wait on that :)
Regards,
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] usb: musb: Fix getting a generic phy for musb_dsps
Quoted 13 lines · Tony Lindgren
Quoted 12 lines · Bin Liu
Tony,
Quoted 9 lines · Tony Lindgren
Quoted 5 lines · George Cherian
Hi Tony,
You also need to add similar things in
dsps_musb_reset();Otherwise you might not recover from a BABBLE condition.
Thank I totally missed that, updated patch below.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Do you have some testcase that easily triggers BABBLE on MUSB?
I normally just shorten DP or DM to VBUS to trigger babble. No device is connected to the port, if I remembered correctly.
Oh OK, that sounds a bit risky with 5V on the VBUS if a device is detected? I think I'll wait on that :)
Sorry, 'shorten' is not a good work for what I did. Just use a wire to quickly touch DP or DM to VBUS, which pulls up DP/DM shortly, but long enough to cross SOF to generate a babble.
Regards,
-Bin.
Quoted 4 lines
Regards,
Tony
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 2/2] usb: musb: Fix getting a generic phy for musb_dsps
Hi Tony,
Quoted 10 lines · Tony Lindgren
Quoted 5 lines · George Cherian
Hi Tony,
You also need to add similar things in
dsps_musb_reset();Otherwise you might not recover from a BABBLE condition.
Thank I totally missed that, updated patch below.
Do you have some testcase that easily triggers BABBLE on MUSB?
On a BBB or BBW you can connect a HUB with multiple device connected on HUB. Then do a repeated Connect and Disconnect of the HUB, This should trigger a BABBLE interrupt. Not all HUB's might not lead you to a BABBLE condition.
Quoted 68 lines
Regards,
Tony
8< ----------------------
From: Tony Lindgren <[email protected]>
Date: Wed, 4 Feb 2015 06:28:49 -0800
Subject: [PATCH] usb: musb: Fix getting a generic phy formusb_dspsWe still have a combination of legacy phys and generic phys in use so we need to support both types of phy for
musb_dsps.c.Cc Brian Hutchinson <[email protected]>Signed-off-by Tony Lindgren <[email protected]>drivers/usb/musb/musb_dsps.c +19
-1@@ -457,12 +457,27 @@ static int dsps_musb_init(struct musb *musb)if (IS_ERR (musb->xceiv))return PTR_ERR (musb->xceiv); + musb->phy =devm_phy_get (dev->parent,"usb2-phy" ); +/* Returns zero if e.g. not clocked */ rev =dsps_readl (reg_base, wrp->revision);if (!rev)return -ENODEV ;usb_phy_init (musb->xceiv); +if (IS_ERR (musb->phy)) { + musb->phy =NULL ; + }else { + ret =phy_init (musb->phy); +if (ret <0 ) +return ret; + ret =phy_power_on (musb->phy); +if (ret) { +phy_exit (musb->phy); +return ret; + } + } +setup_timer (&glue->timer, otg_timer, (unsigned long ) musb);/* Reset the musb */ @@ -502,6 +517,8 @@ static int dsps_musb_exit(struct musb *musb)del_timer_sync (&glue->timer);usb_phy_shutdown (musb->xceiv); +phy_power_off (musb->phy); +phy_exit (musb->phy);debugfs_remove_recursive (glue->dbgfs_root);return 0 ;@@ -610,7 +627,7 @@ static int dsps_musb_reset(struct musb *musb)struct device *dev = musb->controller;struct dsps_glue *glue =dev_get_drvdata (dev->parent);const struct dsps_musb_wrapper *wrp = glue->wrp; -int session_restart =0 ; +int session_restart =0 , error;if (glue->sw_babble_enabled) session_restart =sw_babble_control (musb);@@ -624,8 +641,14 @@ static int dsps_musb_reset(struct musb *musb)dsps_writel (musb->ctrl_base, wrp->control, (1 << wrp->reset));usleep_range (100 ,200 );usb_phy_shutdown (musb->xceiv); + error =phy_power_off (musb->phy);
drivers/usb/musb/musb_dsps.c static int dsps_musb_reset(struct musb *musb) · line 654
Quoted 10 lines
drivers/usb/musb/musb_dsps.c +5
-0+if (error) +dev_err (dev,"phy shutdown failed: %i\n" , error);usleep_range (100 ,200 );usb_phy_init (musb->xceiv); + error =phy_power_on (musb->phy); +if (error) +dev_err (dev,"phy powerup failed: %i\n" , error); session_restart =1 ; }
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 2/2] usb: musb: Fix getting a generic phy for musb_dsps
Quoted 8 lines · George Cherian
Hi Tony,
Quoted 6 lines · Tony Lindgren
Quoted 5 lines · George Cherian
Hi Tony,
You also need to add similar things in
dsps_musb_reset();Otherwise you might not recover from a BABBLE condition.
Quoted 8 lines
Quoted 4 lines
Thank I totally missed that, updated patch below.
Do you have some testcase that easily triggers BABBLE on MUSB?
On a BBB or BBW you can connect a HUB with multiple device connected on HUB. Then do a repeated Connect and Disconnect of the HUB, This should trigger a BABBLE interrupt.
Not all HUB's might not lead you to a BABBLE condition.
OK thanks will keep my eyes open, so far have not been able to trigger it here with the two hubs I've tried.
Regards,
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html