Add tested id switch and vbus connect detect support for Chipidea
v10 cover Add tested id switch and vbus connect detect support for Chipidea
Changes for v10:
- Delete [8/9] at v9, ci core's drvdata must be set for further operation. [8/8]
Changes for v9:
- Some small comments from Alex like: variable comment for otg event additional newline. [3/9]
- Import function tell show if the controller has otg capable, if the controller supports both host and device, we think it is otg capable, and can read OTGSC. [3/9]
- Merge two otg patches [v8 3/8] and [v8 4/8] to one [v9 3/9]. [3/9]
- Add inline to ci_hdrc_gadget_destroy if CONFIG_USB_CHIPIDEA_UDC is not defined, it can fix one build warning "defined but not used" [3/9]
- One comment from Felipe about changing calling gadget disconnect API at chipidea's udc driver. I move calling ci->driver->disconnect from _gadget_stop_activity to which calls _gadget_stop_activity except ci13xxx_stop, as udc core will call disconnect when do rmmod gadget. [7/9]
- Add ci core probe's return value to ci's platform_data, we do this for getting core's probe's result at platform layer, and quit it if the core's probe fails. [8/9] [9/9]
Changes for v8:
- Add ci_supports_gadget helper to know if the controller supports gadget, if the controller supports gadget, it needs to read otgsc to know the vbus value, basically, if the controller supports gadget, it will support host as well [3/8]
- At ci_hdrc_probe, it needs to add free memory at error path [3/8]
- Cosolidate ci->driver = NULL at ci13xxx_stop [8/8]
Changes for v7:
For Patch 8/8, we only need to set ci->driver to NULL when usb cable is not connected, for other changes, it will case some runtime pm unmatch and un-align with udc-core & composite driver problems.
Changes for v6:
- Add Alex comments for init/destroy function [3/8] [4/8]
- Remove memset(&ci->gadget, 0, sizeof(ci->gadget)) at destory function [4/8]
- Add Kishon's comment: Change the format of struct usb_otg otg at drivers/usb/chipidea/ci.h [1/8]
- Add comments for CI_VBUS_STABLE_TIMEOUT [3/8]
- Change the otg_set_peripheral return value check as the fully
chipidea driver users don't need it. [4/8]
- Fix one bug that the oops when re-plug in usb cable after
rmmod gadget [8/8]
Anyone who has tested this patchset, please give a tested-by, thanks.
This patchset adds tested otg id switch function and vbus connect/disconnect detection for chipidea driver. The mainly design of id/vbus handling follows msm otg driver. I hope the msm usb maintainer can have a look of this patchset, and give some comments, and move the whole msm usb driver to chipidea framework if possible in the future.
This patch is fully tested at imx6 sabresd platform.
My chipidea repo: https://github.com/hzpeterchen/linux-usb.git
which is rebased of Sascha's git
(git://git.pengutronix.de/git/imx/linux-2.6.git tags/usb-chipidea-otg-for-next)
At sascha's tag, it finishes some dr_mode and phy_type patches, in that way, we can choose host-only and gadget-only function at dts file as well as we can choose different phy setting.
Besides sascha's work, there are some Michael Grzeschik/Marc Kleine-Budde usbmisc patch, imx chipidea suspend/resume patch, and one pin control patch for imx6
Peter Chen (8):
Revert "USB: chipidea: add vbus detect for udc"
usb: chipidea: add otg file
usb: chipidea: add otg id switch and vbus connect/disconnect detect
usb: chipidea: udc: add pullup/pulldown dp at hw_device_state
usb: chipidea: udc: retire the flag CI13_PULLUP_ON_VBUS
usb: chipidea: imx: add internal vbus regulator control
usb: chipidea: udc: fix the oops when plugs in usb cable after rmmod
gadget
usb: chipidea: imx: fix the error that using uninitialized pointer
drivers/usb/chipidea/Makefile | 2 +- drivers/usb/chipidea/bits.h | 10 ++ drivers/usb/chipidea/ci.h | 14 +++- drivers/usb/chipidea/ci13xxx_imx.c | 87 +++++++++++++---- drivers/usb/chipidea/ci13xxx_msm.c | 1 - drivers/usb/chipidea/core.c | 190 ++++++++++++++++++++++++++++++++---- drivers/usb/chipidea/host.c | 6 + drivers/usb/chipidea/host.h | 6 +- drivers/usb/chipidea/otg.c | 68 +++++++++++++ drivers/usb/chipidea/otg.h | 9 ++ drivers/usb/chipidea/udc.c | 118 ++++++++++------------ drivers/usb/chipidea/udc.h | 4 + include/linux/usb/chipidea.h | 1 - 13 files changed, 406 insertions(+), 110 deletions(-) create mode 100644 drivers/usb/chipidea/otg.c create mode 100644 drivers/usb/chipidea/otg.h
PATCH v10 1/8 Revert "USB: chipidea: add vbus detect for udc"
vbus register is at otgsc, and vbus detect does not belong to device function. Revert this patch, and will move vbus detect function to drivers/usb/chipidea/udc.c
This reverts commit 8c4fc031954b4eb72daf13d3c907a985a3eee208.
--- drivers/usb/chipidea/ci.h | 1 - drivers/usb/chipidea/udc.c | 39 +-------------------------------------- 2 files changed, 1 insertions(+), 39 deletions(-)
drivers/usb/chipidea/ci.h +0 -1
@@ -139,7 +139,6 @@ struct ci13xxx {enum ci_role role;bool is_otg;struct work_struct work; -struct work_struct vbus_work;struct workqueue_struct *wq;struct dma_pool *qh_pool;
drivers/usb/chipidea/udc.c +1 -38
@@ -305,18 +305,6 @@ static u32 hw_test_and_clear_intr_active(struct ci13xxx *ci)return reg; } -static void hw_enable_vbus_intr (struct ci13xxx *ci) -{ -hw_write (ci,OP_OTGSC ,OTGSC_AVVIS ,OTGSC_AVVIS ); -hw_write (ci,OP_OTGSC ,OTGSC_AVVIE ,OTGSC_AVVIE ); -queue_work (ci->wq, &ci->vbus_work); -} - -static void hw_disable_vbus_intr (struct ci13xxx *ci) -{ -hw_write (ci,OP_OTGSC ,OTGSC_AVVIE ,0 ); -} -/** * hw_test_and_clear_setup_guard: test & clear setup guard (execute without * interruption)
@@ -383,16 +371,6 @@ static int hw_usb_reset(struct ci13xxx *ci)return 0 ; } -static void vbus_work (struct work_struct *work) -{ - struct ci13xxx *ci = container_of(work, struct ci13xxx, vbus_work); - -if (hw_read (ci,OP_OTGSC ,OTGSC_AVV )) -usb_gadget_vbus_connect (&ci->gadget); -else -usb_gadget_vbus_disconnect (&ci->gadget); -} -/****************************************************************************** * UTIL block *****************************************************************************/
@@ -1392,7 +1370,6 @@ static int ci13xxx_vbus_session(struct usb_gadget *_gadget, int is_active)if (is_active) {pm_runtime_get_sync (&_gadget->dev);hw_device_reset (ci,USBMODE_CM_DC ); -hw_enable_vbus_intr (ci);hw_device_state (ci, ci->ep0out->qh.dma); }else {hw_device_state (ci,0 );
@@ -1567,10 +1544,8 @@ static int ci13xxx_start(struct usb_gadget *gadget,pm_runtime_get_sync (&ci->gadget.dev);if (ci->platdata->flags &CI13XXX_PULLUP_ON_VBUS ) {if (ci->vbus_active) { -if (ci->platdata->flags &CI13XXX_REGS_SHARED ) { +if (ci->platdata->flags &CI13XXX_REGS_SHARED )hw_device_reset (ci,USBMODE_CM_DC ); -hw_enable_vbus_intr (ci); - } }else {pm_runtime_put_sync (&ci->gadget.dev); goto done;
@@ -1676,13 +1651,6 @@ static irqreturn_t udc_irq(struct ci13xxx *ci) }else { retval =IRQ_NONE ; } - - intr =hw_read (ci,OP_OTGSC , ~0 ); -hw_write (ci,OP_OTGSC , ~0 , intr); - -if (intr & (OTGSC_AVVIE &OTGSC_AVVIS )) -queue_work (ci->wq, &ci->vbus_work); -spin_unlock (&ci->lock);return retval;
@@ -1758,7 +1726,6 @@ static int udc_start(struct ci13xxx *ci) retval =hw_device_reset (ci,USBMODE_CM_DC );if (retval) goto put_transceiver; -hw_enable_vbus_intr (ci); } retval =device_register (&ci->gadget.dev);
@@ -1821,9 +1788,6 @@ static void udc_stop(struct ci13xxx *ci)if (ci ==NULL )return ; -hw_disable_vbus_intr (ci); -cancel_work_sync (&ci->vbus_work); -usb_del_gadget_udc (&ci->gadget);destroy_eps (ci);
@@ -1864,7 +1828,6 @@ int ci_hdrc_gadget_init(struct ci13xxx *ci) rdrv->irq = udc_irq; rdrv->name ="gadget" ; ci->roles[CI_ROLE_GADGET ] = rdrv; -INIT_WORK (&ci->vbus_work, vbus_work);return 0 ; }
Signature · 1 line
1.7.0.4
PATCH v10 2/8 usb: chipidea: add otg file
In reply to Peter ChenImplement struct usb_otg, In that way, calling otg_set_peripheral will not be failed at udc.c.
--- drivers/usb/chipidea/Makefile | 2 +- drivers/usb/chipidea/ci.h | 2 + drivers/usb/chipidea/otg.c | 60 +++++++++++++++++++++++++++++++++++++++++ drivers/usb/chipidea/otg.h | 6 ++++ 4 files changed, 69 insertions(+), 1 deletions(-) create mode 100644 drivers/usb/chipidea/otg.c create mode 100644 drivers/usb/chipidea/otg.h
drivers/usb/chipidea/Makefile +1 -1
@@ -2,7 +2,7 @@ ccflags-$(CONFIG_USB_CHIPIDEA_DEBUG) := -DDEBUG obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc.o -ci_hdrc-y := core.o +ci_hdrc-y := core.o otg.o ci_hdrc-$(CONFIG_USB_CHIPIDEA_UDC) += udc.o ci_hdrc-$(CONFIG_USB_CHIPIDEA_HOST) += host.o ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG) += debug.o
drivers/usb/chipidea/ci.h +2 -0
@@ -129,6 +129,7 @@ struct hw_bank {* @vbus_active: is VBUS active * @transceiver: pointer to USB PHY, if any * @hcd: pointer to usb_hcd for ehci host driver +* @otg: for otg support */ struct ci13xxx {struct device *dev;
@@ -164,6 +165,7 @@ struct ci13xxx {bool global_phy;struct usb_phy *transceiver;struct usb_hcd *hcd; +struct usb_otg otg; };static inline struct ci_role_driver *ci_role (struct ci13xxx *ci)
drivers/usb/chipidea/otg.c new file +60 -0
60 lines not on this page · raw message
drivers/usb/chipidea/otg.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef __DRIVERS_USB_CHIPIDEA_OTG_H +#define __DRIVERS_USB_CHIPIDEA_OTG_H + +int ci_hdrc_otg_init (struct ci13xxx *ci); + +#endif /* __DRIVERS_USB_CHIPIDEA_OTG_H */
Signature · 1 line
1.7.0.4
PATCH v10 3/8 usb: chipidea: add otg id switch and vbus connect/disconnect detect
In reply to Peter ChenThe main design flow is the same with msm otg driver, that is the id and vbus interrupt are handled at core driver, others are handled by individual drivers.
- At former design, when switch usb role from device->host, it will call udc_stop, it will remove the gadget driver, so when switch role from host->device, it can't add gadget driver any more.
At new design, when role switch occurs, the gadget just calls usb_gadget_vbus_disconnect/usb_gadget_vbus_connect as well as reset controller, it will not free any device/gadget structure
- Add vbus connect and disconnect to core interrupt handler, it can notify udc driver by calling usb_gadget_vbus_disconnect /usb_gadget_vbus_connect.
- vbus interrupt needs to be handled when gadget function is enabled
- Create/destroy the gadget at udc's init and destory function
- start/stop API are used at otg id switch and probe routine
- Defer some gadget operations at ci's delayed work queue
--- drivers/usb/chipidea/bits.h | 10 ++ drivers/usb/chipidea/ci.h | 9 ++- drivers/usb/chipidea/ci13xxx_imx.c | 3 +- drivers/usb/chipidea/core.c | 190 ++++++++++++++++++++++++++++++++---- drivers/usb/chipidea/host.c | 6 + drivers/usb/chipidea/host.h | 6 +- drivers/usb/chipidea/otg.c | 28 ++++-- drivers/usb/chipidea/otg.h | 3 + drivers/usb/chipidea/udc.c | 39 ++++++-- drivers/usb/chipidea/udc.h | 4 + 10 files changed, 256 insertions(+), 42 deletions(-)
drivers/usb/chipidea/bits.h +10 -0
@@ -77,11 +77,21 @@#define OTGSC_ASVIS BIT(18)#define OTGSC_BSVIS BIT(19)#define OTGSC_BSEIS BIT(20) +#define OTGSC_1MSIS BIT(21) +#define OTGSC_DPIS BIT(22)#define OTGSC_IDIE BIT(24)#define OTGSC_AVVIE BIT(25)#define OTGSC_ASVIE BIT(26)#define OTGSC_BSVIE BIT(27)#define OTGSC_BSEIE BIT(28) +#define OTGSC_1MSIE BIT(29) +#define OTGSC_DPIE BIT(30) +#define OTGSC_INT_EN_BITS (OTGSC_IDIE | OTGSC_AVVIE | OTGSC_ASVIE \ + | OTGSC_BSVIE | OTGSC_BSEIE | OTGSC_1MSIE \ + | OTGSC_DPIE) +#define OTGSC_INT_STATUS_BITS (OTGSC_IDIS | OTGSC_AVVIS | OTGSC_ASVIS \ + | OTGSC_BSVIS | OTGSC_BSEIS | OTGSC_1MSIS \ + | OTGSC_DPIS)/* USBMODE */ #define USBMODE_CM (0x03UL << 0)
drivers/usb/chipidea/ci.h +8 -1
@@ -130,6 +130,9 @@ struct hw_bank {* @transceiver: pointer to USB PHY, if any * @hcd: pointer to usb_hcd for ehci host driver * @otg: for otg support +* @id_event: indicates there is a id event, and handled at ci_otg_work +* @b_sess_valid_event: indicates there is a vbus event, and handled +*@ci_otg_work */ struct ci13xxx {struct device *dev;
@@ -140,6 +143,7 @@ struct ci13xxx {enum ci_role role;bool is_otg;struct work_struct work; +struct delayed_work dwork;struct workqueue_struct *wq;struct dma_pool *qh_pool;
@@ -166,6 +170,8 @@ struct ci13xxx {struct usb_phy *transceiver;struct usb_hcd *hcd;struct usb_otg otg; +bool id_event; +bool b_sess_valid_event; };static inline struct ci_role_driver *ci_role (struct ci13xxx *ci)
@@ -201,7 +207,6 @@ static inline void ci_role_stop(struct ci13xxx *ci) ci->roles[role]->stop (ci); } -/****************************************************************************** * REGISTERS *****************************************************************************/
@@ -314,4 +319,6 @@ int hw_port_test_set(struct ci13xxx *ci, u8 mode);u8 hw_port_test_get (struct ci13xxx *ci); +void ci_handle_vbus_change (struct ci13xxx *ci); +#endif /* __DRIVERS_USB_CHIPIDEA_CI_H */
drivers/usb/chipidea/ci13xxx_imx.c +2 -1
@@ -110,7 +110,8 @@ static int ci13xxx_imx_probe(struct platform_device *pdev) pdata->capoffset =DEF_CAPOFFSET ; pdata->flags =CI13XXX_REQUIRE_TRANSCEIVER |CI13XXX_PULLUP_ON_VBUS | -CI13XXX_DISABLE_STREAMING ; +CI13XXX_DISABLE_STREAMING | +CI13XXX_REGS_SHARED ; pdata->phy_mode =of_usb_get_phy_mode (pdev->dev.of_node); pdata->dr_mode =of_usb_get_dr_mode (pdev->dev.of_node);
drivers/usb/chipidea/core.c +170 -20
276 lines not on this page · raw message
drivers/usb/chipidea/host.c +6 -0
@@ -105,3 +105,9 @@ int ci_hdrc_host_init(struct ci13xxx *ci)return 0 ; } + +void ci_hdrc_host_destroy (struct ci13xxx *ci) +{ +if (ci->role ==CI_ROLE_HOST ) +host_stop (ci); +}
drivers/usb/chipidea/host.h +5 -1
@@ -4,13 +4,17 @@#ifdef CONFIG_USB_CHIPIDEA_HOST int ci_hdrc_host_init (struct ci13xxx *ci); - +void ci_hdrc_host_destroy (struct ci13xxx *ci);#else static inline int ci_hdrc_host_init (struct ci13xxx *ci) {return -ENXIO ; } +static inline void ci_hdrc_host_destroy (struct ci13xxx *ci) +{ + +}#endif
drivers/usb/chipidea/otg.c +18 -10
@@ -10,21 +10,28 @@* published by the Free Software Foundation. */ -#include <linux/platform_device.h> -#include <linux/module.h> -#include <linux/io.h> -#include <linux/irq.h> -#include <linux/kernel.h> -#include <linux/slab.h> -#include <linux/usb/gadget.h> #include <linux/usb/otg.h> +#include <linux/usb/gadget.h> #include <linux/usb/chipidea.h> #include "ci.h" -#include "udc.h" #include "bits.h" -#include "host.h" -#include "debug.h" + +void ci_clear_otg_interrupt (struct ci13xxx *ci,u32 bits) +{ +/* Only clear request bits */ +hw_write (ci,OP_OTGSC ,OTGSC_INT_STATUS_BITS , bits); +} + +void ci_enable_otg_interrupt (struct ci13xxx *ci,u32 bits) +{ +hw_write (ci,OP_OTGSC , bits, bits); +} + +void ci_disable_otg_interrupt (struct ci13xxx *ci,u32 bits) +{ +hw_write (ci,OP_OTGSC , bits,0 ); +}static int ci_otg_set_peripheral (struct usb_otg *otg,struct usb_gadget *periph)
@@ -55,6 +62,7 @@ int ci_hdrc_otg_init(struct ci13xxx *ci) ci->otg.set_host = ci_otg_set_host;if (!IS_ERR_OR_NULL (ci->transceiver)) ci->transceiver->otg = &ci->otg; +ci_enable_otg_interrupt (ci,OTGSC_IDIE );return 0 ; }
drivers/usb/chipidea/otg.h +3 -0
@@ -2,5 +2,8 @@#define __DRIVERS_USB_CHIPIDEA_OTG_Hint ci_hdrc_otg_init (struct ci13xxx *ci); +void ci_clear_otg_interrupt (struct ci13xxx *ci,u32 bits); +void ci_enable_otg_interrupt (struct ci13xxx *ci,u32 bits); +void ci_disable_otg_interrupt (struct ci13xxx *ci,u32 bits);#endif /* __DRIVERS_USB_CHIPIDEA_OTG_H */
drivers/usb/chipidea/udc.c +30 -9
@@ -31,6 +31,7 @@#include "ci.h" #include "udc.h" +#include "otg.h" #include "bits.h" #include "debug.h"
@@ -1371,6 +1372,7 @@ static int ci13xxx_vbus_session(struct usb_gadget *_gadget, int is_active)pm_runtime_get_sync (&_gadget->dev);hw_device_reset (ci,USBMODE_CM_DC );hw_device_state (ci, ci->ep0out->qh.dma); +dev_dbg (ci->dev,"Connected to host\n" ); }else {hw_device_state (ci,0 );if (ci->platdata->notify_event)
@@ -1378,6 +1380,7 @@ static int ci13xxx_vbus_session(struct usb_gadget *_gadget, int is_active) CI13XXX_CONTROLLER_STOPPED_EVENT);_gadget_stop_activity (&ci->gadget);pm_runtime_put_sync (&_gadget->dev); +dev_dbg (ci->dev,"Disconnected from host\n" ); } }
@@ -1741,7 +1744,12 @@ static int udc_start(struct ci13xxx *ci)if (!IS_ERR_OR_NULL (ci->transceiver)) { retval =otg_set_peripheral (ci->transceiver->otg, &ci->gadget); -if (retval) +/* +* If we implement all USB functions using chipidea drivers, +* it doesn't need to call above API, meanwhile, if we only +* use gadget function, calling above API is useless. +*/ +if (retval && retval != -ENOTSUPP ) goto remove_dbg; }
@@ -1778,12 +1786,27 @@ free_qh_pool:return retval; } +static int udc_id_switch_for_device (struct ci13xxx *ci) +{ +ci_clear_otg_interrupt (ci,OTGSC_BSVIS ); +ci_enable_otg_interrupt (ci,OTGSC_BSVIE ); + +return 0 ; +} + +static void udc_id_switch_for_host (struct ci13xxx *ci) +{ +/* host doesn't care B_SESSION_VALID event */ +ci_clear_otg_interrupt (ci,OTGSC_BSVIS ); +ci_disable_otg_interrupt (ci,OTGSC_BSVIE ); +} +/** -* udc_remove: parent remove must call this to remove UDC +* ci_hdrc_gadget_destroy: parent remove must call this to remove UDC * * No interrupts active, the IRQ has been released */ -static void udc_stop (struct ci13xxx *ci) +void ci_hdrc_gadget_destroy (struct ci13xxx *ci) {if (ci ==NULL )return ;
@@ -1802,15 +1825,13 @@ static void udc_stop(struct ci13xxx *ci) }dbg_remove_files (&ci->gadget.dev);device_unregister (&ci->gadget.dev); -/* my kobject is dynamic, I swear! */ -memset (&ci->gadget,0 ,sizeof (ci->gadget)); }/** * ci_hdrc_gadget_init - initialize device related bits * ci: the controller * -* This function enables the gadget role, if the device is "device capable". +* This function initializes gadget, if the device is "device capable". */ int ci_hdrc_gadget_init (struct ci13xxx *ci) {
@@ -1823,11 +1844,11 @@ int ci_hdrc_gadget_init(struct ci13xxx *ci)if (!rdrv)return -ENOMEM ; - rdrv->start = udc_start; - rdrv->stop = udc_stop; + rdrv->start = udc_id_switch_for_device; + rdrv->stop = udc_id_switch_for_host; rdrv->irq = udc_irq; rdrv->name ="gadget" ; ci->roles[CI_ROLE_GADGET ] = rdrv; -return 0 ; +return udc_start (ci); }
drivers/usb/chipidea/udc.h +4 -0
@@ -80,6 +80,7 @@ struct ci13xxx_req {#ifdef CONFIG_USB_CHIPIDEA_UDC int ci_hdrc_gadget_init (struct ci13xxx *ci); +void ci_hdrc_gadget_destroy (struct ci13xxx *ci);#else
@@ -87,7 +88,10 @@ static inline int ci_hdrc_gadget_init(struct ci13xxx *ci) {return -ENXIO ; } +static inline void ci_hdrc_gadget_destroy (struct ci13xxx *ci) +{ +}#endif #endif /* __DRIVERS_USB_CHIPIDEA_UDC_H */
Signature · 1 line
1.7.0.4
PATCH v10 4/8 usb: chipidea: udc: add pullup/pulldown dp at hw_device_state
In reply to Peter Chen- During the connect/disconnect host, we need to pullup and pulldown dp
- Make sure the dp is not pullup until the vbus is on when flag CI13XXX_PULLUP_ON_VBUS is set
- Using hw_device_state when set run/stop bit
--- drivers/usb/chipidea/udc.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
drivers/usb/chipidea/udc.c +8 -2
@@ -91,8 +91,10 @@ static int hw_device_state(struct ci13xxx *ci, u32 dma)/* interrupt, error, port change, reset, sleep/suspend */ hw_write (ci,OP_USBINTR , ~0 , USBi_UI|USBi_UEI|USBi_PCI|USBi_URI|USBi_SLI); +hw_write (ci,OP_USBCMD ,USBCMD_RS ,USBCMD_RS ); }else {hw_write (ci,OP_USBINTR , ~0 ,0 ); +hw_write (ci,OP_USBCMD ,USBCMD_RS ,0 ); }return 0 ; }
@@ -1424,10 +1426,14 @@ static int ci13xxx_pullup(struct usb_gadget *_gadget, int is_on) { struct ci13xxx *ci = container_of(_gadget, struct ci13xxx, gadget); +if ((ci->platdata->flags &CI13XXX_PULLUP_ON_VBUS ) && + !ci->vbus_active) +return -ENOTSUPP ; +if (is_on) -hw_write (ci,OP_USBCMD ,USBCMD_RS ,USBCMD_RS ); +hw_device_state (ci, ci->ep0out->qh.dma);else -hw_write (ci,OP_USBCMD ,USBCMD_RS ,0 ); +hw_device_state (ci,0 );return 0 ; }
Signature · 1 line
1.7.0.4
A message that is not in the archive (sent off-list or not yet received): CAB7JpEFWMQaAS+tnR2Xd9OL+3eFeOp5ELLA92t55Vu0oMfKn7Q@mail.gmail.com
PATCH v10 4/8 usb: chipidea: udc: add pullup/pulldown dp at hw_device_state
Quoted 39 lines · Alexander Shishkin
On Feb 27, 2013 8:33 AM, "Peter Chen" <[email protected]> wrote: > > - During the connect/disconnect host, we need to pullup > and pulldown dp > - Make sure the dp is not pullup until the vbus is on when > flag CI13XXX_PULLUP_ON_VBUS is set > - Using hw_device_state when set run/stop bit > > Signed-off-by: Peter Chen <[email protected]> > --- > drivers/usb/chipidea/udc.c | 10 ++++++++-- > 1 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c > index e82dae4..597ae64 100644 > --- a/drivers/usb/chipidea/udc.c > +++ b/drivers/usb/chipidea/udc.c > @@ -91,8 +91,10 @@ static int hw_device_state(struct ci13xxx *ci, u32 dma) > /* interrupt, error, port change, reset, sleep/suspend */ > hw_write(ci, OP_USBINTR, ~0, > USBi_UI|USBi_UEI|USBi_PCI|USBi_URI|USBi_SLI); > + hw_write(ci, OP_USBCMD, USBCMD_RS, USBCMD_RS); > } else { > hw_write(ci, OP_USBINTR, ~0, 0); > + hw_write(ci, OP_USBCMD, USBCMD_RS, 0); > } > return 0; > } > @@ -1424,10 +1426,14 @@ static int ci13xxx_pullup(struct usb_gadget *_gadget, int is_on) > { > struct ci13xxx *ci = container_of(_gadget, struct ci13xxx, gadget); > > + if ((ci->platdata->flags & CI13XXX_PULLUP_ON_VBUS) && > + !ci->vbus_active)
Quoted 8 lines
> + return -ENOTSUPP; This doesn't look right, if !ci->vbus_active *and* is_on, then we can't do what we're asked to do, so it makes sense to return error (which, by the looks of it, will be ignored by gadgets anyway, but that's another thing), and I don't think ENOTSUPP is the right choice here. In case !ci->vbus_active and !is_on, it should be safe to return 0.
At later patch, the flag CI13XXX_PULLUP_ON_VBUS is retired. The code likes below:
static int ci13xxx_pullup(struct usb_gadget *_gadget, int is_on)
{
struct ci13xxx *ci = container_of(_gadget, struct ci13xxx, gadget);
if (!ci->vbus_active)
return -ENOTSUPP;
if (is_on)
hw_device_state(ci, ci->ep0out->qh.dma);
else
hw_device_state(ci, 0);
return 0;
}So you suggested I change like below:
static int ci13xxx_pullup(struct usb_gadget *_gadget, int is_on)
{
struct ci13xxx *ci = container_of(_gadget, struct ci13xxx, gadget);
if (!ci->vbus_active)
return -EPERM;
if (is_on)
hw_device_state(ci, ci->ep0out->qh.dma);
else
hw_device_state(ci, 0);
return 0;
}Signature · 2 lines
Best Regards, Peter Chen
PATCH v10 5/8 usb: chipidea: udc: retire the flag CI13_PULLUP_ON_VBUS
In reply to Peter Chen(change CI13XXX to CI13 to avoid junk email check)
Now, we have handled vbus session in core driver when the vbus interrupt occurs, so our pullup operations are all according to vbus.
Of cource, the software can still call .pullup when device connects to host if it wants to connect/disconnect with host.
--- drivers/usb/chipidea/ci13xxx_imx.c | 1 - drivers/usb/chipidea/ci13xxx_msm.c | 1 - drivers/usb/chipidea/udc.c | 23 ++++++++--------------- include/linux/usb/chipidea.h | 1 - 4 files changed, 8 insertions(+), 18 deletions(-)
drivers/usb/chipidea/ci13xxx_imx.c +0 -1
@@ -109,7 +109,6 @@ static int ci13xxx_imx_probe(struct platform_device *pdev) pdata->name ="ci13xxx_imx" ; pdata->capoffset =DEF_CAPOFFSET ; pdata->flags =CI13XXX_REQUIRE_TRANSCEIVER | -CI13XXX_PULLUP_ON_VBUS |CI13XXX_DISABLE_STREAMING |CI13XXX_REGS_SHARED ;
drivers/usb/chipidea/ci13xxx_msm.c +0 -1
@@ -49,7 +49,6 @@ static struct ci13xxx_platform_data ci13xxx_msm_platdata = { .name = "ci13xxx_msm", .flags =CI13XXX_REGS_SHARED |CI13XXX_REQUIRE_TRANSCEIVER | -CI13XXX_PULLUP_ON_VBUS | CI13XXX_DISABLE_STREAMING, .notify_event = ci13xxx_msm_notify_event,
drivers/usb/chipidea/udc.c +8 -15
@@ -1360,9 +1360,6 @@ static int ci13xxx_vbus_session(struct usb_gadget *_gadget, int is_active)unsigned long flags;int gadget_ready =0 ; -if (!(ci->platdata->flags &CI13XXX_PULLUP_ON_VBUS )) -return -EOPNOTSUPP ; -spin_lock_irqsave (&ci->lock, flags); ci->vbus_active = is_active;if (ci->driver)
@@ -1426,8 +1423,7 @@ static int ci13xxx_pullup(struct usb_gadget *_gadget, int is_on) { struct ci13xxx *ci = container_of(_gadget, struct ci13xxx, gadget); -if ((ci->platdata->flags &CI13XXX_PULLUP_ON_VBUS ) && - !ci->vbus_active) +if (!ci->vbus_active)return -ENOTSUPP ;if (is_on)
@@ -1551,14 +1547,12 @@ static int ci13xxx_start(struct usb_gadget *gadget, ci->driver = driver;pm_runtime_get_sync (&ci->gadget.dev); -if (ci->platdata->flags &CI13XXX_PULLUP_ON_VBUS ) { -if (ci->vbus_active) { -if (ci->platdata->flags &CI13XXX_REGS_SHARED ) -hw_device_reset (ci,USBMODE_CM_DC ); - }else { -pm_runtime_put_sync (&ci->gadget.dev); - goto done; - } +if (ci->vbus_active) { +if (ci->platdata->flags &CI13XXX_REGS_SHARED ) +hw_device_reset (ci,USBMODE_CM_DC ); + }else { +pm_runtime_put_sync (&ci->gadget.dev); + goto done; } retval =hw_device_state (ci, ci->ep0out->qh.dma);
@@ -1581,8 +1575,7 @@ static int ci13xxx_stop(struct usb_gadget *gadget,spin_lock_irqsave (&ci->lock, flags); -if (!(ci->platdata->flags &CI13XXX_PULLUP_ON_VBUS ) || - ci->vbus_active) { +if (ci->vbus_active) {hw_device_state (ci,0 );if (ci->platdata->notify_event) ci->platdata->notify_event(ci,
include/linux/usb/chipidea.h +0 -1
@@ -18,7 +18,6 @@ struct ci13xxx_platform_data {unsigned long flags;#define CI13XXX_REGS_SHARED BIT(0)#define CI13XXX_REQUIRE_TRANSCEIVER BIT(1) -#define CI13XXX_PULLUP_ON_VBUS BIT(2)#define CI13XXX_DISABLE_STREAMING BIT(3)enum usb_dr_mode dr_mode;#define CI13XXX_CONTROLLER_RESET_EVENT 0
Signature · 1 line
1.7.0.4
PATCH v10 6/8 usb: chipidea: imx: add internal vbus regulator control
In reply to Peter Chen- For host, the vbus should always be on.
- For otg, the vbus is off defaultly, the vbus needs to be turned on/off when usb role switches.
--- drivers/usb/chipidea/ci.h | 2 + drivers/usb/chipidea/ci13xxx_imx.c | 76 ++++++++++++++++++++++++++++-------- 2 files changed, 61 insertions(+), 17 deletions(-)
drivers/usb/chipidea/ci.h +2 -0
@@ -133,6 +133,7 @@ struct hw_bank {* @id_event: indicates there is a id event, and handled at ci_otg_work * @b_sess_valid_event: indicates there is a vbus event, and handled * at ci_otg_work +* @reg_vbus: used to control internal vbus regulator */ struct ci13xxx {struct device *dev;
@@ -172,6 +173,7 @@ struct ci13xxx {struct usb_otg otg;bool id_event;bool b_sess_valid_event; +struct regulator *reg_vbus; };static inline struct ci_role_driver *ci_role (struct ci13xxx *ci)
drivers/usb/chipidea/ci13xxx_imx.c +59 -17
124 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH v10 6/8 usb: chipidea: imx: add internal vbus regulator control
Hi,
Quoted 5 lines · Peter Chen
- For host, the vbus should always be on.
- For otg, the vbus is off defaultly, the vbus needs to be turned on/off when usb role switches.Signed-off-by Peter Chen <[email protected]>
one quick question, if chipidea already has an imx glue layer, can I delete the broken imx_udc ? It doesn't even compile and it's including headers which don't exist.
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130227/c71f99a1/attachment.sig>
Sascha Hauer
maintainerPATCH v10 6/8 usb: chipidea: imx: add internal vbus regulator control
Quoted 7 lines · Felipe Balbi
Hi,
Quoted 4 lines · Peter Chen
- For host, the vbus should always be on.
- For otg, the vbus is off defaultly, the vbus needs to be turned on/off when usb role switches.
Quoted 5 lines
Quoted 1 line
Signed-off-by Peter Chen <[email protected]>one quick question, if chipidea already has an imx glue layer, can I delete the broken
imx_udc? It doesn't even compile and it's including headers which don't exist.
This driver handles i.MX1. This one has a gadget only core which is not chipidea compatible. You should ping Darius Augulis <[email protected]> if he is willing to put some love into the driver.
Sascha
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
PATCH v10 6/8 usb: chipidea: imx: add internal vbus regulator control
Quoted 10 lines · Sascha Hauer
Quoted 9 lines · Felipe Balbi
Hi,
Quoted 5 lines · Peter Chen
- For host, the vbus should always be on.
- For otg, the vbus is off defaultly, the vbus needs to be turned on/off when usb role switches.Signed-off-by Peter Chen <[email protected]>
Quoted 7 lines
Quoted 3 lines
one quick question, if chipidea already has an imx glue layer, can I delete the broken
imx_udc? It doesn't even compile and it's including headers which don't exist.This driver handles i.MX1. This one has a gadget only core which is not chipidea compatible. You should ping Darius Augulis <[email protected]> if he is willing to put some love into the driver.
Sascha is correct.
Signature · 2 lines
Best Regards, Peter Chen
PATCH v10 6/8 usb: chipidea: imx: add internal vbus regulator control
Hi Darius,
Quoted 15 lines · Peter Chen
Quoted 14 lines · Sascha Hauer
Quoted 12 lines · Felipe Balbi
Hi,
Quoted 5 lines · Peter Chen
- For host, the vbus should always be on.
- For otg, the vbus is off defaultly, the vbus needs to be turned on/off when usb role switches.Signed-off-by Peter Chen <[email protected]>one quick question, if chipidea already has an imx glue layer, can I delete the broken
imx_udc? It doesn't even compile and it's including headers which don't exist.
Quoted 5 lines
Quoted 3 lines
This driver handles i.MX1. This one has a gadget only core which is not chipidea compatible. You should ping Darius Augulis <[email protected]> if he is willing to put some love into the driver.
Sascha is correct.
do you plan to put any work on drivers/usb/gadget/imx_udc.c ? It doesn't even compile since it includes headers which don't exist (and no, simply removing the include doesn't help).
If nobody is going to work on that driver, I'm thinking about scheduling it for removal. We can't keep such drivers that nobody cares (and just break tree compilation) around.
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130227/34c39604/attachment.sig>
PATCH v10 6/8 usb: chipidea: imx: add internal vbus regulator control
Hi balbi,
actually no. I don't work with this hardware any more and don't have free time to support it.
Please feel free to remove it if it breaks other things.
Darius.
Quoted 34 lines · Felipe Balbi
Hi Darius,
Quoted 15 lines · Peter Chen
Quoted 14 lines · Sascha Hauer
Quoted 12 lines · Felipe Balbi
Hi,
Quoted 5 lines · Peter Chen
- For host, the vbus should always be on.
- For otg, the vbus is off defaultly, the vbus needs to be turned on/off when usb role switches.Signed-off-by Peter Chen <[email protected]>one quick question, if chipidea already has an imx glue layer, can I delete the broken
imx_udc? It doesn't even compile and it's including headers which don't exist.Quoted 5 lines
Quoted 3 lines
This driver handles i.MX1. This one has a gadget only core which is not chipidea compatible. You should ping Darius Augulis <[email protected]> if he is willing to put some love into the driver.
Sascha is correct.
do you plan to put any work on
drivers/usb/gadget/imx_udc.c? It doesn't even compile since it includes headers which don't exist (and no, simply removing the include doesn't help).If nobody is going to work on that driver, I'm thinking about scheduling it for removal. We can't keep such drivers that nobody cares (and just break tree compilation) around.
--
balbi
PATCH v10 6/8 usb: chipidea: imx: add internal vbus regulator control
Hi Greg,
Quoted 5 lines · Darius Augulis
Hi balbi,
actually no. I don't work with this hardware any more and don't have free time to support it.
Please feel free to remove it if it breaks other things.
since nobody seems to care about imx_udc and it's currently even including unexistent headers, I'll schedule it for removal on v3.11 (skipping v3.10 to give time for people to complain). Is that alright with you ?
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130304/6fff7238/attachment.sig>
A message that is not in the archive (sent off-list or not yet received): CAB7JpEHq6rDS4=twUf7gito5zxinYiHZban77psKEQ962z0LYw@mail.gmail.com
PATCH v10 6/8 usb: chipidea: imx: add internal vbus regulator control
Quoted 28 lines · Alexander Shishkin
Quoted 9 lines · Peter Chen
- For host, the vbus should always be on.
- For otg, the vbus is off defaultly, the vbus needs to be turned on/off when usb role switches.Signed-off-by Peter Chen <[email protected]>--- drivers/usb/chipidea/ci.h | 2 + drivers/usb/chipidea/ci13xxx_imx.c | 76++++++++++++++++++++++++++++--------
Quoted 17 lines
2 files changed, 61 insertions(+), 17 deletions(-)drivers/usb/chipidea/ci.h +1
-0@@ -133,6 +133,7 @@ struct hw_bank {* @id_event: indicates there is a id event, and handled at ci_otg_work * @b_sess_valid_event: indicates there is a vbus event, and handled * at ci_otg_work +* @reg_vbus: used to control internal vbus regulator */ struct ci13xxx {struct device *dev;@@ -172,6 +173,7 @@ struct ci13xxx {struct usb_otg otg;bool id_event;
Quoted 8 lines
drivers/usb/chipidea/ci.h struct ci13xxx { · line 177
Quoted 3 lines
drivers/usb/chipidea/ci.h +1
-0bool b_sess_valid_event; +struct regulator *reg_vbus; };I suggest that this regulator be taken care of by either the platform code or phy layer, it doesn't look like it really belongs in chipidea core. The easiest way I guess would be to do something similar to the notify callback in msm platform code.
I guess it would look better at the phy layer, but looks like we need another ->set_vbus() method to switch VBUS on/off.
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130227/971b7741/attachment.sig>
PATCH v10 6/8 usb: chipidea: imx: add internal vbus regulator control
In reply to a message not in the archiveQuoted 13 lines · Alexander Shishkin
On Feb 27, 2013 8:34 AM, "Peter Chen" <[email protected]> wrote: > > - For host, the vbus should always be on. > - For otg, the vbus is off defaultly, the vbus needs to be > turned on/off when usb role switches. > > + * @reg_vbus: used to control internal vbus regulator > */ > struct ci13xxx { > struct device *dev; > @@ -172,6 +173,7 @@ struct ci13xxx { > struct usb_otg otg; > bool id_event;
Quoted 8 lines
> bool b_sess_valid_event; > + struct regulator *reg_vbus; > }; I suggest that this regulator be taken care of by either the platform code or phy layer, it doesn't look like it really belongs in chipidea core. The easiest way I guess would be to do something similar to the notify callback in msm platform code.
VBUS operation is typical operation during the USB code, eg, we need to open vbus at Host mode, we need close/open vbus during host<->gadget switch.
I suggest vbus regulator is specified at platform code, and assign it to ci core's pdata, like sasche's patch pdata->dr_mode and pdata->phy_mode.
At core code, we can have a vbus operation API for on/off vbus if vbus regulator is existed.
Signature · 2 lines
Best Regards, Peter Chen
PATCH v10 6/8 usb: chipidea: imx: add internal vbus regulator control
Quoted 23 lines · Peter Chen
Quoted 13 lines · Alexander Shishkin
On Feb 27, 2013 8:34 AM, "Peter Chen" <[email protected]> wrote: > > - For host, the vbus should always be on. > - For otg, the vbus is off defaultly, the vbus needs to be > turned on/off when usb role switches. > > + * @reg_vbus: used to control internal vbus regulator > */ > struct ci13xxx { > struct device *dev; > @@ -172,6 +173,7 @@ struct ci13xxx { > struct usb_otg otg; > bool id_event;Quoted 8 lines
> bool b_sess_valid_event; > + struct regulator *reg_vbus; > }; I suggest that this regulator be taken care of by either the platform code or phy layer, it doesn't look like it really belongs in chipidea core. The easiest way I guess would be to do something similar to the notify callback in msm platform code.
Quoted 6 lines
VBUS operation is typical operation during the USB code, eg, we need to open vbus at Host mode, we need close/open vbus during host<->gadget switch.
I suggest vbus regulator is specified at platform code, and assign it to ci core's pdata, like sasche's patch
pdata->dr_modeandpdata->phy_mode.
you don't need platform_data for it. From ci core probe try to get the regulator, if it doesn't exist, ignore the error and continue anyways.
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130228/f528b649/attachment-0001.sig>
PATCH v10 6/8 usb: chipidea: imx: add internal vbus regulator control
Quoted 28 lines · Felipe Balbi
Quoted 27 lines · Peter Chen
Quoted 13 lines · Alexander Shishkin
On Feb 27, 2013 8:34 AM, "Peter Chen" <[email protected]> wrote: > > - For host, the vbus should always be on. > - For otg, the vbus is off defaultly, the vbus needs to be > turned on/off when usb role switches. > > + * @reg_vbus: used to control internal vbus regulator > */ > struct ci13xxx { > struct device *dev; > @@ -172,6 +173,7 @@ struct ci13xxx { > struct usb_otg otg; > bool id_event;Quoted 8 lines
> bool b_sess_valid_event; > + struct regulator *reg_vbus; > }; I suggest that this regulator be taken care of by either the platform code or phy layer, it doesn't look like it really belongs in chipidea core. The easiest way I guess would be to do something similar to the notify callback in msm platform code.VBUS operation is typical operation during the USB code, eg, we need to open vbus at Host mode, we need close/open vbus during host<->gadget switch.
Quoted 5 lines
Quoted 2 lines
I suggest vbus regulator is specified at platform code, and assign it to ci core's pdata, like sasche's patch
pdata->dr_modeandpdata->phy_mode.you don't need
platform_datafor it. From ci core probe try to get the regulator, if it doesn't exist, ignore the error and continue anyways.
The pdev of ci core is created by platform layer, at ci core probe, it can't get platform things unless it is passed from platform layer
Quoted 3 lines
Signature · 2 lines
-- balbi
Signature · 2 lines
Best Regards, Peter Chen
PATCH v10 7/8 usb: chipidea: udc: fix the oops when plugs in usb cable after rmmod gadget
In reply to Peter ChenWhen we rmmod gadget, the ci->driver needs to be cleared. Otherwise, we plug in usb cable again, the driver will consider gadget is there, in fact, it is removed.
Besides, consolidate the calling of ci->driver->disconnect, when we do rmmod gadget, the gadget's disconnect should be called from udc core.
Below is the oops this patch fixes.
root at freescale ~$ ci_hdrc ci_hdrc.0: Connected to host
Unable to handle kernel paging request at virtual address 7f01171c pgd = 80004000 [7f01171c] *pgd=4fa1e811, *pte=00000000, *ppte=00000000 Internal error: Oops: 7 [#1] SMP ARM Modules linked in: f_acm libcomposite u_serial [last unloaded: g_serial] CPU: 0 Not tainted (3.8.0-rc5+ #221) PC is at _gadget_stop_activity+0xbc/0x128 LR is at ep_fifo_flush+0x68/0xa0 pc : [<803634cc>] lr : [<80363938>] psr: 20000193 sp : 806c7dc8 ip : 00000000 fp : 806c7de4 r10: 00000000 r9 : 80710ea4 r8 : 00000000 r7 : bf834094 r6 : bf834098 r5 : bf834010 r4 : bf8340a0 r3 : 7f011708 r2 : 01940194 r1 : a0000193 r0 : bf834014 Flags: nzCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment kernel Control: 10c53c7d Table: 4f06404a DAC: 00000017 Process swapper/0 (pid: 0, stack limit = 0x806c6238) Stack: (0x806c7dc8 to 0x806c8000) 7dc0: bf834010 bf809950 bf834010 0000004b 806c7e44 806c7de8 7de0: 80365400 8036341c 0000ec1c 00000000 0000ec1c 00000040 fff5ede0 bf834014 7e00: 000a1220 00000000 0000002e ffffd958 806c7e3c 806c7e20 8004e870 bf834010 7e20: bf809950 0000004b 0000004b 00000000 80710ea4 00000000 806c7e5c 806c7e48 7e40: 80362888 80365154 bfb35180 bf809950 806c7e9c 806c7e60 8008111c 803627f4 7e60: 00989680 00000000 bf809900 bf809964 812df8c0 bf809900 bf809950 806c3f2c 7e80: 0000004b 00000000 412fc09a 00000000 806c7eb4 806c7ea0 80081368 800810b8 7ea0: bf809900 bf809950 806c7ecc 806c7eb8 800843c8 8008130c 0000004b 806cf748 7ec0: 806c7ee4 806c7ed0 80081088 8008432c 806c6000 806cf748 806c7f0c 806c7ee8 7ee0: 8000fa44 8008105c f400010c 806ce974 806c7f30 f4000110 806d29e8 412fc09a 7f00: 806c7f2c 806c7f10 80008584 8000f9f4 8000fbd0 60000013 ffffffff 806c7f64 7f20: 806c7f84 806c7f30 8000eac0 80008554 00000000 00000000 0000000f 8001aea0 7f40: 806c6000 80712a48 804f0040 00000000 806d29e8 412fc09a 00000000 806c7f84 7f60: 806c7f88 806c7f78 8000fbcc 8000fbd0 60000013 ffffffff 806c7fac 806c7f88 7f80: 8001015c 8000fb9c 806cf5b0 80712980 806a4528 8fffffff 1000406a 412fc09a 7fa0: 806c7fbc 806c7fb0 804e5334 800100ac 806c7ff4 806c7fc0 80668940 804e52d4 7fc0: ffffffff ffffffff 806684bc 00000000 00000000 806a4528 10c53c7d 806ce94c 7fe0: 806a4524 806d29dc 00000000 806c7ff8 10008078 806686b0 00000000 00000000 Backtrace: [<80363410>] (_gadget_stop_activity+0x0/0x128) from [<80365400>] (udc_irq+0x2b8/0xf38) r7:0000004b r6:bf834010 r5:bf809950 r4:bf834010 [<80365148>] (udc_irq+0x0/0xf38) from [<80362888>] (ci_irq+0xa0/0xf4) [<803627e8>] (ci_irq+0x0/0xf4) from [<8008111c>] (handle_irq_event_percpu+0x70/0x254) r5:bf809950 r4:bfb35180 [<800810ac>] (handle_irq_event_percpu+0x0/0x254) from [<80081368>] (handle_irq_event+0x68/0x88) [<80081300>] (handle_irq_event+0x0/0x88) from [<800843c8>] (handle_fasteoi_irq+0xa8/0x178) r5:bf809950 r4:bf809900 [<80084320>] (handle_fasteoi_irq+0x0/0x178) from [<80081088>] (generic_handle_irq+0x38/0x40) r5:806cf748 r4:0000004b [<80081050>] (generic_handle_irq+0x0/0x40) from [<8000fa44>] (handle_IRQ+0x5c/0xbc) r5:806cf748 r4:806c6000 [<8000f9e8>] (handle_IRQ+0x0/0xbc) from [<80008584>] (gic_handle_irq+0x3c/0x70) r9:412fc09a r8:806d29e8 r7:f4000110 r6:806c7f30 r5:806ce974 r4:f400010c [<80008548>] (gic_handle_irq+0x0/0x70) from [<8000eac0>] (__irq_svc+0x40/0x54) Exception stack(0x806c7f30 to 0x806c7f78) 7f20: 00000000 00000000 0000000f 8001aea0 7f40: 806c6000 80712a48 804f0040 00000000 806d29e8 412fc09a 00000000 806c7f84 7f60: 806c7f88 806c7f78 8000fbcc 8000fbd0 60000013 ffffffff r7:806c7f64 r6:ffffffff r5:60000013 r4:8000fbd0 [<8000fb90>] (default_idle+0x0/0x4c) from [<8001015c>] (cpu_idle+0xbc/0xf8) [<800100a0>] (cpu_idle+0x0/0xf8) from [<804e5334>] (rest_init+0x6c/0x84) r9:412fc09a r8:1000406a r7:8fffffff r6:806a4528 r5:80712980 r4:806cf5b0 [<804e52c8>] (rest_init+0x0/0x84) from [<80668940>] (start_kernel+0x29c/0x2ec) [<806686a4>] (start_kernel+0x0/0x2ec) from [<10008078>] (0x10008078) Code: e12fff33 e5953200 e3530000 0a000002 (e5933014) ---[ end trace aade28ad434062bd ]--- Kernel panic - not syncing: 0xbf8bdfa8) df60: 00000000 00000000 0000000f 8001aea0 bf8bc000 80712a48 804f0040 00000000 df80: 806d29e8 412fc09a 00000000 bf8bdfb4 bf8bdfb8 bf8bdfa8 8000fbcc 8000fbd0 dfa0: 60000013 ffffffff r7:bf8bdf94 r6:ffffffff r5:60000013 r4:8000fbd0 [<8000fb90>] (default_idle+0x0/0x4c) from [<8001015c>] (cpu_idle+0xbc/0xf8) [<800100a0>] (cpu_idle+0x0/0xf8) from [<804e7930>] (secondary_start_kernel+0x120/0x148) r9:412fc09a r8:1000406a r7:80712d20 r6:10c03c7d r5:00000002 r4:806e2008 [<804e7810>] (secondary_start_kernel+0x0/0x148) from [<104e7148>] (0x104e7148) r5:0000001f r4:4f8a806a CPU3: stopping Backtrace: [<800132e8>] (dump_backtrace+0x0/0x114) from [<804ea684>] (dump_stack+0x20/0x24) r7:00000000 r6:806c3f2c r5:806cf748 r4:80712d18 [<804ea664>] (dump_stack+0x0/0x24) from [<80014adc>] (handle_IPI+0x140/0x18c) [<8001499c>] (handle_IPI+0x0/0x18c) from [<800085b0>] (gic_handle_irq+0x68/0x70) r9:412fc09a r8:806d29e8 r7:f4000110 r6:bf8bff60 r5:806ce974 r4:f400010c [<80008548>] (gic_handle_irq+0x0/0x70) from [<8000eac0>] (__irq_svc+0x40/0x54) Exception stack(0xbf8bff60 to 0xbf8bffa8) ff60: 00000000 00000000 0000000f 8001aea0 bf8be000 80712a48 804f0040 00000000 ff80: 806d29e8 412fc09a 00000000 bf8bffb4 bf8bffb8 bf8bffa8 8000fbcc 8000fbd0 ffa0: 60000013 ffffffff r7:bf8bff94 r6:ffffffff r5:60000013 r4:8000fbd0 [<8000fb90>] (default_idle+0x0/0x4c) from [<8001015c>] (cpu_idle+0xbc/0xf8) [<800100a0>] (cpu_idle+0x0/0xf8) from [<804e7930>] (secondary_start_kernel+0x120/0x148) r9:412fc09a r8:1000406a r7:80712d20 r6:10c03c7d r5:00000003 r4:806e2008 [<804e7810>] (secondary_start_kernel+0x0/0x148) from [<104e7148>] (0x104e7148) r5:0000001f r4:4f8a806a CPU1: stopping Backtrace: [<800132e8>] (dump_backtrace+0x0/0x114) from [<804ea684>] (dump_stack+0x20/0x24) r7:00000000 r6:806c3f2c r5:806cf748 r4:80712d18 [<804ea664>] (dump_stack+0x0/0x24) from [<80014adc>] (handle_IPI+0x140/0x18c) [<8001499c>] (handle_IPI+0x0/0x18c) from [<800085b0>] (gic_handle_irq+0x68/0x70) r9:412fc09a r8:806d29e8 r7:f4000110 r6:bf8bbf60 r5:806ce974 r4:f400010c [<80008548>] (gic_handle_irq+0x0/0x70) from [<8000eac0>] (__irq_svc+0x40/0x54) Exception stack(0xbf8bbf60 to 0xbf8bbfa8) bf60: 00000000 00000000 0000000f 8001aea0 bf8ba000 80712a48 804f0040 00000000 bf80: 806d29e8 412fc09a 00000000 bf8bbfb4 bf8bbfb8 bf8bbfa8 8000fbcc 8000fbd0 bfa0: 60000013 ffffffff r7:bf8bbf94 r6:ffffffff r5:60000013 r4:8000fbd0 [<8000fb90>] (default_idle+0x0/0x4c) from [<8001015c>] (cpu_idle+0xbc/0xf8) [<800100a0>] (cpu_idle+0x0/0xf8) from [<804e7930>] (secondary_start_kernel+0x120/0x148) r9:412fc09a r8:1000406a r7:80712d20 r6:10c03c7d r5:00000001 r4:806e2008
--- drivers/usb/chipidea/udc.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-)
drivers/usb/chipidea/udc.c +9 -4
@@ -579,9 +579,6 @@ static int _gadget_stop_activity(struct usb_gadget *gadget)usb_ep_fifo_flush (&ci->ep0out->ep);usb_ep_fifo_flush (&ci->ep0in->ep); -if (ci->driver) - ci->driver->disconnect (gadget); -/* make sure to disable all endpoints */ gadget_for_each_ep (ep, gadget) {usb_ep_disable (ep);
@@ -612,6 +609,11 @@ __acquires(ci->lock)dbg_event (0xFF ,"BUS RST" ,0 ); +if (ci->gadget.speed !=USB_SPEED_UNKNOWN ) { +if (ci->driver) + ci->driver->disconnect (&ci->gadget); + } +spin_unlock (&ci->lock); retval =_gadget_stop_activity (&ci->gadget);if (retval)
@@ -1373,6 +1375,8 @@ static int ci13xxx_vbus_session(struct usb_gadget *_gadget, int is_active)hw_device_state (ci, ci->ep0out->qh.dma);dev_dbg (ci->dev,"Connected to host\n" ); }else { +if (ci->driver) + ci->driver->disconnect (&ci->gadget);hw_device_state (ci,0 );if (ci->platdata->notify_event) ci->platdata->notify_event(ci,
@@ -1580,13 +1584,14 @@ static int ci13xxx_stop(struct usb_gadget *gadget,if (ci->platdata->notify_event) ci->platdata->notify_event (ci,CI13XXX_CONTROLLER_STOPPED_EVENT ); - ci->driver =NULL ;spin_unlock_irqrestore (&ci->lock, flags);_gadget_stop_activity (&ci->gadget);spin_lock_irqsave (&ci->lock, flags);pm_runtime_put (&ci->gadget.dev); } + ci->driver =NULL ; +spin_unlock_irqrestore (&ci->lock, flags);return 0 ;
Signature · 1 line
1.7.0.4
PATCH v10 8/8 usb: chipidea: imx: fix the error that using uninitialized pointer
In reply to Peter ChenIf the core's probe fails, the platform layer may not get core's private data, if the platform tries to use struct ci13xxx, it will use uninitialized pointer. Besides, if the core's probe fails, the platform layer should know it, and let its probe fail too.
--- drivers/usb/chipidea/ci13xxx_imx.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
drivers/usb/chipidea/ci13xxx_imx.c +7 -0
@@ -239,6 +239,13 @@ static int ci13xxx_imx_probe(struct platform_device *pdev)platform_set_drvdata (pdev, data); ci =platform_get_drvdata (plat_ci); + +if (!ci) { + ret = -ENODEV ; +dev_err (&pdev->dev, +"some wrong at ci core's initialization\n" ); + goto err_clk; + }/* * Internal vbus on/off policy * - Always on for host only function
Signature · 1 line
1.7.0.4
PATCH v10 8/8 usb: chipidea: imx: fix the error that using uninitialized pointer
Hello.
Quoted 15 lines · Peter Chen
If the core's probe fails, the platform layer may not get core's private data, if the platform tries to use struct ci13xxx, it will use uninitialized pointer. Besides, if the core's probe fails, the platform layer should know it, and let its probe fail too.
Signed-off-by Peter Chen <[email protected]>--- drivers/usb/chipidea/ci13xxx_imx.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)drivers/usb/chipidea/ci13xxx_imx.c +0
-0
drivers/usb/chipidea/ci13xxx_imx.c static int ci13xxx_imx_probe(struct platform_device *pdev) · line 242
Quoted 4 lines
drivers/usb/chipidea/ci13xxx_imx.c +1
-0@@ -239,6 +239,13 @@ static int ci13xxx_imx_probe(struct platform_device *pdev)platform_set_drvdata (pdev, data); ci =platform_get_drvdata (plat_ci); +
No need for empty line here...
drivers/usb/chipidea/ci13xxx_imx.c static int ci13xxx_imx_probe(struct platform_device *pdev) · line 248
Quoted 6 lines
drivers/usb/chipidea/ci13xxx_imx.c +6
-0+if (!ci) { + ret = -ENODEV ; +dev_err (&pdev->dev, +"some wrong at ci core's initialization\n" ); + goto err_clk; + }
It'd be better to put it here.
drivers/usb/chipidea/ci13xxx_imx.c static int ci13xxx_imx_probe(struct platform_device *pdev) · line 251
Quoted 3 lines
drivers/usb/chipidea/ci13xxx_imx.c +0
-0/* * Internal vbus on/off policy * - Always on for host only function
WBR, Sergei
PATCH v10 8/8 usb: chipidea: imx: fix the error that using uninitialized pointer
Quoted 26 lines · Sergei Shtylyov
Hello.
Quoted 15 lines · Peter Chen
If the core's probe fails, the platform layer may not get core's private data, if the platform tries to use struct ci13xxx, it will use uninitialized pointer. Besides, if the core's probe fails, the platform layer should know it, and let its probe fail too.
Signed-off-by Peter Chen <[email protected]>--- drivers/usb/chipidea/ci13xxx_imx.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)drivers/usb/chipidea/ci13xxx_imx.c +0
-0drivers/usb/chipidea/ci13xxx_imx.c static int ci13xxx_imx_probe(struct platform_device *pdev) · line 242
Quoted 4 lines
drivers/usb/chipidea/ci13xxx_imx.c +1
-0@@ -239,6 +239,13 @@ static int ci13xxx_imx_probe(struct platform_device *pdev)platform_set_drvdata (pdev, data); ci =platform_get_drvdata (plat_ci); +No need for empty line here...
Quoted 8 lines
drivers/usb/chipidea/ci13xxx_imx.c static int ci13xxx_imx_probe(struct platform_device *pdev) · line 248
Quoted 6 lines
drivers/usb/chipidea/ci13xxx_imx.c +6
-0+if (!ci) { + ret = -ENODEV ; +dev_err (&pdev->dev, +"some wrong at ci core's initialization\n" ); + goto err_clk; + }It'd be better to put it here.
Thanks.
Quoted 8 lines
drivers/usb/chipidea/ci13xxx_imx.c static int ci13xxx_imx_probe(struct platform_device *pdev) · line 251
Quoted 4 lines
drivers/usb/chipidea/ci13xxx_imx.c +0
-0/* * Internal vbus on/off policy * - Always on for host only function WBR, Sergei
Signature · 2 lines
Best Regards, Peter Chen
A message that is not in the archive (sent off-list or not yet received): CAB7JpEEuGP2Vo6HMZz30BZgiGQbBYqEVMRFEb7m0MbsC8oDjgQ@mail.gmail.com
PATCH v10 8/8 usb: chipidea: imx: fix the error that using uninitialized pointer
Quoted 6 lines · Alexander Shishkin
Quoted 2 lines · Peter Chen
If the core's probe fails, the platform layer may not get core's
I think the question we should be asking ourselves here is, why does it fail?
I find this problem just make core probe fails as set dr_mode = "peripheral" with host-only controller, we should consider such user mistake.
I can move vbus handling to core code as it is core thing to avoid this bug. But what's your suggestion of platform layer handling when core's probe fails?
http://marc.info/?l=linux-usb&m=136202110302555&w=2
Signature · 2 lines
Best Regards, Peter Chen