Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Pawel Laszczak <pawell@cadence.com>
To:     Peter Chen <peter.chen@kernel.org>
CC:     "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
        "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Rahul Kumar <kurahul@cadence.com>
Subject: RE: [PATCH v2] usb: cdnsp: Fixes issue with Configure Endpoint
 command
Thread-Topic: [PATCH v2] usb: cdnsp: Fixes issue with Configure Endpoint
 command
Thread-Index: AQHXK3hy7gOZ6buWoUCjwtaNarDR9Kqs+OcAgANHeNA=
Date:   Mon, 12 Apr 2021 03:30:17 +0000
Message-ID: <BYAPR07MB5381A83C23875BBBE77CF277DD709@BYAPR07MB5381.namprd07.prod.outlook.com>
References: <20210407063629.43685-1-pawell@gli-login.cadence.com>
 <20210410012208.GA28768@b29397-desktop>
In-Reply-To: <20210410012208.GA28768@b29397-desktop>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 3ce7e749-1920-4142-a0df-08d8fd634af7
X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Apr 2021 03:30:17.2648
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: xmBdTgkcG5nogEpcuNLrgH5fSHNl53cblFju4CitkdqZjIJ1u5YStWSU6G98fNt2on/oZckl58yC1b5fI1Tmw70Woxi1iwk4mVbfT+WE1iA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB4328
X-Proofpoint-ORIG-GUID: JqFrxKfUQRxCyC25T9KJ5RppvcTLcSiJ
X-Proofpoint-GUID: JqFrxKfUQRxCyC25T9KJ5RppvcTLcSiJ
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761
 definitions=2021-04-12_02:2021-04-09,2021-04-12 signatures=0
X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 mlxscore=0
 lowpriorityscore=0 phishscore=0 adultscore=0 suspectscore=0 spamscore=0
 impostorscore=0 mlxlogscore=757 malwarescore=0 priorityscore=1501
 clxscore=1015 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2104060000 definitions=main-2104120021
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

>
>On 21-04-07 08:36:29, Pawel Laszczak wrote:
>> From: Pawel Laszczak <pawell@cadence.com>
>>
>> Patch adds flag EP_UNCONFIGURED to detect whether endpoint was
>> unconfigured. This flag is set in cdnsp_reset_device after Reset Device
>> command. Among others this command disables all non control endpoints.
>> Flag is used in cdnsp_gadget_ep_disable to protect controller against
>> invoking Configure Endpoint command on disabled endpoint. Lack of this
>> protection in some cases caused that Configure Endpoint command complete=
d
>> with Context State Error code completion.
>>
>> Fixes: 3d82904559f4 ("usb: cdnsp: cdns3 Add main part of Cadence USBSSP =
DRD Driver")
>> Signed-off-by: Pawel Laszczak <pawell@cadence.com>
>
>Pawel, it is a little late for v5.12, I apply it to v5.13-rc1 if you
>don't mind.
>
>Peter

Yes, you can apply it to v5.13-rc1.

Thanks.

r
>>
>> ---
>> Changelog:
>> v2:
>> - removed useless blank line
>> - changed the EP_UNCONFIGURED to limit changes in patch
>>
>>  drivers/usb/cdns3/cdnsp-gadget.c | 17 ++++++++++++-----
>>  drivers/usb/cdns3/cdnsp-gadget.h |  1 +
>>  2 files changed, 13 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/usb/cdns3/cdnsp-gadget.c b/drivers/usb/cdns3/cdnsp-=
gadget.c
>> index d7d4bdd57f46..56707b6b0f57 100644
>> --- a/drivers/usb/cdns3/cdnsp-gadget.c
>> +++ b/drivers/usb/cdns3/cdnsp-gadget.c
>> @@ -727,7 +727,7 @@ int cdnsp_reset_device(struct cdnsp_device *pdev)
>>  	 * are in Disabled state.
>>  	 */
>>  	for (i =3D 1; i < CDNSP_ENDPOINTS_NUM; ++i)
>> -		pdev->eps[i].ep_state |=3D EP_STOPPED;
>> +		pdev->eps[i].ep_state |=3D EP_STOPPED | EP_UNCONFIGURED;
>>
>>  	trace_cdnsp_handle_cmd_reset_dev(slot_ctx);
>>
>> @@ -942,6 +942,7 @@ static int cdnsp_gadget_ep_enable(struct usb_ep *ep,
>>
>>  	pep =3D to_cdnsp_ep(ep);
>>  	pdev =3D pep->pdev;
>> +	pep->ep_state &=3D ~EP_UNCONFIGURED;
>>
>>  	if (dev_WARN_ONCE(pdev->dev, pep->ep_state & EP_ENABLED,
>>  			  "%s is already enabled\n", pep->name))
>> @@ -1023,9 +1024,13 @@ static int cdnsp_gadget_ep_disable(struct usb_ep =
*ep)
>>  		goto finish;
>>  	}
>>
>> -	cdnsp_cmd_stop_ep(pdev, pep);
>>  	pep->ep_state |=3D EP_DIS_IN_RROGRESS;
>> -	cdnsp_cmd_flush_ep(pdev, pep);
>> +
>> +	/* Endpoint was unconfigured by Reset Device command. */
>> +	if (!(pep->ep_state & EP_UNCONFIGURED)) {
>> +		cdnsp_cmd_stop_ep(pdev, pep);
>> +		cdnsp_cmd_flush_ep(pdev, pep);
>> +	}
>>
>>  	/* Remove all queued USB requests. */
>>  	while (!list_empty(&pep->pending_list)) {
>> @@ -1043,10 +1048,12 @@ static int cdnsp_gadget_ep_disable(struct usb_ep=
 *ep)
>>
>>  	cdnsp_endpoint_zero(pdev, pep);
>>
>> -	ret =3D cdnsp_update_eps_configuration(pdev, pep);
>> +	if (!(pep->ep_state & EP_UNCONFIGURED))
>> +		ret =3D cdnsp_update_eps_configuration(pdev, pep);
>> +
>>  	cdnsp_free_endpoint_rings(pdev, pep);
>>
>> -	pep->ep_state &=3D ~EP_ENABLED;
>> +	pep->ep_state &=3D ~(EP_ENABLED | EP_UNCONFIGURED);
>>  	pep->ep_state |=3D EP_STOPPED;
>>
>>  finish:
>> diff --git a/drivers/usb/cdns3/cdnsp-gadget.h b/drivers/usb/cdns3/cdnsp-=
gadget.h
>> index 6bbb26548c04..783ca8ffde00 100644
>> --- a/drivers/usb/cdns3/cdnsp-gadget.h
>> +++ b/drivers/usb/cdns3/cdnsp-gadget.h
>> @@ -835,6 +835,7 @@ struct cdnsp_ep {
>>  #define EP_WEDGE		BIT(4)
>>  #define EP0_HALTED_STATUS	BIT(5)
>>  #define EP_HAS_STREAMS		BIT(6)
>> +#define EP_UNCONFIGURED		BIT(7)
>>
>>  	bool skip;
>>  };
>> --
>> 2.25.1
>>
>
>--
>
>Thanks,
>Peter Chen

--

Regards,
Pawel Laszczak