From f6aea6b89ce99b4f490fe1e1062b88042096703e Mon Sep 17 00:00:00 2001 From: Sam Shih Date: Fri, 2 Jun 2023 13:06:26 +0800 Subject: [PATCH] [high-speed-io][999-2621-xHCI-MT7986-USB-2.0-USBIF-compliance-toolkit.patch] --- drivers/usb/host/Kconfig | 9 +++++++++ drivers/usb/host/Makefile | 10 ++++++++++ drivers/usb/host/xhci-mtk.c | 6 ++++-- drivers/usb/host/xhci-mtk.h | 7 +++++++ drivers/usb/host/xhci.c | 2 +- drivers/usb/host/xhci.h | 1 + 6 files changed, 32 insertions(+), 3 deletions(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 79b2e79dd..12b1bf9aa 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -69,6 +69,15 @@ config USB_XHCI_MTK found in MediaTek SoCs. If unsure, say N. +config USB_XHCI_MTK_DEBUGFS + tristate "xHCI DEBUGFS support for Mediatek MT65xx" + depends on USB_XHCI_MTK && DEBUG_FS + default y + ---help--- + Say 'Y' to enable the debugfs support for the xHCI host controller + found in Mediatek MT65xx SoCs. + If don't need, say N. + config USB_XHCI_MVEBU tristate "xHCI support for Marvell Armada 375/38x/37xx" select USB_XHCI_PLATFORM diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index b19136125..f064f836d 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -21,6 +21,16 @@ endif ifneq ($(CONFIG_USB_XHCI_MTK), ) xhci-hcd-y += xhci-mtk-sch.o + xhci-hcd-$(CONFIG_USB_XHCI_MTK_DEBUGFS) += xhci-mtk-test.o + xhci-hcd-$(CONFIG_USB_XHCI_MTK_DEBUGFS) += xhci-mtk-unusual.o + xhci-hcd-$(CONFIG_USB_XHCI_MTK_DEBUGFS) += xhci-mtk-intr-en.o + xhci-hcd-$(CONFIG_USB_XHCI_MTK_DEBUGFS) += xhci-mtk-vrt-vref.o + xhci-hcd-$(CONFIG_USB_XHCI_MTK_DEBUGFS) += xhci-mtk-term-vref.o + xhci-hcd-$(CONFIG_USB_XHCI_MTK_DEBUGFS) += xhci-mtk-hstx-srctrl.o + xhci-hcd-$(CONFIG_USB_XHCI_MTK_DEBUGFS) += xhci-mtk-discth.o + xhci-hcd-$(CONFIG_USB_XHCI_MTK_DEBUGFS) += xhci-mtk-chgdt-en.o + xhci-hcd-$(CONFIG_USB_XHCI_MTK_DEBUGFS) += xhci-mtk-reg.o + xhci-hcd-$(CONFIG_USB_XHCI_MTK_DEBUGFS) += xhci-mtk-preemphasic.o endif xhci-plat-hcd-y := xhci-plat.o diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c index 77ddb8c05..7a2007931 100644 --- a/drivers/usb/host/xhci-mtk.c +++ b/drivers/usb/host/xhci-mtk.c @@ -18,10 +18,10 @@ #include #include #include - +#include #include "xhci.h" #include "xhci-mtk.h" - +#include "xhci-mtk-test.h" /* COMPLIANCE_CP5_CP7_TXDEEMPH_10G register */ #define COMPLIANCE_CP5_CP7_TXDEEMPH_10G 0x2428 #define CP5_CP7_TXDEEMPH_10G GENMASK(17, 0) @@ -586,6 +586,7 @@ static int xhci_mtk_probe(struct platform_device *pdev) ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED); if (ret) goto dealloc_usb2_hcd; + hqa_create_attr(dev); return 0; @@ -620,6 +621,7 @@ static int xhci_mtk_remove(struct platform_device *dev) struct usb_hcd *hcd = mtk->hcd; struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct usb_hcd *shared_hcd = xhci->shared_hcd; + hqa_remove_attr(&dev->dev); pm_runtime_put_noidle(&dev->dev); pm_runtime_disable(&dev->dev); diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h index 8a884e7b4..e815d7091 100644 --- a/drivers/usb/host/xhci-mtk.h +++ b/drivers/usb/host/xhci-mtk.h @@ -157,6 +157,13 @@ struct xhci_hcd_mtk { u32 uwk_reg_base; u32 uwk_vers; bool p0_speed_fixup; + +#ifdef CONFIG_USB_XHCI_MTK_DEBUGFS + int test_mode; + size_t hqa_size; + u32 hqa_pos; + char *hqa_buf; +#endif }; static inline struct xhci_hcd_mtk *hcd_to_mtk(struct usb_hcd *hcd) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index b8915790a..dd1b520af 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -714,7 +714,7 @@ EXPORT_SYMBOL_GPL(xhci_run); * Disable device contexts, disable IRQs, and quiesce the HC. * Reset the HC, finish any completed transactions, and cleanup memory. */ -static void xhci_stop(struct usb_hcd *hcd) +void xhci_stop(struct usb_hcd *hcd) { u32 temp; struct xhci_hcd *xhci = hcd_to_xhci(hcd); diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index e696f1508..07f904167 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -2073,6 +2073,7 @@ int xhci_halt(struct xhci_hcd *xhci); int xhci_start(struct xhci_hcd *xhci); int xhci_reset(struct xhci_hcd *xhci, u64 timeout_us); int xhci_run(struct usb_hcd *hcd); +void xhci_stop(struct usb_hcd *hcd); int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks); void xhci_shutdown(struct usb_hcd *hcd); void xhci_init_driver(struct hc_driver *drv, -- 2.34.1