mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-16 22:10:24 +00:00
5845c13a70
Hi Greg, This is the first of three steps to fix your usb-linus and usb-next trees. As I mentioned, commit4fae6f0fa8
"USB: handle LPM errors during device suspend correctly" was incorrectly added to usb-next when it should have been added to usb-linus and marked for stable. Two port power off bug fixes touch the same code that patch touches, but it's not easy to simply move commit4fae6f0f
patch to usb-linus because commit28e861658e
"USB: refactor code for enabling/disabling remote wakeup" also touched those code sections. I propose a two step process to fix this: 1. Pull these four patches into usb-linus. 2. Revert commit28e861658e
from usb-next. Merge usb-linus into usb-next, and resolve the conflicts. I will be sending pull requests for these steps. This pull request is step one, and contains the backported version of commit4fae6f0fa8
, the two port power off fixes, and an unrelated xhci-plat bug fix. Sarah Sharp -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJSDXUgAAoJEBMGWMLi1Gc5KrcP/jVYFI7CRS9sRWaBxtMdAbi7 Ve0q7479ZmPA9o+SwGKVzO8cM8XJ6mb6CmNww6rByxneUFKvcnq0dwWBc31mZltP +zYzgOKk0GwAYZ644QvpcZfh8lh/ex52qdPb+RKZIfcsmKJzPJwHJSaYUh+LJrTC NxW4NqWYSMbroh3X0nsvM4bw/vEP2D8BhMjXrBDcDDC9gkj+YGE3eIeW08Hq47x1 Hil6rA0/BERWvKP5SJdgWdRld6z5NzrOMdOea9LJtHTzrhi9Gyvc2hul4cvKfj4P VMUslkxw2x13oqeY0xp/uCZkIMYGmvHf50BOGjIoRW8JARe92Vh3mb6xE+ywu4LQ pHWDDH+ANUtrtNEF1/3xu+8mYNgg5prdhKRztkUlzJ/FTvNPjbYAN+t4p0s3O8bh VRo6iH9G0pydjVpo1YERX1S69noyUHsguXkrZnMPVMfMC7reOAb5mev56hcSjh9Y S24RYVHYhJNz9A4L8Y7yDu7Z1MorcIvviTI0xa0AS7n2r40vnEQJtQyP2GbK7KZH iHIUNh2E6GHyCsvDBMuYgIELJM0OswCiF+SKtMiGgwlbOcVvXMXcgNdCSuMJhuo9 PjNT9bs6RsgSEqYemYruFkhomhPBJHPwTr8dy4YsThx2GOTm0AsZ0FCbVmNPqOvI 1NYgwzvX3fr94iNt3xdg =0/wL -----END PGP SIGNATURE----- Merge tag 'for-usb-2013-08-15-step-1' into for-usb-next xhci: Step 1 to fix usb-linus and usb-next. Hi Greg, This is the first of three steps to fix your usb-linus and usb-next trees. As I mentioned, commit4fae6f0fa8
"USB: handle LPM errors during device suspend correctly" was incorrectly added to usb-next when it should have been added to usb-linus and marked for stable. Two port power off bug fixes touch the same code that patch touches, but it's not easy to simply move commit4fae6f0f
patch to usb-linus because commit28e861658e
"USB: refactor code for enabling/disabling remote wakeup" also touched those code sections. I propose a two step process to fix this: 1. Pull these four patches into usb-linus. 2. Revert commit28e861658e
from usb-next. Merge usb-linus into usb-next, and resolve the conflicts. I will be sending pull requests for these steps. This pull request is step one, and contains the backported version of commit4fae6f0fa8
, the two port power off fixes, and an unrelated xhci-plat bug fix. Sarah Sharp Resolved conflicts: drivers/usb/core/hub.c
253 lines
5.8 KiB
C
253 lines
5.8 KiB
C
/*
|
|
* xhci-plat.c - xHCI host controller driver platform Bus Glue.
|
|
*
|
|
* Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
|
|
* Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
*
|
|
* A lot of code borrowed from the Linux xHCI driver.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* version 2 as published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/platform_device.h>
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/of.h>
|
|
#include <linux/dma-mapping.h>
|
|
|
|
#include "xhci.h"
|
|
|
|
static void xhci_plat_quirks(struct device *dev, struct xhci_hcd *xhci)
|
|
{
|
|
/*
|
|
* As of now platform drivers don't provide MSI support so we ensure
|
|
* here that the generic code does not try to make a pci_dev from our
|
|
* dev struct in order to setup MSI
|
|
*/
|
|
xhci->quirks |= XHCI_PLAT;
|
|
}
|
|
|
|
/* called during probe() after chip reset completes */
|
|
static int xhci_plat_setup(struct usb_hcd *hcd)
|
|
{
|
|
return xhci_gen_setup(hcd, xhci_plat_quirks);
|
|
}
|
|
|
|
static const struct hc_driver xhci_plat_xhci_driver = {
|
|
.description = "xhci-hcd",
|
|
.product_desc = "xHCI Host Controller",
|
|
.hcd_priv_size = sizeof(struct xhci_hcd *),
|
|
|
|
/*
|
|
* generic hardware linkage
|
|
*/
|
|
.irq = xhci_irq,
|
|
.flags = HCD_MEMORY | HCD_USB3 | HCD_SHARED,
|
|
|
|
/*
|
|
* basic lifecycle operations
|
|
*/
|
|
.reset = xhci_plat_setup,
|
|
.start = xhci_run,
|
|
.stop = xhci_stop,
|
|
.shutdown = xhci_shutdown,
|
|
|
|
/*
|
|
* managing i/o requests and associated device resources
|
|
*/
|
|
.urb_enqueue = xhci_urb_enqueue,
|
|
.urb_dequeue = xhci_urb_dequeue,
|
|
.alloc_dev = xhci_alloc_dev,
|
|
.free_dev = xhci_free_dev,
|
|
.alloc_streams = xhci_alloc_streams,
|
|
.free_streams = xhci_free_streams,
|
|
.add_endpoint = xhci_add_endpoint,
|
|
.drop_endpoint = xhci_drop_endpoint,
|
|
.endpoint_reset = xhci_endpoint_reset,
|
|
.check_bandwidth = xhci_check_bandwidth,
|
|
.reset_bandwidth = xhci_reset_bandwidth,
|
|
.address_device = xhci_address_device,
|
|
.update_hub_device = xhci_update_hub_device,
|
|
.reset_device = xhci_discover_or_reset_device,
|
|
|
|
/*
|
|
* scheduling support
|
|
*/
|
|
.get_frame_number = xhci_get_frame,
|
|
|
|
/* Root hub support */
|
|
.hub_control = xhci_hub_control,
|
|
.hub_status_data = xhci_hub_status_data,
|
|
.bus_suspend = xhci_bus_suspend,
|
|
.bus_resume = xhci_bus_resume,
|
|
};
|
|
|
|
static int xhci_plat_probe(struct platform_device *pdev)
|
|
{
|
|
const struct hc_driver *driver;
|
|
struct xhci_hcd *xhci;
|
|
struct resource *res;
|
|
struct usb_hcd *hcd;
|
|
int ret;
|
|
int irq;
|
|
|
|
if (usb_disabled())
|
|
return -ENODEV;
|
|
|
|
driver = &xhci_plat_xhci_driver;
|
|
|
|
irq = platform_get_irq(pdev, 0);
|
|
if (irq < 0)
|
|
return -ENODEV;
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (!res)
|
|
return -ENODEV;
|
|
|
|
/* Initialize dma_mask and coherent_dma_mask to 32-bits */
|
|
ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
|
|
if (ret)
|
|
return ret;
|
|
if (!pdev->dev.dma_mask)
|
|
pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
|
|
else
|
|
dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
|
|
|
|
hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
|
|
if (!hcd)
|
|
return -ENOMEM;
|
|
|
|
hcd->rsrc_start = res->start;
|
|
hcd->rsrc_len = resource_size(res);
|
|
|
|
if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
|
|
driver->description)) {
|
|
dev_dbg(&pdev->dev, "controller already in use\n");
|
|
ret = -EBUSY;
|
|
goto put_hcd;
|
|
}
|
|
|
|
hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
|
|
if (!hcd->regs) {
|
|
dev_dbg(&pdev->dev, "error mapping memory\n");
|
|
ret = -EFAULT;
|
|
goto release_mem_region;
|
|
}
|
|
|
|
ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
|
|
if (ret)
|
|
goto unmap_registers;
|
|
|
|
/* USB 2.0 roothub is stored in the platform_device now. */
|
|
hcd = platform_get_drvdata(pdev);
|
|
xhci = hcd_to_xhci(hcd);
|
|
xhci->shared_hcd = usb_create_shared_hcd(driver, &pdev->dev,
|
|
dev_name(&pdev->dev), hcd);
|
|
if (!xhci->shared_hcd) {
|
|
ret = -ENOMEM;
|
|
goto dealloc_usb2_hcd;
|
|
}
|
|
|
|
/*
|
|
* Set the xHCI pointer before xhci_plat_setup() (aka hcd_driver.reset)
|
|
* is called by usb_add_hcd().
|
|
*/
|
|
*((struct xhci_hcd **) xhci->shared_hcd->hcd_priv) = xhci;
|
|
|
|
ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED);
|
|
if (ret)
|
|
goto put_usb3_hcd;
|
|
|
|
return 0;
|
|
|
|
put_usb3_hcd:
|
|
usb_put_hcd(xhci->shared_hcd);
|
|
|
|
dealloc_usb2_hcd:
|
|
usb_remove_hcd(hcd);
|
|
|
|
unmap_registers:
|
|
iounmap(hcd->regs);
|
|
|
|
release_mem_region:
|
|
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
|
|
|
|
put_hcd:
|
|
usb_put_hcd(hcd);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int xhci_plat_remove(struct platform_device *dev)
|
|
{
|
|
struct usb_hcd *hcd = platform_get_drvdata(dev);
|
|
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
|
|
|
|
usb_remove_hcd(xhci->shared_hcd);
|
|
usb_put_hcd(xhci->shared_hcd);
|
|
|
|
usb_remove_hcd(hcd);
|
|
iounmap(hcd->regs);
|
|
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
|
|
usb_put_hcd(hcd);
|
|
kfree(xhci);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_PM
|
|
static int xhci_plat_suspend(struct device *dev)
|
|
{
|
|
struct usb_hcd *hcd = dev_get_drvdata(dev);
|
|
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
|
|
|
|
return xhci_suspend(xhci);
|
|
}
|
|
|
|
static int xhci_plat_resume(struct device *dev)
|
|
{
|
|
struct usb_hcd *hcd = dev_get_drvdata(dev);
|
|
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
|
|
|
|
return xhci_resume(xhci, 0);
|
|
}
|
|
|
|
static const struct dev_pm_ops xhci_plat_pm_ops = {
|
|
SET_SYSTEM_SLEEP_PM_OPS(xhci_plat_suspend, xhci_plat_resume)
|
|
};
|
|
#define DEV_PM_OPS (&xhci_plat_pm_ops)
|
|
#else
|
|
#define DEV_PM_OPS NULL
|
|
#endif /* CONFIG_PM */
|
|
|
|
#ifdef CONFIG_OF
|
|
static const struct of_device_id usb_xhci_of_match[] = {
|
|
{ .compatible = "xhci-platform" },
|
|
{ },
|
|
};
|
|
MODULE_DEVICE_TABLE(of, usb_xhci_of_match);
|
|
#endif
|
|
|
|
static struct platform_driver usb_xhci_driver = {
|
|
.probe = xhci_plat_probe,
|
|
.remove = xhci_plat_remove,
|
|
.driver = {
|
|
.name = "xhci-hcd",
|
|
.pm = DEV_PM_OPS,
|
|
.of_match_table = of_match_ptr(usb_xhci_of_match),
|
|
},
|
|
};
|
|
MODULE_ALIAS("platform:xhci-hcd");
|
|
|
|
int xhci_register_plat(void)
|
|
{
|
|
return platform_driver_register(&usb_xhci_driver);
|
|
}
|
|
|
|
void xhci_unregister_plat(void)
|
|
{
|
|
platform_driver_unregister(&usb_xhci_driver);
|
|
}
|