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: core: allow ci_irq_handler() handle both ID and VBUS change

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

commit b94b631d9f78e653855f7fb58dbcb86c2a856f6f
Author: Xu Yang <xu.yang_2@nxp.com>
Date:   Thu Apr 2 15:14:56 2026 +0800

    usb: chipidea: core: allow ci_irq_handler() handle both ID and VBUS change
    
    For USB role switch-triggered IRQ, ID and VBUS change come together, for
    example when switching from host to device mode. ID indicate a role switch
    and VBUS is required to determine whether the device controller can start
    operating. Currently, ci_irq_handler() handles only a single event per
    invocation. This can cause an issue where switching to device mode results
    in the device controller not working at all. Allowing ci_irq_handler() to
    handle both ID and VBUS change in one call resolves this issue.
    
    Meanwhile, this change also affects the VBUS event handling logic.
    Previously, if an ID event indicated host mode the VBUS IRQ will be
    ignored as the device disable BSE when stop() is called. With the new
    behavior, if ID and VBUS IRQ occur together and the target mode is host,
    the VBUS event is queued and ci_handle_vbus_change() will call
    usb_gadget_vbus_connect(), after which USBMODE is switched to device mode,
    causing host mode to stop working. To prevent this, an additional check is
    added to skip handling VBUS event when current role is not device mode.
    
    Suggested-by: Peter Chen <peter.chen@kernel.org>
    Fixes: e1b5d2bed6 ("usb: chipidea: core: handle usb role switch in a common way")
    Cc: stable@vger.kernel.org
    Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
    Link: https://patch.msgid.link/20260402071457.2516021-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 1075f7e3c2
commit 82793b5222
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/usb/chipidea/core.c
+23 -22
View File
@@ -544,30 +544,31 @@ static irqreturn_t ci_irq_handler(int irq, void *data)
if (ret == IRQ_HANDLED)
return ret;
}
}
/*
* Handle id change interrupt, it indicates device/host function
* switch.
*/
if (ci->is_otg && (otgsc & OTGSC_IDIE) && (otgsc & OTGSC_IDIS)) {
ci->id_event = true;
/* Clear ID change irq status */
hw_write_otgsc(ci, OTGSC_IDIS, OTGSC_IDIS);
ci_otg_queue_work(ci);
return IRQ_HANDLED;
}
/*
* Handle id change interrupt, it indicates device/host function
* switch.
*/
if ((otgsc & OTGSC_IDIE) && (otgsc & OTGSC_IDIS)) {
ci->id_event = true;
/* Clear ID change irq status */
hw_write_otgsc(ci, OTGSC_IDIS, OTGSC_IDIS);
}
/*
* Handle vbus change interrupt, it indicates device connection
* and disconnection events.
*/
if (ci->is_otg && (otgsc & OTGSC_BSVIE) && (otgsc & OTGSC_BSVIS)) {
ci->b_sess_valid_event = true;
/* Clear BSV irq */
hw_write_otgsc(ci, OTGSC_BSVIS, OTGSC_BSVIS);
ci_otg_queue_work(ci);
return IRQ_HANDLED;
/*
* Handle vbus change interrupt, it indicates device connection
* and disconnection events.
*/
if ((otgsc & OTGSC_BSVIE) && (otgsc & OTGSC_BSVIS)) {
ci->b_sess_valid_event = true;
/* Clear BSV irq */
hw_write_otgsc(ci, OTGSC_BSVIS, OTGSC_BSVIS);
}
if (ci->id_event || ci->b_sess_valid_event) {
ci_otg_queue_work(ci);
return IRQ_HANDLED;
}
}
/* Handle device/host interrupt */
drivers/usb/chipidea/otg.c
+3
View File
@@ -130,6 +130,9 @@ enum ci_role ci_otg_role(struct ci_hdrc *ci)
void ci_handle_vbus_change(struct ci_hdrc *ci)
{
if (ci->role != CI_ROLE_GADGET)
return;
if (!ci->is_otg) {
if (ci->platdata->flags & CI_HDRC_FORCE_VBUS_ACTIVE_ALWAYS)
usb_gadget_vbus_connect(&ci->gadget);