xhci: Add interrupt pending autoclear flag to each interrupter

[ Upstream commit 4f022aad80dc8b175e309197720f4fca8004fb2e ]

Each interrupter has an interrupt pending (IP) bit that should be cleared
in the interrupt handler. This is done automatically for systems using
MSI/MSI-X interrupts.

Secondary interrupters used by audio offload may not actually trigger
MSI/MSI-X messages, so driver may need to clear the IP bit manually for
these, even if the primary interrupter IP is cleared automatically.

Add an ip_autoclear flag to each interrupter that driver can configure
when requesting an interrupt for that xHC interrupter, and move
the interrupt pending clearing code to its own helper function.
Use this ip_autoclear flag instead of the current hcd->msi_enabled
to check if IP flag is cleared by software.

[Moved ip_autoclear into xhci and set based on msi_enabled -wcheng]

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com>
Link: https://lore.kernel.org/r/20240217001017.29969-2-quic_wcheng@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: e30e9ad9ed66 ("xhci: update event ring dequeue pointer position to controller correctly")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 4f64b814d4aa20fdd08e349e5c07324b3e105c5e..b1ca3c9e5a75f7b20bec712e83dc03300b4f8c4c 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -3069,6 +3069,19 @@ static void xhci_update_erst_dequeue(struct xhci_hcd *xhci,
        xhci_write_64(xhci, temp_64, &ir->ir_set->erst_dequeue);
 }
 
+/* Clear the interrupt pending bit for a specific interrupter. */
+static void xhci_clear_interrupt_pending(struct xhci_hcd *xhci,
+                                        struct xhci_interrupter *ir)
+{
+       if (!ir->ip_autoclear) {
+               u32 irq_pending;
+
+               irq_pending = readl(&ir->ir_set->irq_pending);
+               irq_pending |= IMAN_IP;
+               writel(irq_pending, &ir->ir_set->irq_pending);
+       }
+}
+
 /*
  * 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
@@ -3118,12 +3131,8 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd)
 
        /* This is the handler of the primary interrupter */
        ir = xhci->interrupters[0];
-       if (!hcd->msi_enabled) {
-               u32 irq_pending;
-               irq_pending = readl(&ir->ir_set->irq_pending);
-               irq_pending |= IMAN_IP;
-               writel(irq_pending, &ir->ir_set->irq_pending);
-       }
+
+       xhci_clear_interrupt_pending(xhci, ir);
 
        if (xhci->xhc_state & XHCI_STATE_DYING ||
            xhci->xhc_state & XHCI_STATE_HALTED) {

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index c057c42c36f4cc9385af591c2921f77dac62c21f..0886829d53e51b244815bdcc09693438c5cb5d69 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -538,6 +538,9 @@ int xhci_run(struct usb_hcd *hcd)
         */
 
        hcd->uses_new_polling = 1;
+       if (hcd->msi_enabled)
+               ir->ip_autoclear = true;
+
        if (!usb_hcd_is_primary_hcd(hcd))
                return xhci_run_finished(xhci);
 

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 6f82d404883f9accf627c057a96702a7d8d65a80..9e05ccdd36b2bbfd2feea06eb5b9a3d9ea874131 100644 (file)
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1688,6 +1688,7 @@ struct xhci_interrupter {
        struct xhci_erst        erst;
        struct xhci_intr_reg __iomem *ir_set;
        unsigned int            intr_num;
+       bool                    ip_autoclear;
        /* For interrupter registers save and restore over suspend/resume */
        u32     s3_irq_pending;
        u32     s3_irq_control;