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>,
<krzk+dt@kernel.org>, <gregkh@linuxfoundation.org>,
<Thinh.Nguyen@synopsys.com>, <broonie@kernel.org>,
<bgoswami@quicinc.com>, <tiwai@suse.com>, <bagasdotme@gmail.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 v21 05/39] usb: host: xhci-mem: Cleanup pending secondary event ring events
Date: Tue, 7 May 2024 12:50:42 -0700 [thread overview]
Message-ID: <20240507195116.9464-6-quic_wcheng@quicinc.com> (raw)
In-Reply-To: <20240507195116.9464-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.c | 2 +-
drivers/usb/host/xhci.h | 6 ++++++
4 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 2ca5937b73f4..60dfc59260d8 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 80dca780317a..a012ddf94fb5 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -3012,7 +3012,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)
{
@@ -3112,6 +3112,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.c b/drivers/usb/host/xhci.c
index 0b22342bbff1..608062d8fab6 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -333,7 +333,7 @@ static int xhci_enable_interrupter(struct xhci_interrupter *ir)
return 0;
}
-static int xhci_disable_interrupter(struct xhci_interrupter *ir)
+int xhci_disable_interrupter(struct xhci_interrupter *ir)
{
u32 iman;
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index eb1d1f946cdb..35e5079ce621 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1836,6 +1836,8 @@ xhci_create_secondary_interrupter(struct usb_hcd *hcd, unsigned int segs,
u32 imod_interval);
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 *);
@@ -1875,6 +1877,7 @@ int xhci_alloc_tt_info(struct xhci_hcd *xhci,
struct usb_tt *tt, gfp_t mem_flags);
int xhci_set_interrupter_moderation(struct xhci_interrupter *ir,
u32 imod_interval);
+int xhci_disable_interrupter(struct xhci_interrupter *ir);
/* xHCI ring, segment, TRB, and TD functions */
dma_addr_t xhci_trb_virt_to_dma(struct xhci_segment *seg, union xhci_trb *trb);
@@ -1924,6 +1927,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-05-07 19:51 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 19:50 [PATCH v21 00/39] Introduce QC USB SND audio offloading support Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 01/39] xhci: add helper to stop endpoint and wait for completion Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 02/39] usb: host: xhci: Repurpose event handler for skipping interrupter events Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 03/39] xhci: sideband: add initial api to register a sideband entity Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 04/39] usb: xhci: Allow for secondary interrupter to set IMOD Wesley Cheng
2024-05-07 19:50 ` Wesley Cheng [this message]
2024-05-07 19:50 ` [PATCH v21 06/39] usb: host: xhci-mem: Allow for interrupter clients to choose specific index Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 07/39] ASoC: Add SOC USB APIs for adding an USB backend Wesley Cheng
2024-05-07 20:26 ` Pierre-Louis Bossart
2024-05-08 20:16 ` Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 08/39] ASoC: dt-bindings: qcom,q6dsp-lpass-ports: Add USB_RX port Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 09/39] ASoC: qcom: qdsp6: Introduce USB AFE port to q6dsp Wesley Cheng
2024-05-07 20:37 ` Pierre-Louis Bossart
2024-05-08 23:34 ` Wesley Cheng
2024-05-09 12:54 ` Pierre-Louis Bossart
2024-05-09 21:34 ` Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 10/39] ASoC: qdsp6: q6afe: Increase APR timeout Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 11/39] ASoC: qcom: qdsp6: Add USB backend ASoC driver for Q6 Wesley Cheng
2024-05-07 20:39 ` Pierre-Louis Bossart
2024-05-07 19:50 ` [PATCH v21 12/39] ALSA: usb-audio: Introduce USB SND platform op callbacks Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 13/39] ALSA: usb-audio: Export USB SND APIs for modules Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 14/39] ALSA: usb-audio: Save UAC sample size information Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 15/39] usb: dwc3: Specify maximum number of XHCI interrupters Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 16/39] usb: host: xhci-plat: Set XHCI max interrupters if property is present Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 17/39] ALSA: usb-audio: qcom: Add USB QMI definitions Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 18/39] ALSA: usb-audio: qcom: Introduce QC USB SND offloading support Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 19/39] ALSA: usb-audio: Check for support for requested audio format Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 20/39] ASoC: usb: Add PCM format check API for USB backend Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 21/39] ASoC: qcom: qdsp6: Ensure PCM format is supported by USB audio device Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 22/39] ALSA: usb-audio: Prevent starting of audio stream if in use Wesley Cheng
2024-05-07 21:20 ` Pierre-Louis Bossart
2024-05-08 23:40 ` Wesley Cheng
2024-05-09 13:01 ` Pierre-Louis Bossart
2024-05-09 21:38 ` Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 23/39] ALSA: usb-audio: Do not allow USB offload path if PCM device is " Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 24/39] ASoC: dt-bindings: Update example for enabling USB offload on SM8250 Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 25/39] ALSA: usb-audio: qcom: Populate PCM and USB chip information Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 26/39] ASoC: qcom: qdsp6: Add support to track available USB PCM devices Wesley Cheng
2024-05-07 21:23 ` Pierre-Louis Bossart
2024-05-08 23:57 ` Wesley Cheng
2024-05-09 13:02 ` Pierre-Louis Bossart
2024-05-09 21:49 ` Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 27/39] ASoC: Introduce SND kcontrols to select sound card and PCM device Wesley Cheng
2024-05-07 21:26 ` Pierre-Louis Bossart
2024-05-09 0:10 ` Wesley Cheng
2024-05-09 13:07 ` Pierre-Louis Bossart
2024-05-09 22:32 ` Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 28/39] ASoC: qcom: qdsp6: Add SOC USB offload select get/put callbacks Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 29/39] ASoC: Introduce SND kcontrols to track USB offloading state Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 30/39] ASoC: qcom: qdsp6: Add PCM ops to track current state Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 31/39] ASoC: usb: Create SOC USB SND jack kcontrol Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 32/39] ASoC: qcom: qdsp6: Add headphone jack for offload connection status Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 33/39] ASoC: usb: Fetch ASoC sound card information Wesley Cheng
2024-05-07 21:33 ` Pierre-Louis Bossart
2024-05-09 0:13 ` Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 34/39] ALSA: usb-audio: Add USB offloading capable kcontrol Wesley Cheng
2024-05-07 21:37 ` Pierre-Louis Bossart
2024-05-08 19:41 ` Wesley Cheng
2024-05-09 0:42 ` Wesley Cheng
2024-05-09 13:11 ` Pierre-Louis Bossart
2024-05-09 22:05 ` Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 35/39] ALSA: usb-audio: Allow for rediscovery of connected USB SND devices Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 36/39] ALSA: usb-audio: qcom: Use card and PCM index from QMI request Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 37/39] ASoC: usb: Rediscover USB SND devices on USB port add Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 38/39] ASoC: qcom: Populate SoC components string Wesley Cheng
2024-05-07 21:40 ` Pierre-Louis Bossart
2024-05-08 20:06 ` Wesley Cheng
2024-05-09 13:17 ` Pierre-Louis Bossart
2024-05-09 22:09 ` Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 39/39] ASoC: doc: Add documentation for SOC USB Wesley Cheng
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=20240507195116.9464-6-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=bagasdotme@gmail.com \
--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=krzk+dt@kernel.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).