qiurui/Centos-kernel-stream-10
1
0
Fork 0
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10.git synced 2026-09-09 00:07:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

usb: chipidea: udc: support dynamic gadget add/remove

Browse Source 
JIRA: https://redhat.atlassian.net/browse/RHEL-248519

commit dd0c03d685225cb8fc60c477417d1b9c3b05ba9d
Author: Xu Yang <xu.yang_2@nxp.com>
Date:   Mon Apr 27 15:56:53 2026 +0800

    usb: chipidea: udc: support dynamic gadget add/remove
    
    An asynchronous vbus_event_work() keep running when switch the role from
    device to host. This affects EHCI host controller initialization.
    
    USBCMD.RUNSTOP bit is set at ehci_run() and cleared by following
    vbus_event_work() if bus_event_work() run after ehci_run().
    
    The log below shows what happens:
    
    [   87.819925] ci_hdrc ci_hdrc.0: EHCI Host Controller
    [   87.819963] ci_hdrc ci_hdrc.0: new USB bus registered, assigned bus number 1
    [   87.955634] ci_hdrc ci_hdrc.0: USB 2.0, controller refused to start: -110
    [   87.955658] ci_hdrc ci_hdrc.0: startup error -110
    [   87.955682] ci_hdrc ci_hdrc.0: USB bus 1 deregistered
    
    The problem is that the chipidea UDC driver call usb_udc_vbus_handler() to
    pull down data line but it don't wait for completion before host controller
    starts running.
    
    Now UDC core can properly delete usb gadget device and make sure that vbus
    work is cancelled or completed after usb_del_gadget_udc() is returned. But
    the udc.c only call usb_del_gadget_udc() in ci_hdrc_gadget_destroy(). To
    avoid above issue, add/remove the gadget device dynamically during USB role
    switching.
    
    To support dynamic gadget add/remove, do below steps:
      - clear ci->gadget and ci->ci_hw_ep at initialization.
      - assign udc_[start|stop]() to rdrv->[start|stop] and properly merge the
        operations in udc_id_switch_for_[device|host]() to udc_[start|stop]()
    
    Adjust the order ci_handle_vbus_change() and ci_role_start() to avoid NULL
    pointer reference since ci_hdrc_gadget_init() doesn't add gadget anymore.
    
    Acked-by: Peter Chen <peter.chen@kernel.org>
    Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
    Link: https://patch.msgid.link/20260427075653.3611180-2-xu.yang_2@nxp.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Jared Kangas <jkangas@redhat.com>
