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;
From:   Pawel Laszczak <pawell@cadence.com>
To:     "3090101217@zju.edu.cn" <3090101217@zju.edu.cn>,
        "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
        "peter.chen@kernel.org" <peter.chen@kernel.org>
CC:     "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Jing Leng <jleng@ambarella.com>
Subject: RE: [PATCH] usb: cdnsp: Fixed setting last_trb incorrectly
Thread-Topic: [PATCH] usb: cdnsp: Fixed setting last_trb incorrectly
Thread-Index: AQHYe6ZQ67fRenHLO0e4DnN78WOKXK1Grcgg
Date:   Thu, 9 Jun 2022 07:33:37 +0000
Message-ID: <BYAPR07MB5381C83A4E06D4972E6874A9DDA79@BYAPR07MB5381.namprd07.prod.outlook.com>
References: <20220609021134.1606-1-3090101217@zju.edu.cn>
In-Reply-To: <20220609021134.1606-1-3090101217@zju.edu.cn>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?sMb35eziCQAXA3/pko/QYXanpFOoCJFNnIqctKKSTr7RKwIFB6IXUV2T+jTA?=
 =?us-ascii?Q?qVyre+nivNxZz+D0QRk1roKDDJTnFhTPIuA1BqIn6gca60X57BvEHeR/CAv+?=
 =?us-ascii?Q?UHu/22ihk9f27fhugdLHUyVyx1JmRVOAGwY7gYWY4ZRzeBMCkI/w7aYa2iVQ?=
 =?us-ascii?Q?Zus223nVb9OhoZsYgnn18EdDXEKP6ULtT3NEYZOlCIGHh67lfLndZ4/D6jeq?=
 =?us-ascii?Q?TVpKAqh+FCH1f0Ey2TLNTcMJwprklmoXvgdpmK55HEi8szDy50d2uUl73TXR?=
 =?us-ascii?Q?cSVkVbRVebAdYmt+iGmyPs3v6sRzXPHJMG5iRt/UBGG7sedcyDe1WVKrc5EG?=
 =?us-ascii?Q?i4RDL7wr0F6hj+IXhaIbg9ynwJfMY7ZXOGXeoKAucOthGaCQLYuIVefx4GNx?=
 =?us-ascii?Q?X/xXU/yxuc20Pj1PvED+fgKoUbSzYw4xOAYWE7PS+fFGYXJPHcWMd6xYkBwX?=
 =?us-ascii?Q?jDZZnfYNDSprkUcOKx1FPXRCUwZX7HM1bXVDY7R+vV9LUadpBWu2qbvdiltv?=
 =?us-ascii?Q?DIQt3Gl7hAv6KwKuPp3idBzimcm3PgvhgLbKvoNWT7qWgo7j4NqVI9U6RSTQ?=
 =?us-ascii?Q?OVfbUNFZD6tferTc1siaPEtpkNvl68MOf3RORus21gsU5Ri41qJBqTgbYmur?=
 =?us-ascii?Q?H5+Ee7G9muiJbSCXEZzLS9NtR+Cw9lX4rzCw3QsP/OCr+y4kfIoJQ9FI6GdA?=
 =?us-ascii?Q?DzB4l35WP25efPtqsN8xiyX0a0NFQdG6z88FK4/KVM9Whr1zKFGtnvnLQDri?=
 =?us-ascii?Q?/2NEVprsIuh6BA5Hs4CVQz5jHbCs3oniIt4jo7q3mVa40U2Kfu8pYmgObwB7?=
 =?us-ascii?Q?WDaPBKMdx56l972LtR/issDamwLh+Hoc1a7uyEmlZvEhbsxgtz1R7MtUkW+d?=
 =?us-ascii?Q?G86rR2st/OvNu7uE+HMWP6fzn9529nQfwBWbs8CBL0fKYETGVB9AHdDiNGHb?=
 =?us-ascii?Q?Vnl3I8254k4EKV2s3yd9KxjgF++gBbohnkhNIzHGupdKgC6NuffRwcz5yoX+?=
 =?us-ascii?Q?yvGqtwAqLDCAlUc8gEDTJX1qym+tXJyC+K9uEJJysF78alvEo0+O06k3iNdz?=
 =?us-ascii?Q?zeJBF43yDAAW5RS6VgjS4bXtiWy2nHnkEtzf9j1Un0TwnsEqfPF0vZ0/dj88?=
 =?us-ascii?Q?LPhb5cgJ63ABQYD/IPMzlx+lw0Ztf4906M3DzPEceAjmOEBrRB9Zp/FyQYIM?=
 =?us-ascii?Q?bRYx3DE03nbxgUFD8AfydTtbr3PUapfcbRJ/bJMrxBA6DCR1Vn42bVRBREwU?=
 =?us-ascii?Q?CWxqIrJGoDovTHlcSlpoz0I6UWY3hgM9hmyzIbvQNBADrAji4/+BXdoYE34G?=
 =?us-ascii?Q?v5mNIg4Zd3AIa3oeu5i7OHQjA5V58TsSXkNn24HtcomvfKIV/OJIgtXSg12b?=
 =?us-ascii?Q?qPRPfXbFF/EtC79+vlOL7IjiOrqNjxNa62ufCsVyTa5AFlZWIXvE0B5aBZHY?=
 =?us-ascii?Q?bexppCE8o+gsmGgLPxq6kyjkKRKrK6VA3ifxV9BZgRV7OdgJ66JyefnR21W+?=
 =?us-ascii?Q?Q7JU7y3ZyOWb2HXWgRfnvdasI8Z5jwp3BOUfrcbL2wL+yogeGeMIZj23sKgq?=
 =?us-ascii?Q?7NLnsZEaw43fRNVWfw20RBckT4a/DrY/pmLUTl+rf1uEqc4/kqCvXh7A9sAw?=
 =?us-ascii?Q?ToD0moDd816Wc56P+UmYXp/YsGNvFk1cGYRg6SQv/NhFhmwjrO86d6uX0956?=
 =?us-ascii?Q?CiskFINsoiiXGAeUSvMuEkFKLT172F2UB8VqZ7PWErV/RAPrIfBhcLTr6ZHC?=
 =?us-ascii?Q?cEHCj/JdKj9t52iQA2d6EwZwW/+CM7o=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: cadence.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BYAPR07MB5381.namprd07.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: da16f729-1923-41e9-91eb-08da49ea5e38
