Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/stand/efiboot/bootaa64 Style fixes, NFCI.



details:   https://anonhg.NetBSD.org/src/rev/b8877c1f8aeb
branches:  trunk
changeset: 958510:b8877c1f8aeb
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Jan 09 13:15:15 2021 +0000

description:
Style fixes, NFCI.

diffstat:

 sys/stand/efiboot/bootaa64/efibootaa64.c |  22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diffs (40 lines):

diff -r 2873ed928096 -r b8877c1f8aeb sys/stand/efiboot/bootaa64/efibootaa64.c
--- a/sys/stand/efiboot/bootaa64/efibootaa64.c  Sat Jan 09 13:12:13 2021 +0000
+++ b/sys/stand/efiboot/bootaa64/efibootaa64.c  Sat Jan 09 13:15:15 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: efibootaa64.c,v 1.3 2020/11/28 14:02:09 jmcneill Exp $ */
+/*     $NetBSD: efibootaa64.c,v 1.4 2021/01/09 13:15:15 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka%netbsd.org@localhost>
@@ -47,18 +47,22 @@
 void
 efi_boot_kernel(u_long marks[MARK_MAX])
 {
-       void (*kernel_entry)(register_t, register_t, register_t, register_t);
-       u_long kernel_size;
+       u_long kernel_start, kernel_size, kernel_entry;
+       u_long fdt_start, fdt_size;
 
-       kernel_entry = (void *)marks[MARK_ENTRY];
-       kernel_size = marks[MARK_END] - marks[MARK_START];
+       kernel_start = marks[MARK_START];
+       kernel_size = marks[MARK_END] - kernel_start;
+       kernel_entry = marks[MARK_ENTRY];
+       fdt_start = (u_long)efi_fdt_data();
+       fdt_size = efi_fdt_size();
 
-       aarch64_dcache_wbinv_range((u_long)kernel_entry, kernel_size);
-       if (efi_fdt_size() > 0)
-               aarch64_dcache_wbinv_range((u_long)efi_fdt_data(), efi_fdt_size());
+       aarch64_dcache_wbinv_range(kernel_entry, kernel_size);
+       if (efi_fdt_size() > 0) {
+               aarch64_dcache_wbinv_range(fdt_start, fdt_size);
+       }
        aarch64_icache_inv_all();
 
-       aarch64_exec_kernel((paddr_t)marks[MARK_ENTRY], (paddr_t)efi_fdt_data());
+       aarch64_exec_kernel((paddr_t)kernel_entry, (paddr_t)fdt_start);
 }
 
 /*



Home | Main Index | Thread Index | Old Index