This commit is contained in:
Jared Kangas
2026-08-25 12:07:27 -07:00
parent e506fc9057
commit a5c877cc16
2 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/usb/chipidea/core.c
+4 -7
View File
@@ -1191,19 +1191,16 @@ static int ci_hdrc_probe(struct platform_device *pdev)
ci->role = ci_get_role(ci);
if (!ci_otg_is_fsm_mode(ci)) {
/* only update vbus status for peripheral */
if (ci->role == CI_ROLE_GADGET) {
/* Pull down DP for possible charger detection */
hw_write(ci, OP_USBCMD, USBCMD_RS, 0);
ci_handle_vbus_change(ci);
}
ret = ci_role_start(ci, ci->role);
if (ret) {
dev_err(dev, "can't start %s role\n",
ci_role(ci)->name);
goto stop;
}
/* only update vbus status for peripheral */
if (ci->role == CI_ROLE_GADGET)
ci_handle_vbus_change(ci);
}
ret = devm_request_irq(dev, ci->irq, ci_irq_handler, IRQF_SHARED,
drivers/usb/chipidea/udc.c
+34 -31
View File
@@ -2044,6 +2044,8 @@ static int init_eps(struct ci_hdrc *ci)
{
int retval = 0, i, j;
memset(ci->ci_hw_ep, 0, sizeof(ci->ci_hw_ep));
for (i = 0; i < ci->hw_ep_max/2; i++)
for (j = RX; j <= TX; j++) {
int k = i + j * ci->hw_ep_max/2;
@@ -2289,6 +2291,8 @@ static int udc_start(struct ci_hdrc *ci)
struct usb_otg_caps *otg_caps = &ci->platdata->ci_otg_caps;
int retval = 0;
memset(&ci->gadget, 0, sizeof(ci->gadget));
ci->gadget.ops = &usb_gadget_ops;
ci->gadget.speed = USB_SPEED_UNKNOWN;
ci->gadget.max_speed = USB_SPEED_HIGH;
@@ -2327,10 +2331,15 @@ static int udc_start(struct ci_hdrc *ci)
ci->gadget.ep0 = &ci->ep0in->ep;
if (ci->platdata->pins_device)
pinctrl_select_state(ci->platdata->pctl,
ci->platdata->pins_device);
retval = usb_add_gadget_udc(dev, &ci->gadget);
if (retval)
goto destroy_eps;
ci_udc_enable_vbus_irq(ci, true);
return retval;
destroy_eps:
@@ -2342,38 +2351,20 @@ free_qh_pool:
return retval;
}
/*
* ci_hdrc_gadget_destroy: parent remove must call this to remove UDC
*
* No interrupts active, the IRQ has been released
/**
* udc_stop: deinitialize gadget role
* @ci: chipidea controller
*/
void ci_hdrc_gadget_destroy(struct ci_hdrc *ci)
static void udc_stop(struct ci_hdrc *ci)
{
if (!ci->roles[CI_ROLE_GADGET])
return;
ci_udc_enable_vbus_irq(ci, false);
usb_del_gadget_udc(&ci->gadget);
ci->vbus_active = 0;
destroy_eps(ci);
dma_pool_destroy(ci->td_pool);
dma_pool_destroy(ci->qh_pool);
}
static int udc_id_switch_for_device(struct ci_hdrc *ci)
{
if (ci->platdata->pins_device)
pinctrl_select_state(ci->platdata->pctl,
ci->platdata->pins_device);
ci_udc_enable_vbus_irq(ci, true);
return 0;
}
static void udc_id_switch_for_host(struct ci_hdrc *ci)
{
ci_udc_enable_vbus_irq(ci, false);
ci->vbus_active = 0;
if (ci->platdata->pins_device && ci->platdata->pins_default)
pinctrl_select_state(ci->platdata->pctl,
@@ -2422,7 +2413,6 @@ static void udc_resume(struct ci_hdrc *ci, bool power_lost)
int ci_hdrc_gadget_init(struct ci_hdrc *ci)
{
struct ci_role_driver *rdrv;
int ret;
if (!hw_read(ci, CAP_DCCPARAMS, DCCPARAMS_DC))
return -ENXIO;
@@ -2431,8 +2421,8 @@ int ci_hdrc_gadget_init(struct ci_hdrc *ci)
if (!rdrv)
return -ENOMEM;
rdrv->start = udc_id_switch_for_device;
rdrv->stop = udc_id_switch_for_host;
rdrv->start = udc_start;
rdrv->stop = udc_stop;
#ifdef CONFIG_PM_SLEEP
rdrv->suspend = udc_suspend;
rdrv->resume = udc_resume;
@@ -2440,9 +2430,22 @@ int ci_hdrc_gadget_init(struct ci_hdrc *ci)
rdrv->irq = udc_irq;
rdrv->name = "gadget";
ret = udc_start(ci);
if (!ret)
ci->roles[CI_ROLE_GADGET] = rdrv;
ci->roles[CI_ROLE_GADGET] = rdrv;
return ret;
/* Pull down DP for possible charger detection */
hw_write(ci, OP_USBCMD, USBCMD_RS, 0);
return 0;
}
/*
* ci_hdrc_gadget_destroy: parent remove must call this to remove UDC
*
* No interrupts active, the IRQ has been released
*/
void ci_hdrc_gadget_destroy(struct ci_hdrc *ci)
{
struct device *dev = &ci->gadget.dev;
if (ci->roles[CI_ROLE_GADGET] && device_is_registered(dev))
udc_stop(ci);
}