X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jun 2022 07:33:37.8130
 (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: fMPR3NAFKBq/F8Ew5im8ftswMbrdboGP/TiKKRKE6qMbmmmNlu3qApaQ2NLyJ6n7GnLn8xsYcK5X0OOL5oEQAJx8zO1X/aJsCZ7Pz5BcikM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR07MB5043
X-Proofpoint-GUID: -g-W6EXzFJ4Ko4H4E-AZTOEwsbTAOF4q
X-Proofpoint-ORIG-GUID: -g-W6EXzFJ4Ko4H4E-AZTOEwsbTAOF4q
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.517,FMLib:17.11.64.514
 definitions=2022-06-09_07,2022-06-07_02,2022-02-23_01
X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 suspectscore=0
 mlxscore=0 phishscore=0 impostorscore=0 bulkscore=0 malwarescore=0
 adultscore=0 spamscore=0 lowpriorityscore=0 clxscore=1011
 priorityscore=1501 mlxlogscore=636 classifier=spam adjust=0 reason=mlx
 scancount=1 engine=8.12.0-2204290000 definitions=main-2206090030
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,URIBL_BLOCKED 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

>
>From: Jing Leng <jleng@ambarella.com>
>
>When ZLP occurs in bulk transmission, currently cdnsp will set last_trb
>for the last two TRBs, it will trigger an error "ERROR Transfer event TRB
>DMA ptr not part of current TD ...".
>
>Fixes: e913aada0683 ("usb: cdnsp: Fixed issue with ZLP")
>Signed-off-by: Jing Leng <jleng@ambarella.com>

Acked-by: Pawel Laszczak <pawell@cadence.com>

>---
> drivers/usb/cdns3/cdnsp-ring.c | 19 +++++++++++--------
> 1 file changed, 11 insertions(+), 8 deletions(-)
>
>diff --git a/drivers/usb/cdns3/cdnsp-ring.c b/drivers/usb/cdns3/cdnsp-ring=
.c
>index e45c3d6e1536..794e413800ae 100644
>--- a/drivers/usb/cdns3/cdnsp-ring.c
>+++ b/drivers/usb/cdns3/cdnsp-ring.c
>@@ -1941,13 +1941,16 @@ int cdnsp_queue_bulk_tx(struct cdnsp_device *pdev,=
 struct cdnsp_request *preq)
> 		}
>
> 		if (enqd_len + trb_buff_len >=3D full_len) {
>-			if (need_zero_pkt)
>-				zero_len_trb =3D !zero_len_trb;
>-
>-			field &=3D ~TRB_CHAIN;
>-			field |=3D TRB_IOC;
>-			more_trbs_coming =3D false;
>-			preq->td.last_trb =3D ring->enqueue;
>+			if (need_zero_pkt && !zero_len_trb) {
>+				zero_len_trb =3D true;
>+			} else {
>+				zero_len_trb =3D false;
>+				field &=3D ~TRB_CHAIN;
>+				field |=3D TRB_IOC;
>+				more_trbs_coming =3D false;
>+				need_zero_pkt =3D false;
>+				preq->td.last_trb =3D ring->enqueue;
>+			}
> 		}
>
> 		/* Only set interrupt on short packet for OUT endpoints. */
>@@ -1962,7 +1965,7 @@ int cdnsp_queue_bulk_tx(struct cdnsp_device *pdev, s=
truct cdnsp_request *preq)
> 		length_field =3D TRB_LEN(trb_buff_len) | TRB_TD_SIZE(remainder) |
> 			TRB_INTR_TARGET(0);
>
>-		cdnsp_queue_trb(pdev, ring, more_trbs_coming | zero_len_trb,
>+		cdnsp_queue_trb(pdev, ring, more_trbs_coming,
> 				lower_32_bits(send_addr),
> 				upper_32_bits(send_addr),
> 				length_field,
>--
>2.17.1