Re: [Qemu-devel] [EXTERNAL][PATCH v8 13/37] target/mips: Style improvements in mips_fulong2e.c

[Aleksandar Rikalo]

> From: Aleksandar Markovic <address@hidden>
> Sent: Monday, August 19, 2019 2:07 PM
> To: address@hidden <address@hidden>
> Cc: address@hidden <address@hidden>; Aleksandar Markovic <address@hidden>; 
> Aleksandar Rikalo <address@hidden>
> Subject: [EXTERNAL][PATCH v8 13/37] target/mips: Style improvements in 
> mips_fulong2e.c
>
> From: Aleksandar Markovic <address@hidden>
>
> Fixes mostly errors and warnings reported by 'checkpatch.pl -f'.
>
> Signed-off-by: Aleksandar Markovic <address@hidden>
> ---
>  hw/mips/mips_fulong2e.c | 96 
> +++++++++++++++++++++++++++++--------------------
>  1 file changed, 58 insertions(+), 38 deletions(-)
>
> diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
> index 5dbaa3b..0c3d947 100644
> --- a/hw/mips/mips_fulong2e.c
> +++ b/hw/mips/mips_fulong2e.c
> @@ -48,13 +48,13 @@
>
>  #define DEBUG_FULONG2E_INIT
>
> -#define ENVP_ADDR       0x80002000l
> -#define ENVP_NB_ENTRIES          16
> -#define ENVP_ENTRY_SIZE          256
> +#define ENVP_ADDR               0x80002000l
> +#define ENVP_NB_ENTRIES         16
> +#define ENVP_ENTRY_SIZE         256
>
>  /* fulong 2e has a 512k flash: Winbond W39L040AP70Z */
> -#define BIOS_SIZE (512 * KiB)
> -#define MAX_IDE_BUS 2
> +#define BIOS_SIZE               (512 * KiB)
> +#define MAX_IDE_BUS             2
>
>  /*
>   * PMON is not part of qemu and released with BSD license, anyone
> @@ -83,14 +83,15 @@ static struct _loaderparams {
>      const char *initrd_filename;
>  } loaderparams;
>
> -static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t* prom_buf, int index,
> +static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t *prom_buf, int index,
>                                          const char *string, ...)
>  {
>      va_list ap;
>      int32_t table_addr;
>
> -    if (index >= ENVP_NB_ENTRIES)
> +    if (index >= ENVP_NB_ENTRIES) {
>          return;
> +    }
>
>      if (string == NULL) {
>          prom_buf[index] = 0;
> @@ -105,7 +106,7 @@ static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t* 
> prom_buf, int index,
>      va_end(ap);
>  }
>
> -static int64_t load_kernel (CPUMIPSState *env)
> +static int64_t load_kernel(CPUMIPSState *env)
>  {
>      int64_t kernel_entry, kernel_low, kernel_high, initrd_size;
>      int index = 0;
> @@ -130,16 +131,18 @@ static int64_t load_kernel (CPUMIPSState *env)
>      initrd_size = 0;
>      initrd_offset = 0;
>      if (loaderparams.initrd_filename) {
> -        initrd_size = get_image_size (loaderparams.initrd_filename);
> +        initrd_size = get_image_size(loaderparams.initrd_filename);
>          if (initrd_size > 0) {
> -            initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & 
> INITRD_PAGE_MASK;
> +            initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) &
> +                            INITRD_PAGE_MASK;
>              if (initrd_offset + initrd_size > ram_size) {
>                  error_report("memory too small for initial ram disk '%s'",
>                               loaderparams.initrd_filename);
>                  exit(1);
>              }
>              initrd_size = load_image_targphys(loaderparams.initrd_filename,
> -                                     initrd_offset, ram_size - 
> initrd_offset);
> +                                              initrd_offset,
> +                                              ram_size - initrd_offset);
>          }
>          if (initrd_size == (target_ulong) -1) {
>              error_report("could not load initial ram disk '%s'",
> @@ -154,9 +157,10 @@ static int64_t load_kernel (CPUMIPSState *env)
>
>      prom_set(prom_buf, index++, "%s", loaderparams.kernel_filename);
>      if (initrd_size > 0) {
> -        prom_set(prom_buf, index++, "rd_start=0x%" PRIx64 " rd_size=%" 
> PRId64 " %s",
> -                 cpu_mips_phys_to_kseg0(NULL, initrd_offset), initrd_size,
> -                 loaderparams.kernel_cmdline);
> +        prom_set(prom_buf, index++,
> +                 "rd_start=0x%" PRIx64 " rd_size=%" PRId64 " %s",
> +                 cpu_mips_phys_to_kseg0(NULL, initrd_offset),
> +                 initrd_size, loaderparams.kernel_cmdline);
>      } else {
>          prom_set(prom_buf, index++, "%s", loaderparams.kernel_cmdline);
>      }
> @@ -175,34 +179,48 @@ static int64_t load_kernel (CPUMIPSState *env)
>      return kernel_entry;
>  }
>
> -static void write_bootloader (CPUMIPSState *env, uint8_t *base, int64_t 
> kernel_addr)
> +static void write_bootloader(CPUMIPSState *env, uint8_t *base,
> +                             int64_t kernel_addr)
>  {
>      uint32_t *p;
>
>      /* Small bootloader */
> -    p = (uint32_t *) base;
> +    p = (uint32_t *)base;
>
> -    stl_p(p++, 0x0bf00010);                                      /* j 
> 0x1fc00040 */
> -    stl_p(p++, 0x00000000);                                      /* nop */
> +    /* j 0x1fc00040 */
> +    stl_p(p++, 0x0bf00010);
> +    /* nop */
> +    stl_p(p++, 0x00000000);
>
>      /* Second part of the bootloader */
> -    p = (uint32_t *) (base + 0x040);
> -
> -    stl_p(p++, 0x3c040000);                                      /* lui a0, 
> 0 */
> -    stl_p(p++, 0x34840002);                                      /* ori a0, 
> a0, 2 */
> -    stl_p(p++, 0x3c050000 | ((ENVP_ADDR >> 16) & 0xffff));       /* lui a1, 
> high(ENVP_ADDR) */
> -    stl_p(p++, 0x34a50000 | (ENVP_ADDR & 0xffff));               /* ori a1, 
> a0, low(ENVP_ADDR) */
> -    stl_p(p++, 0x3c060000 | (((ENVP_ADDR + 8) >> 16) & 0xffff)); /* lui a2, 
> high(ENVP_ADDR + 8) */
> -    stl_p(p++, 0x34c60000 | ((ENVP_ADDR + 8) & 0xffff));         /* ori a2, 
> a2, low(ENVP_ADDR + 8) */
> -    stl_p(p++, 0x3c070000 | (loaderparams.ram_size >> 16));      /* lui a3, 
> high(env->ram_size) */
> -    stl_p(p++, 0x34e70000 | (loaderparams.ram_size & 0xffff));   /* ori a3, 
> a3, low(env->ram_size) */
> -    stl_p(p++, 0x3c1f0000 | ((kernel_addr >> 16) & 0xffff));     /* lui ra, 
> high(kernel_addr) */;
> -    stl_p(p++, 0x37ff0000 | (kernel_addr & 0xffff));             /* ori ra, 
> ra, low(kernel_addr) */
> -    stl_p(p++, 0x03e00008);                                      /* jr ra */
> -    stl_p(p++, 0x00000000);                                      /* nop */
> +    p = (uint32_t *)(base + 0x040);
> +
> +    /* lui a0, 0 */
> +    stl_p(p++, 0x3c040000);
> +    /* ori a0, a0, 2 */
> +    stl_p(p++, 0x34840002);
> +    /* lui a1, high(ENVP_ADDR) */
> +    stl_p(p++, 0x3c050000 | ((ENVP_ADDR >> 16) & 0xffff));
> +    /* ori a1, a0, low(ENVP_ADDR) */
> +    stl_p(p++, 0x34a50000 | (ENVP_ADDR & 0xffff));
> +    /* lui a2, high(ENVP_ADDR + 8) */
> +    stl_p(p++, 0x3c060000 | (((ENVP_ADDR + 8) >> 16) & 0xffff));
> +    /* ori a2, a2, low(ENVP_ADDR + 8) */
> +    stl_p(p++, 0x34c60000 | ((ENVP_ADDR + 8) & 0xffff));
> +    /* lui a3, high(env->ram_size) */
> +    stl_p(p++, 0x3c070000 | (loaderparams.ram_size >> 16));
> +    /* ori a3, a3, low(env->ram_size) */
> +    stl_p(p++, 0x34e70000 | (loaderparams.ram_size & 0xffff));
> +    /* lui ra, high(kernel_addr) */
> +    stl_p(p++, 0x3c1f0000 | ((kernel_addr >> 16) & 0xffff));
> +    /* ori ra, ra, low(kernel_addr) */
> +    stl_p(p++, 0x37ff0000 | (kernel_addr & 0xffff));
> +    /* jr ra */
> +    stl_p(p++, 0x03e00008);
> +    /* nop */
> +    stl_p(p++, 0x00000000);
>  }
>
> -
>  static void main_cpu_reset(void *opaque)
>  {
>      MIPSCPU *cpu = opaque;
> @@ -252,11 +270,11 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, 
> int slot, qemu_irq intc,
>  }
>
>  /* Network support */
> -static void network_init (PCIBus *pci_bus)
> +static void network_init(PCIBus *pci_bus)
>  {
>      int i;
>
> -    for(i = 0; i < nb_nics; i++) {
> +    for (i = 0; i < nb_nics; i++) {
>          NICInfo *nd = &nd_table[i];
>          const char *default_devaddr = NULL;
>
> @@ -308,15 +326,17 @@ static void mips_fulong2e_init(MachineState *machine)
>      memory_region_add_subregion(address_space_mem, 0, ram);
>      memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios);
>
> -    /* We do not support flash operation, just loading pmon.bin as raw BIOS.
> -     * Please use -L to set the BIOS path and -bios to set bios name. */
> +    /*
> +     * We do not support flash operation, just loading pmon.bin as raw BIOS.
> +     * Please use -L to set the BIOS path and -bios to set bios name.
> +     */
>
>      if (kernel_filename) {
>          loaderparams.ram_size = ram_size;
>          loaderparams.kernel_filename = kernel_filename;
>          loaderparams.kernel_cmdline = kernel_cmdline;
>          loaderparams.initrd_filename = initrd_filename;
> -        kernel_entry = load_kernel (env);
> +        kernel_entry = load_kernel(env);
>          write_bootloader(env, memory_region_get_ram_ptr(bios), kernel_entry);
>      } else {
>          if (bios_name == NULL) {
> --
> 2.7.4

Reviewed-by: Aleksandar Rikalo <address@hidden>