Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1758ef68 authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

sparc64: remove byteshifting from out* helpers 



__raw_write avoids the need to byteswap, as we are reading from a
host-endian area, just deref the pointers directly, taking care
of alignment.

As before, outsw must be called with a 2-byte aligned pointer.

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 60b82673

arch/sparc64/lib/PeeCeeI.c

+47 −92
Original line number Diff line number Diff line
@@ -20,109 +20,64 @@ void outsw(unsigned long __addr, const void *src, unsigned long count) 
{

	void __iomem *addr = (void __iomem *) __addr;



	if (count) {

		u16 *ps = (u16 *)src;

		u32 *pi;



		if (((u64)src) & 0x2) {

			u16 val = le16_to_cpup(ps);

			outw(val, addr);

			ps++;

			count--;

		}

		pi = (u32 *)ps;

		while (count >= 2) {

			u32 w = le32_to_cpup(pi);



			pi++;

			outw(w >> 0, addr);

			outw(w >> 16, addr);

			count -= 2;

		}

		ps = (u16 *)pi;

		if (count) {

			u16 val = le16_to_cpup(ps);

			outw(val, addr);

		}

	while (count--) {

		__raw_writew(*(u16 *)src, addr);

		src += sizeof(u16);

	}

}



void outsl(unsigned long __addr, const void *src, unsigned long count)

{

	void __iomem *addr = (void __iomem *) __addr;

	u32 l, l2;



	if (count) {

		if ((((u64)src) & 0x3) == 0) {

			u32 *p = (u32 *)src;

	if (!count)

		return;



	switch (((unsigned long)src) & 0x3) {

	case 0x0:

		/* src is naturally aligned */

		while (count--) {

				u32 val = cpu_to_le32p(p);

				outl(val, addr);

				p++;

			__raw_writel(*(u32 *)src, addr);

			src += sizeof(u32);

		}

		} else {

			u8 *pb;

			u16 *ps = (u16 *)src;

			u32 l = 0, l2;

			u32 *pi;



			switch (((u64)src) & 0x3) {

		break;

	case 0x2:

				count -= 1;

				l = cpu_to_le16p(ps) << 16;

				ps++;

				pi = (u32 *)ps;

		/* 2-byte alignment */

		while (count--) {

					l2 = cpu_to_le32p(pi);

					pi++;

					outl(((l >> 16) | (l2 << 16)), addr);

					l = l2;

			l = (*(u16 *)src) << 16;

			l |= *(u16 *)(src + sizeof(u16));

			__raw_writel(l, addr);

			src += sizeof(u32);

		}

				ps = (u16 *)pi;

				l2 = cpu_to_le16p(ps);

				outl(((l >> 16) | (l2 << 16)), addr);

		break;



	case 0x1:

				count -= 1;

				pb = (u8 *)src;

				l = (*pb++ << 8);

				ps = (u16 *)pb;

				l2 = cpu_to_le16p(ps);

				ps++;

				l |= (l2 << 16);

				pi = (u32 *)ps;

		/* Hold three bytes in l each time, grab a byte from l2 */

		l = (*(u8 *)src) << 24;

		l |= (*(u16 *)(src + sizeof(u8))) << 8;

		src += sizeof(u8) + sizeof(u16);

		while (count--) {

					l2 = cpu_to_le32p(pi);

					pi++;

					outl(((l >> 8) | (l2 << 24)), addr);

					l = l2;

			l2 = *(u32 *)src;

			l |= (l2 >> 24);

			__raw_writel(l, addr);

			l = l2 << 8;

			src += sizeof(u32);

		}

				pb = (u8 *)pi;

				outl(((l >> 8) | (*pb << 24)), addr);

		break;



	case 0x3:

				count -= 1;

				pb = (u8 *)src;

				l = (*pb++ << 24);

				pi = (u32 *)pb;

		/* Hold a byte in l each time, grab 3 bytes from l2 */

		l = (*(u8 *)src) << 24;

		src += sizeof(u8);

		while (count--) {

					l2 = cpu_to_le32p(pi);

					pi++;

					outl(((l >> 24) | (l2 << 8)), addr);

					l = l2;

			l2 = *(u32 *)src;

			l |= (l2 >> 8);

			__raw_writel(l, addr);

			l = l2 << 24;

			src += sizeof(u32);

		}

				ps = (u16 *)pi;

				l2 = cpu_to_le16p(ps);

				ps++;

				pb = (u8 *)ps;

				l2 |= (*pb << 16);

				outl(((l >> 24) | (l2 << 8)), addr);

		break;

	}

}

	}

}



void insb(unsigned long __addr, void *dst, unsigned long count)

{