1234567891011121314151617181920212223242526272829303132333435363738394041424344 |
- From d5199adc79072f6cd49f8c79bc02769397a3456c Mon Sep 17 00:00:00 2001
- From: P33M <P33M@github.com>
- Date: Fri, 18 Mar 2016 17:38:37 +0000
- Subject: [PATCH 206/381] dwc_otg: Don't free qh align buffers in atomic
- context
- ---
- drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
- --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
- +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
- @@ -56,6 +56,9 @@ void dwc_otg_hcd_qh_free(dwc_otg_hcd_t *
- {
- dwc_otg_qtd_t *qtd, *qtd_tmp;
- dwc_irqflags_t flags;
- + uint32_t buf_size = 0;
- + uint8_t *align_buf_virt = NULL;
- + dwc_dma_t align_buf_dma;
-
- /* Free each QTD in the QTD list */
- DWC_SPINLOCK_IRQSAVE(hcd->lock, &flags);
- @@ -67,17 +70,19 @@ void dwc_otg_hcd_qh_free(dwc_otg_hcd_t *
- if (hcd->core_if->dma_desc_enable) {
- dwc_otg_hcd_qh_free_ddma(hcd, qh);
- } else if (qh->dw_align_buf) {
- - uint32_t buf_size;
- if (qh->ep_type == UE_ISOCHRONOUS) {
- buf_size = 4096;
- } else {
- buf_size = hcd->core_if->core_params->max_transfer_size;
- }
- - DWC_DMA_FREE(buf_size, qh->dw_align_buf, qh->dw_align_buf_dma);
- + align_buf_virt = qh->dw_align_buf;
- + align_buf_dma = qh->dw_align_buf_dma;
- }
-
- DWC_FREE(qh);
- DWC_SPINUNLOCK_IRQRESTORE(hcd->lock, flags);
- + if (align_buf_virt)
- + DWC_DMA_FREE(buf_size, align_buf_virt, align_buf_dma);
- return;
- }
-
|