renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 14:14:01 +08:00
Code

staging: octeon-usb: use generic prefetch

Browse Source 
Use generic prefetch.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aaro Koskinen 2014-05-11 14:15:20 +03:00 committed by Greg Kroah-Hartman
parent a4570140b3
commit 20f6b82992
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/octeon-usb/octeon-hcd.c
View File

@ -47,6 +47,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/prefetch.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/usb.h> #include <linux/usb.h>
@ -245,9 +246,6 @@ enum cvmx_usb_pipe_flags {
__CVMX_USB_PIPE_FLAGS_NEED_PING = 1 << 18, __CVMX_USB_PIPE_FLAGS_NEED_PING = 1 << 18,
}; };
/* Normal prefetch that use the pref instruction. */
#define CVMX_PREFETCH(address, offset) asm volatile ("pref %[type], %[off](%[rbase])" : : [rbase] "d" (address), [off] "I" (offset), [type] "n" (0))
/* Maximum number of times to retry failed transactions */ /* Maximum number of times to retry failed transactions */
#define MAX_RETRIES 3 #define MAX_RETRIES 3
@ -2008,7 +2006,7 @@ static struct cvmx_usb_pipe *__cvmx_usb_find_ready_pipe(
((((int)current_frame - (int)pipe->split_sc_frame) ((((int)current_frame - (int)pipe->split_sc_frame)
& 0x7f) < 0x40)) && & 0x7f) < 0x40)) &&
(!usb->active_split || (usb->active_split == t))) { (!usb->active_split || (usb->active_split == t))) {
CVMX_PREFETCH(t, 0); prefetch(t);
return pipe; return pipe;
} }
} }
@ -2658,13 +2656,13 @@ static int __cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel)
/* Make sure this channel is tied to a valid pipe */ /* Make sure this channel is tied to a valid pipe */
pipe = usb->pipe_for_channel[channel]; pipe = usb->pipe_for_channel[channel];
CVMX_PREFETCH(pipe, 0); prefetch(pipe);
if (!pipe) if (!pipe)
return 0; return 0;
transaction = list_first_entry(&pipe->transactions, transaction = list_first_entry(&pipe->transactions,
typeof(*transaction), typeof(*transaction),
node); node);
CVMX_PREFETCH(transaction, 0); prefetch(transaction);
/* /*
* Disconnect this pipe from the HW channel. Later the schedule * Disconnect this pipe from the HW channel. Later the schedule
@ -3121,11 +3119,7 @@ static int cvmx_usb_poll(struct cvmx_usb_state *usb)
union cvmx_usbcx_hfnum usbc_hfnum; union cvmx_usbcx_hfnum usbc_hfnum;
union cvmx_usbcx_gintsts usbc_gintsts; union cvmx_usbcx_gintsts usbc_gintsts;
CVMX_PREFETCH(usb, 0); prefetch_range(usb, sizeof(*usb));
CVMX_PREFETCH(usb, 1*128);
CVMX_PREFETCH(usb, 2*128);
CVMX_PREFETCH(usb, 3*128);
CVMX_PREFETCH(usb, 4*128);
/* Update the frame counter */ /* Update the frame counter */
usbc_hfnum.u32 = __cvmx_usb_read_csr32(usb, CVMX_USBCX_HFNUM(usb->index)); usbc_hfnum.u32 = __cvmx_usb_read_csr32(usb, CVMX_USBCX_HFNUM(usb->index));