Commit 14295a15 authored by Chunfeng Yun's avatar Chunfeng Yun Committed by Greg Kroah-Hartman
Browse files

usb: xhci-mtk: support to build xhci-mtk-hcd.ko 



Currently xhci-hcd.ko building depends on USB_XHCI_MTK, this
is not flexible for some cases. For example:
USB_XHCI_HCD is y, and USB_XHCI_MTK is m, then we can't
implement extended functions if only update xhci-mtk.ko
This patch is used to remove the dependence.

Acked-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarChunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/0b62e21ddfacc1c2874726dd27ccab80c993f303.1615170625.git.chunfeng.yun@mediatek.com


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

drivers/usb/host/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -19,9 +19,7 @@ ifneq ($(CONFIG_USB_XHCI_DBGCAP), ) 
	xhci-hcd-y += xhci-dbgcap.o xhci-dbgtty.o

endif



ifneq ($(CONFIG_USB_XHCI_MTK), )

	xhci-hcd-y += xhci-mtk-sch.o

endif

xhci-mtk-hcd-y := xhci-mtk.o xhci-mtk-sch.o



xhci-plat-hcd-y := xhci-plat.o

ifneq ($(CONFIG_USB_XHCI_MVEBU), )
@@ -73,7 +71,7 @@ obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o 
obj-$(CONFIG_USB_XHCI_PCI_RENESAS)	+= xhci-pci-renesas.o

obj-$(CONFIG_USB_XHCI_PLATFORM) += xhci-plat-hcd.o

obj-$(CONFIG_USB_XHCI_HISTB)	+= xhci-histb.o

obj-$(CONFIG_USB_XHCI_MTK)	+= xhci-mtk.o

obj-$(CONFIG_USB_XHCI_MTK)	+= xhci-mtk-hcd.o

obj-$(CONFIG_USB_XHCI_TEGRA)	+= xhci-tegra.o

obj-$(CONFIG_USB_SL811_HCD)	+= sl811-hcd.o

obj-$(CONFIG_USB_SL811_CS)	+= sl811_cs.o

drivers/usb/host/xhci-mem.c

+1 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ struct xhci_ep_ctx *xhci_get_ep_ctx(struct xhci_hcd *xhci, 
	return (struct xhci_ep_ctx *)

		(ctx->bytes + (ep_index * CTX_SIZE(xhci->hcc_params)));

}



EXPORT_SYMBOL_GPL(xhci_get_ep_ctx);



/***************** Streams structures manipulation *************************/

drivers/usb/host/xhci-mtk-sch.c

+34 −14
Original line number Diff line number Diff line
@@ -691,25 +691,22 @@ int xhci_mtk_sch_init(struct xhci_hcd_mtk *mtk) 


	return 0;

}

EXPORT_SYMBOL_GPL(xhci_mtk_sch_init);



void xhci_mtk_sch_exit(struct xhci_hcd_mtk *mtk)

{

	kfree(mtk->sch_array);

}

EXPORT_SYMBOL_GPL(xhci_mtk_sch_exit);



int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev,

static int add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev,

			struct usb_host_endpoint *ep)

{

	struct xhci_hcd_mtk *mtk = hcd_to_mtk(hcd);

	struct xhci_hcd *xhci;

	struct xhci_hcd *xhci = hcd_to_xhci(hcd);

	struct xhci_ep_ctx *ep_ctx;

	struct xhci_virt_device *virt_dev;

	struct mu3h_sch_ep_info *sch_ep;

	unsigned int ep_index;



	xhci = hcd_to_xhci(hcd);

	virt_dev = xhci->devs[udev->slot_id];

	ep_index = xhci_get_endpoint_index(&ep->desc);

	ep_ctx = xhci_get_ep_ctx(xhci, virt_dev->in_ctx, ep_index);
@@ -741,18 +738,16 @@ int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, 


	return 0;

}

EXPORT_SYMBOL_GPL(xhci_mtk_add_ep_quirk);



void xhci_mtk_drop_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev,

static void drop_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev,

			  struct usb_host_endpoint *ep)

{

	struct xhci_hcd_mtk *mtk = hcd_to_mtk(hcd);

	struct xhci_hcd *xhci;

	struct xhci_hcd *xhci = hcd_to_xhci(hcd);

	struct xhci_virt_device *virt_dev;

