mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/mips: Simplify code using ROUND_UP(INITRD_PAGE_SIZE)

Browse Source 
Instead of using a INITRD_PAGE_MASK definition, use the
simpler INITRD_PAGE_SIZE one which allows us to simplify
the code by using directly the self-explicit ROUND_UP()
macro.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200927163943.614604-3-f4bug@amsat.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-09-27 13:18:17 +02:00
parent 9d585eaa87
commit acab36ca25
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/mips/fuloong2e.c
View File

@ -133,8 +133,7 @@ static int64_t load_kernel(CPUMIPSState *env)
if (loaderparams.initrd_filename) { if (loaderparams.initrd_filename) {
initrd_size = get_image_size(loaderparams.initrd_filename); initrd_size = get_image_size(loaderparams.initrd_filename);
if (initrd_size > 0) { if (initrd_size > 0) {
initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & initrd_offset = ROUND_UP(kernel_high, INITRD_PAGE_SIZE);
INITRD_PAGE_MASK;
if (initrd_offset + initrd_size > ram_size) { if (initrd_offset + initrd_size > ram_size) {
error_report("memory too small for initial ram disk '%s'", error_report("memory too small for initial ram disk '%s'",
loaderparams.initrd_filename); loaderparams.initrd_filename);

6
hw/mips/malta.c
View File

@ -1077,9 +1077,9 @@ static int64_t load_kernel(void)
* the initrd. It takes at most 128kiB for 2GB RAM and 4kiB * the initrd. It takes at most 128kiB for 2GB RAM and 4kiB
* pages. * pages.
*/ */
initrd_offset = (loaderparams.ram_low_size - initrd_size initrd_offset = ROUND_UP(loaderparams.ram_low_size
- (128 * KiB) - (initrd_size + 128 * KiB),
- ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK; INITRD_PAGE_SIZE);
if (kernel_high >= initrd_offset) { if (kernel_high >= initrd_offset) {
error_report("memory too small for initial ram disk '%s'", error_report("memory too small for initial ram disk '%s'",
loaderparams.initrd_filename); loaderparams.initrd_filename);

3
hw/mips/mipssim.c
View File

@ -90,8 +90,7 @@ static int64_t load_kernel(void)
if (loaderparams.initrd_filename) { if (loaderparams.initrd_filename) {
initrd_size = get_image_size(loaderparams.initrd_filename); initrd_size = get_image_size(loaderparams.initrd_filename);
if (initrd_size > 0) { if (initrd_size > 0) {
initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & initrd_offset = ROUND_UP(kernel_high, INITRD_PAGE_SIZE);
INITRD_PAGE_MASK;
if (initrd_offset + initrd_size > loaderparams.ram_size) { if (initrd_offset + initrd_size > loaderparams.ram_size) {
error_report("memory too small for initial ram disk '%s'", error_report("memory too small for initial ram disk '%s'",
loaderparams.initrd_filename); loaderparams.initrd_filename);

3
hw/mips/r4k.c
View File

@ -115,8 +115,7 @@ static int64_t load_kernel(void)
if (loaderparams.initrd_filename) { if (loaderparams.initrd_filename) {
initrd_size = get_image_size(loaderparams.initrd_filename); initrd_size = get_image_size(loaderparams.initrd_filename);
if (initrd_size > 0) { if (initrd_size > 0) {
initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & initrd_offset = ROUND_UP(kernel_high, INITRD_PAGE_SIZE);
INITRD_PAGE_MASK;
if (initrd_offset + initrd_size > ram_size) { if (initrd_offset + initrd_size > ram_size) {
error_report("memory too small for initial ram disk '%s'", error_report("memory too small for initial ram disk '%s'",
loaderparams.initrd_filename); loaderparams.initrd_filename);

4
include/hw/mips/mips.h
View File

@ -2,8 +2,10 @@
#define HW_MIPS_H #define HW_MIPS_H
/* Definitions for mips board emulation. */ /* Definitions for mips board emulation. */
#include "qemu/units.h"
/* Kernels can be configured with 64KB pages */ /* Kernels can be configured with 64KB pages */
#define INITRD_PAGE_MASK (~((1 << 16) - 1)) #define INITRD_PAGE_SIZE (64 * KiB)
#include "exec/memory.h" #include "exec/memory.h"