Commit 4f022aad authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: Add interrupt pending autoclear flag to each interrupter 



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: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarWesley Cheng <quic_wcheng@quicinc.com>
Link: https://lore.kernel.org/r/20240217001017.29969-2-quic_wcheng@quicinc.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88bae831

drivers/usb/host/xhci-ring.c

+15 −6
Original line number Diff line number Diff line
@@ -3063,6 +3063,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
@@ -3112,12 +3125,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) {

drivers/usb/host/xhci.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

drivers/usb/host/xhci.h

+1 −0
Original line number Diff line number Diff line
@@ -1432,6 +1432,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;