FAILED: patch "[PATCH] usb: cdnsp: Fix issue with CV Bad Descriptor test" failed to apply to 6.6-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 2831a81077f5162f104ba5a97a7d886eb371c21c
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025070816-explicit-pry-2bf8@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 2831a81077f5162f104ba5a97a7d886eb371c21c Mon Sep 17 00:00:00 2001
From: Pawel Laszczak <[email protected]>
Date: Fri, 20 Jun 2025 08:23:12 +0000
Subject: [PATCH] usb: cdnsp: Fix issue with CV Bad Descriptor test
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.
drivers/usb/cdns3/cdnsp-debug.h +3 -2
@@ -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,
drivers/usb/cdns3/cdnsp-ep0.c +15 -3
@@ -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 ; }/*
drivers/usb/cdns3/cdnsp-gadget.h +6 -0
@@ -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)
drivers/usb/cdns3/cdnsp-ring.c +2 -1
@@ -2485,7 +2485,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)