Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Received-SPF: Pass (protection.outlook.com: domain of cadence.com designates
 158.140.1.148 as permitted sender) receiver=protection.outlook.com;
 client-ip=158.140.1.148; helo=sjmaillnx2.cadence.com;
X-CrossPremisesHeadersFilteredBySendConnector: maileu3.global.cadence.com
Received: from maileu4.global.cadence.com (10.160.110.201) by
 maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id
 15.0.1497.2; Tue, 29 Mar 2022 10:48:29 +0200
Received: from vleu-orange.cadence.com (10.160.88.83) by
 maileu4.global.cadence.com (10.160.110.201) with Microsoft SMTP Server
 (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2
 via Frontend Transport; Tue, 29 Mar 2022 10:48:29 +0200
Received: from vleu-orange.cadence.com (localhost.localdomain [127.0.0.1])
        by vleu-orange.cadence.com (8.14.4/8.14.4) with ESMTP id 22T8ki27004742;
        Tue, 29 Mar 2022 10:47:08 +0200
Received: (from pawell@localhost)
        by vleu-orange.cadence.com (8.14.4/8.14.4/Submit) id 22T8khSS004722;
        Tue, 29 Mar 2022 10:46:43 +0200
From:   Pawel Laszczak <pawell@cadence.com>
To:     <peter.chen@kernel.org>
CC:     <pawell@cadence.com>, <rogerq@kernel.org>, <a-govindraju@ti.com>,
        <gregkh@linuxfoundation.org>, <felipe.balbi@linux.intel.com>,
        <linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <stable@vger.kernel.org>
Subject: [PATCH] usb: cdns3: Fix issue for clear halt endpoint
Date:   Tue, 29 Mar 2022 10:46:05 +0200
Message-ID: <20220329084605.4022-1-pawell@cadence.com>
X-Mailer: git-send-email 2.30.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-OrganizationHeadersPreserved: maileu3.global.cadence.com
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 3d82fcbf-d346-4dcf-33db-08da1160eec5
X-MS-TrafficTypeDiagnostic: BYAPR07MB5256:EE_
X-Microsoft-Antispam-PRVS: <BYAPR07MB52567AC2C017FC8921E3D097DD1E9@BYAPR07MB5256.namprd07.prod.outlook.com>
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: hvFEVPkigG5VeqethYo5U4p4MFZBmSxUfG+CyPyveRtuFDuELSFANDNOSiCumHdy+K7FiDZxQiMQPXLgUZpHMdv/7YkI1A97Z9S+HT/OX9Pxul6ltsC34elfqA38jHoqbh/mVHQx7uPvbjKnR7KtrYdUjbBvuJ743QYW3QOqRzramSmf/YTxH3QKQ9bRchqkhYAf5TjkSx3NSg//wgJ4tgF/6D0LP1vmlDDZJM2Rl8oPUxYEMUHjPyUM3Uhp3793FCQ1/tQM5Je9ExraCe2IMiWoSyUuQbHmPo5qwfFdiJO2fjdTjk8C8FuwOpDFl25oGOUwmGkCxCsXzD0ex5LSDTMIb7dtyvO0BP4wxoekGZ3AnHPBwtg1LY6TH8HCcdsw6kFGikqhbKhSwxYhSQbHInL8tCaJ3oNyni8sQfDga3akttDCZKOWJL68VW/FZuKjEaRjP+afkeBGqTQTE/BuR2BorRfQ6TA+85a1LYBs032jNhkoo1qY+2NhGyg9ZkOJ/ll1RxO/kU+7x5vQpM1hIEDFoDvM+21J/z7DHzNNyKXBs1kpepDHakpcnfe+FWy/DPAlq1fbdC0u1a4W6cZv7TK2dx11vqKUCm3PatEejF0wyA9M6tqHAkPa/rKTGnU/6DC0dT4C7hPCXD/uOB4/dKP4Oao0xI9QtmzZQGPOTx8K9GwY6nzbVcm+3K6ECwtU
X-Forefront-Antispam-Report: CIP:158.140.1.148;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:sjmaillnx2.cadence.com;PTR:unknown.Cadence.COM;CAT:NONE;SFS:(13230001)(4636009)(36092001)(40470700004)(36840700001)(46966006)(5660300002)(36756003)(8936002)(2906002)(7636003)(40460700003)(356005)(1076003)(4326008)(83380400001)(82310400004)(70586007)(70206006)(8676002)(186003)(26005)(47076005)(2616005)(86362001)(336012)(426003)(36860700001)(508600001)(6666004)(6916009)(316002)(42186006)(54906003);DIR:OUT;SFP:1101;
X-OriginatorOrg: cadence.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2022 08:48:44.5842
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 3d82fcbf-d346-4dcf-33db-08da1160eec5
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.148];Helo=[sjmaillnx2.cadence.com]
X-MS-Exchange-CrossTenant-AuthSource: DM6NAM12FT022.eop-nam12.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB5256
X-Proofpoint-ORIG-GUID: JiKTS29yMdY857qA8ty2hK-bVLoGSpBI
X-Proofpoint-GUID: JiKTS29yMdY857qA8ty2hK-bVLoGSpBI
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.850,Hydra:6.0.425,FMLib:17.11.64.514
 definitions=2022-03-29_02,2022-03-28_01,2022-02-23_01
X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0
 priorityscore=1501 lowpriorityscore=0 mlxscore=0 bulkscore=0
 malwarescore=0 adultscore=0 spamscore=0 clxscore=1011 mlxlogscore=421
 impostorscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0
 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2203290052
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Path fixes bug which occurs during resetting endpoint in
__cdns3_gadget_ep_clear_halt function. During resetting endpoint
controller will change HW/DMA owned TRB. It set Abort flag in
trb->control and will change trb->length field. If driver want
to use the aborted trb it must update the changed field in
TRB.

Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")
cc: <stable@vger.kernel.org>
Signed-off-by: Pawel Laszczak <pawell@cadence.com>
---
 drivers/usb/cdns3/cdns3-gadget.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/cdns3/cdns3-gadget.c b/drivers/usb/cdns3/cdns3-gadget.c
index 80aaab159e58..3a9f0968fd24 100644
--- a/drivers/usb/cdns3/cdns3-gadget.c
+++ b/drivers/usb/cdns3/cdns3-gadget.c
@@ -2682,6 +2682,7 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep)
 	struct usb_request *request;
 	struct cdns3_request *priv_req;
 	struct cdns3_trb *trb = NULL;
+	struct cdns3_trb trb_tmp;
 	int ret;
 	int val;
 
@@ -2691,8 +2692,10 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep)
 	if (request) {
 		priv_req = to_cdns3_request(request);
 		trb = priv_req->trb;
-		if (trb)
+		if (trb) {
+			trb_tmp = *trb;
 			trb->control = trb->control ^ cpu_to_le32(TRB_CYCLE);
+		}
 	}
 
 	writel(EP_CMD_CSTALL | EP_CMD_EPRST, &priv_dev->regs->ep_cmd);
@@ -2707,7 +2710,7 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep)
 
 	if (request) {
 		if (trb)
-			trb->control = trb->control ^ cpu_to_le32(TRB_CYCLE);
+			*trb = trb_tmp;
 
 		cdns3_rearm_transfer(priv_ep, 1);
 	}
-- 
2.25.1