Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 792f7525 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-ci-v4.7-rc1' of... 

Merge tag 'usb-ci-v4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next

Hi Greg, below are changes for chipidea and OTG FSM, no major changes.
Some for documentation, some for tiny changes, thanks.
parents e6c037bf 764763f0

Documentation/usb/chipidea.txt

+8 −5
Original line number Diff line number Diff line
@@ -3,14 +3,17 @@ 
To show how to demo OTG HNP and SRP functions via sys input files

with 2 Freescale i.MX6Q sabre SD boards.



1.1 How to enable OTG FSM in menuconfig

1.1 How to enable OTG FSM

---------------------------------------

Select CONFIG_USB_OTG_FSM, rebuild kernel Image and modules.

If you want to check some internal variables for otg fsm,

mount debugfs, there are 2 files which can show otg fsm

variables and some controller registers value:

1.1.1 Select CONFIG_USB_OTG_FSM in menuconfig, rebuild kernel

Image and modules. If you want to check some internal

variables for otg fsm, mount debugfs, there are 2 files

which can show otg fsm variables and some controller registers value:

cat /sys/kernel/debug/ci_hdrc.0/otg

cat /sys/kernel/debug/ci_hdrc.0/registers

1.1.2 Add below entries in your dts file for your controller node

	otg-rev = <0x0200>;

	adp-disable;



1.2 Test operations

-------------------

drivers/usb/chipidea/ci_hdrc_imx.c

+0 −4
Original line number Diff line number Diff line
@@ -292,10 +292,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) 
	if (pdata.flags & CI_HDRC_SUPPORTS_RUNTIME_PM)

		data->supports_runtime_pm = true;



	ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

	if (ret)

		goto err_clk;



	ret = imx_usbmisc_init(data->usbmisc_data);

	if (ret) {

		dev_err(&pdev->dev, "usbmisc init failed, ret=%d\n", ret);

drivers/usb/common/usb-otg-fsm.c

+4 −6
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ static int otg_set_protocol(struct otg_fsm *fsm, int protocol) 
	return 0;

}



static int state_changed;



/* Called when leaving a state.  Do state clean up jobs here */

static void otg_leave_state(struct otg_fsm *fsm, enum usb_otg_state old_state)

{
@@ -208,7 +206,6 @@ static void otg_start_hnp_polling(struct otg_fsm *fsm) 
/* Called when entering a state */

static int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state)

{

	state_changed = 1;

	if (fsm->otg->state == new_state)

		return 0;

	VDBG("Set state: %s\n", usb_otg_state_string(new_state));
@@ -324,6 +321,7 @@ static int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state) 
	}



	fsm->otg->state = new_state;

	fsm->state_changed = 1;

	return 0;

}
@@ -335,7 +333,7 @@ int otg_statemachine(struct otg_fsm *fsm) 
	mutex_lock(&fsm->lock);



	state = fsm->otg->state;

	state_changed = 0;

	fsm->state_changed = 0;

	/* State machine state change judgement */



	switch (state) {
@@ -448,7 +446,7 @@ int otg_statemachine(struct otg_fsm *fsm) 
	}

	mutex_unlock(&fsm->lock);



	VDBG("quit statemachine, changed = %d\n", state_changed);

	return state_changed;

	VDBG("quit statemachine, changed = %d\n", fsm->state_changed);

	return fsm->state_changed;

}

EXPORT_SYMBOL_GPL(otg_statemachine);

include/linux/usb/otg-fsm.h

+84 −7
Original line number Diff line number Diff line
@@ -72,37 +72,113 @@ enum otg_fsm_timer { 
	NUM_OTG_FSM_TIMERS,

};



/* OTG state machine according to the OTG spec */

