From: Wesley Cheng <quic_wcheng@quicinc.com>
To: <srinivas.kandagatla@linaro.org>, <mathias.nyman@intel.com>,
<perex@perex.cz>, <conor+dt@kernel.org>, <corbet@lwn.net>,
<lgirdwood@gmail.com>, <andersson@kernel.org>,
<krzysztof.kozlowski+dt@linaro.org>, <gregkh@linuxfoundation.org>,
<Thinh.Nguyen@synopsys.com>, <broonie@kernel.org>,
<bgoswami@quicinc.com>, <tiwai@suse.com>, <robh@kernel.org>,
<konrad.dybcio@linaro.org>
Cc: <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-sound@vger.kernel.org>, <linux-usb@vger.kernel.org>,
<linux-arm-msm@vger.kernel.org>, <linux-doc@vger.kernel.org>,
<alsa-devel@alsa-project.org>,
Wesley Cheng <quic_wcheng@quicinc.com>
Subject: [PATCH v20 07/41] usb: host: xhci-mem: Cleanup pending secondary event ring events
Date: Thu, 25 Apr 2024 14:50:51 -0700 [thread overview]
Message-ID: <20240425215125.29761-8-quic_wcheng@quicinc.com> (raw)
In-Reply-To: <20240425215125.29761-1-quic_wcheng@quicinc.com>
As part of xHCI bus suspend, the XHCI is halted. However, if there are
pending events in the secondary event ring, it is observed that the xHCI
controller stops responding to further commands upon host or device
initiated bus resume. Iterate through all pending events and update the
dequeue pointer to the beginning of the event ring.
Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com>
---
drivers/usb/host/xhci-mem.c | 7 ++++++-
drivers/usb/host/xhci-ring.c | 33 ++++++++++++++++++++++++++++++++-
drivers/usb/host/xhci.h | 5 +++++
3 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 69dd86669883..d686de0581b3 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -1816,7 +1816,7 @@ xhci_remove_interrupter(struct xhci_hcd *xhci, struct xhci_interrupter *ir)
tmp &= ERST_SIZE_MASK;
writel(tmp, &ir->ir_set->erst_size);
- xhci_write_64(xhci, ERST_EHB, &ir->ir_set->erst_dequeue);
+ xhci_update_erst_dequeue(xhci, ir, true);
}
}
@@ -1859,6 +1859,11 @@ void xhci_remove_secondary_interrupter(struct usb_hcd *hcd, struct xhci_interrup
return;
}
+ /*
+ * Cleanup secondary interrupter to ensure there are no pending events.
+ * This also updates event ring dequeue pointer back to the start.
+ */
+ xhci_skip_sec_intr_events(xhci, ir->event_ring, ir);
intr_num = ir->intr_num;
xhci_remove_interrupter(xhci, ir);
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 6c7a21f522cd..b9c2c23d5717 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -3034,7 +3034,7 @@ static int xhci_handle_event_trb(struct xhci_hcd *xhci, struct xhci_interrupter
* - When all events have finished
* - To avoid "Event Ring Full Error" condition
*/
-static void xhci_update_erst_dequeue(struct xhci_hcd *xhci,
+void xhci_update_erst_dequeue(struct xhci_hcd *xhci,
struct xhci_interrupter *ir,
bool clear_ehb)
{
@@ -3134,6 +3134,37 @@ static int xhci_handle_events(struct xhci_hcd *xhci, struct xhci_interrupter *ir
return 0;
}
+/*
+ * Move the event ring dequeue pointer to skip events kept in the secondary
+ * event ring. This is used to ensure that pending events in the ring are
+ * acknowledged, so the XHCI HCD can properly enter suspend/resume. The
+ * secondary ring is typically maintained by an external component.
+ */
+void xhci_skip_sec_intr_events(struct xhci_hcd *xhci,
+ struct xhci_ring *ring, struct xhci_interrupter *ir)
+{
+ union xhci_trb *current_trb;
+ u64 erdp_reg;
+ dma_addr_t deq;
+
+ /* disable irq, ack pending interrupt and ack all pending events */
+ xhci_disable_interrupter(ir);
+
+ /* last acked event trb is in erdp reg */
+ erdp_reg = xhci_read_64(xhci, &ir->ir_set->erst_dequeue);
+ deq = (dma_addr_t)(erdp_reg & ERST_PTR_MASK);
+ if (!deq) {
+ xhci_err(xhci, "event ring handling not required\n");
+ return;
+ }
+
+ current_trb = ir->event_ring->dequeue;
+ /* read cycle state of the last acked trb to find out CCS */
+ ring->cycle_state = le32_to_cpu(current_trb->event_cmd.flags) & TRB_CYCLE;
+
+ xhci_handle_events(xhci, ir);
+}
+
/*
* xHCI spec says we can get an interrupt, and if the HC has an error condition,
* we might get bad data out of the event ring. Section 4.10.2.7 has a list of
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 57ad141242ca..79dc3801d359 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1841,6 +1841,8 @@ struct xhci_interrupter *
xhci_create_secondary_interrupter(struct usb_hcd *hcd, int num_seg);
void xhci_remove_secondary_interrupter(struct usb_hcd
*hcd, struct xhci_interrupter *ir);
+void xhci_skip_sec_intr_events(struct xhci_hcd *xhci,
+ struct xhci_ring *ring, struct xhci_interrupter *ir);
/* xHCI host controller glue */
typedef void (*xhci_get_quirks_t)(struct device *, struct xhci_hcd *);
@@ -1932,6 +1934,9 @@ void inc_deq(struct xhci_hcd *xhci, struct xhci_ring *ring);
unsigned int count_trbs(u64 addr, u64 len);
int xhci_stop_endpoint_sync(struct xhci_hcd *xhci, struct xhci_virt_ep *ep,
int suspend, gfp_t gfp_flags);
+void xhci_update_erst_dequeue(struct xhci_hcd *xhci,
+ struct xhci_interrupter *ir,
+ bool clear_ehb);
/* xHCI roothub code */
void xhci_set_link_state(struct xhci_hcd *xhci, struct xhci_port *port,
next prev parent reply other threads:[~2024-04-25 21:52 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 21:50 [PATCH v20 00/41] Introduce QC USB SND audio offloading support Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 01/41] xhci: add helper to stop endpoint and wait for completion Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 02/41] usb: host: xhci: Export enable and disable interrupter APIs Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 03/41] usb: host: xhci: Repurpose event handler for skipping interrupter events Wesley Cheng
2024-04-30 11:02 ` Mathias Nyman
2024-04-30 21:57 ` Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 04/41] xhci: export XHCI IMOD setting helper for interrupters Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 05/41] xhci: sideband: add initial api to register a sideband entity Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 06/41] usb: host: xhci-sideband: Expose a sideband interrupter enable API Wesley Cheng
2024-05-02 11:07 ` Mathias Nyman
2024-05-02 23:37 ` Wesley Cheng
2024-04-25 21:50 ` Wesley Cheng [this message]
2024-04-25 21:50 ` [PATCH v20 08/41] usb: host: xhci-mem: Allow for interrupter clients to choose specific index Wesley Cheng
2024-04-26 13:24 ` Amadeusz Sławiński
2024-04-26 20:03 ` Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 09/41] ASoC: Add SOC USB APIs for adding an USB backend Wesley Cheng
2024-04-26 13:25 ` Amadeusz Sławiński
2024-04-26 21:55 ` Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 10/41] ASoC: dt-bindings: qcom,q6dsp-lpass-ports: Add USB_RX port Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 11/41] ASoC: qcom: qdsp6: Introduce USB AFE port to q6dsp Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 12/41] ASoC: qdsp6: q6afe: Increase APR timeout Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 13/41] ASoC: qcom: qdsp6: Add USB backend ASoC driver for Q6 Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 14/41] ALSA: usb-audio: Introduce USB SND platform op callbacks Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 15/41] ALSA: usb-audio: Export USB SND APIs for modules Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 16/41] ALSA: usb-audio: Save UAC sample size information Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 17/41] usb: dwc3: Specify maximum number of XHCI interrupters Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 18/41] usb: host: xhci-plat: Set XHCI max interrupters if property is present Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 19/41] ALSA: usb-audio: qcom: Add USB QMI definitions Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 20/41] ALSA: usb-audio: qcom: Introduce QC USB SND offloading support Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 21/41] ALSA: usb-audio: Check for support for requested audio format Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 22/41] ASoC: usb: Add PCM format check API for USB backend Wesley Cheng
2024-04-26 13:25 ` Amadeusz Sławiński
2024-04-30 8:01 ` Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 23/41] ASoC: qcom: qdsp6: Ensure PCM format is supported by USB audio device Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 24/41] ALSA: usb-audio: Prevent starting of audio stream if in use Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 25/41] ALSA: usb-audio: Do not allow USB offload path if PCM device is " Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 26/41] ASoC: dt-bindings: Update example for enabling USB offload on SM8250 Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 27/41] ALSA: usb-audio: qcom: Populate PCM and USB chip information Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 28/41] ASoC: qcom: qdsp6: Add support to track available USB PCM devices Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 29/41] ASoC: Introduce SND kcontrols to select sound card and PCM device Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 30/41] ASoC: qcom: qdsp6: Add SOC USB offload select get/put callbacks Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 31/41] ASoC: Introduce SND kcontrols to track USB offloading state Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 32/41] ASoC: qcom: qdsp6: Add PCM ops to track current state Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 33/41] ASoC: usb: Create SOC USB SND jack kcontrol Wesley Cheng
2024-04-26 13:26 ` Amadeusz Sławiński
2024-05-01 0:32 ` Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 34/41] ASoC: qcom: qdsp6: Add headphone jack for offload connection status Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 35/41] ASoC: usb: Fetch ASoC sound card information Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 36/41] ALSA: usb-audio: Add USB offloading capable kcontrol Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 37/41] ALSA: usb-audio: Allow for rediscovery of connected USB SND devices Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 38/41] ALSA: usb-audio: qcom: Use card and PCM index from QMI request Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 39/41] ASoC: usb: Rediscover USB SND devices on USB port add Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 40/41] ASoC: qcom: Populate SoC components string Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 41/41] ASoC: doc: Add documentation for SOC USB Wesley Cheng
2024-04-26 3:36 ` Bagas Sanjaya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240425215125.29761-8-quic_wcheng@quicinc.com \
--to=quic_wcheng@quicinc.com \
--cc=Thinh.Nguyen@synopsys.com \
--cc=alsa-devel@alsa-project.org \
--cc=andersson@kernel.org \
--cc=bgoswami@quicinc.com \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=corbet@lwn.net \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=perex@perex.cz \
--cc=robh@kernel.org \
--cc=srinivas.kandagatla@linaro.org \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).