@@ -2365,10 +2365,7 @@ xhci_create_secondary_interrupter(struct usb_hcd *hcd, unsigned int segs,
return NULL;
}
- err = xhci_set_interrupter_moderation(ir, imod_interval);
- if (err)
- xhci_warn(xhci, "Failed to set interrupter %d moderation to %uns\n",
- i, imod_interval);
+ xhci_set_interrupter_moderation(xhci, ir, imod_interval);
xhci_dbg(xhci, "Add secondary interrupter %d, max interrupters %d\n",
i, xhci->max_interrupters);
@@ -346,21 +346,22 @@ static int xhci_disable_interrupter(struct xhci_interrupter *ir)
return 0;
}
-/* interrupt moderation interval imod_interval in nanoseconds */
-int xhci_set_interrupter_moderation(struct xhci_interrupter *ir,
- u32 imod_interval)
+/* Interrupt moderation interval in 250 nanoseconds increments, 0 means no interrupt throttling. */
+void xhci_set_interrupter_moderation(struct xhci_hcd *xhci, struct xhci_interrupter *ir,
+ u32 imod_interval)
{
- u32 imod;
+ u32 irq_control;
- if (!ir || !ir->ir_set || imod_interval > U16_MAX * 250)
- return -EINVAL;
+ imod_interval /= 250;
+ imod_interval = min(imod_interval, U16_MAX);
- imod = readl(&ir->ir_set->irq_control);
- imod &= ~ER_IRQ_INTERVAL_MASK;
- imod |= (imod_interval / 250) & ER_IRQ_INTERVAL_MASK;
- writel(imod, &ir->ir_set->irq_control);
+ irq_control = readl(&ir->ir_set->irq_control);
+ irq_control &= ~ER_IRQ_INTERVAL_MASK;
+ irq_control |= imod_interval & ER_IRQ_INTERVAL_MASK;
+ writel(irq_control, &ir->ir_set->irq_control);
- return 0;
+ xhci_dbg(xhci, "Interrupt moderation interval set to %uns for interrupt %u\n",
+ imod_interval * 250, ir->intr_num);
}
static void compliance_mode_recovery(struct timer_list *t)
@@ -567,7 +568,7 @@ int xhci_run(struct usb_hcd *hcd)
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
"ERST deq = 64'h%0lx", (long unsigned int) temp_64);
- xhci_set_interrupter_moderation(ir, xhci->imod_interval);
+ xhci_set_interrupter_moderation(xhci, ir, xhci->imod_interval);
if (xhci->quirks & XHCI_NEC_HOST) {
struct xhci_command *command;
@@ -1871,8 +1871,8 @@ int xhci_alloc_tt_info(struct xhci_hcd *xhci,
struct xhci_virt_device *virt_dev,
struct usb_device *hdev,
struct usb_tt *tt, gfp_t mem_flags);
-int xhci_set_interrupter_moderation(struct xhci_interrupter *ir,
- u32 imod_interval);
+void xhci_set_interrupter_moderation(struct xhci_hcd *xhci, struct xhci_interrupter *ir,
+ u32 imod_interval);
/* xHCI ring, segment, TRB, and TD functions */
dma_addr_t xhci_trb_virt_to_dma(struct xhci_segment *seg, union xhci_trb *trb);
The function sets the interrupt moderation interval through the IMODI 16-bit register, where the interval is represented in increments of 250 nanoseconds. For example, an IMODI register value of 16 is multiplied by 250 to get 4000 nanoseconds, resulting in an interrupt every ~1ms. Currently, the function has the potential to fail, but this failure is not handled, and the xhci driver proceeds as usual. Fix the issue by removing the possibility of failure. Instead, the IMODI is set to the closest valid value. Signed-off-by: Niklas Neronin <niklas.neronin@linux.intel.com> --- drivers/usb/host/xhci-mem.c | 5 +---- drivers/usb/host/xhci.c | 25 +++++++++++++------------ drivers/usb/host/xhci.h | 4 ++-- 3 files changed, 16 insertions(+), 18 deletions(-)