February 2016 - U-Boot

[U-Boot] [PATCH] test/py: HTML awesome!
by Stephen Warren 06 Feb '16

06 Feb '16

From: Stephen Warren <swarren(a)nvidia.com> Implement three improvements to the HTML log file: - Ability to expand/contract sections. All passing sections are contracted at file load time so the user can concentrate on issues requiring action. - The overall status report is copied to the top of the log for easy access. - Add links from the status report to the test logs, for easy navigation. This all relies on Javascript and the jquery library. If the user doesn't have Javascript enabled, or jquery can't be downloaded, the log should look and behave identically to how it did before this patch. A few notes on the diff: - A few more 'with log.section("xxx")' were added, so that all stream blocks are kept within a section block for consistent HTML entity nesting structure. This changed indentation in a few places, making the diff look slightly larger. - HTML entity IDs are cleaned up. We assign simple incrementing integer IDs now, rather than using mangled test names which were possibly invalid. - Sections and streams now use common CSS class names (in addition to the current separate class names) to more easily share the new behaviour. This also reduces the CSS file size since rules don't need to be duplicated. - An "OK" status is logged after some external command executions so that make and flash steps are auto-contracted at log file load time, assuming they passed. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- test/py/conftest.py | 61 ++++++++------- test/py/multiplexed_log.css | 41 +++++----- test/py/multiplexed_log.py | 142 +++++++++++++++++++++++++++------- test/py/u_boot_console_exec_attach.py | 12 +-- 4 files changed, 178 insertions(+), 78 deletions(-) diff --git a/test/py/conftest.py b/test/py/conftest.py index 84f71d47db6a..f55bf68686ba 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -123,10 +123,12 @@ def pytest_configure(config): ['make', o_opt, '-s', board_type + '_defconfig'], ['make', o_opt, '-s', '-j8'], ) - runner = log.get_runner('make', sys.stdout) - for cmd in cmds: - runner.run(cmd, cwd=source_dir) - runner.close() + with log.section('make'): + runner = log.get_runner('make', sys.stdout) + for cmd in cmds: + runner.run(cmd, cwd=source_dir) + runner.close() + log.status_pass('OK') class ArbitraryAttributeContainer(object): pass @@ -302,6 +304,7 @@ def u_boot_console(request): console.ensure_spawned() return console +anchors = {} tests_not_run = set() tests_failed = set() tests_xpassed = set() @@ -341,27 +344,33 @@ def cleanup(): if console: console.close() if log: - log.status_pass('%d passed' % len(tests_passed)) - if tests_skipped: - log.status_skipped('%d skipped' % len(tests_skipped)) - for test in tests_skipped: - log.status_skipped('... ' + test) - if tests_xpassed: - log.status_xpass('%d xpass' % len(tests_xpassed)) - for test in tests_xpassed: - log.status_xpass('... ' + test) - if tests_xfailed: - log.status_xfail('%d xfail' % len(tests_xfailed)) - for test in tests_xfailed: - log.status_xfail('... ' + test) - if tests_failed: - log.status_fail('%d failed' % len(tests_failed)) - for test in tests_failed: - log.status_fail('... ' + test) - if tests_not_run: - log.status_fail('%d not run' % len(tests_not_run)) - for test in tests_not_run: - log.status_fail('... ' + test) + with log.section('Status Report', 'status_report'): + log.status_pass('%d passed' % len(tests_passed)) + if tests_skipped: + log.status_skipped('%d skipped' % len(tests_skipped)) + for test in tests_skipped: + anchor = anchors.get(test, None) + log.status_skipped('... ' + test, anchor) + if tests_xpassed: + log.status_xpass('%d xpass' % len(tests_xpassed)) + for test in tests_xpassed: + anchor = anchors.get(test, None) + log.status_xpass('... ' + test, anchor) + if tests_xfailed: + log.status_xfail('%d xfail' % len(tests_xfailed)) + for test in tests_xfailed: + anchor = anchors.get(test, None) + log.status_xfail('... ' + test, anchor) + if tests_failed: + log.status_fail('%d failed' % len(tests_failed)) + for test in tests_failed: + anchor = anchors.get(test, None) + log.status_fail('... ' + test, anchor) + if tests_not_run: + log.status_fail('%d not run' % len(tests_not_run)) + for test in tests_not_run: + anchor = anchors.get(test, None) + log.status_fail('... ' + test, anchor) log.close() atexit.register(cleanup) @@ -427,7 +436,7 @@ def pytest_runtest_setup(item): Nothing. """ - log.start_section(item.name) + anchors[item.name] = log.start_section(item.name) setup_boardspec(item) setup_buildconfigspec(item) diff --git a/test/py/multiplexed_log.css b/test/py/multiplexed_log.css index f6240d52da66..f135b10a24c9 100644 --- a/test/py/multiplexed_log.css +++ b/test/py/multiplexed_log.css @@ -25,37 +25,24 @@ pre { color: #808080; } -.section { +.block { border-style: solid; border-color: #303030; border-width: 0px 0px 0px 5px; padding-left: 5px } -.section-header { +.block-header { background-color: #303030; margin-left: -5px; margin-top: 5px; } -.section-trailer { - display: none; +.block-header:hover { + text-decoration: underline; } -.stream { - border-style: solid; - border-color: #303030; - border-width: 0px 0px 0px 5px; - padding-left: 5px -} - -.stream-header { - background-color: #303030; - margin-left: -5px; - margin-top: 5px; -} - -.stream-trailer { +.block-trailer { display: none; } @@ -94,3 +81,21 @@ pre { .status-fail { color: #ff0000 } + +.hidden { + display: none; +} + +a:link { + text-decoration: inherit; + color: inherit; +} + +a:visited { + text-decoration: inherit; + color: inherit; +} + +a:hover { + text-decoration: underline; +} diff --git a/test/py/multiplexed_log.py b/test/py/multiplexed_log.py index 69a577e57720..68917eb0ea96 100644 --- a/test/py/multiplexed_log.py +++ b/test/py/multiplexed_log.py @@ -168,12 +168,13 @@ class SectionCtxMgr(object): Objects of this type should be created by factory functions in the Logfile class rather than directly.""" - def __init__(self, log, marker): + def __init__(self, log, marker, anchor): """Initialize a new object. Args: log: The Logfile object to log to. marker: The name of the nested log section. + anchor: The anchor value to pass to start_section(). Returns: Nothing. @@ -181,9 +182,10 @@ class SectionCtxMgr(object): self.log = log self.marker = marker + self.anchor = anchor def __enter__(self): - self.log.start_section(self.marker) + self.anchor = self.log.start_section(self.marker, self.anchor) def __exit__(self, extype, value, traceback): self.log.end_section(self.marker) @@ -206,11 +208,70 @@ class Logfile(object): self.last_stream = None self.blocks = [] self.cur_evt = 1 + self.anchor = 0 + shutil.copy(mod_dir + '/multiplexed_log.css', os.path.dirname(fn)) self.f.write('''\ <html> <head> <link rel="stylesheet" type="text/css" href="multiplexed_log.css"> +<script src="http://code.jquery.com/jquery.min.js"></script> +<script> +$(document).ready(function () { + // Copy status report HTML to start of log for easy access + sts = $(".block#status_report")[0].outerHTML; + $("tt").prepend(sts); + + // Add expand/contract buttons to all block headers + btns = "<span class=\\\"block-expand hidden\\\">[+] </span>" + + "<span class=\\\"block-contract\\\">[-] </span>"; + $(".block-header").prepend(btns); + + // Pre-contract all blocks which passed, leaving only problem cases + // expanded, to highlight issues the user should look at. + // Only top-level blocks (sections) should have any status + passed_bcs = $(".block-content:has(.status-pass)"); + // Some blocks might have multiple status entries (e.g. the status + // report), so take care not to hide blocks with partial success. + passed_bcs = passed_bcs.not(":has(.status-fail)"); + passed_bcs = passed_bcs.not(":has(.status-xfail)"); + passed_bcs = passed_bcs.not(":has(.status-xpass)"); + passed_bcs = passed_bcs.not(":has(.status-skipped)"); + // Hide the passed blocks + passed_bcs.addClass("hidden"); + // Flip the expand/contract button hiding for those blocks. + bhs = passed_bcs.parent().children(".block-header") + bhs.children(".block-expand").removeClass("hidden"); + bhs.children(".block-contract").addClass("hidden"); + + // Add click handler to block headers. + // The handler expands/contracts the block. + $(".block-header").on("click", function (e) { + var header = $(this); + var content = header.next(".block-content"); + var expanded = !content.hasClass("hidden"); + if (expanded) { + content.addClass("hidden"); + header.children(".block-expand").first().removeClass("hidden"); + header.children(".block-contract").first().addClass("hidden"); + } else { + header.children(".block-contract").first().removeClass("hidden"); + header.children(".block-expand").first().addClass("hidden"); + content.removeClass("hidden"); + } + }); + + // When clicking on a link, expand the target block + $("a").on("click", function (e) { + var block = $($(this).attr("href")); + var header = block.children(".block-header"); + var content = block.children(".block-content").first(); + header.children(".block-contract").first().removeClass("hidden"); + header.children(".block-expand").first().addClass("hidden"); + content.removeClass("hidden"); + }); +}); +</script> </head> <body> <tt> @@ -273,45 +334,60 @@ class Logfile(object): if not self.last_stream: return self.f.write('</pre>\n') - self.f.write('<div class="stream-trailer" id="' + - self.last_stream.name + '">End stream: ' + + self.f.write('<div class="stream-trailer block-trailer">End stream: ' + self.last_stream.name + '</div>\n') self.f.write('</div>\n') + self.f.write('</div>\n') self.last_stream = None - def _note(self, note_type, msg): + def _note(self, note_type, msg, anchor=None): """Write a note or one-off message to the log file. Args: note_type: The type of note. This must be a value supported by the accompanying multiplexed_log.css. msg: The note/message to log. + anchor: Optional internal link target. Returns: Nothing. """ self._terminate_stream() - self.f.write('<div class="' + note_type + '">\n<pre>') + self.f.write('<div class="' + note_type + '">\n') + if anchor: + self.f.write('<a href="#%s">\n' % anchor) + self.f.write('<pre>') self.f.write(self._escape(msg)) - self.f.write('\n</pre></div>\n') + self.f.write('\n</pre>\n') + if anchor: + self.f.write('</a>\n') + self.f.write('</div>\n') - def start_section(self, marker): + def start_section(self, marker, anchor=None): """Begin a new nested section in the log file. Args: marker: The name of the section that is starting. + anchor: The value to use for the anchor. If None, a unique value + will be calculated and used Returns: - Nothing. + Name of the HTML anchor emitted before section. """ self._terminate_stream() self.blocks.append(marker) + if not anchor: + self.anchor += 1 + anchor = str(self.anchor) blk_path = '/'.join(self.blocks) - self.f.write('<div class="section" id="' + blk_path + '">\n') - self.f.write('<div class="section-header" id="' + blk_path + - '">Section: ' + blk_path + '</div>\n') + self.f.write('<div class="section block" id="' + anchor + '">\n') + self.f.write('<div class="section-header block-header">Section: ' + + blk_path + '</div>\n') + self.f.write('<div class="section-content block-content">\n') + + return anchor def end_section(self, marker): """Terminate the current nested section in the log file. @@ -331,12 +407,13 @@ class Logfile(object): (marker, '/'.join(self.blocks))) self._terminate_stream() blk_path = '/'.join(self.blocks) - self.f.write('<div class="section-trailer" id="section-trailer-' + - blk_path + '">End section: ' + blk_path + '</div>\n') + self.f.write('<div class="section-trailer block-trailer">' + + 'End section: ' + blk_path + '</div>\n') + self.f.write('</div>\n') self.f.write('</div>\n') self.blocks.pop() - def section(self, marker): + def section(self, marker, anchor=None): """Create a temporary section in the log file. This function creates a context manager for Python's "with" statement, @@ -349,12 +426,13 @@ class Logfile(object): Args: marker: The name of the nested section. + anchor: The anchor value to pass to start_section(). Returns: A context manager object. """ - return SectionCtxMgr(self, marker) + return SectionCtxMgr(self, marker, anchor) def error(self, msg): """Write an error note to the log file. @@ -404,65 +482,70 @@ class Logfile(object): self._note("action", msg) - def status_pass(self, msg): + def status_pass(self, msg, anchor=None): """Write a note to the log file describing test(s) which passed. Args: msg: A message describing the passed test(s). + anchor: Optional internal link target. Returns: Nothing. """ - self._note("status-pass", msg) + self._note("status-pass", msg, anchor) - def status_skipped(self, msg): + def status_skipped(self, msg, anchor=None): """Write a note to the log file describing skipped test(s). Args: msg: A message describing the skipped test(s). + anchor: Optional internal link target. Returns: Nothing. """ - self._note("status-skipped", msg) + self._note("status-skipped", msg, anchor) - def status_xfail(self, msg): + def status_xfail(self, msg, anchor=None): """Write a note to the log file describing xfailed test(s). Args: msg: A message describing the xfailed test(s). + anchor: Optional internal link target. Returns: Nothing. """ - self._note("status-xfail", msg) + self._note("status-xfail", msg, anchor) - def status_xpass(self, msg): + def status_xpass(self, msg, anchor=None): """Write a note to the log file describing xpassed test(s). Args: msg: A message describing the xpassed test(s). + anchor: Optional internal link target. Returns: Nothing. """ - self._note("status-xpass", msg) + self._note("status-xpass", msg, anchor) - def status_fail(self, msg): + def status_fail(self, msg, anchor=None): """Write a note to the log file describing failed test(s). Args: msg: A message describing the failed test(s). + anchor: Optional internal link target. Returns: Nothing. """ - self._note("status-fail", msg) + self._note("status-fail", msg, anchor) def get_stream(self, name, chained_file=None): """Create an object to log a single stream's data into the log file. @@ -519,9 +602,10 @@ class Logfile(object): if stream != self.last_stream: self._terminate_stream() - self.f.write('<div class="stream" id="%s">\n' % stream.name) - self.f.write('<div class="stream-header" id="' + stream.name + - '">Stream: ' + stream.name + '</div>\n') + self.f.write('<div class="stream block">\n') + self.f.write('<div class="stream-header block-header">Stream: ' + + stream.name + '</div>\n') + self.f.write('<div class="stream-content block-content">\n') self.f.write('<pre>') if implicit: self.f.write('<span class="implicit">') diff --git a/test/py/u_boot_console_exec_attach.py b/test/py/u_boot_console_exec_attach.py index 19520cb3b907..1be27c193079 100644 --- a/test/py/u_boot_console_exec_attach.py +++ b/test/py/u_boot_console_exec_attach.py @@ -35,11 +35,13 @@ class ConsoleExecAttach(ConsoleBase): # HW flow control would mean this could be infinite. super(ConsoleExecAttach, self).__init__(log, config, max_fifo_fill=16) - self.log.action('Flashing U-Boot') - cmd = ['u-boot-test-flash', config.board_type, config.board_identity] - runner = self.log.get_runner(cmd[0], sys.stdout) - runner.run(cmd) - runner.close() + with self.log.section('flash'): + self.log.action('Flashing U-Boot') + cmd = ['u-boot-test-flash', config.board_type, config.board_identity] + runner = self.log.get_runner(cmd[0], sys.stdout) + runner.run(cmd) + runner.close() + self.log.status_pass('OK') def get_spawn(self): """Connect to a fresh U-Boot instance. -- 2.7.0

2 2

[U-Boot] [PATCH] test/py: exit(1) if there are problems running py.test
by Stephen Warren 06 Feb '16

06 Feb '16

From: Stephen Warren <swarren(a)nvidia.com> The test/py/test.py wrapper script catches exceptions thrown when exec()ing py.test in order to print a helpful error message. However, the exception handling code squashes the exception and so the script exits with a non-zero exit code, leading callers to believe that it passed. Fix this. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- test/py/test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/py/test.py b/test/py/test.py index 95671d473776..74e560a4d33a 100755 --- a/test/py/test.py +++ b/test/py/test.py @@ -30,3 +30,4 @@ except: print >>sys.stderr, ''' exec(py.test) failed; perhaps you are missing some dependencies? See test/py/README.md for the list.''' + sys.exit(1) -- 2.7.0

2 2

[U-Boot] [RFC PATCH] itest: allow map_physmem to return 0 in limited cases
by Stephen Warren 06 Feb '16

06 Feb '16

From: Stephen Warren <swarren(a)nvidia.com> On some systems, RAM starts at address 0. If the user executes itest against address 0 on such a system, it will call map_physmem(0, ...) which will return 0 back; mapping only changes the address on sandbox. This causes itest to believe map_physmem() has failed, and hence fails the comparison. Fix itest so that it allows map_physmem() to return 0 /if/ the orignal address passed to it was also 0. This fixes "tegra-uboot-flasher flash" on Tegra20. This has the disadvantage that on sandbox, failed mapping attempts for address 0 are not detected. Instead, should the code only call map_physmem() on sandbox? Or, should map_physmem() return its error status some other way. Or, should the special case only be allowed on systems where the base of RAM is 0 somehow? Fixes: 7861204c9af7 ("itest: make memory access work under sandbox") Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- Another approach would be to fix the scripts generated by t-u-f to use some other address, e.g. address 4. However, I think itest should work on any legal address in RAM? common/cmd_itest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/cmd_itest.c b/common/cmd_itest.c index 91ae5c2704c8..fb4d797e43d7 100644 --- a/common/cmd_itest.c +++ b/common/cmd_itest.c @@ -59,7 +59,7 @@ static long evalexp(char *s, int w) if (s[0] == '*') { addr = simple_strtoul(&s[1], NULL, 16); buf = map_physmem(addr, w, MAP_WRBACK); - if (!buf) { + if (!buf && addr) { puts("Failed to map physical memory\n"); return 0; } -- 2.7.0

2 2

[U-Boot] [PATCH] gunzip: remove avail_in recalculation
by Stephen Warren 06 Feb '16

06 Feb '16

From: Stephen Warren <swarren(a)nvidia.com> Current, the following passes: ./u-boot -d arch/sandbox/dts/test.dtb -c 'ut_image_decomp' but the following fails: ./u-boot -d arch/sandbox/dts/test.dtb -c 'ut dm; ut_image_decomp' This is because the gunzip code reads input data beyond the end of its input buffer. In the first case above, this data just happens to be 0, which just happens to trigger gzip to signal the error the decompression unit test expects. In the second case above, the "ut dm" test has written data to the accidentally-read memory, which causes the gzip code to take a different path and so return a different value, which triggers the test failure. The cause of gunzip reading past its input buffer is the re-calculation of s.avail_in in zunzip(), since it can underflow. Not only is the formula non-sensical (it uses the delta between two output buffer pointers to calculate available input buffer size), it also appears to be unnecessary, since the gunzip code already maintains this value itself. This patch removes this re-calculation to avoid the underflow and redundant work. The loop exit condition is also adjusted so that if inflate() has consumed the entire input buffer, without indicating returning Z_STREAM_END (i.e. decompression complete without error), an error is raised. There is still opportunity to simplify the code here by splitting up the loop exit condition into separate tests. However, this patch makes the minimum modifications required to solve the problem at hand, in order to keep the diff simple. I am not entirely convinced that the loop in zunzip() is necessary at all. It could only be useful if inflate() can return Z_BUF_ERROR (which typically means that it needs more data in the input buffer, or more space in the output buffer), even though Z_FINISH is set /and/ the full input is available in the input buffer /and/ there is enough space to store the decompressed output in the output buffer. The comment in zlib.h after the prototype of inflate() implies this is never the case. However, I assume there must have been some reason for introducing this loop in the first place, as part of commit "Fix gunzip to work for any gziped uImage size". This patch is similar to the earlier b75650d84d4b "gzip: correctly bounds-check output buffer", which corrected a similar issue for s.avail_out. Cc: Catalin Radu <Catalin(a)VirtualMetrix.com> Cc: Kees Cook <keescook(a)chromium.org> Fixes: f039ada5c109 ("Fix gunzip to work for any gziped uImage size") Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- Simon, this patch may be a dependency for any updated version of patch "test/py: run C-based unit tests", depending on when/whether we enable ut_image_decomp in that test. So, it might make sense to apply this to the dm tree directly, or ensure that it's included in an upstream tree that the dm tree is rebased upon before applying the test/py patch. lib/gunzip.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/gunzip.c b/lib/gunzip.c index 80b157f99eb4..da0c76c500d1 100644 --- a/lib/gunzip.c +++ b/lib/gunzip.c @@ -286,12 +286,11 @@ int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, do { r = inflate(&s, Z_FINISH); if (stoponerr == 1 && r != Z_STREAM_END && - (s.avail_out == 0 || r != Z_BUF_ERROR)) { + (s.avail_in == 0 || s.avail_out == 0 || r != Z_BUF_ERROR)) { printf("Error: inflate() returned %d\n", r); err = -1; break; } - s.avail_in = *lenp - offset - (int)(s.next_out - (unsigned char*)dst); } while (r == Z_BUF_ERROR); *lenp = s.next_out - (unsigned char *) dst; inflateEnd(&s); -- 2.7.0

3 3

[U-Boot] help on using patman
by Mugunthan V N 06 Feb '16

06 Feb '16

Hi Simon I tried to use patman with a sample commit, below is the commit with the tag patmantest Commit: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ $ git show patmantest tag patmantest Tagger: Mugunthan V N <mugunthanvnm(a)ti.com> Date: Thu Feb 4 11:51:48 2016 +0530 Series-to: me Series-prefix: RFC Cover-letter: Unified command execution in one place At present two parsers have similar code to execute commands. Also cmd_usage() is called all over the place. This series adds a single function which processes commands called cmd_process(). END commit 02c23a9b585d91272befb8fe43d21fe52e1fd139 Author: Mugunthan V N <mugunthanvnm(a)ti.com> Date: Mon Jan 18 14:17:43 2016 +0530 defconfig: dra72_evm: enable disk driver model Enable disk driver model for dra72_evm as dwc_ahci supports driver model Signed-off-by: Mugunthan V N <mugunthanvnm(a)ti.com> Reviewed-by: Tom Rini <trini(a)konsulko.com> diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index 32d1dc1..7ff2a4e 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -24,3 +24,5 @@ CONFIG_DM_SPI=y CONFIG_DM_SPI_FLASH=y CONFIG_TIMER=y CONFIG_OMAP_TIMER=y +CONFIG_DISK=y +CONFIG_DWC_AHCI=y ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ But when I patman -n, it throws below error $ ./tools/patman/patman -n Cleaned 1 patches total: 0 errors, 0 warnings, 0 checks, 5 lines checked NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE NETWORKING_BLOCK_COMMENT_STYLE PREFER_ETHER_ADDR_COPY USLEEP_RANGE 0001-defconfig-dra72_evm-enable-disk-driver-model.patch has no obvious style problems and is ready for submission. Traceback (most recent call last): File "./tools/patman/patman", line 158, in <module> options.add_maintainers) File "/home/mugunthan/workspace/git/mainline/u-boot-ti/tools/patman/series.py", line 222, in MakeCcFile raise_on_error=raise_on_error) File "/home/mugunthan/workspace/git/mainline/u-boot-ti/tools/patman/gitutil.py", line 321, in BuildEmailList raw += LookupEmail(item, alias, raise_on_error=raise_on_error) File "/home/mugunthan/workspace/git/mainline/u-boot-ti/tools/patman/gitutil.py", line 495, in LookupEmail raise ValueError, msg ValueError: Alias 'defconfig' not found Then I tried with patman setting ignore_errors: True and process_tags: False, then the out seems fine but the tag is not processed. Do you find any thing I missed? Output with modified patman settings: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ $ ./tools/patman/patman -n Cleaned 1 patches total: 0 errors, 0 warnings, 0 checks, 5 lines checked NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE NETWORKING_BLOCK_COMMENT_STYLE PREFER_ETHER_ADDR_COPY USLEEP_RANGE 0001-defconfig-dra72_evm-enable-disk-driver-model.patch has no obvious style problems and is ready for submission. No recipient. Please add something like this to a commit Series-to: Fred Bloggs <f.blogs(a)napier.co.nz> Or do something like this git config sendemail.to u-boot(a)lists.denx.de Dry run, so not doing much. But I would do this: Send a total of 1 patch with no cover letter. 0001-defconfig-dra72_evm-enable-disk-driver-model.patch Cc: u-boot(a)lists.denx.de Cc: Lokesh Vutla <lokeshvutla(a)ti.com> Version: None Prefix: None Here is my patman config $ cat ~/.patman [alias] me: Mugunthan V N <mugunthanvnm(a)ti.com> [settings] ignore_errors: True process_tags: False verbose: True Regards Mugunthan V N

2 3

[U-Boot] [PATCH V2 1/2] Makefile: generate symbol list from u-boot
by Stephen Warren 06 Feb '16

06 Feb '16

From: Stephen Warren <swarren(a)nvidia.com> This information may be useful for both debugging, and processes that want to perform simple forms of introspection on the U-Boot binary, such as determining the set of "ut" subtests that are compiled in. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- v2: New patch. --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4ae605810f82..2884ee676f00 100644 --- a/Makefile +++ b/Makefile @@ -732,7 +732,7 @@ DO_STATIC_RELA = endif # Always append ALL so that arch config.mk's can add custom ones -ALL-y += u-boot.srec u-boot.bin System.map u-boot.cfg binary_size_check +ALL-y += u-boot.srec u-boot.bin u-boot.syms System.map u-boot.cfg binary_size_check ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin ifeq ($(CONFIG_SPL_FSL_PBL),y) @@ -1178,6 +1178,11 @@ ifeq ($(CONFIG_KALLSYMS),y) $(call cmd,u-boot__) common/system_map.o endif +quiet_cmd_syms ?= SYMS $@ + cmd_syms ?= $(OBJDUMP) -t $< > $@ +u-boot.syms: u-boot FORCE + $(call if_changed,syms) + # The actual objects are generated when descending, # make sure no implicit rule kicks in $(sort $(u-boot-init) $(u-boot-main)): $(u-boot-dirs) ; -- 2.7.0

2 3

[U-Boot] [PATCH] video: bcm2835: use bus_to_phys() on FB address
by Stephen Warren 06 Feb '16

06 Feb '16

The FB address is generated by the firmware running on the GPU/VideoCore and is a "bus" address. This address is the other side of an IOMMU from the ARM upon which U-Boot is running. Use bus_to_phys() to convert this to an ARM physical address. Without this, U-Boot seems to work just fine, but once the Linux kernel boots on an RPi2, accessing the FB memory often causes a hard system hang. This is related to: 122426d46e31 ARM: bcm2835: use phys_to_bus() for mbox 5c0beb5c58c8 usb: dwc2: use phys_to_bus/bus_to_phys 79340db7f1f6 ARM: bcm2835: implement phys_to_bus/bus_to_phys Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- drivers/video/bcm2835.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c index 7867fe3895d0..bff1fcb9eaf7 100644 --- a/drivers/video/bcm2835.c +++ b/drivers/video/bcm2835.c @@ -7,6 +7,7 @@ #include <common.h> #include <lcd.h> #include <memalign.h> +#include <phys2bus.h> #include <asm/arch/mbox.h> #include <asm/global_data.h> @@ -103,7 +104,8 @@ void lcd_ctrl_init(void *lcdbase) panel_info.vl_row = h; panel_info.vl_bpix = LCD_COLOR16; - gd->fb_base = msg_setup->allocate_buffer.body.resp.fb_address; + gd->fb_base = bus_to_phys( + msg_setup->allocate_buffer.body.resp.fb_address); } void lcd_enable(void) -- 1.9.1

2 1

Re: [U-Boot] [PATCH v2]net: null check after pointer dereference
by Vishwas Srivastava 06 Feb '16

06 Feb '16

Author: Vishwas Srivastava <vishu.kernel(a)gmail.com> Date: Tue Jan 26 12:46:42 2016 +0530 null check after pointer dereference NULL check is made after the pointer dereference in davinci-emac driver. This patch fixes this issue. Signed-off-by: Vishwas Srivastava <vishu.kernel(a)gmail.com> CC: Joe Hershberger <joe.hershberger(a)ni.com> Reviewed-by: Tom Rini <trini(a)konsulko.com> Changes for v2: -cleaned up the style format -addressed various comments given by Joe <joe.hershberger(a)ni.com> on the first version of the patch. diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 3f54a3f..a61374d 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -692,8 +692,10 @@ static int davinci_eth_rcv_packet (struct eth_device *dev) davinci_invalidate_rx_descs(); rx_curr_desc = emac_rx_active_head; + if (!rx_curr_desc) + return 0; status = rx_curr_desc->pkt_flag_len; - if ((rx_curr_desc) && ((status & EMAC_CPPI_OWNERSHIP_BIT) == 0)) { + if ((status & EMAC_CPPI_OWNERSHIP_BIT) == 0) { if (status & EMAC_CPPI_RX_ERROR_FRAME) { /* Error in packet - discard it and requeue desc */ printf ("WARN: emac_rcv_pkt: Error in packet\n"); On Thu, Jan 28, 2016 at 1:35 AM, Joe Hershberger <joe.hershberger(a)gmail.com> wrote: > On Tue, Jan 26, 2016 at 1:26 AM, Vishwas Srivastava > <vishu.kernel(a)gmail.com> wrote: > > Author: Vishwas Srivastava <vishu.kernel(a)gmail.com> > > Date: Tue Jan 26 12:46:42 2016 +0530 > > Please fix the subject of this patch. No space in the "net :". > > > > > null check after pointer dereference > > All of your commit logs should not have spaces in them (at the start of > lines). > > > > > NULL check is made after the pointer dereference is davinci- > > emac driver. This patch fixes this issue. > > > > CC: Sergey Kubushyn <ksi(a)koi8.net>;Joe Hershberger < > > joe.hershberger(a)ni.com> > > Fix this format. One "Cc:" per line. > > > Signed-off-by: Vishwas Srivastava <vishu.kernel(a)gmail.com> > > This belongs first... before the Cc: > > > > > diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c > > index 3f54a3f..1966eb9 100644 > > --- a/drivers/net/davinci_emac.c > > +++ b/drivers/net/davinci_emac.c > > @@ -692,8 +692,10 @@ static int davinci_eth_rcv_packet (struct eth_device > > *dev) > > davinci_invalidate_rx_descs(); > > > > rx_curr_desc = emac_rx_active_head; > > You need to run your patches through scripts/checkpatch.pl. > > > + if (!rx_curr_desc) > > + return 0; > > status = rx_curr_desc->pkt_flag_len; > > - if ((rx_curr_desc) && ((status & EMAC_CPPI_OWNERSHIP_BIT) == 0)) > { > > + if ((status & EMAC_CPPI_OWNERSHIP_BIT) == 0) { > > if (status & EMAC_CPPI_RX_ERROR_FRAME) { > > /* Error in packet - discard it and requeue desc > */ > > printf ("WARN: emac_rcv_pkt: Error in packet\n"); > > Consider using tools/patman. > > Thanks, > -Joe >

2 2

[U-Boot] [PATCH] ppc: xilinx-ppc405-generic
by Ricardo Ribalda Delgado 06 Feb '16

06 Feb '16

Fix device tree name: +(xilinx-ppc405-generic) Device Tree Source is not correctly specified. +(xilinx-ppc405-generic) Please define 'CONFIG_DEFAULT_DEVICE_TREE' +(xilinx-ppc405-generic) or build with 'DEVICE_TREE=<device_tree>' argument +(xilinx-ppc405-generic) make[2]: *** [arch/powerpc/dts/xilinx-ppc440-generic.dtb] Error 1 +(xilinx-ppc405-generic) make[1]: *** [dts] Error 2 Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda(a)gmail.com> --- configs/xilinx-ppc405-generic_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig index e7132cd61152..85bc3b97ff38 100644 --- a/configs/xilinx-ppc405-generic_defconfig +++ b/configs/xilinx-ppc405-generic_defconfig @@ -14,4 +14,4 @@ CONFIG_OF_EMBED=y CONFIG_OF_CONTROL=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y -CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc440-generic" +CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc405-generic" -- 2.7.0

4 3

Re: [U-Boot] [PATCH v3]net: Wrong Initialization in davinci-emac driver
by Vishwas Srivastava 06 Feb '16

06 Feb '16

Author: Vishwas Srivastava <vishu.kernel(a)gmail.com> Date: Mon Jan 25 21:28:17 2016 +0530 Wrong Initialization in davinci emac driver emac module of the davinci platform supports only 8 tx and 8 rx channels (total 16). emac driver for davinci platform, however, while doing initialization of the dma descriptor head pointers,wrongly initializes the 16 head pointers (instead of 8) for tx dma and 16 head pointers(insted of 8) for rx dma, which is wrong.The result is, that this register initilization spills over the other registers which was not intended and is undesirable.This patch fixes this problem. Changes for v2: -cleaned up the style format -addressed various comments given by Joe <joe.hershberger(a)ni.com> on the first version of the patch. Changes for v3: - Added the missing patch part of v2 Signed-off-by: Vishwas Srivastava <vishu.kernel(a)gmail.com> CC: Joe Hershberger <joe.hershberger(a)ni.com> Acked-by: Joe Hershberger <joe.hershberger(a)ni.com> diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 92c3dca..3f54a3f 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -459,11 +459,11 @@ static int davinci_eth_open(struct eth_device *dev, bd_t *bis) /* Set DMA 8 TX / 8 RX Head pointers to 0 */ addr = &adap_emac->TX0HDP; - for(cnt = 0; cnt < 16; cnt++) + for (cnt = 0; cnt < 8; cnt++) writel(0, addr++); addr = &adap_emac->RX0HDP; - for(cnt = 0; cnt < 16; cnt++) + for (cnt = 0; cnt < 8; cnt++) writel(0, addr++); /* Clear Statistics (do this before setting MacControl register) */ On Fri, Jan 29, 2016 at 9:32 PM, Vishwas Srivastava <vishu.kernel(a)gmail.com> wrote: > Author: Vishwas Srivastava <vishu.kernel(a)gmail.com> > Date: Mon Jan 25 21:28:17 2016 +0530 > > Wrong Initialization in davinci emac driver > > emac module of the davinci platform supports only 8 tx and 8 > rx channels (total 16). emac driver for davinci platform, > however, while doing initialization of the dma descriptor > head pointers,wrongly initializes the 16 head pointers > (instead of 8) for tx dma and 16 head pointers(insted of 8) > for rx dma, which is wrong.The result is, that this register > initilization spills over the other registers which was not > intended and is undesirable.This patch fixes this problem. > > Changes for v2: > -cleaned up the style format > -addressed various comments given by Joe <joe.hershberger(a)ni.com> > on the first version of the patch. > > Signed-off-by: Vishwas Srivastava <vishu.kernel(a)gmail.com> > CC: Joe Hershberger <joe.hershberger(a)ni.com> > Acked-by: Joe Hershberger <joe.hershberger(a)ni.com> > > diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c > index 92c3dca..3f54a3f 100644 > --- a/drivers/net/davinci_emac.c > +++ b/drivers/net/davinci_emac.c > @@ -459,11 +459,11 @@ static int davinci_eth_open(struct eth_device *dev, > bd_t *bis) > > /* Set DMA 8 TX / 8 RX Head pointers to 0 */ > addr = &adap_emac->TX0HDP; > - for(cnt = 0; cnt < 16; cnt++) > + for (cnt = 0; cnt < 8; cnt++) > writel(0, addr++); > > > On Thu, Jan 28, 2016 at 1:27 AM, Joe Hershberger < > joe.hershberger(a)gmail.com> wrote: > >> On Mon, Jan 25, 2016 at 11:00 AM, Vishwas Srivastava >> <vishu.kernel(a)gmail.com> wrote: >> > Author: Vishwas Srivastava <vishu.kernel(a)gmail.com> >> > Date: Mon Jan 25 21:28:17 2016 +0530 >> >> Please fix the patch subject. No Leading colon. >> >> > >> > Wrong Initialization in davinci emac driver >> > >> > emac module of the davinci platform supports only 8 tx and >> > 8 rx channels (total 16). emac driver for davinci platform, >> > however, while doing initialization of the dma descriptor >> > head pointers,wrongly initializes the 16 head pointers >> > (instead of 8) for tx dma and 16 head pointers for rx dma, >> > which is wrong.The result is, that this register initilization >> > spills over the other registers which was not intended and is >> > undesirable.This patch fixes this problem. >> > >> > Signed-off-by: Vishwas Srivastava <vishu.kernel(a)gmail.com> >> > CC: Sergey Kubushyn <ksi(a)koi8.net>;Joe Hershberger < >> > joe.hershberger(a)ni.com> >> >> Please fix this formatting. One "Cc:" per line. >> >> > Signed-off-by: Vishwas Srivastava <vishu.kernel(a)gmail.com> >> >> Don't specify this twice. >> >> > >> > diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c >> > index 92c3dca..3f54a3f 100644 >> > --- a/drivers/net/davinci_emac.c >> > +++ b/drivers/net/davinci_emac.c >> > @@ -459,11 +459,11 @@ static int davinci_eth_open(struct eth_device >> *dev, >> > bd_t *bis) >> >> This line wrap is corrupt. The patch won't apply cleanly. >> >> > >> > /* Set DMA 8 TX / 8 RX Head pointers to 0 */ >> > addr = &adap_emac->TX0HDP; >> > - for(cnt = 0; cnt < 16; cnt++) >> > + for(cnt = 0; cnt < 8; cnt++) >> > writel(0, addr++); >> > >> > addr = &adap_emac->RX0HDP; >> > - for(cnt = 0; cnt < 16; cnt++) >> > + for(cnt = 0; cnt < 8; cnt++) >> > writel(0, addr++); >> > >> > /* Clear Statistics (do this before setting MacControl >> register) */ >> >> This line was corrupted by patchwork. You are doing something wrong. >> >> > _______________________________________________ >> > U-Boot mailing list >> > U-Boot(a)lists.denx.de >> > http://lists.denx.de/mailman/listinfo/u-boot >> >> Please correct all these issues, but for the content of the patch, still >> Acked. >> >> Thanks, >> -Joe >> > >

3 3