android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: common: usb-conn-gpio: Set last role to unknown before initial detection

Browse Source 
[ Upstream commit edd60d24bd858cef165274e4cd6cab43bdc58d15 ]

Currently if we bootup a device without cable connected, then
usb-conn-gpio won't call set_role() since last_role is same as
current role. This happens because during probe last_role gets
initialised to zero.

To avoid this, added a new constant in enum usb_role, last_role
is set to USB_ROLE_UNKNOWN before performing initial detection.

While at it, also handle default case for the usb_role switch
in cdns3, intel-xhci-usb-role-switch & musb/jz4740 to avoid
build warnings.

Fixes: 4602f3bff2 ("usb: common: add USB GPIO based connection detection driver")
Signed-off-by: Prashanth K <quic_prashk@quicinc.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Message-ID: <1685544074-17337-1-git-send-email-quic_prashk@quicinc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Prashanth K 2023-05-31 20:11:14 +05:30 committed by Greg Kroah-Hartman
parent 0e9e127835
commit 7ade555ac5
5 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/cdns3/core.c
View File

@ -243,6 +243,8 @@ static enum usb_role cdns3_hw_role_state_machine(struct cdns3 *cdns)
if (!vbus) if (!vbus)
role = USB_ROLE_NONE; role = USB_ROLE_NONE;
break; break;
default:
break;
} }
dev_dbg(cdns->dev, "role %d -> %d\n", cdns->role, role); dev_dbg(cdns->dev, "role %d -> %d\n", cdns->role, role);

3
drivers/usb/common/usb-conn-gpio.c
View File

@ -276,6 +276,9 @@ static int usb_conn_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, info); platform_set_drvdata(pdev, info);
/* Set last role to unknown before performing the initial detection */
info->last_role = USB_ROLE_UNKNOWN;
/* Perform initial detection */ /* Perform initial detection */
usb_conn_queue_dwork(info, 0); usb_conn_queue_dwork(info, 0);

2
drivers/usb/musb/jz4740.c
View File

@ -91,6 +91,8 @@ static int jz4740_musb_role_switch_set(struct usb_role_switch *sw,
case USB_ROLE_HOST: case USB_ROLE_HOST:
atomic_notifier_call_chain(&phy->notifier, USB_EVENT_ID, phy); atomic_notifier_call_chain(&phy->notifier, USB_EVENT_ID, phy);
break; break;
default:
break;
} }
return 0; return 0;

2
drivers/usb/roles/intel-xhci-usb-role-switch.c
View File

@ -97,6 +97,8 @@ static int intel_xhci_usb_set_role(struct usb_role_switch *sw,
val |= SW_VBUS_VALID; val |= SW_VBUS_VALID;
drd_config = DRD_CONFIG_STATIC_DEVICE; drd_config = DRD_CONFIG_STATIC_DEVICE;
break; break;
default:
break;
} }
val |= SW_IDPIN_EN; val |= SW_IDPIN_EN;
if (data->enable_sw_switch) { if (data->enable_sw_switch) {

1
include/linux/usb/role.h
View File

@ -11,6 +11,7 @@ enum usb_role {
USB_ROLE_NONE, USB_ROLE_NONE,
USB_ROLE_HOST, USB_ROLE_HOST,
USB_ROLE_DEVICE, USB_ROLE_DEVICE,
USB_ROLE_UNKNOWN,
}; };
typedef int (*usb_role_switch_set_t)(struct usb_role_switch *sw, typedef int (*usb_role_switch_set_t)(struct usb_role_switch *sw,