Received-SPF: Pass (protection.outlook.com: domain of cadence.com designates
 158.140.1.147 as permitted sender) receiver=protection.outlook.com;
 client-ip=158.140.1.147; helo=sjmaillnx1.cadence.com; pr=C
From:   Pawel Laszczak <pawell@cadence.com>
To:     <peter.chen@kernel.org>
CC:     <gregkh@linuxfoundation.org>, <linux-usb@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <pawell@cadence.com>,
        <stable@vger.kernel.org>
Subject: [PATCH] usb: cdnsp: Fixes issue with redundant Status Stage
Date:   Tue, 7 Mar 2023 06:14:20 -0500
Message-ID: <20230307111420.376056-1-pawell@cadence.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-CrossPremisesHeadersFilteredBySendConnector: maileu4.global.cadence.com
X-OrganizationHeadersPreserved: maileu4.global.cadence.com
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: BN8NAM12FT105:EE_|CH0PR07MB8329:EE_
X-MS-Office365-Filtering-Correlation-Id: 839ae856-5fc0-419f-19da-08db1efd21da
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: rDweJ/fW8PXAdmqYqte0RrHU7hGXHZ1VKhMAYpi7bSUBsRETTjXhlfBhhhdRQlVBuZbCtt9/5ni4o0jqaM4bKe8IDxnIFhQ+0c63FFsrqNAhHQlPkF7aNdw9LJD+l9zo79lbDRy50/hG4/IoM/0V6l9X1RMsupB1Wpe5uOoYDpM19yPI8x3Bq7xVvrHij0pJJ10IvoC2U2A/yZ0hGRFfeQkljN/anCdwDwrggwARD/b6QwSuXSp3wvO37eSRMo92XzPYzL13wR+vlV7TQn+9k25PJVq1fGdUavfz3OJGQirbwzmn75jCTw+UMMcrrQY95DDNB/sqmUq4E1HBi0xTO5KhgeuFjyFtu3aScAQbIBgC9tJOTpUc+KEWHqDlp9lCfg2AWgcAC2FmO27NtVPmbuuzwshsHkBFEQItA2sfSLxo+uy0Ew7BbjRBnWzm9VHUyoSEjknfmANngzyNx/2dNjPg2uNouE3WJG2xebizONG5FsgDooJKdB4NYFku6rSRfOTtH8m+pS8QQWeC1i2Jf8zpVs9KDAcGxU0jeuY7Os4B1RePix+t7TLwLLRctyTDsmA1LkFtCFDV6q3Q1sdj3s0XRDjEj1hpV9BeKNr3WT2Xwxhzn+dpEwGrMmGvk25YsmsLTktu6rL4koZWayMiDBeF15u+JA/lAZUfSOLxxAGtB8VSu5QkZgmnhJdC8kvA/XokfrH3qrCwOlZ1ymfkpQ==
X-Forefront-Antispam-Report: CIP:158.140.1.147;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:sjmaillnx1.cadence.com;PTR:unknown.Cadence.COM;CAT:NONE;SFS:(13230025)(4636009)(396003)(376002)(136003)(346002)(39860400002)(36092001)(451199018)(36840700001)(40470700004)(46966006)(41300700001)(70206006)(70586007)(2906002)(8676002)(6916009)(86362001)(4326008)(82310400005)(54906003)(36860700001)(42186006)(356005)(83380400001)(82740400003)(186003)(316002)(8936002)(7636003)(1076003)(26005)(478600001)(2616005)(36756003)(5660300002)(336012)(426003)(47076005)(40480700001)(6666004)(40460700003);DIR:OUT;SFP:1101;
X-OriginatorOrg: cadence.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2023 11:14:34.4839
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 839ae856-5fc0-419f-19da-08db1efd21da
X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9;Ip=[158.140.1.147];Helo=[sjmaillnx1.cadence.com]
X-MS-Exchange-CrossTenant-AuthSource: BN8NAM12FT105.eop-nam12.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR07MB8329
X-Proofpoint-GUID: lUzkVsaeL284cpsnfSqXHwdLzLPAlwnM
X-Proofpoint-ORIG-GUID: lUzkVsaeL284cpsnfSqXHwdLzLPAlwnM
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-03-07_05,2023-03-07_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0
 lowpriorityscore=0 mlxlogscore=706 priorityscore=1501 malwarescore=0
 phishscore=0 mlxscore=0 bulkscore=0 impostorscore=0 spamscore=0
 adultscore=0 suspectscore=0 clxscore=1011 classifier=spam adjust=0
 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2303070101
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

In some cases, driver trees to send Status Stage twice.
The first one from upper layer of gadget usb subsystem and
second time from controller driver.
This patch fixes this issue and remove tricky handling of
SET_INTERFACE from controller driver which is no longer
needed.

cc: <stable@vger.kernel.org>
Fixes: 3d82904559f4 ("usb: cdnsp: cdns3 Add main part of Cadence USBSSP DRD Driver")
Signed-off-by: Pawel Laszczak <pawell@cadence.com>
---
 drivers/usb/cdns3/cdnsp-ep0.c | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/drivers/usb/cdns3/cdnsp-ep0.c b/drivers/usb/cdns3/cdnsp-ep0.c
index 9b8325f82499..d63d5d92f255 100644
--- a/drivers/usb/cdns3/cdnsp-ep0.c
+++ b/drivers/usb/cdns3/cdnsp-ep0.c
@@ -403,20 +403,6 @@ static int cdnsp_ep0_std_request(struct cdnsp_device *pdev,
 	case USB_REQ_SET_ISOCH_DELAY:
 		ret = cdnsp_ep0_set_isoch_delay(pdev, ctrl);
 		break;
-	case USB_REQ_SET_INTERFACE:
-		/*
-		 * Add request into pending list to block sending status stage
-		 * by libcomposite.
-		 */
-		list_add_tail(&pdev->ep0_preq.list,
-			      &pdev->ep0_preq.pep->pending_list);
-
-		ret = cdnsp_ep0_delegate_req(pdev, ctrl);
-		if (ret == -EBUSY)
-			ret = 0;
-
-		list_del(&pdev->ep0_preq.list);
-		break;
 	default:
 		ret = cdnsp_ep0_delegate_req(pdev, ctrl);
 		break;
@@ -474,9 +460,6 @@ void cdnsp_setup_analyze(struct cdnsp_device *pdev)
 	else
 		ret = cdnsp_ep0_delegate_req(pdev, ctrl);
 
-	if (!len)
-		pdev->ep0_stage = CDNSP_STATUS_STAGE;
-
 	if (ret == USB_GADGET_DELAYED_STATUS) {
 		trace_cdnsp_ep0_status_stage("delayed");
 		return;
@@ -484,6 +467,6 @@ void cdnsp_setup_analyze(struct cdnsp_device *pdev)
 out:
 	if (ret < 0)
 		cdnsp_ep0_stall(pdev);
-	else if (pdev->ep0_stage == CDNSP_STATUS_STAGE)
+	else if (!len && pdev->ep0_stage != CDNSP_STATUS_STAGE)
 		cdnsp_status_stage(pdev);
 }
-- 
2.25.1