Commit 18cfd7b8 authored by Chunfeng Yun's avatar Chunfeng Yun Committed by Greg Kroah-Hartman
Browse files

usb: mtu3: rebuild role switch flow of extcon 



This is a preparation patch to plan to use the same work to
handle role switch for all three supported ways.

Signed-off-by: default avatarChunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1623139069-8173-11-git-send-email-chunfeng.yun@mediatek.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a04c9f2d

drivers/usb/mtu3/mtu3.h

+5 −4
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/usb/ch9.h>

#include <linux/usb/gadget.h>

#include <linux/usb/otg.h>

#include <linux/usb/role.h>



struct mtu3;

struct mtu3_ep;
@@ -193,8 +194,8 @@ struct mtu3_gpd_ring { 
* @vbus: vbus 5V used by host mode

* @edev: external connector used to detect vbus and iddig changes

* @id_nb : notifier for iddig(idpin) detection

* @id_work : work of iddig detection notifier

* @id_event : event of iddig detecion notifier

* @dr_work : work for drd mode switch, used to avoid sleep in atomic context

* @desired_role : role desired to switch

* @role_sw : use USB Role Switch to support dual-role switch, can't use

*		extcon at the same time, and extcon is deprecated.

* @role_sw_used : true when the USB Role Switch is used.
@@ -206,8 +207,8 @@ struct otg_switch_mtk { 
	struct regulator *vbus;

	struct extcon_dev *edev;

	struct notifier_block id_nb;

	struct work_struct id_work;

	unsigned long id_event;

	struct work_struct dr_work;

	enum usb_role desired_role;

	struct usb_role_switch *role_sw;

	bool role_sw_used;

	bool is_u3_drd;

drivers/usb/mtu3/mtu3_dr.c

+33 −28
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 
 * Author: Chunfeng Yun <chunfeng.yun@mediatek.com>

 */



#include <linux/usb/role.h>



#include "mtu3.h"

#include "mtu3_dr.h"

#include "mtu3_debug.h"
@@ -124,16 +122,28 @@ int ssusb_set_vbus(struct otg_switch_mtk *otg_sx, int is_on) 
	return 0;

}



static void ssusb_set_role(struct otg_switch_mtk *otg_sx, enum usb_role role)

static void ssusb_mode_sw_work(struct work_struct *work)

{

	struct otg_switch_mtk *otg_sx =

		container_of(work, struct otg_switch_mtk, dr_work);

	struct ssusb_mtk *ssusb =

		container_of(otg_sx, struct ssusb_mtk, otg_switch);

	struct mtu3 *mtu = ssusb->u3d;

	enum usb_role desired_role = otg_sx->desired_role;

	enum usb_role current_role;



	current_role = ssusb->is_host ? USB_ROLE_HOST : USB_ROLE_DEVICE;



	if (desired_role == USB_ROLE_NONE)

		desired_role = USB_ROLE_HOST;



	dev_dbg(ssusb->dev, "set role : %d\n", role);

	mtu3_dbg_trace(ssusb->dev, "set role : %d", role);

	if (current_role == desired_role)

		return;



	dev_dbg(ssusb->dev, "set role : %s\n", usb_role_string(desired_role));

	mtu3_dbg_trace(ssusb->dev, "set role : %s", usb_role_string(desired_role));



	switch (role) {

	switch (desired_role) {

	case USB_ROLE_HOST:

		mtu3_stop(mtu);

		switch_port_to_host(ssusb);
@@ -147,35 +157,30 @@ static void ssusb_set_role(struct otg_switch_mtk *otg_sx, enum usb_role role) 
		mtu3_start(mtu);

		break;

	case USB_ROLE_NONE:

		break;

	default:

		dev_err(ssusb->dev, "invalid role\n");

	}

}



static void ssusb_id_work(struct work_struct *work)

static void ssusb_set_mode(struct otg_switch_mtk *otg_sx, enum usb_role role)

{

	struct otg_switch_mtk *otg_sx =

		container_of(work, struct otg_switch_mtk, id_work);

	struct ssusb_mtk *ssusb =

		container_of(otg_sx, struct ssusb_mtk, otg_switch);



	if (otg_sx->id_event)

		ssusb_set_role(otg_sx, USB_ROLE_HOST);

	else

		ssusb_set_role(otg_sx, USB_ROLE_DEVICE);

	if (ssusb->dr_mode != USB_DR_MODE_OTG)

		return;



	otg_sx->desired_role = role;

	queue_work(system_freezable_wq, &otg_sx->dr_work);

}



/*

 * @ssusb_id_notifier is called in atomic context, but ssusb_set_role()

 * may sleep, so use work queue here

 */

static int ssusb_id_notifier(struct notifier_block *nb,

	unsigned long event, void *ptr)

{

	struct otg_switch_mtk *otg_sx =

		container_of(nb, struct otg_switch_mtk, id_nb);



	otg_sx->id_event = event;

	schedule_work(&otg_sx->id_work);

	ssusb_set_mode(otg_sx, event ? USB_ROLE_HOST : USB_ROLE_DEVICE);



	return NOTIFY_DONE;

}
@@ -199,12 +204,12 @@ static int ssusb_extcon_register(struct otg_switch_mtk *otg_sx) 
		return ret;

	}



	dev_dbg(ssusb->dev, "EXTCON_USB_HOST: %d\n",

		extcon_get_state(edev, EXTCON_USB_HOST));

	ret = extcon_get_state(edev, EXTCON_USB_HOST);

	dev_dbg(ssusb->dev, "EXTCON_USB_HOST: %d\n", ret);



	/* default as host, switch to device mode if needed */

	if (extcon_get_state(edev, EXTCON_USB_HOST) == false)

		ssusb_set_role(otg_sx, USB_ROLE_DEVICE);

	if (!ret)

		ssusb_set_mode(otg_sx, USB_ROLE_DEVICE);



	return 0;

}
@@ -221,10 +226,10 @@ void ssusb_mode_switch(struct ssusb_mtk *ssusb, int to_host) 


	if (to_host) {

		ssusb_set_force_mode(ssusb, MTU3_DR_FORCE_HOST);

		ssusb_set_role(otg_sx, USB_ROLE_HOST);

		ssusb_set_mode(otg_sx, USB_ROLE_HOST);

	} else {

		ssusb_set_force_mode(ssusb, MTU3_DR_FORCE_DEVICE);

		ssusb_set_role(otg_sx, USB_ROLE_DEVICE);

		ssusb_set_mode(otg_sx, USB_ROLE_DEVICE);

	}

}
@@ -298,7 +303,7 @@ int ssusb_otg_switch_init(struct ssusb_mtk *ssusb) 
	struct otg_switch_mtk *otg_sx = &ssusb->otg_switch;

	int ret = 0;



	INIT_WORK(&otg_sx->id_work, ssusb_id_work);

	INIT_WORK(&otg_sx->dr_work, ssusb_mode_sw_work);



	if (otg_sx->manual_drd_enabled)

		ssusb_dr_debugfs_init(ssusb);
@@ -314,6 +319,6 @@ void ssusb_otg_switch_exit(struct ssusb_mtk *ssusb) 
{

	struct otg_switch_mtk *otg_sx = &ssusb->otg_switch;



	cancel_work_sync(&otg_sx->id_work);

	cancel_work_sync(&otg_sx->dr_work);

	usb_role_switch_unregister(otg_sx->role_sw);

}