-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'xip_zdata' of http://git.linaro.org/people/nicolas.pitr…
…e/linux into devel-testing This contains important fixes to the XIP linker script, some more linker script cleanups, .bss clearing and .data copying speedups related to the above, and an opt-in config option for XIP kernels that allows for compressing .data in ROM that depend on those other patches to work properly.
- Loading branch information
Showing
8 changed files
with
256 additions
and
118 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| #!/bin/sh | ||
|
|
||
| # XIP kernel .data segment compressor | ||
| # | ||
| # Created by: Nicolas Pitre, August 2017 | ||
| # Copyright: (C) 2017 Linaro Limited | ||
| # | ||
| # This program is free software; you can redistribute it and/or modify | ||
| # it under the terms of the GNU General Public License version 2 as | ||
| # published by the Free Software Foundation. | ||
|
|
||
| # This script locates the start of the .data section in xipImage and | ||
| # substitutes it with a compressed version. The needed offsets are obtained | ||
| # from symbol addresses in vmlinux. It is expected that .data extends to | ||
| # the end of xipImage. | ||
|
|
||
| set -e | ||
|
|
||
| VMLINUX="$1" | ||
| XIPIMAGE="$2" | ||
|
|
||
| DD="dd status=none" | ||
|
|
||
| # Use "make V=1" to debug this script. | ||
| case "$KBUILD_VERBOSE" in | ||
| *1*) | ||
| set -x | ||
| ;; | ||
| esac | ||
|
|
||
| sym_val() { | ||
| # extract hex value for symbol in $1 | ||
| local val=$($NM "$VMLINUX" | sed -n "/ $1$/{s/ .*$//p;q}") | ||
| [ "$val" ] || { echo "can't find $1 in $VMLINUX" 1>&2; exit 1; } | ||
| # convert from hex to decimal | ||
| echo $((0x$val)) | ||
| } | ||
|
|
||
| __data_loc=$(sym_val __data_loc) | ||
| _edata_loc=$(sym_val _edata_loc) | ||
| base_offset=$(sym_val _xiprom) | ||
|
|
||
| # convert to file based offsets | ||
| data_start=$(($__data_loc - $base_offset)) | ||
| data_end=$(($_edata_loc - $base_offset)) | ||
|
|
||
| # Make sure data occupies the last part of the file. | ||
| file_end=$(stat -c "%s" "$XIPIMAGE") | ||
| if [ "$file_end" != "$data_end" ]; then | ||
| printf "end of xipImage doesn't match with _edata_loc (%#x vs %#x)\n" \ | ||
| $(($file_end + $base_offset)) $_edata_loc 2>&1 | ||
| exit 1; | ||
| fi | ||
|
|
||
| # be ready to clean up | ||
| trap 'rm -f "$XIPIMAGE.tmp"' 0 1 2 3 | ||
|
|
||
| # substitute the data section by a compressed version | ||
| $DD if="$XIPIMAGE" count=$data_start iflag=count_bytes of="$XIPIMAGE.tmp" | ||
| $DD if="$XIPIMAGE" skip=$data_start iflag=skip_bytes | | ||
| gzip -9 >> "$XIPIMAGE.tmp" | ||
|
|
||
| # replace kernel binary | ||
| mv -f "$XIPIMAGE.tmp" "$XIPIMAGE" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * XIP kernel .data segment decompressor | ||
| * | ||
| * Created by: Nicolas Pitre, August 2017 | ||
| * Copyright: (C) 2017 Linaro Limited | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2 as | ||
| * published by the Free Software Foundation. | ||
| */ | ||
|
|
||
| #include <linux/init.h> | ||
| #include <linux/zutil.h> | ||
|
|
||
| /* for struct inflate_state */ | ||
| #include "../../../lib/zlib_inflate/inftrees.h" | ||
| #include "../../../lib/zlib_inflate/inflate.h" | ||
| #include "../../../lib/zlib_inflate/infutil.h" | ||
|
|
||
| extern char __data_loc[]; | ||
| extern char _edata_loc[]; | ||
| extern char _sdata[]; | ||
|
|
||
| /* | ||
| * This code is called very early during the boot process to decompress | ||
| * the .data segment stored compressed in ROM. Therefore none of the global | ||
| * variables are valid yet, hence no kernel services such as memory | ||
| * allocation is available. Everything must be allocated on the stack and | ||
| * we must avoid any global data access. We use a temporary stack located | ||
| * in the .bss area. The linker script makes sure the .bss is big enough | ||
| * to hold our stack frame plus some room for called functions. | ||
| * | ||
| * We mimic the code in lib/decompress_inflate.c to use the smallest work | ||
| * area possible. And because everything is statically allocated on the | ||
| * stack then there is no need to clean up before returning. | ||
| */ | ||
|
|
||
| int __init __inflate_kernel_data(void) | ||
| { | ||
| struct z_stream_s stream, *strm = &stream; | ||
| struct inflate_state state; | ||
| char *in = __data_loc; | ||
| int rc; | ||
|
|
||
| /* Check and skip gzip header (assume no filename) */ | ||
| if (in[0] != 0x1f || in[1] != 0x8b || in[2] != 0x08 || in[3] & ~3) | ||
| return -1; | ||
| in += 10; | ||
|
|
||
| strm->workspace = &state; | ||
| strm->next_in = in; | ||
| strm->avail_in = _edata_loc - __data_loc; /* upper bound */ | ||
| strm->next_out = _sdata; | ||
| strm->avail_out = _edata_loc - __data_loc; | ||
| zlib_inflateInit2(strm, -MAX_WBITS); | ||
| WS(strm)->inflate_state.wsize = 0; | ||
| WS(strm)->inflate_state.window = NULL; | ||
| rc = zlib_inflate(strm, Z_FINISH); | ||
| if (rc == Z_OK || rc == Z_STREAM_END) | ||
| rc = strm->avail_out; /* should be 0 */ | ||
| return rc; | ||
| } |
Oops, something went wrong.