diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-19 09:15:18 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-06-20 13:48:43 +0200 |
| commit | 474db39934658d351f35a7678ccaf5cc9dfdf909 (patch) | |
| tree | d2f4d82a5d22b9f78c9bd5180d1d9760f15f8b02 | |
| parent | 22666b55d7f1bb22b61229618f740c4a02a08ae3 (diff) | |
| download | barebox-for-next/dma_alloc.tar.gz barebox-for-next/dma_alloc.tar.xz | |
USB gadget: Fix dma memory allocationsfor-next/dma_alloc
This is another variant of:
USB gadget fsl: request cacheline aligned buffer
The fsl udc driver allocates a buffer for small requests. The
driver then calls dma_inv_range later on it. This buffer happens
to be not cacheline aligned which means that a dma_inv_range can
corrupt other memory around the buffer.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
[mkl: use dma_alloc]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | drivers/usb/gadget/composite.c | 5 | ||||
| -rw-r--r-- | drivers/usb/gadget/dfu.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index fd70e623a..44e58d7de 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -22,6 +22,7 @@ #include <common.h> #include <errno.h> +#include <dma.h> #include <usb/composite.h> #include <asm/byteorder.h> @@ -867,7 +868,7 @@ composite_unbind(struct usb_gadget *gadget) composite->unbind(cdev); if (cdev->req) { - kfree(cdev->req->buf); + dma_free(cdev->req->buf); usb_ep_free_request(gadget->ep0, cdev->req); } kfree(cdev); @@ -911,7 +912,7 @@ static int __init composite_bind(struct usb_gadget *gadget) cdev->req = usb_ep_alloc_request(gadget->ep0); if (!cdev->req) goto fail; - cdev->req->buf = malloc(USB_BUFSIZ); + cdev->req->buf = dma_alloc(USB_BUFSIZ); if (!cdev->req->buf) goto fail; cdev->req->complete = composite_setup_complete; diff --git a/drivers/usb/gadget/dfu.c b/drivers/usb/gadget/dfu.c index f26c1e43d..e205c65f3 100644 --- a/drivers/usb/gadget/dfu.c +++ b/drivers/usb/gadget/dfu.c @@ -40,6 +40,7 @@ * - make 'dnstate' attached to 'struct usb_device_instance' */ +#include <dma.h> #include <asm/byteorder.h> #include <usb/composite.h> #include <linux/types.h> @@ -183,7 +184,7 @@ dfu_unbind(struct usb_configuration *c, struct usb_function *f) if (gadget_is_dualspeed(c->cdev->gadget)) free(f->hs_descriptors); - free(dfu->dnreq->buf); + dma_free(dfu->dnreq->buf); usb_ep_free_request(c->cdev->gadget->ep0, dfu->dnreq); free(dfu); } @@ -602,7 +603,7 @@ static int dfu_bind_config(struct usb_configuration *c) dfu->dnreq = usb_ep_alloc_request(c->cdev->gadget->ep0); if (!dfu->dnreq) printf("usb_ep_alloc_request failed\n"); - dfu->dnreq->buf = xmalloc(CONFIG_USBD_DFU_XFER_SIZE); + dfu->dnreq->buf = dma_alloc(CONFIG_USBD_DFU_XFER_SIZE); dfu->dnreq->complete = dn_complete; dfu->dnreq->zero = 0; |