leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6

Browse Source 
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  Blackfin arch: fix some bugs in lib/string.h functions found by our string testing modules
  Blackfin arch: fix the aliased write macros
  Blackfin arch: Update/Fix PM support add new pm_ops valid
This commit is contained in:
Linus Torvalds 2007-09-14 14:04:13 -07:00
commit 53a3f3087b
3 changed files with 87 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/blackfin/mach-common/pm.c
View File

@ -158,10 +158,16 @@ static int bfin_pm_finish(suspend_state_t state)
return 0; return 0;
} }
static int bfin_pm_valid(suspend_state_t state)
{
return (state == PM_SUSPEND_STANDBY);
}
struct pm_ops bfin_pm_ops = { struct pm_ops bfin_pm_ops = {
.prepare = bfin_pm_prepare, .prepare = bfin_pm_prepare,
.enter = bfin_pm_enter, .enter = bfin_pm_enter,
.finish = bfin_pm_finish, .finish = bfin_pm_finish,
.valid = bfin_pm_valid,
}; };
static int __init bfin_pm_init(void) static int __init bfin_pm_init(void)

4
include/asm-blackfin/mach-bf561/cdefBF561.h
View File

@ -83,9 +83,9 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val)
/* For MMR's that are reserved on Core B, set up defines to better integrate with other ports */ /* For MMR's that are reserved on Core B, set up defines to better integrate with other ports */
#define bfin_read_SWRST() bfin_read_SICA_SWRST() #define bfin_read_SWRST() bfin_read_SICA_SWRST()
#define bfin_write_SWRST() bfin_write_SICA_SWRST() #define bfin_write_SWRST(val) bfin_write_SICA_SWRST(val)
#define bfin_read_SYSCR() bfin_read_SICA_SYSCR() #define bfin_read_SYSCR() bfin_read_SICA_SYSCR()
#define bfin_write_SYSCR() bfin_write_SICA_SYSCR() #define bfin_write_SYSCR(val) bfin_write_SICA_SYSCR(val)
/* System Reset and Interrupt Controller registers for core A (0xFFC0 0100-0xFFC0 01FF) */ /* System Reset and Interrupt Controller registers for core A (0xFFC0 0100-0xFFC0 01FF) */
#define bfin_read_SICA_SWRST() bfin_read16(SICA_SWRST) #define bfin_read_SICA_SWRST() bfin_read16(SICA_SWRST)

117
include/asm-blackfin/string.h
View File

