added IPC versioning system

PPC code can ask mini for its version number ... not currently
used for anything, but we should bump it next time we break ABI
This commit is contained in:
bushing 2009-04-12 20:27:10 -07:00
parent d68251da45
commit f27118319b
2 changed files with 35 additions and 3 deletions

8
ipc.c
View File

@ -37,6 +37,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "powerpc.h" #include "powerpc.h"
#include "panic.h" #include "panic.h"
#define MINI_VERSION_MAJOR 1
#define MINI_VERSION_MINOR 0
static volatile ipc_request in_queue[IPC_IN_SIZE] ALIGNED(32) MEM2_BSS; static volatile ipc_request in_queue[IPC_IN_SIZE] ALIGNED(32) MEM2_BSS;
static volatile ipc_request out_queue[IPC_OUT_SIZE] ALIGNED(32) MEM2_BSS; static volatile ipc_request out_queue[IPC_OUT_SIZE] ALIGNED(32) MEM2_BSS;
static volatile ipc_request slow_queue[IPC_SLOW_SIZE]; static volatile ipc_request slow_queue[IPC_SLOW_SIZE];
@ -82,6 +85,7 @@ static inline void poke_outtail(u16 num)
{ {
mask32(HW_IPC_ARMMSG, 0xFFFF, num); mask32(HW_IPC_ARMMSG, 0xFFFF, num);
} }
static inline void poke_inhead(u16 num) static inline void poke_inhead(u16 num)
{ {
mask32(HW_IPC_ARMMSG, 0xFFFF0000, num<<16); mask32(HW_IPC_ARMMSG, 0xFFFF0000, num<<16);
@ -91,6 +95,7 @@ static inline u16 peek_intail(void)
{ {
return read32(HW_IPC_PPCMSG) & 0xFFF; return read32(HW_IPC_PPCMSG) & 0xFFF;
} }
static inline u16 peek_outhead(void) static inline u16 peek_outhead(void)
{ {
return read32(HW_IPC_PPCMSG) >> 16; return read32(HW_IPC_PPCMSG) >> 16;
@ -143,6 +148,9 @@ static u32 process_slow(volatile ipc_request *req)
break; break;
case IPC_SYS_JUMP: case IPC_SYS_JUMP:
return req->args[0]; return req->args[0];
case IPC_SYS_GETVERS:
ipc_post(req->code, req->tag, 1, MINI_VERSION_MAJOR << 16 | MINI_VERSION_MINOR);
break;
default: default:
gecko_printf("IPC: unknown SLOW SYS request %04x\n", req->req); gecko_printf("IPC: unknown SLOW SYS request %04x\n", req->req);
} }

26
ipc.h
View File

@ -4,7 +4,7 @@
inter-processor communications inter-processor communications
Copyright (C) 2008, 2009 Hector Martin "marcan" <marcan@marcansoft.com> Copyright (C) 2008, 2009 Hector Martin "marcan" <marcan@marcansoft.com>
Copyright (C) 2008, 2009 Haxx Enterprises Copyright (C) 2008, 2009 Haxx Enterprises <bushing@gmail.com
Copyright (C) 2008, 2009 Sven Peter <svenpeter@gmail.com> Copyright (C) 2008, 2009 Sven Peter <svenpeter@gmail.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -26,6 +26,21 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "types.h" #include "types.h"
/* For the sake of interface compatibility between mini and powerpc code,
you should try to commit any enhancements you make back upstream so
that they can be assigned a standard request number. Otherwise, if
you are creating a new device, you MUST assign it a device ID >= 0x80.
Likewise, if you add functionality to any of the existing drivers,
your must assign it to a request ID >= 0x8000. This will prevent
problems if a mismatch between ARM and PPC code occurs. Similarly,
if you add functions, you should always add them to the end, to
prevent someone from calling the wrong function.
Even still, you are encouraged to add in sanity checks and version
checking to prevent strange bugs or even data loss. --bushing */
#define IPC_FAST 0x01 #define IPC_FAST 0x01
#define IPC_SLOW 0x00 #define IPC_SLOW 0x00
@ -38,8 +53,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#define IPC_DEV_PPC 0x06 #define IPC_DEV_PPC 0x06
#define IPC_DEV_SDMMC 0x07 #define IPC_DEV_SDMMC 0x07
//#define IPC_DEV_USER0 0x80
//#define IPC_DEV_USER1 0x81
#define IPC_SYS_PING 0x0000 #define IPC_SYS_PING 0x0000
#define IPC_SYS_JUMP 0x0001 #define IPC_SYS_JUMP 0x0001
#define IPC_SYS_GETVERS 0x0002
#define IPC_SYS_WRITE32 0x0100 #define IPC_SYS_WRITE32 0x0100
#define IPC_SYS_WRITE16 0x0101 #define IPC_SYS_WRITE16 0x0101
#define IPC_SYS_WRITE8 0x0102 #define IPC_SYS_WRITE8 0x0102
@ -62,6 +81,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#define IPC_NAND_WRITE 0x0003 #define IPC_NAND_WRITE 0x0003
#define IPC_NAND_ERASE 0x0004 #define IPC_NAND_ERASE 0x0004
#define IPC_NAND_STATUS 0x0005 #define IPC_NAND_STATUS 0x0005
//#define IPC_NAND_USER0 0x8000
//#define IPC_NAND_USER1 0x8001
// etc.
#define IPC_SDHC_DISCOVER 0x0000 #define IPC_SDHC_DISCOVER 0x0000
@ -84,6 +106,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#define IPC_PPC_BOOT 0x0000 #define IPC_PPC_BOOT 0x0000
//#define IPC_USER0_OHAI 0x8000 <- your code goez here
#define IPC_CODE (f,d,r) (((f)<<24)|((d)<<16)|(r)) #define IPC_CODE (f,d,r) (((f)<<24)|((d)<<16)|(r))
#define IPC_IN_SIZE 32 #define IPC_IN_SIZE 32