Commit 9c0c11bb authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: support setting interrupt moderation IMOD for secondary interrupters 



Allow creators of seconday interrupters to specify the interrupt
moderation interval value in nanoseconds when creating the interrupter.

If not sure what value to use then use the xhci driver default
xhci->imod_interval

Suggested-by: default avatarWesley Cheng <quic_wcheng@quicinc.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20240905143300.1959279-13-mathias.nyman@linux.intel.com


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

drivers/usb/host/xhci-mem.c

+7 −1
Original line number Diff line number Diff line
@@ -2332,7 +2332,8 @@ xhci_add_interrupter(struct xhci_hcd *xhci, struct xhci_interrupter *ir, 
}



struct xhci_interrupter *

xhci_create_secondary_interrupter(struct usb_hcd *hcd, unsigned int segs)

xhci_create_secondary_interrupter(struct usb_hcd *hcd, unsigned int segs,

				  u32 imod_interval)

{

	struct xhci_hcd *xhci = hcd_to_xhci(hcd);

	struct xhci_interrupter *ir;
@@ -2365,6 +2366,11 @@ 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_dbg(xhci, "Add secondary interrupter %d, max interrupters %d\n",

		 i, xhci->max_interrupters);

drivers/usb/host/xhci.c

+2 −2
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static int xhci_disable_interrupter(struct xhci_interrupter *ir) 
}



/* interrupt moderation interval imod_interval in nanoseconds */

static int xhci_set_interrupter_moderation(struct xhci_interrupter *ir,

int xhci_set_interrupter_moderation(struct xhci_interrupter *ir,

				    u32 imod_interval)

{

	u32 imod;

drivers/usb/host/xhci.h

+4 −1
Original line number Diff line number Diff line
@@ -1826,7 +1826,8 @@ struct xhci_container_ctx *xhci_alloc_container_ctx(struct xhci_hcd *xhci, 
void xhci_free_container_ctx(struct xhci_hcd *xhci,

		struct xhci_container_ctx *ctx);

struct xhci_interrupter *

xhci_create_secondary_interrupter(struct usb_hcd *hcd, unsigned int segs);

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);
@@ -1866,6 +1867,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);



/* xHCI ring, segment, TRB, and TD functions */

dma_addr_t xhci_trb_virt_to_dma(struct xhci_segment *seg, union xhci_trb *trb);