[PATCH] USB: EHCI for AU1200 (76fa9a24) · Commits · github.com / kvm-riscv / linux

arch/mips/au1000/common/cputable.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ struct cpu_spec cpu_specs[] = {
		{ 0xffffffff, 0x02030204, "Au1100 BE", 0, 1 },
		{ 0xffffffff, 0x03030200, "Au1550 AA", 0, 1 },
		{ 0xffffffff, 0x04030200, "Au1200 AB", 0, 0 },
		{ 0xffffffff, 0x04030201, "Au1200 AC", 0, 1 },
		{ 0xffffffff, 0x04030201, "Au1200 AC", 1, 0 },
		{ 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0 },
		};

arch/mips/au1000/common/platform.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -278,9 +278,7 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = {
		&au1100_lcd_device,
		#endif
		#ifdef CONFIG_SOC_AU1200
		#if 0 /* fixme */
		&au1xxx_usb_ehci_device,
		#endif
		&au1xxx_usb_gdt_device,
		&au1xxx_usb_otg_device,
		&au1200_lcd_device,

drivers/usb/Kconfig

+8 −1

Original line number	Diff line number	Diff line
		@@ -10,8 +10,8 @@ menu "USB support"
		config USB_ARCH_HAS_HCD
		boolean
		default y if USB_ARCH_HAS_OHCI
		default y if USB_ARCH_HAS_EHCI
		default y if ARM # SL-811
		default y if PPC_83xx
		default PCI

		# many non-PCI SOC chips embed OHCI
		@@ -31,6 +31,13 @@ config USB_ARCH_HAS_OHCI
		# more:
		default PCI

		# some non-PCI hcds implement EHCI
		config USB_ARCH_HAS_EHCI
		boolean
		default y if PPC_83xx
		default y if SOC_AU1200
		default PCI

		# ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
		config USB
		tristate "Support for Host-side USB"

drivers/usb/host/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ comment "USB Host Controller Drivers"

		config USB_EHCI_HCD
		tristate "EHCI HCD (USB 2.0) support"
		depends on USB && (PCI \|\| PPC_83xx)
		depends on USB && USB_ARCH_HAS_EHCI
		---help---
		The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
		"high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.

drivers/usb/host/ehci-au1xxx.c

0 → 100644

+297 −0

Original line number	Diff line number	Diff line
		/*
		* EHCI HCD (Host Controller Driver) for USB.
		*
		* (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
		*
		* Bus Glue for AMD Alchemy Au1xxx
		*
		* Based on "ohci-au1xxx.c" by Matt Porter <mporter@kernel.crashing.org>
		*
		* Modified for AMD Alchemy Au1200 EHC
		* by K.Boge <karsten.boge@amd.com>
		*
		* This file is licenced under the GPL.
		*/

		#include <linux/platform_device.h>
		#include <asm/mach-au1x00/au1000.h>

		#ifndef CONFIG_SOC_AU1200
		#error "this Alchemy chip doesn't have EHCI"
		#else /* Au1200 */

		#define USB_HOST_CONFIG (USB_MSR_BASE + USB_MSR_MCFG)
		#define USB_MCFG_PFEN (1<<31)
		#define USB_MCFG_RDCOMB (1<<30)
		#define USB_MCFG_SSDEN (1<<23)
		#define USB_MCFG_PHYPLLEN (1<<19)
		#define USB_MCFG_EHCCLKEN (1<<17)
		#define USB_MCFG_UCAM (1<<7)
		#define USB_MCFG_EBMEN (1<<3)
		#define USB_MCFG_EMEMEN (1<<2)

		#define USBH_ENABLE_CE (USB_MCFG_PHYPLLEN \| USB_MCFG_EHCCLKEN)

		#ifdef CONFIG_DMA_COHERENT
		#define USBH_ENABLE_INIT (USBH_ENABLE_CE \
		\| USB_MCFG_PFEN \| USB_MCFG_RDCOMB \
		\| USB_MCFG_SSDEN \| USB_MCFG_UCAM \
		\| USB_MCFG_EBMEN \| USB_MCFG_EMEMEN)
		#else
		#define USBH_ENABLE_INIT (USBH_ENABLE_CE \
		\| USB_MCFG_PFEN \| USB_MCFG_RDCOMB \
		\| USB_MCFG_SSDEN \
		\| USB_MCFG_EBMEN \| USB_MCFG_EMEMEN)
		#endif
		#define USBH_DISABLE (USB_MCFG_EBMEN \| USB_MCFG_EMEMEN)

		#endif /* Au1200 */

		extern int usb_disabled(void);

		/-------------------------------------------------------------------------/

		static void au1xxx_start_ehc(struct platform_device *dev)
		{
		pr_debug(__FILE__ ": starting Au1xxx EHCI USB Controller\n");

		/* write HW defaults again in case Yamon cleared them */
		if (au_readl(USB_HOST_CONFIG) == 0) {
		au_writel(0x00d02000, USB_HOST_CONFIG);
		au_readl(USB_HOST_CONFIG);
		udelay(1000);
		}
		/* enable host controller */
		au_writel(USBH_ENABLE_CE \| au_readl(USB_HOST_CONFIG), USB_HOST_CONFIG);
		au_readl(USB_HOST_CONFIG);
		udelay(1000);
		au_writel(USBH_ENABLE_INIT \| au_readl(USB_HOST_CONFIG),
		USB_HOST_CONFIG);
		au_readl(USB_HOST_CONFIG);
		udelay(1000);

		pr_debug(__FILE__ ": Clock to USB host has been enabled\n");
		}

		static void au1xxx_stop_ehc(struct platform_device *dev)
		{
		pr_debug(__FILE__ ": stopping Au1xxx EHCI USB Controller\n");

		/* Disable mem */
		au_writel(~USBH_DISABLE & au_readl(USB_HOST_CONFIG), USB_HOST_CONFIG);
		udelay(1000);
		/* Disable clock */
		au_writel(~USB_MCFG_EHCCLKEN & au_readl(USB_HOST_CONFIG),
		USB_HOST_CONFIG);
		au_readl(USB_HOST_CONFIG);
		}

		/-------------------------------------------------------------------------/

		/* configure so an HC device and id are always provided */
		/* always called with process context; sleeping is OK */

		/**
		* usb_ehci_au1xxx_probe - initialize Au1xxx-based HCDs
		* Context: !in_interrupt()
		*
		* Allocates basic resources for this USB host controller, and
		* then invokes the start() method for the HCD associated with it
		* through the hotplug entry's driver_data.
		*
		*/
		int usb_ehci_au1xxx_probe(const struct hc_driver *driver,
		struct usb_hcd *hcd_out, struct platform_device dev)
		{
		int retval;
		struct usb_hcd *hcd;
		struct ehci_hcd *ehci;

		#if defined(CONFIG_SOC_AU1200) && defined(CONFIG_DMA_COHERENT)

		/* Au1200 AB USB does not support coherent memory */
		if (!(read_c0_prid() & 0xff)) {
		pr_info("%s: this is chip revision AB!\n", dev->dev.name);
		pr_info("%s: update your board or re-configure the kernel\n",
		dev->dev.name);
		return -ENODEV;
		}
		#endif

		au1xxx_start_ehc(dev);

		if (dev->resource[1].flags != IORESOURCE_IRQ) {
		pr_debug("resource[1] is not IORESOURCE_IRQ");
		retval = -ENOMEM;
		}
		hcd = usb_create_hcd(driver, &dev->dev, "Au1xxx");
		if (!hcd)
		return -ENOMEM;
		hcd->rsrc_start = dev->resource[0].start;
		hcd->rsrc_len = dev->resource[0].end - dev->resource[0].start + 1;

		if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
		pr_debug("request_mem_region failed");
		retval = -EBUSY;
		goto err1;
		}

		hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
		if (!hcd->regs) {
		pr_debug("ioremap failed");
		retval = -ENOMEM;
		goto err2;
		}

		ehci = hcd_to_ehci(hcd);
		ehci->caps = hcd->regs;
		ehci->regs = hcd->regs + HC_LENGTH(readl(&ehci->caps->hc_capbase));
		/* cache this readonly data; minimize chip reads */
		ehci->hcs_params = readl(&ehci->caps->hcs_params);

		/* ehci_hcd_init(hcd_to_ehci(hcd)); */

		retval =
		usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT \| SA_SHIRQ);
		if (retval == 0)
		return retval;

		au1xxx_stop_ehc(dev);
		iounmap(hcd->regs);
		err2:
		release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
		err1:
		usb_put_hcd(hcd);
		return retval;
		}

		/* may be called without controller electrically present */
		/* may be called with controller, bus, and devices active */

		/**
		* usb_ehci_hcd_au1xxx_remove - shutdown processing for Au1xxx-based HCDs
		* @dev: USB Host Controller being removed
		* Context: !in_interrupt()
		*
		* Reverses the effect of usb_ehci_hcd_au1xxx_probe(), first invoking
		* the HCD's stop() method. It is always called from a thread
		* context, normally "rmmod", "apmd", or something similar.
		*
		*/
		void usb_ehci_au1xxx_remove(struct usb_hcd hcd, struct platform_device dev)
		{
		usb_remove_hcd(hcd);
		iounmap(hcd->regs);
		release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
		usb_put_hcd(hcd);
		au1xxx_stop_ehc(dev);
		}

		/-------------------------------------------------------------------------/

		static const struct hc_driver ehci_au1xxx_hc_driver = {
		.description = hcd_name,
		.product_desc = "Au1xxx EHCI",
		.hcd_priv_size = sizeof(struct ehci_hcd),

		/*
		* generic hardware linkage
		*/
		.irq = ehci_irq,
		.flags = HCD_MEMORY \| HCD_USB2,

		/*
		* basic lifecycle operations
		*/
		.reset = ehci_init,
		.start = ehci_run,
		.stop = ehci_stop,

		/*
		* managing i/o requests and associated device resources
		*/
		.urb_enqueue = ehci_urb_enqueue,
		.urb_dequeue = ehci_urb_dequeue,
		.endpoint_disable = ehci_endpoint_disable,

		/*
		* scheduling support
		*/
		.get_frame_number = ehci_get_frame,

		/*
		* root hub support
		*/
		.hub_status_data = ehci_hub_status_data,
		.hub_control = ehci_hub_control,
		#ifdef CONFIG_PM
		.hub_suspend = ehci_hub_suspend,
		.hub_resume = ehci_hub_resume,
		#endif
		};

		/-------------------------------------------------------------------------/

		static int ehci_hcd_au1xxx_drv_probe(struct device *dev)
		{
		struct platform_device *pdev = to_platform_device(dev);
		struct usb_hcd *hcd = NULL;
		int ret;

		pr_debug("In ehci_hcd_au1xxx_drv_probe\n");

		if (usb_disabled())
		return -ENODEV;

		ret = usb_ehci_au1xxx_probe(&ehci_au1xxx_hc_driver, &hcd, pdev);
		return ret;
		}

		static int ehci_hcd_au1xxx_drv_remove(struct device *dev)
		{
		struct platform_device *pdev = to_platform_device(dev);
		struct usb_hcd *hcd = dev_get_drvdata(dev);

		usb_ehci_au1xxx_remove(hcd, pdev);
		return 0;
		}

		/TBD/
		/static int ehci_hcd_au1xxx_drv_suspend(struct device dev)
		{
		struct platform_device *pdev = to_platform_device(dev);
		struct usb_hcd *hcd = dev_get_drvdata(dev);

		return 0;
		}
		static int ehci_hcd_au1xxx_drv_resume(struct device *dev)
		{
		struct platform_device *pdev = to_platform_device(dev);
		struct usb_hcd *hcd = dev_get_drvdata(dev);

		return 0;
		}
		*/
		static struct device_driver ehci_hcd_au1xxx_driver = {
		.name = "au1xxx-ehci",
		.bus = &platform_bus_type,
		.probe = ehci_hcd_au1xxx_drv_probe,
		.remove = ehci_hcd_au1xxx_drv_remove,
		/.suspend = ehci_hcd_au1xxx_drv_suspend, /
		/.resume = ehci_hcd_au1xxx_drv_resume, /
		};

		static int __init ehci_hcd_au1xxx_init(void)
		{
		pr_debug(DRIVER_INFO " (Au1xxx)\n");

		return driver_register(&ehci_hcd_au1xxx_driver);
		}

		static void __exit ehci_hcd_au1xxx_cleanup(void)
		{
		driver_unregister(&ehci_hcd_au1xxx_driver);
		}

		module_init(ehci_hcd_au1xxx_init);
		module_exit(ehci_hcd_au1xxx_cleanup);