From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from relay1.mentorg.com ([192.94.38.131]:60398 "EHLO
	relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752475AbbJVBVC (ORCPT
	<rfc822;stable@vger.kernel.org>); Wed, 21 Oct 2015 21:21:02 -0400
Message-ID: <562839B1.9030703@mentor.com>
Date: Thu, 22 Oct 2015 10:19:45 +0900
From: Jiada Wang <jiada_wang@mentor.com>
MIME-Version: 1.0
To: Peter Chen <peter.chen@freescale.com>, <linux-usb@vger.kernel.org>
CC: Li Jun <B47624@freescale.com>, Li Jun <jun.li@freescale.com>,
	<stable@vger.kernel.org>
Subject: Re: [PATCH 1/1] usb: chipidea: otg: gadget module load and unload
 support
References: <1445397800-19980-1-git-send-email-peter.chen@freescale.com>
In-Reply-To: <1445397800-19980-1-git-send-email-peter.chen@freescale.com>
Content-Type: text/plain; charset="windows-1252"; format=flowed
Content-Transfer-Encoding: 7bit
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

Hello


On 10/21/2015 12:23 PM, Peter Chen wrote:
> From: Li Jun <B47624@freescale.com>
>
> This patch is to support load and unload gadget driver in full OTG mode.
>
> Signed-off-by: Li Jun <jun.li@freescale.com>
> Signed-off-by: Peter Chen <peter.chen@freescale.com>
> Cc: Jiada Wang <jiada_wang@mentor.com>
> (Peter: it fixes a bug that the unload/reload gadget driver can't work
>   well at OTG FSM mode)
> Cc: <stable@vger.kernel.org> #v4.0+
> ---
>   drivers/usb/chipidea/udc.c | 17 +++++++++++++++++
>   1 file changed, 17 insertions(+)
>
> diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
> index e19d8b8..67cfa04 100644
> --- a/drivers/usb/chipidea/udc.c
> +++ b/drivers/usb/chipidea/udc.c
> @@ -1755,6 +1755,22 @@ static int ci_udc_start(struct usb_gadget *gadget,
>   	return retval;
>   }
>
> +static void ci_udc_stop_for_otg_fsm(struct ci_hdrc *ci)
> +{
> +	if (!ci_otg_is_fsm_mode(ci))
> +		return;
> +
> +	mutex_lock(&ci->fsm.lock);
> +	if (ci->fsm.otg->state == OTG_STATE_A_PERIPHERAL) {
> +		ci->fsm.a_bidl_adis_tmout = 1;
> +		ci_hdrc_otg_fsm_start(ci);
> +	} else if (ci->fsm.otg->state == OTG_STATE_B_PERIPHERAL) {
> +		ci->fsm.protocol = PROTO_UNDEF;
> +		ci->fsm.otg->state = OTG_STATE_UNDEFINED;
> +	}
> +	mutex_unlock(&ci->fsm.lock);
> +}
> +
>   /**
>    * ci_udc_stop: unregister a gadget driver
>    */
> @@ -1779,6 +1795,7 @@ static int ci_udc_stop(struct usb_gadget *gadget)
>   	ci->driver = NULL;
>   	spin_unlock_irqrestore(&ci->lock, flags);
>
> +	ci_udc_stop_for_otg_fsm(ci);
>   	return 0;
>   }
>
>
I have confirmed this patch resolves my issue with gadget module load/unload
please feel free to add my Tested-by

Thanks,
Jiada