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

xHCI: refine td allocation

Browse Source 
In xhci_urb_enqueue(), allocate a block of memory for all the TDs instead
of allocating memory for each of them separately. This reduces the number
of kzalloc calling when an isochronous usb is submitted.

Signed-off-by: Andiry Xu <andiry.xu@amd.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Andiry Xu 2011-09-02 11:05:57 -07:00 committed by Greg Kroah-Hartman
parent fd984d242a
commit 2ffdea25f0
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/usb/host/xhci-mem.c
View File

@ -1666,19 +1666,11 @@ struct xhci_command *xhci_alloc_command(struct xhci_hcd *xhci,
void xhci_urb_free_priv(struct xhci_hcd *xhci, struct urb_priv *urb_priv) void xhci_urb_free_priv(struct xhci_hcd *xhci, struct urb_priv *urb_priv)
{ {
int last; if (urb_priv) {
kfree(urb_priv->td[0]);
if (!urb_priv)
return;
last = urb_priv->length - 1;
if (last >= 0) {
int i;
for (i = 0; i <= last; i++)
kfree(urb_priv->td[i]);
}
kfree(urb_priv); kfree(urb_priv);
} }
}
void xhci_free_command(struct xhci_hcd *xhci, void xhci_free_command(struct xhci_hcd *xhci,
struct xhci_command *command) struct xhci_command *command)

13
drivers/usb/host/xhci.c
View File

@ -1035,6 +1035,7 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id,
int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags) int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags)
{ {
struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct xhci_hcd *xhci = hcd_to_xhci(hcd);
struct xhci_td *buffer;
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
unsigned int slot_id, ep_index; unsigned int slot_id, ep_index;
@ -1065,13 +1066,15 @@ int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags)
if (!urb_priv) if (!urb_priv)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < size; i++) { buffer = kzalloc(size * sizeof(struct xhci_td), mem_flags);
urb_priv->td[i] = kzalloc(sizeof(struct xhci_td), mem_flags); if (!buffer) {
if (!urb_priv->td[i]) { kfree(urb_priv);
urb_priv->length = i;
xhci_urb_free_priv(xhci, urb_priv);
return -ENOMEM; return -ENOMEM;
} }
for (i = 0; i < size; i++) {
urb_priv->td[i] = buffer;
buffer++;
} }
urb_priv->length = size; urb_priv->length = size;