iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: dwc3: use bus->sysdev for DMA configuration

Browse Source 
The dma ops for dwc3 devices are not set properly. So, use a
physical device sysdev, which will be inherited from parent,
to set the hardware / firmware parameters like dma.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sriram Dash <sriram.dash@nxp.com>
Tested-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Arnd Bergmann 2016-11-17 17:13:47 +05:30 committed by Felipe Balbi
parent 1c404b51a0
commit d64ff406e5
6 changed files with 54 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/usb/dwc3/core.c
View File

@ -202,7 +202,7 @@ static void dwc3_frame_length_adjustment(struct dwc3 *dwc)
static void dwc3_free_one_event_buffer(struct dwc3 *dwc, static void dwc3_free_one_event_buffer(struct dwc3 *dwc,
struct dwc3_event_buffer *evt) struct dwc3_event_buffer *evt)
{ {
dma_free_coherent(dwc->dev, evt->length, evt->buf, evt->dma); dma_free_coherent(dwc->sysdev, evt->length, evt->buf, evt->dma);
} }
/** /**
@ -228,7 +228,7 @@ static struct dwc3_event_buffer *dwc3_alloc_one_event_buffer(struct dwc3 *dwc,
if (!evt->cache) if (!evt->cache)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
evt->buf = dma_alloc_coherent(dwc->dev, length, evt->buf = dma_alloc_coherent(dwc->sysdev, length,
&evt->dma, GFP_KERNEL); &evt->dma, GFP_KERNEL);
if (!evt->buf) if (!evt->buf)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
@ -341,11 +341,11 @@ static int dwc3_setup_scratch_buffers(struct dwc3 *dwc)
if (!WARN_ON(dwc->scratchbuf)) if (!WARN_ON(dwc->scratchbuf))
return 0; return 0;
scratch_addr = dma_map_single(dwc->dev, dwc->scratchbuf, scratch_addr = dma_map_single(dwc->sysdev, dwc->scratchbuf,
dwc->nr_scratch * DWC3_SCRATCHBUF_SIZE, dwc->nr_scratch * DWC3_SCRATCHBUF_SIZE,
DMA_BIDIRECTIONAL); DMA_BIDIRECTIONAL);
if (dma_mapping_error(dwc->dev, scratch_addr)) { if (dma_mapping_error(dwc->sysdev, scratch_addr)) {
dev_err(dwc->dev, "failed to map scratch buffer\n"); dev_err(dwc->sysdev, "failed to map scratch buffer\n");
ret = -EFAULT; ret = -EFAULT;
goto err0; goto err0;
} }
@ -369,7 +369,7 @@ static int dwc3_setup_scratch_buffers(struct dwc3 *dwc)
return 0; return 0;
err1: err1:
dma_unmap_single(dwc->dev, dwc->scratch_addr, dwc->nr_scratch * dma_unmap_single(dwc->sysdev, dwc->scratch_addr, dwc->nr_scratch *
DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL); DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL);
err0: err0:
@ -388,7 +388,7 @@ static void dwc3_free_scratch_buffers(struct dwc3 *dwc)
if (!WARN_ON(dwc->scratchbuf)) if (!WARN_ON(dwc->scratchbuf))
return; return;
dma_unmap_single(dwc->dev, dwc->scratch_addr, dwc->nr_scratch * dma_unmap_single(dwc->sysdev, dwc->scratch_addr, dwc->nr_scratch *
DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL); DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL);
kfree(dwc->scratchbuf); kfree(dwc->scratchbuf);
} }
@ -927,6 +927,13 @@ static void dwc3_get_properties(struct dwc3 *dwc)
dwc->dr_mode = usb_get_dr_mode(dev); dwc->dr_mode = usb_get_dr_mode(dev);
dwc->hsphy_mode = of_usb_get_phy_mode(dev->of_node); dwc->hsphy_mode = of_usb_get_phy_mode(dev->of_node);
dwc->sysdev_is_parent = device_property_read_bool(dev,
"linux,sysdev_is_parent");
if (dwc->sysdev_is_parent)
dwc->sysdev = dwc->dev->parent;
else
dwc->sysdev = dwc->dev;
dwc->has_lpm_erratum = device_property_read_bool(dev, dwc->has_lpm_erratum = device_property_read_bool(dev,
"snps,has-lpm-erratum"); "snps,has-lpm-erratum");
device_property_read_u8(dev, "snps,lpm-nyet-threshold", device_property_read_u8(dev, "snps,lpm-nyet-threshold",
@ -1097,12 +1104,6 @@ static int dwc3_probe(struct platform_device *pdev)
spin_lock_init(&dwc->lock); spin_lock_init(&dwc->lock);
if (!dev->dma_mask) {
dev->dma_mask = dev->parent->dma_mask;
dev->dma_parms = dev->parent->dma_parms;
dma_set_coherent_mask(dev, dev->parent->coherent_dma_mask);
}
pm_runtime_set_active(dev); pm_runtime_set_active(dev);
pm_runtime_use_autosuspend(dev); pm_runtime_use_autosuspend(dev);
pm_runtime_set_autosuspend_delay(dev, DWC3_DEFAULT_AUTOSUSPEND_DELAY); pm_runtime_set_autosuspend_delay(dev, DWC3_DEFAULT_AUTOSUSPEND_DELAY);

3
drivers/usb/dwc3/core.h
View File

@ -819,6 +819,7 @@ struct dwc3_scratchpad_array {
* @ep0_bounced: true when we used bounce buffer * @ep0_bounced: true when we used bounce buffer
* @ep0_expect_in: true when we expect a DATA IN transfer * @ep0_expect_in: true when we expect a DATA IN transfer
* @has_hibernation: true when dwc3 was configured with Hibernation * @has_hibernation: true when dwc3 was configured with Hibernation
* @sysdev_is_parent: true when dwc3 device has a parent driver
* @has_lpm_erratum: true when core was configured with LPM Erratum. Note that * @has_lpm_erratum: true when core was configured with LPM Erratum. Note that
* there's now way for software to detect this in runtime. * there's now way for software to detect this in runtime.
* @is_utmi_l1_suspend: the core asserts output signal * @is_utmi_l1_suspend: the core asserts output signal
@ -875,6 +876,7 @@ struct dwc3 {
spinlock_t lock; spinlock_t lock;
struct device *dev; struct device *dev;
struct device *sysdev;
struct platform_device *xhci; struct platform_device *xhci;
struct resource xhci_resources[DWC3_XHCI_RESOURCES_NUM]; struct resource xhci_resources[DWC3_XHCI_RESOURCES_NUM];
@ -976,6 +978,7 @@ struct dwc3 {
unsigned ep0_bounced:1; unsigned ep0_bounced:1;
unsigned ep0_expect_in:1; unsigned ep0_expect_in:1;
unsigned has_hibernation:1; unsigned has_hibernation:1;
unsigned sysdev_is_parent:1;
unsigned has_lpm_erratum:1; unsigned has_lpm_erratum:1;
unsigned is_utmi_l1_suspend:1; unsigned is_utmi_l1_suspend:1;
unsigned is_fpga:1; unsigned is_fpga:1;

10
drivers/usb/dwc3/dwc3-pci.c
View File

@ -73,6 +73,16 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc)
{ {
struct platform_device *dwc3 = dwc->dwc3; struct platform_device *dwc3 = dwc->dwc3;
struct pci_dev *pdev = dwc->pci; struct pci_dev *pdev = dwc->pci;
int ret;
struct property_entry sysdev_property[] = {
PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
{ },
};
ret = platform_device_add_properties(dwc3, sysdev_property);
if (ret)
return ret;
if (pdev->vendor == PCI_VENDOR_ID_AMD && if (pdev->vendor == PCI_VENDOR_ID_AMD &&
pdev->device == PCI_DEVICE_ID_AMD_NL_USB) { pdev->device == PCI_DEVICE_ID_AMD_NL_USB) {

8
drivers/usb/dwc3/ep0.c
View File

@ -1001,8 +1001,8 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
u32 transfer_size = 0; u32 transfer_size = 0;
u32 maxpacket; u32 maxpacket;
ret = usb_gadget_map_request(&dwc->gadget, &req->request, ret = usb_gadget_map_request_by_dev(dwc->sysdev,
dep->number); &req->request, dep->number);
if (ret) if (ret)
return; return;
@ -1027,8 +1027,8 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
dwc->ep0_bounce_addr, transfer_size, dwc->ep0_bounce_addr, transfer_size,
DWC3_TRBCTL_CONTROL_DATA, false); DWC3_TRBCTL_CONTROL_DATA, false);
} else { } else {
ret = usb_gadget_map_request(&dwc->gadget, &req->request, ret = usb_gadget_map_request_by_dev(dwc->sysdev,
dep->number); &req->request, dep->number);
if (ret) if (ret)
return; return;

33
drivers/usb/dwc3/gadget.c
View File

@ -183,8 +183,8 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
if (dwc->ep0_bounced && dep->number == 0) if (dwc->ep0_bounced && dep->number == 0)
dwc->ep0_bounced = false; dwc->ep0_bounced = false;
else else
usb_gadget_unmap_request(&dwc->gadget, &req->request, usb_gadget_unmap_request_by_dev(dwc->sysdev,
req->direction); &req->request, req->direction);
trace_dwc3_gadget_giveback(req); trace_dwc3_gadget_giveback(req);
@ -399,7 +399,7 @@ static int dwc3_alloc_trb_pool(struct dwc3_ep *dep)
if (dep->trb_pool) if (dep->trb_pool)
return 0; return 0;
dep->trb_pool = dma_alloc_coherent(dwc->dev, dep->trb_pool = dma_alloc_coherent(dwc->sysdev,
sizeof(struct dwc3_trb) * DWC3_TRB_NUM, sizeof(struct dwc3_trb) * DWC3_TRB_NUM,
&dep->trb_pool_dma, GFP_KERNEL); &dep->trb_pool_dma, GFP_KERNEL);
if (!dep->trb_pool) { if (!dep->trb_pool) {
@ -415,7 +415,7 @@ static void dwc3_free_trb_pool(struct dwc3_ep *dep)
{ {
struct dwc3 *dwc = dep->dwc; struct dwc3 *dwc = dep->dwc;
dma_free_coherent(dwc->dev, sizeof(struct dwc3_trb) * DWC3_TRB_NUM, dma_free_coherent(dwc->sysdev, sizeof(struct dwc3_trb) * DWC3_TRB_NUM,
dep->trb_pool, dep->trb_pool_dma); dep->trb_pool, dep->trb_pool_dma);
dep->trb_pool = NULL; dep->trb_pool = NULL;
@ -1171,8 +1171,8 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
trace_dwc3_ep_queue(req); trace_dwc3_ep_queue(req);
ret = usb_gadget_map_request(&dwc->gadget, &req->request, ret = usb_gadget_map_request_by_dev(dwc->sysdev, &req->request,
dep->direction); dep->direction);
if (ret) if (ret)
return ret; return ret;
@ -2977,7 +2977,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
dwc->irq_gadget = irq; dwc->irq_gadget = irq;
dwc->ctrl_req = dma_alloc_coherent(dwc->dev, sizeof(*dwc->ctrl_req), dwc->ctrl_req = dma_alloc_coherent(dwc->sysdev, sizeof(*dwc->ctrl_req),
&dwc->ctrl_req_addr, GFP_KERNEL); &dwc->ctrl_req_addr, GFP_KERNEL);
if (!dwc->ctrl_req) { if (!dwc->ctrl_req) {
dev_err(dwc->dev, "failed to allocate ctrl request\n"); dev_err(dwc->dev, "failed to allocate ctrl request\n");
@ -2985,8 +2985,9 @@ int dwc3_gadget_init(struct dwc3 *dwc)
goto err0; goto err0;
} }
dwc->ep0_trb = dma_alloc_coherent(dwc->dev, sizeof(*dwc->ep0_trb) * 2, dwc->ep0_trb = dma_alloc_coherent(dwc->sysdev,
&dwc->ep0_trb_addr, GFP_KERNEL); sizeof(*dwc->ep0_trb) * 2,
&dwc->ep0_trb_addr, GFP_KERNEL);
if (!dwc->ep0_trb) { if (!dwc->ep0_trb) {
dev_err(dwc->dev, "failed to allocate ep0 trb\n"); dev_err(dwc->dev, "failed to allocate ep0 trb\n");
ret = -ENOMEM; ret = -ENOMEM;
@ -2999,7 +3000,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
goto err2; goto err2;
} }
dwc->ep0_bounce = dma_alloc_coherent(dwc->dev, dwc->ep0_bounce = dma_alloc_coherent(dwc->sysdev,
DWC3_EP0_BOUNCE_SIZE, &dwc->ep0_bounce_addr, DWC3_EP0_BOUNCE_SIZE, &dwc->ep0_bounce_addr,
GFP_KERNEL); GFP_KERNEL);
if (!dwc->ep0_bounce) { if (!dwc->ep0_bounce) {
@ -3072,18 +3073,18 @@ err5:
err4: err4:
dwc3_gadget_free_endpoints(dwc); dwc3_gadget_free_endpoints(dwc);
dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE, dma_free_coherent(dwc->sysdev, DWC3_EP0_BOUNCE_SIZE,
dwc->ep0_bounce, dwc->ep0_bounce_addr); dwc->ep0_bounce, dwc->ep0_bounce_addr);
err3: err3:
kfree(dwc->setup_buf); kfree(dwc->setup_buf);
err2: err2:
dma_free_coherent(dwc->dev, sizeof(*dwc->ep0_trb) * 2, dma_free_coherent(dwc->sysdev, sizeof(*dwc->ep0_trb) * 2,
dwc->ep0_trb, dwc->ep0_trb_addr); dwc->ep0_trb, dwc->ep0_trb_addr);
err1: err1:
dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req), dma_free_coherent(dwc->sysdev, sizeof(*dwc->ctrl_req),
dwc->ctrl_req, dwc->ctrl_req_addr); dwc->ctrl_req, dwc->ctrl_req_addr);
err0: err0:
@ -3098,16 +3099,16 @@ void dwc3_gadget_exit(struct dwc3 *dwc)
dwc3_gadget_free_endpoints(dwc); dwc3_gadget_free_endpoints(dwc);
dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE, dma_free_coherent(dwc->sysdev, DWC3_EP0_BOUNCE_SIZE,
dwc->ep0_bounce, dwc->ep0_bounce_addr); dwc->ep0_bounce, dwc->ep0_bounce_addr);
kfree(dwc->setup_buf); kfree(dwc->setup_buf);
kfree(dwc->zlp_buf); kfree(dwc->zlp_buf);
dma_free_coherent(dwc->dev, sizeof(*dwc->ep0_trb) * 2, dma_free_coherent(dwc->sysdev, sizeof(*dwc->ep0_trb) * 2,
dwc->ep0_trb, dwc->ep0_trb_addr); dwc->ep0_trb, dwc->ep0_trb_addr);
dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req), dma_free_coherent(dwc->sysdev, sizeof(*dwc->ctrl_req),
dwc->ctrl_req, dwc->ctrl_req_addr); dwc->ctrl_req, dwc->ctrl_req_addr);
} }

16
drivers/usb/dwc3/host.c
View File

@ -84,11 +84,7 @@ int dwc3_host_init(struct dwc3 *dwc)
return -ENOMEM; return -ENOMEM;
} }
dma_set_coherent_mask(&xhci->dev, dwc->dev->coherent_dma_mask);
xhci->dev.parent = dwc->dev; xhci->dev.parent = dwc->dev;
xhci->dev.dma_mask = dwc->dev->dma_mask;
xhci->dev.dma_parms = dwc->dev->dma_parms;
dwc->xhci = xhci; dwc->xhci = xhci;
@ -111,9 +107,9 @@ int dwc3_host_init(struct dwc3 *dwc)
} }
phy_create_lookup(dwc->usb2_generic_phy, "usb2-phy", phy_create_lookup(dwc->usb2_generic_phy, "usb2-phy",
dev_name(&xhci->dev)); dev_name(dwc->dev));
phy_create_lookup(dwc->usb3_generic_phy, "usb3-phy", phy_create_lookup(dwc->usb3_generic_phy, "usb3-phy",
dev_name(&xhci->dev)); dev_name(dwc->dev));
ret = platform_device_add(xhci); ret = platform_device_add(xhci);
if (ret) { if (ret) {
@ -124,9 +120,9 @@ int dwc3_host_init(struct dwc3 *dwc)
return 0; return 0;
err2: err2:
phy_remove_lookup(dwc->usb2_generic_phy, "usb2-phy", phy_remove_lookup(dwc->usb2_generic_phy, "usb2-phy",
dev_name(&xhci->dev)); dev_name(dwc->dev));
phy_remove_lookup(dwc->usb3_generic_phy, "usb3-phy", phy_remove_lookup(dwc->usb3_generic_phy, "usb3-phy",
dev_name(&xhci->dev)); dev_name(dwc->dev));
err1: err1:
platform_device_put(xhci); platform_device_put(xhci);
return ret; return ret;
@ -135,8 +131,8 @@ err1:
void dwc3_host_exit(struct dwc3 *dwc) void dwc3_host_exit(struct dwc3 *dwc)
{ {
phy_remove_lookup(dwc->usb2_generic_phy, "usb2-phy", phy_remove_lookup(dwc->usb2_generic_phy, "usb2-phy",
dev_name(&dwc->xhci->dev)); dev_name(dwc->dev));
phy_remove_lookup(dwc->usb3_generic_phy, "usb3-phy", phy_remove_lookup(dwc->usb3_generic_phy, "usb3-phy",
dev_name(&dwc->xhci->dev)); dev_name(dwc->dev));
platform_device_unregister(dwc->xhci); platform_device_unregister(dwc->xhci);
} }