Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add: FSL control read and write

Browse Source
master
Michal Simek 17 years ago
parent 3c4bd60de1
commit ab874d5047
2 changed files with 210 additions and 72 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 267
      common/cmd_mfsl.c
  2. 15
      include/asm-microblaze/asm.h

267
common/cmd_mfsl.c
Unescape View File

@ -55,73 +55,129 @@ int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
switch (fslnum) { switch (fslnum) {
#if (XILINX_FSL_NUMBER > 0) #if (XILINX_FSL_NUMBER > 0)
case 0: case 0:
if (blocking) { switch (blocking) {
GET (num, 0); case 0: NGET (num, 0);
} else { break;
NGET (num, 0); case 1: NCGET (num, 0);
break;
case 2: GET (num, 0);
break;
case 3: CGET (num, 0);
break;
default:
return 2;
} }
break; break;
#endif #endif
#if (XILINX_FSL_NUMBER > 1) #if (XILINX_FSL_NUMBER > 1)
case 1: case 1:
if (blocking) { switch (blocking) {
GET (num, 1); case 0: NGET (num, 1);
} else { break;
NGET (num, 1); case 1: NCGET (num, 1);
break;
case 2: GET (num, 1);
break;
case 3: CGET (num, 1);
break;
default:
return 2;
} }
break; break;
#endif #endif
#if (XILINX_FSL_NUMBER > 2) #if (XILINX_FSL_NUMBER > 2)
case 2: case 2:
if (blocking) { switch (blocking) {
GET (num, 2); case 0: NGET (num, 2);
} else { break;
NGET (num, 2); case 1: NCGET (num, 2);
break;
case 2: GET (num, 2);
break;
case 3: CGET (num, 2);
break;
default:
return 2;
} }
break; break;
#endif #endif
#if (XILINX_FSL_NUMBER > 3) #if (XILINX_FSL_NUMBER > 3)
case 3: case 3:
if (blocking) { switch (blocking) {
GET (num, 3); case 0: NGET (num, 3);
} else { break;
NGET (num, 3); case 1: NCGET (num, 3);
break;
case 2: GET (num, 3);
break;
case 3: CGET (num, 3);
break;
default:
return 2;
} }
break; break;
#endif #endif
#if (XILINX_FSL_NUMBER > 4) #if (XILINX_FSL_NUMBER > 4)
case 4: case 4:
if (blocking) { switch (blocking) {
GET (num, 4); case 0: NGET (num, 4);
} else { break;
NGET (num, 4); case 1: NCGET (num, 4);
break;
case 2: GET (num, 4);
break;
case 3: CGET (num, 4);
break;
default:
return 2;
} }
break; break;
#endif #endif
#if (XILINX_FSL_NUMBER > 5) #if (XILINX_FSL_NUMBER > 5)
case 5: case 5:
if (blocking) { switch (blocking) {
GET (num, 5); case 0: NGET (num, 5);
} else { break;
NGET (num, 5); case 1: NCGET (num, 5);
break;
case 2: GET (num, 5);
break;
case 3: CGET (num, 5);
break;
default:
return 2;
} }
break; break;
#endif #endif
#if (XILINX_FSL_NUMBER > 6) #if (XILINX_FSL_NUMBER > 6)
case 6: case 6:
if (blocking) { switch (blocking) {
GET (num, 6); case 0: NGET (num, 6);
} else { break;
NGET (num, 6); case 1: NCGET (num, 6);
break;
case 2: GET (num, 6);
break;
case 3: CGET (num, 6);
break;
default:
return 2;
} }
break; break;
#endif #endif
#if (XILINX_FSL_NUMBER > 7) #if (XILINX_FSL_NUMBER > 7)
case 7: case 7:
if (blocking) { switch (blocking) {
GET (num, 7); case 0: NGET (num, 7);
} else { break;
NGET (num, 7); case 1: NCGET (num, 7);
break;
case 2: GET (num, 7);
break;
case 3: CGET (num, 7);
break;
default:
return 2;
} }
break; break;
#endif #endif
@ -129,8 +185,9 @@ int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
return 1; return 1;
} }
printf ("%01x: 0x%08lx - %s read\n", fslnum, num, printf ("%01x: 0x%08lx - %s %s read\n", fslnum, num,
blocking ? "blocking" : "non blocking"); blocking < 2 ? "non blocking" : "blocking",
((blocking == 1) || (blocking == 3)) ? "control" : "data" );
return 0; return 0;
} }
@ -156,73 +213,129 @@ int do_fwr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
switch (fslnum) { switch (fslnum) {
#if (XILINX_FSL_NUMBER > 0) #if (XILINX_FSL_NUMBER > 0)
case 0: case 0:
if (blocking) { switch (blocking) {
PUT (num, 0); case 0: NPUT (num, 0);
} else { break;
NPUT (num, 0); case 1: NCPUT (num, 0);
break;
case 2: PUT (num, 0);
break;
case 3: CPUT (num, 0);
break;
default:
return 2;
} }
break; break;
#endif #endif
#if (XILINX_FSL_NUMBER > 1) #if (XILINX_FSL_NUMBER > 1)
case 1: case 1:
if (blocking) { switch (blocking) {
PUT (num, 1); case 0: NPUT (num, 1);
} else { break;
NPUT (num, 1); case 1: NCPUT (num, 1);
break;
case 2: PUT (num, 1);
break;
case 3: CPUT (num, 1);
break;
default:
return 2;
} }
break; break;
#endif #endif
#if (XILINX_FSL_NUMBER > 2) #if (XILINX_FSL_NUMBER > 2)
case 2: case 2:
if (blocking) { switch (blocking) {
PUT (num, 2); case 0: NPUT (num, 2);
} else { break;
NPUT (num, 2); case 1: NCPUT (num, 2);
break;
case 2: PUT (num, 2);
break;
case 3: CPUT (num, 2);
break;
default:
return 2;
} }
break; break;
#endif #endif
#if (XILINX_FSL_NUMBER > 3) #if (XILINX_FSL_NUMBER > 3)
case 3: case 3:
if (blocking) { switch (blocking) {
PUT (num, 3); case 0: NPUT (num, 3);
} else { break;
NPUT (num, 3); case 1: NCPUT (num, 3);
break;
case 2: PUT (num, 3);
break;
case 3: CPUT (num, 3);
break;
default:
return 2;
} }
break; break;
#endif #endif
#if (XILINX_FSL_NUMBER > 4) #if (XILINX_FSL_NUMBER > 4)
case 4: case 4:
if (blocking) { switch (blocking) {
PUT (num, 4); case 0: NPUT (num, 4);
} else { break;
NPUT (num, 4); case 1: NCPUT (num, 4);
break;
case 2: PUT (num, 4);
break;
case 3: CPUT (num, 4);
break;
default:
return 2;
} }
break; break;
#endif #endif
#if (XILINX_FSL_NUMBER > 5) #if (XILINX_FSL_NUMBER > 5)
case 5: case 5:
if (blocking) { switch (blocking) {
PUT (num, 5); case 0: NPUT (num, 5);
} else { break;
NPUT (num, 5); case 1: NCPUT (num, 5);
break;
case 2: PUT (num, 5);
break;
case 3: CPUT (num, 5);
break;
default:
return 2;
} }
break; break;
#endif #endif
#if (XILINX_FSL_NUMBER > 6) #if (XILINX_FSL_NUMBER > 6)
case 6: case 6:
if (blocking) { switch (blocking) {
PUT (num, 6); case 0: NPUT (num, 6);
} else { break;
NPUT (num, 6); case 1: NCPUT (num, 6);
break;
case 2: PUT (num, 6);
break;
case 3: CPUT (num, 6);
break;
default:
return 2;
} }
break; break;
#endif #endif
#if (XILINX_FSL_NUMBER > 7) #if (XILINX_FSL_NUMBER > 7)
case 7: case 7:
if (blocking) { switch (blocking) {
PUT (num, 7); case 0: NPUT (num, 7);
} else { break;
NPUT (num, 7); case 1: NCPUT (num, 7);
break;
case 2: PUT (num, 7);
break;
case 3: CPUT (num, 7);
break;
default:
return 2;
} }
break; break;
#endif #endif
@ -230,8 +343,9 @@ int do_fwr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
return 1; return 1;
} }
printf ("%01x: 0x%08lx - %s write\n", fslnum, num, printf ("%01x: 0x%08lx - %s %s write\n", fslnum, num,
blocking ? "blocking" : "non blocking"); blocking < 2 ? "non blocking" : "blocking",
((blocking == 1) || (blocking == 3)) ? "control" : "data" );
return 0; return 0;
} }
@ -258,12 +372,21 @@ int do_rmsr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
/***************************************************/ /***************************************************/
U_BOOT_CMD (frd, 3, 1, do_frd, U_BOOT_CMD (frd, 3, 1, do_frd,
"frd - read data from FSL\n", "frd - read data from FSL\n",
"- [fslnum [0|x]], (0 - non blocking|x - blocking).\n"); "- [fslnum [0|1|2|3]]\n"
" 0 - non blocking data read\n"
" 1 - non blocking control read\n"
" 2 - blocking data read\n"
" 3 - blocking control read\n");
U_BOOT_CMD (fwr, 4, 1, do_fwr, U_BOOT_CMD (fwr, 4, 1, do_fwr,
"fwr - write data to FSL\n", "fwr - write data to FSL\n",
"- [fslnum data [0|x]], (0 - non blocking|x - blocking).\n"); "- [fslnum [0|1|2|3]]\n"
" 0 - non blocking data write\n"
" 1 - non blocking control write\n"
" 2 - blocking data write\n"
" 3 - blocking control write\n");
U_BOOT_CMD (rmsr, 2, 1, do_rmsr, U_BOOT_CMD (rmsr, 2, 1, do_rmsr,
"rmsr - read MSR register\n", "- read MSR register.\n"); "rmsr - read MSR register\n", "- read MSR register.\n");

