V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix mtest indenting 

Some of the inner loops are not indented correctly. Fix this.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2013-02-24 17:33:18 +00:00
parent 51209b1f42
commit 7ecbd4d708
1 changed files with 164 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

328
common/cmd_mem.c
View File

@ -655,32 +655,31 @@ static ulong mem_test_alt(vu_long *start, vu_long *end)
0xaaaaaaaa, /* alternating 1/0 */ 0xaaaaaaaa, /* alternating 1/0 */
}; };
/* /*
* Data line test: write a pattern to the first * Data line test: write a pattern to the first
* location, write the 1's complement to a 'parking' * location, write the 1's complement to a 'parking'
* address (changes the state of the data bus so a * address (changes the state of the data bus so a
* floating bus doesn't give a false OK), and then * floating bus doesn't give a false OK), and then
* read the value back. Note that we read it back * read the value back. Note that we read it back
* into a variable because the next time we read it, * into a variable because the next time we read it,
* it might be right (been there, tough to explain to * it might be right (been there, tough to explain to
* the quality guys why it prints a failure when the * the quality guys why it prints a failure when the
* "is" and "should be" are obviously the same in the * "is" and "should be" are obviously the same in the
* error message). * error message).
* *
* Rather than exhaustively testing, we test some * Rather than exhaustively testing, we test some
* patterns by shifting '1' bits through a field of * patterns by shifting '1' bits through a field of
* '0's and '0' bits through a field of '1's (i.e. * '0's and '0' bits through a field of '1's (i.e.
* pattern and ~pattern). * pattern and ~pattern).
*/ */
addr = start; addr = start;
for (j = 0; j < sizeof(bitpattern) / sizeof(bitpattern[0]); for (j = 0; j < sizeof(bitpattern) / sizeof(bitpattern[0]); j++) {
j++) { val = bitpattern[j];
val = bitpattern[j]; for (; val != 0; val <<= 1) {
for (; val != 0; val <<= 1) {
*addr = val; *addr = val;
*dummy = ~val; /* clear the test data off the bus */ *dummy = ~val; /* clear the test data off the bus */
readback = *addr; readback = *addr;
if(readback != val) { if (readback != val) {
printf("FAILURE (data line): " printf("FAILURE (data line): "
"expected %08lx, actual %08lx\n", "expected %08lx, actual %08lx\n",
val, readback); val, readback);
@ -703,129 +702,130 @@ static ulong mem_test_alt(vu_long *start, vu_long *end)
return -1; return -1;
} }
} }
}
} }
}
/* /*
* Based on code whose Original Author and Copyright * Based on code whose Original Author and Copyright
* information follows: Copyright (c) 1998 by Michael * information follows: Copyright (c) 1998 by Michael
* Barr. This software is placed into the public * Barr. This software is placed into the public
* domain and may be used for any purpose. However, * domain and may be used for any purpose. However,
* this notice must not be changed or removed and no * this notice must not be changed or removed and no
* warranty is either expressed or implied by its * warranty is either expressed or implied by its
* publication or distribution. * publication or distribution.
*/ */
/* /*
* Address line test * Address line test
*
* Description: Test the address bus wiring in a
* memory region by performing a walking
* 1's test on the relevant bits of the
* address and checking for aliasing.
* This test will find single-bit
* address failures such as stuck-high,
* stuck-low, and shorted pins. The base
* address and size of the region are
* selected by the caller.
*
* Notes: For best results, the selected base
* address should have enough LSB 0's to
* guarantee single address bit changes.
* For example, to test a 64-Kbyte
* region, select a base address on a
* 64-Kbyte boundary. Also, select the
* region size as a power-of-two if at
* all possible.
*
* Returns: 0 if the test succeeds, 1 if the test fails.
*/
len = ((ulong)end - (ulong)start)/sizeof(vu_long);
pattern = (vu_long) 0xaaaaaaaa;
anti_pattern = (vu_long) 0x55555555;
debug("%s:%d: length = 0x%.8lx\n", * Description: Test the address bus wiring in a
__func__, __LINE__, len); * memory region by performing a walking
/* * 1's test on the relevant bits of the
* Write the default pattern at each of the * address and checking for aliasing.
* power-of-two offsets. * This test will find single-bit
*/ * address failures such as stuck-high,
for (offset = 1; offset < len; offset <<= 1) * stuck-low, and shorted pins. The base
start[offset] = pattern; * address and size of the region are
* selected by the caller.
/* * Notes: For best results, the selected base
* Check for address bits stuck high. * address should have enough LSB 0's to
*/ * guarantee single address bit changes.
test_offset = 0; * For example, to test a 64-Kbyte
start[test_offset] = anti_pattern; * region, select a base address on a
* 64-Kbyte boundary. Also, select the
* region size as a power-of-two if at
* all possible.
*
* Returns: 0 if the test succeeds, 1 if the test fails.
*/
len = ((ulong)end - (ulong)start)/sizeof(vu_long);
pattern = (vu_long) 0xaaaaaaaa;
anti_pattern = (vu_long) 0x55555555;
for (offset = 1; offset < len; offset <<= 1) { debug("%s:%d: length = 0x%.8lx\n",
temp = start[offset]; __func__, __LINE__, len);
if (temp != pattern) { /*
* Write the default pattern at each of the
* power-of-two offsets.
*/
for (offset = 1; offset < len; offset <<= 1)
start[offset] = pattern;
/*
* Check for address bits stuck high.
*/
test_offset = 0;
start[test_offset] = anti_pattern;
for (offset = 1; offset < len; offset <<= 1) {
temp = start[offset];
if (temp != pattern) {
printf("\nFAILURE: Address bit stuck high @ 0x%.8lx:" printf("\nFAILURE: Address bit stuck high @ 0x%.8lx:"
" expected 0x%.8lx, actual 0x%.8lx\n", " expected 0x%.8lx, actual 0x%.8lx\n",
(ulong)&start[offset], pattern, temp); (ulong)&start[offset], pattern, temp);
errs++; errs++;
if (ctrlc()) { if (ctrlc()) {
putc('\n');
return -1;
}
}
}
start[test_offset] = pattern;
WATCHDOG_RESET();
/*
* Check for addr bits stuck low or shorted.
*/
for (test_offset = 1; test_offset < len; test_offset <<= 1) {
start[test_offset] = anti_pattern;
for (offset = 1; offset < len; offset <<= 1) {
temp = start[offset];
if ((temp != pattern) && (offset != test_offset)) {
printf("\nFAILURE: Address bit stuck low or shorted @"
" 0x%.8lx: expected 0x%.8lx, actual 0x%.8lx\n",
(ulong)&start[offset], pattern, temp);
errs++;
if (ctrlc()) {
putc('\n'); putc('\n');
return -1; return -1;
}
} }
}
start[test_offset] = pattern;
} }
}
start[test_offset] = pattern;
WATCHDOG_RESET();
/* /*
* Description: Test the integrity of a physical * Check for addr bits stuck low or shorted.
* memory device by performing an */
* increment/decrement test over the for (test_offset = 1; test_offset < len; test_offset <<= 1) {
* entire region. In the process every start[test_offset] = anti_pattern;
* storage bit in the device is tested
* as a zero and a one. The base address
* and the size of the region are
* selected by the caller.
*
* Returns: 0 if the test succeeds, 1 if the test fails.
*/
num_words = ((ulong)end - (ulong)start)/sizeof(vu_long) + 1;
/* for (offset = 1; offset < len; offset <<= 1) {
* Fill memory with a known pattern. temp = start[offset];
*/ if ((temp != pattern) && (offset != test_offset)) {
for (pattern = 1, offset = 0; offset < num_words; pattern++, offset++) { printf("\nFAILURE: Address bit stuck low or"
WATCHDOG_RESET(); " shorted @ 0x%.8lx: expected 0x%.8lx,"
start[offset] = pattern; " actual 0x%.8lx\n",
(ulong)&start[offset], pattern, temp);
errs++;
if (ctrlc()) {
putc('\n');
return -1;
}
}
} }
start[test_offset] = pattern;
}
/* /*
* Check each location and invert it for the second pass. * Description: Test the integrity of a physical
*/ * memory device by performing an
for (pattern = 1, offset = 0; offset < num_words; pattern++, offset++) { * increment/decrement test over the
WATCHDOG_RESET(); * entire region. In the process every
temp = start[offset]; * storage bit in the device is tested
if (temp != pattern) { * as a zero and a one. The base address
* and the size of the region are
* selected by the caller.
*
* Returns: 0 if the test succeeds, 1 if the test fails.
*/
num_words = ((ulong)end - (ulong)start)/sizeof(vu_long) + 1;
/*
* Fill memory with a known pattern.
*/
for (pattern = 1, offset = 0; offset < num_words; pattern++, offset++) {
WATCHDOG_RESET();
start[offset] = pattern;
}
/*
* Check each location and invert it for the second pass.
*/
for (pattern = 1, offset = 0; offset < num_words; pattern++, offset++) {
WATCHDOG_RESET();
temp = start[offset];
if (temp != pattern) {
printf("\nFAILURE (read/write) @ 0x%.8lx:" printf("\nFAILURE (read/write) @ 0x%.8lx:"
" expected 0x%.8lx, actual 0x%.8lx)\n", " expected 0x%.8lx, actual 0x%.8lx)\n",
(ulong)&start[offset], pattern, temp); (ulong)&start[offset], pattern, temp);
@ -834,20 +834,20 @@ static ulong mem_test_alt(vu_long *start, vu_long *end)
putc('\n'); putc('\n');
return -1; return -1;
} }
}
anti_pattern = ~pattern;
start[offset] = anti_pattern;
} }
/* anti_pattern = ~pattern;
* Check each location for the inverted pattern and zero it. start[offset] = anti_pattern;
*/ }
for (pattern = 1, offset = 0; offset < num_words; pattern++, offset++) {
WATCHDOG_RESET(); /*
anti_pattern = ~pattern; * Check each location for the inverted pattern and zero it.
temp = start[offset]; */
if (temp != anti_pattern) { for (pattern = 1, offset = 0; offset < num_words; pattern++, offset++) {
WATCHDOG_RESET();
anti_pattern = ~pattern;
temp = start[offset];
if (temp != anti_pattern) {
printf("\nFAILURE (read/write): @ 0x%.8lx:" printf("\nFAILURE (read/write): @ 0x%.8lx:"
" expected 0x%.8lx, actual 0x%.8lx)\n", " expected 0x%.8lx, actual 0x%.8lx)\n",
(ulong)&start[offset], anti_pattern, temp); (ulong)&start[offset], anti_pattern, temp);
@ -856,9 +856,9 @@ static ulong mem_test_alt(vu_long *start, vu_long *end)
putc('\n'); putc('\n');
return -1; return -1;
} }
}
start[offset] = 0;
} }
start[offset] = 0;
}
return 0; return 0;
} }
@ -886,34 +886,34 @@ static ulong mem_test_quick(vu_long *start, vu_long *end, vu_long pattern,
else else
pattern = ~pattern; pattern = ~pattern;
} }
printf("\rPattern %08lX Writing..." printf("\rPattern %08lX Writing..."
"%12s" "%12s"
"\b\b\b\b\b\b\b\b\b\b", "\b\b\b\b\b\b\b\b\b\b",
pattern, ""); pattern, "");
for (addr = start, val = pattern; addr < end; addr++) { for (addr = start, val = pattern; addr < end; addr++) {
WATCHDOG_RESET(); WATCHDOG_RESET();
*addr = val; *addr = val;
val += incr; val += incr;
} }
puts("Reading..."); puts("Reading...");
for (addr = start, val = pattern; addr < end; addr++) { for (addr = start, val = pattern; addr < end; addr++) {
WATCHDOG_RESET(); WATCHDOG_RESET();
readback = *addr; readback = *addr;
if (readback != val) { if (readback != val) {
printf("\nMem error @ 0x%08X: " printf("\nMem error @ 0x%08X: "
"found %08lX, expected %08lX\n", "found %08lX, expected %08lX\n",
(uint)(uintptr_t)addr, readback, val); (uint)(uintptr_t)addr, readback, val);
errs++; errs++;
if (ctrlc()) { if (ctrlc()) {
putc('\n'); putc('\n');
return -1; return -1;
}
} }
val += incr;
} }
val += incr;
}
return 0; return 0;
} }