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

Commit 717460ee authored by Max Filippov's avatar Max Filippov Committed by Chris Zankel
Browse files

xtensa: ISS: fix __simc implementation 



Do not rely on compiler implicitly placing function arguments into
specifc registers, place them explicitly.

Move __simc and related helpers to platform/simcall.h

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parent 33c8213d

arch/xtensa/platforms/iss/console.c

+0 −13
Original line number Diff line number Diff line
@@ -41,19 +41,6 @@ static struct timer_list serial_timer; 


static DEFINE_SPINLOCK(timer_lock);



int errno;



static int __simc (int a, int b, int c, int d, int e, int f) __attribute__((__noinline__));

static int __simc (int a, int b, int c, int d, int e, int f)

{

	int ret;

	__asm__ __volatile__ ("simcall\n"

			"mov %0, a2\n"

			"mov %1, a3\n" : "=a" (ret), "=a" (errno)

			: : "a2", "a3");

	return ret;

}



static char *serial_version = "0.1";

static char *serial_name = "ISS serial driver";

arch/xtensa/platforms/iss/include/platform/simcall.h

+53 −0
Original line number Diff line number Diff line
@@ -57,6 +57,59 @@ 
#define  XTISS_SELECT_ONE_WRITE   2

#define  XTISS_SELECT_ONE_EXCEPT  3



static int errno;



static inline int __simc(int a, int b, int c, int d, int e, int f)

{

	int ret;

	register int a1 asm("a2") = a;

	register int b1 asm("a3") = b;

	register int c1 asm("a4") = c;

	register int d1 asm("a5") = d;

	register int e1 asm("a6") = e;

	register int f1 asm("a7") = f;

	__asm__ __volatile__ (

			"simcall\n"

			"mov %0, a2\n"

			"mov %1, a3\n"

			: "=a" (ret), "=a" (errno), "+r"(a1), "+r"(b1)

			: "r"(c1), "r"(d1), "r"(e1), "r"(f1)

			: );

	return ret;

}



static inline int simc_open(char *file, int flags, int mode)

{

	return __simc(SYS_open, (int) file, flags, mode, 0, 0);

}



static inline int simc_close(int fd)

{

	return __simc(SYS_close, fd, 0, 0, 0, 0);

}



static inline int simc_ioctl(int fd, int request, void *arg)

{

	return __simc(SYS_ioctl, fd, request, (int) arg, 0, 0);

}



static inline int simc_read(int fd, void *buf, size_t count)

{

	return __simc(SYS_read, fd, (int) buf, count, 0, 0);

}



static inline int simc_write(int fd, void *buf, size_t count)

{

	return __simc(SYS_write, fd, (int) buf, count, 0, 0);

}



static inline int simc_poll(int fd)

{

	struct timeval tv = { .tv_sec = 0, .tv_usec = 0 };



	return __simc(SYS_select_one, fd, XTISS_SELECT_ONE_READ, (int)&tv,

			0, 0);

}



#endif /* _XTENSA_PLATFORM_ISS_SIMCALL_H */

arch/xtensa/platforms/iss/network.c

+0 −49
Original line number Diff line number Diff line
@@ -101,55 +101,6 @@ struct iss_net_private { 


};



/* ======================= ISS SIMCALL INTERFACE =========================== */



/* Note: __simc must _not_ be declared inline! */



static int errno;



static int __simc (int a, int b, int c, int d, int e, int f) __attribute__((__noinline__));

static int __simc (int a, int b, int c, int d, int e, int f)

{

	int ret;

	__asm__ __volatile__ ("simcall\n"

	    		      "mov %0, a2\n"

			      "mov %1, a3\n" : "=a" (ret), "=a" (errno)

			      : : "a2", "a3");

	return ret;

}



static int inline simc_open(char *file, int flags, int mode)

{

	return __simc(SYS_open, (int) file, flags, mode, 0, 0);

}



static int inline simc_close(int fd)

{

	return __simc(SYS_close, fd, 0, 0, 0, 0);

}



static int inline simc_ioctl(int fd, int request, void *arg)

{

	return __simc(SYS_ioctl, fd, request, (int) arg, 0, 0);

}



static int inline simc_read(int fd, void *buf, size_t count)

{

	return __simc(SYS_read, fd, (int) buf, count, 0, 0);

}



static int inline simc_write(int fd, void *buf, size_t count)

{

	return __simc(SYS_write, fd, (int) buf, count, 0, 0);

}



static int inline simc_poll(int fd)

{

	struct timeval tv = { .tv_sec = 0, .tv_usec = 0 };



	return __simc(SYS_select_one, fd, XTISS_SELECT_ONE_READ, (int)&tv,0,0);

}



/* ================================ HELPERS ================================ */