15
include/asm-microblaze/asm.h
Unescape View File

@ -25,13 +25,28 @@
/* FSL macros */ /* FSL macros */
#define NGET(val, fslnum) \ #define NGET(val, fslnum) \
__asm__ __volatile__ ("nget %0, rfsl" #fslnum :"=r" (val)); __asm__ __volatile__ ("nget %0, rfsl" #fslnum :"=r" (val));
#define GET(val, fslnum) \ #define GET(val, fslnum) \
__asm__ __volatile__ ("get %0, rfsl" #fslnum :"=r" (val)); __asm__ __volatile__ ("get %0, rfsl" #fslnum :"=r" (val));
#define NCGET(val, fslnum) \
__asm__ __volatile__ ("ncget %0, rfsl" #fslnum :"=r" (val));
#define CGET(val, fslnum) \
__asm__ __volatile__ ("cget %0, rfsl" #fslnum :"=r" (val));
#define NPUT(val, fslnum) \ #define NPUT(val, fslnum) \
__asm__ __volatile__ ("nput %0, rfsl" #fslnum ::"r" (val)); __asm__ __volatile__ ("nput %0, rfsl" #fslnum ::"r" (val));
#define PUT(val, fslnum) \ #define PUT(val, fslnum) \
__asm__ __volatile__ ("put %0, rfsl" #fslnum ::"r" (val)); __asm__ __volatile__ ("put %0, rfsl" #fslnum ::"r" (val));
#define NCPUT(val, fslnum) \
__asm__ __volatile__ ("ncput %0, rfsl" #fslnum ::"r" (val));
#define CPUT(val, fslnum) \
__asm__ __volatile__ ("cput %0, rfsl" #fslnum ::"r" (val));
/* CPU dependent */ /* CPU dependent */
#define MFS(val) \ #define MFS(val) \
__asm__ __volatile__ ("mfs %0, rmsr":"=r" (val)); __asm__ __volatile__ ("mfs %0, rmsr":"=r" (val));

Write Preview
Loading…
Cancel
Save