Skip to content

Commit

Permalink
sh: generic_in/outs{bwl} optimizations.
Browse files Browse the repository at this point in the history
After performing the port2addr conversion, and checking that the data is
correctly aligned, simply call __raw_readsX/writesX. These have already been
optimised.

Signed-off-by: Stuart Menefy <stuart.menefy@st.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Stuart Menefy authored and Paul Mundt committed Aug 24, 2009
1 parent 7d9c035 commit 8af57f8
Showing 1 changed file with 8 additions and 42 deletions.
50 changes: 8 additions & 42 deletions arch/sh/kernel/io_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,35 +73,19 @@ u32 generic_inl_p(unsigned long port)

void generic_insb(unsigned long port, void *dst, unsigned long count)
{
volatile u8 *port_addr;
u8 *buf = dst;

port_addr = (volatile u8 __force *)__ioport_map(port, 1);
while (count--)
*buf++ = *port_addr;
__raw_readsb(__ioport_map(port, 1), dst, count);
dummy_read();
}

void generic_insw(unsigned long port, void *dst, unsigned long count)
{
volatile u16 *port_addr;
u16 *buf = dst;

port_addr = (volatile u16 __force *)__ioport_map(port, 2);
while (count--)
*buf++ = *port_addr;

__raw_readsw(__ioport_map(port, 2), dst, count);
dummy_read();
}

void generic_insl(unsigned long port, void *dst, unsigned long count)
{
volatile u32 *port_addr;
u32 *buf = dst;

port_addr = (volatile u32 __force *)__ioport_map(port, 4);
while (count--)
*buf++ = *port_addr;

__raw_readsl(__ioport_map(port, 4), dst, count);
dummy_read();
}

Expand Down Expand Up @@ -145,37 +129,19 @@ void generic_outl_p(u32 b, unsigned long port)
*/
void generic_outsb(unsigned long port, const void *src, unsigned long count)
{
volatile u8 *port_addr;
const u8 *buf = src;

port_addr = (volatile u8 __force *)__ioport_map(port, 1);

while (count--)
*port_addr = *buf++;
__raw_writesb(__ioport_map(port, 1), src, count);
dummy_read();
}

void generic_outsw(unsigned long port, const void *src, unsigned long count)
{
volatile u16 *port_addr;
const u16 *buf = src;

port_addr = (volatile u16 __force *)__ioport_map(port, 2);

while (count--)
*port_addr = *buf++;

__raw_writesw(__ioport_map(port, 2), src, count);
dummy_read();
}

void generic_outsl(unsigned long port, const void *src, unsigned long count)
{
volatile u32 *port_addr;
const u32 *buf = src;

port_addr = (volatile u32 __force *)__ioport_map(port, 4);
while (count--)
*port_addr = *buf++;

__raw_writesl(__ioport_map(port, 4), src, count);
dummy_read();
}

Expand Down

0 comments on commit 8af57f8

Please sign in to comment.