Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab725cbe authored by Adam Wallis's avatar Adam Wallis Committed by Greg Kroah-Hartman
Browse files

usb: xhci: allow imod-interval to be configurable 



The xHCI driver currently has the IMOD set to 160, which
translates to an IMOD interval of 40,000ns (160 * 250)ns

Commit 0cbd4b34 ("xhci: mediatek: support MTK xHCI host controller")
introduced a QUIRK for the MTK platform to adjust this interval to 20,
which translates to an IMOD interval of 5,000ns (20 * 250)ns. This is
due to the fact that the MTK controller IMOD interval is 8 times
as much as defined in xHCI spec.

Instead of adding more quirk bits for additional platforms, this patch
introduces the ability for vendors to set the IMOD_INTERVAL as is
optimal for their platform. By using device_property_read_u32() on
"imod-interval-ns", the IMOD INTERVAL can be specified in nano seconds.
If no interval is specified, the default of 40,000ns (IMOD=160) will be
used.

No bounds checking has been implemented due to the fact that a vendor
may have violated the spec and would need to specify a value outside of
the max 8,000 IRQs/second limit specified in the xHCI spec.

Tested-by: default avatarChunfeng Yun <chunfeng.yun@mediatek.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarAdam Wallis <awallis@codeaurora.org>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3054ea45

Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ Optional properties: 
 - pinctrl-names : a pinctrl state named "default" must be defined

 - pinctrl-0 : pin control group

	See: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt

 - imod-interval-ns: default interrupt moderation interval is 5000ns



Example:

usb30: usb@11270000 {
@@ -66,6 +67,7 @@ usb30: usb@11270000 { 
	usb3-lpm-capable;

	mediatek,syscon-wakeup = <&pericfg>;

	mediatek,wakeup-src = <1>;

	imod-interval-ns = <10000>;

};



2nd: dual-role mode with xHCI driver

Documentation/devicetree/bindings/usb/usb-xhci.txt

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ Optional properties: 
  - usb2-lpm-disable: indicate if we don't want to enable USB2 HW LPM

  - usb3-lpm-capable: determines if platform is USB3 LPM capable

  - quirk-broken-port-ped: set if the controller has broken port disable mechanism

  - imod-interval-ns: default interrupt moderation interval is 5000ns



Example:

	usb@f0931000 {

drivers/usb/host/xhci-mtk.c

+9 −0
Original line number Diff line number Diff line
@@ -674,6 +674,15 @@ static int xhci_mtk_probe(struct platform_device *pdev) 


	xhci = hcd_to_xhci(hcd);

	xhci->main_hcd = hcd;



	/*

	 * imod_interval is the interrupt moderation value in nanoseconds.

	 * The increment interval is 8 times as much as that defined in

	 * the xHCI spec on MTK's controller.

	 */

	xhci->imod_interval = 5000;

	device_property_read_u32(dev, "imod-interval-ns", &xhci->imod_interval);



	xhci->shared_hcd = usb_create_shared_hcd(driver, dev,

			dev_name(dev), hcd);

	if (!xhci->shared_hcd) {

drivers/usb/host/xhci-pci.c

+3 −0
Original line number Diff line number Diff line
@@ -234,6 +234,9 @@ static int xhci_pci_setup(struct usb_hcd *hcd) 
	if (!xhci->sbrn)

		pci_read_config_byte(pdev, XHCI_SBRN_OFFSET, &xhci->sbrn);



	/* imod_interval is the interrupt moderation value in nanoseconds. */

	xhci->imod_interval = 40000;



	retval = xhci_gen_setup(hcd, xhci_pci_quirks);

	if (retval)

		return retval;

drivers/usb/host/xhci-plat.c

+5 −0
Original line number Diff line number Diff line
@@ -269,6 +269,11 @@ static int xhci_plat_probe(struct platform_device *pdev) 
	if (device_property_read_bool(&pdev->dev, "quirk-broken-port-ped"))

		xhci->quirks |= XHCI_BROKEN_PORT_PED;



	/* imod_interval is the interrupt moderation value in nanoseconds. */

	xhci->imod_interval = 40000;

	device_property_read_u32(sysdev, "imod-interval-ns",

				 &xhci->imod_interval);



	hcd->usb_phy = devm_usb_get_phy_by_phandle(sysdev, "usb-phy", 0);

	if (IS_ERR(hcd->usb_phy)) {

		ret = PTR_ERR(hcd->usb_phy);