Changeset 63a045c in mainline for boot/arch/mips32

Timestamp:

2018-10-10T17:41:44Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9286475

Parents:

63c1dd5

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-10 17:11:15)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-10 17:41:44)

Message:

Unify handling of compressed init data and use regular tar + gzip to achieve it

There are two issues this commit solves.

First is that architecture-specific code duplicates most of the init binary
handling in each architecture, each with miniscule and confusing variations.
After this commit, the init binary expansion is almost entirely handled by
unified generic code.

Second is that the way we used to generate the incorporated data is somewhat
convoluted. Previously we have a Python script which generates a zip archive
with individual deflate-compressed files and accompanying header and C files
which contain structures describing the archive contents.
The zip file is then extracted and the individual deflate-compressed files are
included in the binary via assembler code.
Since gas doesn't take particular care to be consistent between architectures,
the assembly portions are also not uniform and the build script needs to know
particulars of the architecture's assembly.

Instead of doing that, after this commit we first gzip each included file, then
we pack the gzipped files into a tar archive, and then we include the archive
into the binary using objcopy.
Linker script provides symbols for the start and end of the archive,
and the payload is in a self-describing format, so there is no need for any
generated code.

Note that we are doing the opposite of the conventional .tar.gz format.
It would be somewhat inconvenient to use .tar.gz since the uncompressed files
need to be aligned to page size, so we'd have to first decompress the entire
payload to determine the final position of the files (and hence the required
amount of memory).

Location:

boot/arch/mips32

Files:

• Makefile.inc (modified) (2 diffs)
• _link.ld.in (modified) (2 diffs)
• include/arch/types.h (modified) (1 diff)
• src/asm.S (modified) (1 diff)
• src/main.c (modified) (2 diffs)

boot/arch/mips32/Makefile.inc

@@ -76 +76 @@
         arch/$(BARCH)/src/main.c \
         arch/$(BARCH)/src/putchar.c \
-        $(COMPS).s \
-        $(COMPS)_desc.c \
+        $(COMPS).o \
         genarch/src/division.c \
         genarch/src/multiplication.c \
@@ -86 +85 @@
         generic/src/str.c \
         generic/src/version.c \
-        generic/src/inflate.c
-
-PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c $(COMPONENTS_DEFLATE)
+        generic/src/inflate.c \
+        generic/src/gzip.c \
+        generic/src/tar.c \
+        generic/src/payload.c

boot/arch/mips32/_link.ld.in

@@ -8 +8 @@
 #endif
         .text : {
+                loader_start = .;
                 *(BOOTSTRAP);
                 *(.text);
@@ -21 +22 @@
                 *(.bss);        /* uninitialized static variables */
                 *(COMMON);      /* global variables */
-                *(.components);
+                loader_end = .;
+                payload_start = .;
+                *(.payload);
+                payload_end = .;
         }
 

boot/arch/mips32/include/arch/types.h

@@ -46 +46 @@
 
 typedef struct {
+        size_t cnt;
+        task_t tasks[TASKMAP_MAX_RECORDS];
+} taskmap_t;
+
+typedef struct {
 #if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
         uint32_t sdram_size;
 #endif
         uint32_t cpumap;
-        size_t cnt;
-        task_t tasks[TASKMAP_MAX_RECORDS];
+        taskmap_t taskmap;
 } bootinfo_t;
 

boot/arch/mips32/src/asm.S

@@ -147 +147 @@
 
 FUNCTION_BEGIN(jump_to_kernel)
-        /*
-         * TODO:
-         *
-         * Make sure that the I-cache, D-cache and memory are mutually
-         * coherent before passing control to the copied code.
-         */
         j $a0
         nop

boot/arch/mips32/src/main.c

@@ -39 +39 @@
 #include <str.h>
 #include <errno.h>
-#include <inflate.h>
-#include "../../components.h"
-
-#define TOP2ADDR(top)  (((void *) PA2KA(BOOT_OFFSET)) + (top))
+#include <payload.h>
 
 static bootinfo_t *bootinfo = (bootinfo_t *) PA2KA(BOOTINFO_OFFSET);
@@ -63 +60 @@
             (void *) PA2KA(LOADER_OFFSET), (void *) LOADER_OFFSET);
 
-        size_t i;
-        for (i = 0; i < COMPONENTS; i++)
-                printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].addr,
-                    (uintptr_t) components[i].addr >= PA2KSEG(0) ?
-                    (void *) KSEG2PA(components[i].addr) :
-                    (void *) KA2PA(components[i].addr),
-                    components[i].name, components[i].inflated,
-                    components[i].size);
+        uint8_t *kernel_start = (uint8_t *) PA2KA(BOOT_OFFSET);
+        // FIXME: Use the correct value.
+        uint8_t *ram_end = kernel_start + (1 << 24);
 
-        void *dest[COMPONENTS];
-        size_t top = 0;
-        size_t cnt = 0;
-        bootinfo->cnt = 0;
-        for (i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) {
-                top = ALIGN_UP(top, PAGE_SIZE);
+        // TODO: Make sure that the I-cache, D-cache and memory are coherent.
+        //       (i.e. provide the clear_cache callback)
 
-                if (i > 0) {
-                        bootinfo->tasks[bootinfo->cnt].addr = TOP2ADDR(top);
-                        bootinfo->tasks[bootinfo->cnt].size = components[i].inflated;
-
-                        str_cpy(bootinfo->tasks[bootinfo->cnt].name,
-                            BOOTINFO_TASK_NAME_BUFLEN, components[i].name);
-
-                        bootinfo->cnt++;
-                }
-
-                dest[i] = TOP2ADDR(top);
-                top += components[i].inflated;
-                cnt++;
-        }
-
-        printf("\nInflating components ... ");
-
-        for (i = cnt; i > 0; i--) {
-#ifdef MACHINE_msim
-                void *tail = dest[i - 1] + components[i].inflated;
-                if (tail >= ((void *) PA2KA(LOADER_OFFSET))) {
-                        printf("\n%s: Image too large to fit (%p >= %p), halting.\n",
-                            components[i].name, tail, (void *) PA2KA(LOADER_OFFSET));
-                        halt();
-                }
-#endif
-
-                printf("%s ", components[i - 1].name);
-
-                int err = inflate(components[i - 1].addr, components[i - 1].size,
-                    dest[i - 1], components[i - 1].inflated);
-
-                if (err != EOK) {
-                        printf("\n%s: Inflating error %d, halting.\n",
-                            components[i - 1].name, err);
-                        halt();
-                }
-        }
-
-        printf(".\n");
+        extract_payload(&bootinfo->taskmap, kernel_start, ram_end,
+            (uintptr_t) kernel_start, NULL);
 
         printf("Copying CPU map ... \n");
 
         bootinfo->cpumap = 0;
-        for (i = 0; i < CPUMAP_MAX_RECORDS; i++) {
+        for (int i = 0; i < CPUMAP_MAX_RECORDS; i++) {
                 if (cpumap[i] != 0)
                         bootinfo->cpumap |= (1 << i);