@ -9,13 +9,16 @@ extern inline char *strcpy(char *dest, const char *src)
char *xdest = dest; char *xdest = dest;
char temp = 0; char temp = 0;
__asm__ __volatile__ __asm__ __volatile__ (
("1:\t%2 = B [%1++] (Z);\n\t" "1:"
"B [%0++] = %2;\n\t" "%2 = B [%1++] (Z);"
"CC = %2;\n\t" "B [%0++] = %2;"
"if cc jump 1b (bp);\n" "CC = %2;"
"if cc jump 1b (bp);"
: "+&a" (dest), "+&a" (src), "=&d" (temp) : "+&a" (dest), "+&a" (src), "=&d" (temp)
::"memory", "CC"); :
: "memory", "CC");
return xdest; return xdest;
} }
@ -28,37 +31,56 @@ extern inline char *strncpy(char *dest, const char *src, size_t n)
if (n == 0) if (n == 0)
return xdest; return xdest;
__asm__ __volatile__ __asm__ __volatile__ (
("1:\t%3 = B [%1++] (Z);\n\t" "1:"
"B [%0++] = %3;\n\t" "%3 = B [%1++] (Z);"
"CC = %3;\n\t" "B [%0++] = %3;"
"if ! cc jump 2f;\n\t" "CC = %3;"
"%2 += -1;\n\t" "if ! cc jump 2f;"
"CC = %2 == 0;\n\t" "%2 += -1;"
"if ! cc jump 1b (bp);\n" "CC = %2 == 0;"
"2:\n" "if ! cc jump 1b (bp);"
"jump 4f;"
"2:"
/* if src is shorter than n, we need to null pad bytes now */
"%3 = 0;"
"3:"
"%2 += -1;"
"CC = %2 == 0;"
"if cc jump 4f;"
"B [%0++] = %3;"
"jump 3b;"
"4:"
: "+&a" (dest), "+&a" (src), "+&da" (n), "=&d" (temp) : "+&a" (dest), "+&a" (src), "+&da" (n), "=&d" (temp)
::"memory", "CC"); :
: "memory", "CC");
return xdest; return xdest;
} }
#define __HAVE_ARCH_STRCMP #define __HAVE_ARCH_STRCMP
extern inline int strcmp(const char *cs, const char *ct) extern inline int strcmp(const char *cs, const char *ct)
{ {
char __res1, __res2; /* need to use int's here so the char's in the assembly don't get
* sign extended incorrectly when we don't want them to be
*/
int __res1, __res2;
__asm__ __asm__ __volatile__ (
("1:\t%2 = B[%0++] (Z);\n\t" /* get *cs */ "1:"
"%3 = B[%1++] (Z);\n\t" /* get *ct */ "%2 = B[%0++] (Z);" /* get *cs */
"CC = %2 == %3;\n\t" /* compare a byte */ "%3 = B[%1++] (Z);" /* get *ct */
"if ! cc jump 2f;\n\t" /* not equal, break out */ "CC = %2 == %3;" /* compare a byte */
"CC = %2;\n\t" /* at end of cs? */ "if ! cc jump 2f;" /* not equal, break out */
"if cc jump 1b (bp);\n\t" /* no, keep going */ "CC = %2;" /* at end of cs? */
"jump.s 3f;\n" /* strings are equal */ "if cc jump 1b (bp);" /* no, keep going */
"2:\t%2 = %2 - %3;\n" /* *cs - *ct */ "jump.s 3f;" /* strings are equal */
"3:\n" "2:"
"%2 = %2 - %3;" /* *cs - *ct */
"3:"
: "+&a" (cs), "+&a" (ct), "=&d" (__res1), "=&d" (__res2) : "+&a" (cs), "+&a" (ct), "=&d" (__res1), "=&d" (__res2)
: : "CC"); :
: "memory", "CC");
return __res1; return __res1;
} }
@ -66,26 +88,35 @@ extern inline int strcmp(const char *cs, const char *ct)
#define __HAVE_ARCH_STRNCMP #define __HAVE_ARCH_STRNCMP
extern inline int strncmp(const char *cs, const char *ct, size_t count) extern inline int strncmp(const char *cs, const char *ct, size_t count)
{ {
char __res1, __res2; /* need to use int's here so the char's in the assembly don't get
* sign extended incorrectly when we don't want them to be
*/
int __res1, __res2;
if (!count) if (!count)
return 0; return 0;
__asm__
("1:\t%3 = B[%0++] (Z);\n\t" /* get *cs */ __asm__ __volatile__ (
"%4 = B[%1++] (Z);\n\t" /* get *ct */ "1:"
"CC = %3 == %4;\n\t" /* compare a byte */ "%3 = B[%0++] (Z);" /* get *cs */
"if ! cc jump 3f;\n\t" /* not equal, break out */ "%4 = B[%1++] (Z);" /* get *ct */
"CC = %3;\n\t" /* at end of cs? */ "CC = %3 == %4;" /* compare a byte */
"if ! cc jump 4f;\n\t" /* yes, all done */ "if ! cc jump 3f;" /* not equal, break out */
"%2 += -1;\n\t" /* no, adjust count */ "CC = %3;" /* at end of cs? */
"CC = %2 == 0;\n\t" "if ! cc jump 4f;" /* yes, all done */
"if ! cc jump 1b;\n" /* more to do, keep going */ "%2 += -1;" /* no, adjust count */
"2:\t%3 = 0;\n\t" /* strings are equal */ "CC = %2 == 0;"
"jump.s 4f;\n" "if ! cc jump 1b;" /* more to do, keep going */
"3:\t%3 = %3 - %4;\n" /* *cs - *ct */ "2:"
"%3 = 0;" /* strings are equal */
"jump.s 4f;"
"3:"
"%3 = %3 - %4;" /* *cs - *ct */
"4:" "4:"
: "+&a" (cs), "+&a" (ct), "+&da" (count), "=&d" (__res1), "=&d" (__res2) : "+&a" (cs), "+&a" (ct), "+&da" (count), "=&d" (__res1), "=&d" (__res2)
: : "CC"); :
: "memory", "CC");
return __res1; return __res1;
} }