/**

 * struct otg_fsm - OTG state machine according to the OTG spec

 *

 * OTG hardware Inputs

 *

 *	Common inputs for A and B device

 * @id:		TRUE for B-device, FALSE for A-device.

 * @adp_change: TRUE when current ADP measurement (n) value, compared to the

 *		ADP measurement taken at n-2, differs by more than CADP_THR

 * @power_up:	TRUE when the OTG device first powers up its USB system and

 *		ADP measurement taken if ADP capable

 *

 *	A-Device state inputs

 * @a_srp_det:	TRUE if the A-device detects SRP

 * @a_vbus_vld:	TRUE when VBUS voltage is in regulation

 * @b_conn:	TRUE if the A-device detects connection from the B-device

 * @a_bus_resume: TRUE when the B-device detects that the A-device is signaling

 *		  a resume (K state)

 *	B-Device state inputs

 * @a_bus_suspend: TRUE when the B-device detects that the A-device has put the

 *		bus into suspend

 * @a_conn:	TRUE if the B-device detects a connection from the A-device

 * @b_se0_srp:	TRUE when the line has been at SE0 for more than the minimum

 *		time before generating SRP

 * @b_ssend_srp: TRUE when the VBUS has been below VOTG_SESS_VLD for more than

 *		 the minimum time before generating SRP

 * @b_sess_vld:	TRUE when the B-device detects that the voltage on VBUS is

 *		above VOTG_SESS_VLD

 * @test_device: TRUE when the B-device switches to B-Host and detects an OTG

 *		test device. This must be set by host/hub driver

 *

 *	Application inputs (A-Device)

 * @a_bus_drop:	TRUE when A-device application needs to power down the bus

 * @a_bus_req:	TRUE when A-device application wants to use the bus.

 *		FALSE to suspend the bus

 *

 *	Application inputs (B-Device)

 * @b_bus_req:	TRUE during the time that the Application running on the

 *		B-device wants to use the bus

 *

 *	Auxilary inputs (OTG v1.3 only. Obsolete now.)

 * @a_sess_vld:	TRUE if the A-device detects that VBUS is above VA_SESS_VLD

 * @b_bus_suspend: TRUE when the A-device detects that the B-device has put

 *		the bus into suspend

 * @b_bus_resume: TRUE when the A-device detects that the B-device is signaling

 *		 resume on the bus

 *

 * OTG Output status. Read only for users. Updated by OTG FSM helpers defined

 * in this file

 *

 *	Outputs for Both A and B device

 * @drv_vbus:	TRUE when A-device is driving VBUS

 * @loc_conn:	TRUE when the local device has signaled that it is connected

 *		to the bus

 * @loc_sof:	TRUE when the local device is generating activity on the bus

 * @adp_prb:	TRUE when the local device is in the process of doing

 *		ADP probing

 *

 *	Outputs for B-device state

 * @adp_sns:	TRUE when the B-device is in the process of carrying out

 *		ADP sensing

 * @data_pulse: TRUE when the B-device is performing data line pulsing

 *

 * Internal Variables

 *

 * a_set_b_hnp_en: TRUE when the A-device has successfully set the

 *		b_hnp_enable bit in the B-device.

 *		   Unused as OTG fsm uses otg->host->b_hnp_enable instead

 * b_srp_done:	TRUE when the B-device has completed initiating SRP

 * b_hnp_enable: TRUE when the B-device has accepted the

 *		SetFeature(b_hnp_enable) B-device.

 *		Unused as OTG fsm uses otg->gadget->b_hnp_enable instead

 * a_clr_err:	Asserted (by application ?) to clear a_vbus_err due to an

 *		overcurrent condition and causes the A-device to transition

 *		to a_wait_vfall

 */

struct otg_fsm {

	/* Input */

	int id;

	int adp_change;

	int power_up;

	int test_device;

	int a_bus_drop;

	int a_bus_req;

	int a_srp_det;

	int a_vbus_vld;

	int b_conn;

	int a_bus_resume;

	int a_bus_suspend;

	int a_conn;

	int b_bus_req;

	int b_se0_srp;

	int b_ssend_srp;

	int b_sess_vld;

	int test_device;

	int a_bus_drop;

	int a_bus_req;

	int b_bus_req;



	/* Auxilary inputs */

	int a_sess_vld;

	int b_bus_resume;

	int b_bus_suspend;



	/* Output */

	int data_pulse;

	int drv_vbus;

	int loc_conn;

	int loc_sof;

	int adp_prb;

	int adp_sns;

	int data_pulse;



	/* Internal variables */

	int a_set_b_hnp_en;
@@ -110,7 +186,7 @@ struct otg_fsm { 
	int b_hnp_enable;

	int a_clr_err;



	/* Informative variables */

	/* Informative variables. All unused as of now */

	int a_bus_drop_inf;

	int a_bus_req_inf;

	int a_clr_err_inf;
@@ -134,6 +210,7 @@ struct otg_fsm { 
	struct mutex lock;

	u8 *host_req_flag;

	struct delayed_work hnp_polling_work;

	bool state_changed;

};



struct otg_fsm_ops {