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
 64.207.220.244 as permitted sender) receiver=protection.outlook.com;
 client-ip=64.207.220.244; helo=wcmailrelayl01.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>,
        Pawel Laszczak <pawell@cadence.com>, <stable@vger.kernel.org>
Subject: [PATCH] usb: cdnsp: fix issue with ZLP - added TD_SIZE = 1
Date:   Wed, 19 Oct 2022 02:07:17 -0400
Message-ID: <1666159637-161135-1-git-send-email-pawell@cadence.com>
MIME-Version: 1.0
Content-Type: text/plain
X-CrossPremisesHeadersFilteredBySendConnector: maileu5.global.cadence.com
X-OrganizationHeadersPreserved: maileu5.global.cadence.com
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DM6NAM12FT057:EE_|BN7PR07MB5091:EE_
X-MS-Office365-Filtering-Correlation-Id: 4ed6c74c-dd65-48fa-572d-08dab1983396
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: FKqLeH/38hFHBSBSiNj4yNdlp/q0UwmO1F7m1dJc7PedX0vjT2sBN2xd7vVIG3nGMZ+2cwKCWjMY9DxQN9x9TZSI4LpSSutYvzBb1w0cIId9oO2S5TlK5MV41vC3ijD5f++pCUZO4a2fPWHayEUZCfxr01iHhSgVvE7YuksnHxjQcLm/64rwdsUnvUj9GtC4Z+Q0UoTEXvZmJNfjYkla9R2ipg+7cS/TvvmXmwBhlah34Ooi2sEWJeGpNY4AsHOJ7g/tjnt7s00xTP7fadfeBvjBAnJklGFlKVmbL4dXJVO2II5oGZTaQSnof+V8w+hrjgsPZFw2pvdPvMoPj4mL6NTsqLz9flEcUsgCnP9odIqHhOzqWpAq1H9h7ZcqCPSqDP4nhSPO4hTSLnfYhvA3pblCZVs8XbrcsSjjchjKyvir7IV9XRsTTtX5XIQwTL7H32MTXmxYoaN7+GweYVS9KbIpXFl8O4UVDAKbeSOB3qR4atXIuK22hrP01ZlYgj9l1ZyVop/QZF7PEt82nSw6sfGpsHoqc93SFg2523Koow0rCyd+n2JtOhb0nGVHaWItBpsUre4/HP/8Nop9Z4bIkwW8mVh/5DlGu0IV/Q8TGNpnz+98Y6bzXmSLWGnTfUddS1RZL0pa7aXmIOkI/hONn8JgQNB0Nf8x+CS5qDrag3MM3p9JZm86ZiG0CH0uuOx28gUq5Z/MWXFv+X06/DI7X6bwC/NR16Kp8Vi8BTUkpNjKgXk9b0Ms6ND90/Vll+YIo8YK3wbPGWwT+YV7BRERrQ9HM4+xZ9KSxUNsZ/0f+quRU+/0bW6iqfCxDodvbtuh
X-Forefront-Antispam-Report: CIP:64.207.220.244;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:wcmailrelayl01.cadence.com;PTR:ErrorRetry;CAT:NONE;SFS:(13230022)(4636009)(39860400002)(136003)(396003)(376002)(346002)(36092001)(451199015)(36840700001)(46966006)(40470700004)(5660300002)(2906002)(8676002)(4326008)(8936002)(336012)(2616005)(41300700001)(40460700003)(356005)(81166007)(86362001)(82740400003)(26005)(54906003)(6916009)(82310400005)(36756003)(6666004)(478600001)(36860700001)(47076005)(70586007)(70206006)(42186006)(316002)(186003)(40480700001)(426003)(83380400001)(36900700001);DIR:OUT;SFP:1101;
X-OriginatorOrg: cadence.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 06:07:28.3888
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 4ed6c74c-dd65-48fa-572d-08dab1983396
X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9;Ip=[64.207.220.244];Helo=[wcmailrelayl01.cadence.com]
X-MS-Exchange-CrossTenant-AuthSource: DM6NAM12FT057.eop-nam12.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR07MB5091
X-Proofpoint-ORIG-GUID: L4dSBQesf5cjdNbPipFvKuYuTFVz6a_0
X-Proofpoint-GUID: L4dSBQesf5cjdNbPipFvKuYuTFVz6a_0
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-10-19_02,2022-10-19_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 impostorscore=0
 adultscore=0 spamscore=0 bulkscore=0 clxscore=1011 priorityscore=1501
 phishscore=0 lowpriorityscore=0 malwarescore=0 mlxlogscore=426 mlxscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2209130000 definitions=main-2210190033
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 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

Patch modifies the TD_SIZE in TRB before ZLP TRB.
The TD_SIZE in TRB before ZLP TRB must be set to 1 to force
processing ZLP TRB by controller.

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-ring.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/cdns3/cdnsp-ring.c b/drivers/usb/cdns3/cdnsp-ring.c
index 794e413800ae..4809d0e894bb 100644
--- a/drivers/usb/cdns3/cdnsp-ring.c
+++ b/drivers/usb/cdns3/cdnsp-ring.c
@@ -1765,18 +1765,19 @@ static u32 cdnsp_td_remainder(struct cdnsp_device *pdev,
 			      struct cdnsp_request *preq,
 			      bool more_trbs_coming)
 {
-	u32 maxp, total_packet_count;
-
-	/* One TRB with a zero-length data packet. */
-	if (!more_trbs_coming || (transferred == 0 && trb_buff_len == 0) ||
-	    trb_buff_len == td_total_len)
-		return 0;
+	u32 maxp, total_packet_count, remainder;
 
 	maxp = usb_endpoint_maxp(preq->pep->endpoint.desc);
 	total_packet_count = DIV_ROUND_UP(td_total_len, maxp);
 
 	/* Queuing functions don't count the current TRB into transferred. */
-	return (total_packet_count - ((transferred + trb_buff_len) / maxp));
+	remainder = (total_packet_count - ((transferred + trb_buff_len) / maxp));
+
+	/* Before ZLP driver needs set TD_SIZE=1. */
+	if (!remainder && more_trbs_coming)
+		remainder = 1;
+
+	return remainder;
 }
 
 static int cdnsp_align_td(struct cdnsp_device *pdev,
-- 
2.25.1