From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0997118D; Sat, 21 Jun 2025 00:36:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750466213; cv=none; b=tZgWuWGeXlJr6gaHY/43E7ctRSB57OsRXST1yvDSQQz99drHe3nvw3T/H9+J+m3a2sZvL9fj6uEXvP3MeEIE1AuIND+e7gllA1JMQkQ55OSXOR1rW3cIb+7+FEc1b7mbuKOYTJdYu+HFoxWNv//qlHialS6sDUTu4EWKNaikAcU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750466213; c=relaxed/simple; bh=cpoeRYl68AdZV72kJE/G36W5Kkk3qHbamShIfbeav40=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=JiDLh360TpYFRNQS0o4keNWSBXhsl8TdjLJEEwlNAckoGFy7cEPmZtod7v5VMgiEj0sfGSaCoAQkTDd+bg1fwu0L2VrCtN1MV/u9rDe8h0wni2/QnAxem6qI4/sh9vgi8/YqOeYeIqRzijcOTg8w2cWm50pq0y254UaZAAEwuRk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BFZ9rPcG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BFZ9rPcG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98983C4CEE3; Sat, 21 Jun 2025 00:36:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750466211; bh=cpoeRYl68AdZV72kJE/G36W5Kkk3qHbamShIfbeav40=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=BFZ9rPcGeXTNAuPRrFtIG8AnVUCQ7hpoSOpX+cTf48z6OP56M+/4KtlBBBZe4n6hc 4Ige1VCefhniVOxYDl5X8t8UlVHQf/0aNQDXX7EXvFNdHfyjatc64zZIBeAqfXBXnB xMABUTxPIwNd80UjjzEtFVDKTstU5o8KC0Ybbo10PcDO3IKeurVhdz01i+x4tLKP8L awz8bM0pv9ic9GsUMIHGzxCe0UqFoo1Da0AuH9nuk6NnSS7nYNPvTrbZ1ChfO6OljH qwxcYlqODuWncKMYq2TXG1YJpC/uwf/I+dYwnN0slIFRxsYT+iJJJ/n1xWk4Y808c1 disqASKiLeDNw== Date: Sat, 21 Jun 2025 08:36:43 +0800 From: "Peter Chen (CIX)" To: Pawel Laszczak Cc: "gregkh@linuxfoundation.org" , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: Re: [PATCH v3] usb: cdnsp: Fix issue with CV Bad Descriptor test Message-ID: <20250621003643.GA41153@nchen-desktop> References: <20250620074306.2278838-1-pawell@cadence.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On 25-06-20 08:23:12, Pawel Laszczak wrote: > The SSP2 controller has extra endpoint state preserve bit (ESP) which > setting causes that endpoint state will be preserved during > Halt Endpoint command. It is used only for EP0. > Without this bit the Command Verifier "TD 9.10 Bad Descriptor Test" > failed. > Setting this bit doesn't have any impact for SSP controller. > > Fixes: 3d82904559f4 ("usb: cdnsp: cdns3 Add main part of Cadence USBSSP DRD Driver") > cc: stable@vger.kernel.org > Signed-off-by: Pawel Laszczak > --- > Changelog: > v3: > - removed else {} > > v2: > - removed some typos > - added pep variable initialization > - updated TRB_ESP description > > drivers/usb/cdns3/cdnsp-debug.h | 5 +++-- > drivers/usb/cdns3/cdnsp-ep0.c | 18 +++++++++++++++--- > drivers/usb/cdns3/cdnsp-gadget.h | 6 ++++++ > drivers/usb/cdns3/cdnsp-ring.c | 3 ++- > 4 files changed, 26 insertions(+), 6 deletions(-) > > diff --git a/drivers/usb/cdns3/cdnsp-debug.h b/drivers/usb/cdns3/cdnsp-debug.h > index cd138acdcce1..86860686d836 100644 > --- a/drivers/usb/cdns3/cdnsp-debug.h > +++ b/drivers/usb/cdns3/cdnsp-debug.h > @@ -327,12 +327,13 @@ static inline const char *cdnsp_decode_trb(char *str, size_t size, u32 field0, > case TRB_RESET_EP: > case TRB_HALT_ENDPOINT: > ret = scnprintf(str, size, > - "%s: ep%d%s(%d) ctx %08x%08x slot %ld flags %c", > + "%s: ep%d%s(%d) ctx %08x%08x slot %ld flags %c %c", > cdnsp_trb_type_string(type), > ep_num, ep_id % 2 ? "out" : "in", > TRB_TO_EP_INDEX(field3), field1, field0, > TRB_TO_SLOT_ID(field3), > - field3 & TRB_CYCLE ? 'C' : 'c'); > + field3 & TRB_CYCLE ? 'C' : 'c', > + field3 & TRB_ESP ? 'P' : 'p'); > break; > case TRB_STOP_RING: > ret = scnprintf(str, size, > diff --git a/drivers/usb/cdns3/cdnsp-ep0.c b/drivers/usb/cdns3/cdnsp-ep0.c > index f317d3c84781..5cd9b898ce97 100644 > --- a/drivers/usb/cdns3/cdnsp-ep0.c > +++ b/drivers/usb/cdns3/cdnsp-ep0.c > @@ -414,6 +414,7 @@ static int cdnsp_ep0_std_request(struct cdnsp_device *pdev, > void cdnsp_setup_analyze(struct cdnsp_device *pdev) > { > struct usb_ctrlrequest *ctrl = &pdev->setup; > + struct cdnsp_ep *pep; > int ret = -EINVAL; > u16 len; > > @@ -427,10 +428,21 @@ void cdnsp_setup_analyze(struct cdnsp_device *pdev) > goto out; > } > > + pep = &pdev->eps[0]; > + > /* Restore the ep0 to Stopped/Running state. */ > - if (pdev->eps[0].ep_state & EP_HALTED) { > - trace_cdnsp_ep0_halted("Restore to normal state"); > - cdnsp_halt_endpoint(pdev, &pdev->eps[0], 0); > + if (pep->ep_state & EP_HALTED) { > + if (GET_EP_CTX_STATE(pep->out_ctx) == EP_STATE_HALTED) > + cdnsp_halt_endpoint(pdev, pep, 0); > + > + /* > + * Halt Endpoint Command for SSP2 for ep0 preserve current > + * endpoint state and driver has to synchronize the > + * software endpoint state with endpoint output context > + * state. > + */ > + pep->ep_state &= ~EP_HALTED; > + pep->ep_state |= EP_STOPPED; You do not reset endpoint by calling clear_halt, could we change ep_state directly? Peter > } > > /* > diff --git a/drivers/usb/cdns3/cdnsp-gadget.h b/drivers/usb/cdns3/cdnsp-gadget.h > index 2afa3e558f85..a91cca509db0 100644 > --- a/drivers/usb/cdns3/cdnsp-gadget.h > +++ b/drivers/usb/cdns3/cdnsp-gadget.h > @@ -987,6 +987,12 @@ enum cdnsp_setup_dev { > #define STREAM_ID_FOR_TRB(p) ((((p)) << 16) & GENMASK(31, 16)) > #define SCT_FOR_TRB(p) (((p) << 1) & 0x7) > > +/* > + * Halt Endpoint Command TRB field. > + * The ESP bit only exists in the SSP2 controller. > + */ > +#define TRB_ESP BIT(9) > + > /* Link TRB specific fields. */ > #define TRB_TC BIT(1) > > diff --git a/drivers/usb/cdns3/cdnsp-ring.c b/drivers/usb/cdns3/cdnsp-ring.c > index fd06cb85c4ea..d397d28efc6e 100644 > --- a/drivers/usb/cdns3/cdnsp-ring.c > +++ b/drivers/usb/cdns3/cdnsp-ring.c > @@ -2483,7 +2483,8 @@ void cdnsp_queue_halt_endpoint(struct cdnsp_device *pdev, unsigned int ep_index) > { > cdnsp_queue_command(pdev, 0, 0, 0, TRB_TYPE(TRB_HALT_ENDPOINT) | > SLOT_ID_FOR_TRB(pdev->slot_id) | > - EP_ID_FOR_TRB(ep_index)); > + EP_ID_FOR_TRB(ep_index) | > + (!ep_index ? TRB_ESP : 0)); > } > > void cdnsp_force_header_wakeup(struct cdnsp_device *pdev, int intf_num) > -- > 2.43.0 > -- Best regards, Peter