	struct mu3h_sch_bw_info *sch_bw;

	struct mu3h_sch_ep_info *sch_ep, *tmp;



	xhci = hcd_to_xhci(hcd);

	virt_dev = xhci->devs[udev->slot_id];



	xhci_dbg(xhci, "%s() type:%d, speed:%d, mpks:%d, dir:%d, ep:%p\n",
@@ -772,7 +767,6 @@ void xhci_mtk_drop_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev, 
		}

	}

}

EXPORT_SYMBOL_GPL(xhci_mtk_drop_ep_quirk);



int xhci_mtk_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev)

{
@@ -818,7 +812,6 @@ int xhci_mtk_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev) 


	return xhci_check_bandwidth(hcd, udev);

}

EXPORT_SYMBOL_GPL(xhci_mtk_check_bandwidth);



void xhci_mtk_reset_bandwidth(struct usb_hcd *hcd, struct usb_device *udev)

{
@@ -836,4 +829,31 @@ void xhci_mtk_reset_bandwidth(struct usb_hcd *hcd, struct usb_device *udev) 


	xhci_reset_bandwidth(hcd, udev);

}

EXPORT_SYMBOL_GPL(xhci_mtk_reset_bandwidth);
 


int xhci_mtk_add_ep(struct usb_hcd *hcd, struct usb_device *udev,

		    struct usb_host_endpoint *ep)

{

	int ret;



	ret = xhci_add_endpoint(hcd, udev, ep);

	if (ret)

		return ret;



	if (ep->hcpriv)

		ret = add_ep_quirk(hcd, udev, ep);



	return ret;

}



int xhci_mtk_drop_ep(struct usb_hcd *hcd, struct usb_device *udev,

		     struct usb_host_endpoint *ep)

{

	int ret;



	ret = xhci_drop_endpoint(hcd, udev, ep);

	if (ret)

		return ret;



	drop_ep_quirk(hcd, udev, ep);

	return 0;

}

drivers/usb/host/xhci-mtk.c

+2 −0
Original line number Diff line number Diff line
@@ -417,6 +417,8 @@ static int xhci_mtk_setup(struct usb_hcd *hcd) 


static const struct xhci_driver_overrides xhci_mtk_overrides __initconst = {

	.reset = xhci_mtk_setup,

	.add_endpoint = xhci_mtk_add_ep,

	.drop_endpoint = xhci_mtk_drop_ep,

	.check_bandwidth = xhci_mtk_check_bandwidth,

	.reset_bandwidth = xhci_mtk_reset_bandwidth,

};

drivers/usb/host/xhci-mtk.h

+4 −29
Original line number Diff line number Diff line
@@ -161,38 +161,13 @@ static inline struct xhci_hcd_mtk *hcd_to_mtk(struct usb_hcd *hcd) 
	return dev_get_drvdata(hcd->self.controller);

}



#if IS_ENABLED(CONFIG_USB_XHCI_MTK)

int xhci_mtk_sch_init(struct xhci_hcd_mtk *mtk);

void xhci_mtk_sch_exit(struct xhci_hcd_mtk *mtk);

int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev,

int xhci_mtk_add_ep(struct usb_hcd *hcd, struct usb_device *udev,

		    struct usb_host_endpoint *ep);

void xhci_mtk_drop_ep_quirk(struct usb_hcd *hcd, struct usb_device *udev,

int xhci_mtk_drop_ep(struct usb_hcd *hcd, struct usb_device *udev,

		     struct usb_host_endpoint *ep);

int xhci_mtk_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev);

void xhci_mtk_reset_bandwidth(struct usb_hcd *hcd, struct usb_device *udev);



#else

static inline int xhci_mtk_add_ep_quirk(struct usb_hcd *hcd,

	struct usb_device *udev, struct usb_host_endpoint *ep)

{

	return 0;

}



static inline void xhci_mtk_drop_ep_quirk(struct usb_hcd *hcd,

	struct usb_device *udev, struct usb_host_endpoint *ep)

{

}



static inline int xhci_mtk_check_bandwidth(struct usb_hcd *hcd,

		struct usb_device *udev)

{

	return 0;

}



static inline void xhci_mtk_reset_bandwidth(struct usb_hcd *hcd,

		struct usb_device *udev)

{

}

#endif



#endif		/* _XHCI_MTK_H_ */