From nobody Tue Nov 11 22:52:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1566283695; cv=none; d=zoho.com; s=zohoarc; b=lb6oQrk8GqOgbQIU6a63SuEEzYme2/2KuixijUIn1z6d/lXltICYgKYATMd0eCQW6KjVsZ8Ou6l4hMmk+GmV8iHfYpOiFJ18k6Kh14eBYNeX9rIA3aLEQiDV7hBRsmK0xFWAoalTLTduwjQRU2qdFg8z8Ievi885hD/VoAvR2a4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566283695; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=RP5pH/s8oLPco3ZoRkIRARxvAc8PtAivGGd6KXGMUC4=; b=HNR6jy8s2DYMEo2+lbOHu93Ukv10s/50FvBsnbpeZQtzBlPPqFdEBlm8kyc/wG+bROEva7J53Lo/SFATbgdi0CXDTR6LUCA50W9Ty0YVqrkm5cf9Nke/cnSAh3S6LGCotgCINFz/h74MzhqvtZflDut8QA8gW7T9n1Gvi8nVZPY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1566283695882379.59918560606013; Mon, 19 Aug 2019 23:48:15 -0700 (PDT) Received: from localhost ([::1]:33456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzxwB-0008S8-Ml for importer@patchew.org; Tue, 20 Aug 2019 02:48:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39991) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzxmg-0004pr-GH for qemu-devel@nongnu.org; Tue, 20 Aug 2019 02:38:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hzxme-0006bi-Oe for qemu-devel@nongnu.org; Tue, 20 Aug 2019 02:38:22 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:39311 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hzxme-0006W0-D0 for qemu-devel@nongnu.org; Tue, 20 Aug 2019 02:38:20 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id BC6A81A2018; Tue, 20 Aug 2019 08:38:15 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.13.43]) by mail.rt-rk.com (Postfix) with ESMTPSA id 7D9771A0F20; Tue, 20 Aug 2019 08:38:15 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Tue, 20 Aug 2019 08:37:58 +0200 Message-Id: <1566283083-21838-7-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1566283083-21838-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1566283083-21838-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PULL 06/11] target/mips: Style improvements in mips_fulong2e.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, amarkovic@wavecomp.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Fixes mostly errors and warnings reported by 'checkpatch.pl -f'. Signed-off-by: Aleksandar Markovic Reviewed-by: Aleksandar Rikalo Message-Id: <1566216496-17375-14-git-send-email-aleksandar.markovic@rt-rk.c= om> --- 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 6e4fba2..cf537dd 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -48,13 +48,13 @@ =20 #define DEBUG_FULONG2E_INIT =20 -#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 =20 /* 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 =20 /* * PMON is not part of qemu and released with BSD license, anyone @@ -83,14 +83,15 @@ static struct _loaderparams { const char *initrd_filename; } loaderparams; =20 -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; =20 - if (index >=3D ENVP_NB_ENTRIES) + if (index >=3D ENVP_NB_ENTRIES) { return; + } =20 if (string =3D=3D NULL) { prom_buf[index] =3D 0; @@ -105,7 +106,7 @@ static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t* prom_= buf, int index, va_end(ap); } =20 -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 =3D 0; @@ -130,16 +131,18 @@ static int64_t load_kernel (CPUMIPSState *env) initrd_size =3D 0; initrd_offset =3D 0; if (loaderparams.initrd_filename) { - initrd_size =3D get_image_size (loaderparams.initrd_filename); + initrd_size =3D get_image_size(loaderparams.initrd_filename); if (initrd_size > 0) { - initrd_offset =3D (kernel_high + ~INITRD_PAGE_MASK) & INITRD_P= AGE_MASK; + initrd_offset =3D (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 =3D load_image_targphys(loaderparams.initrd_filena= me, - initrd_offset, ram_size - initrd_offs= et); + initrd_offset, + ram_size - initrd_offset); } if (initrd_size =3D=3D (target_ulong) -1) { error_report("could not load initial ram disk '%s'", @@ -154,9 +157,10 @@ static int64_t load_kernel (CPUMIPSState *env) =20 prom_set(prom_buf, index++, "%s", loaderparams.kernel_filename); if (initrd_size > 0) { - prom_set(prom_buf, index++, "rd_start=3D0x%" PRIx64 " rd_size=3D%"= PRId64 " %s", - cpu_mips_phys_to_kseg0(NULL, initrd_offset), initrd_size, - loaderparams.kernel_cmdline); + prom_set(prom_buf, index++, + "rd_start=3D0x%" PRIx64 " rd_size=3D%" 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; } =20 -static void write_bootloader (CPUMIPSState *env, uint8_t *base, int64_t ke= rnel_addr) +static void write_bootloader(CPUMIPSState *env, uint8_t *base, + int64_t kernel_addr) { uint32_t *p; =20 /* Small bootloader */ - p =3D (uint32_t *) base; + p =3D (uint32_t *)base; =20 - stl_p(p++, 0x0bf00010); /* j 0x1f= c00040 */ - stl_p(p++, 0x00000000); /* nop */ + /* j 0x1fc00040 */ + stl_p(p++, 0x0bf00010); + /* nop */ + stl_p(p++, 0x00000000); =20 /* Second part of the bootloader */ - p =3D (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 =3D (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); } =20 - static void main_cpu_reset(void *opaque) { MIPSCPU *cpu =3D opaque; @@ -252,11 +270,11 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bu= s, int slot, qemu_irq intc, } =20 /* Network support */ -static void network_init (PCIBus *pci_bus) +static void network_init(PCIBus *pci_bus) { int i; =20 - for(i =3D 0; i < nb_nics; i++) { + for (i =3D 0; i < nb_nics; i++) { NICInfo *nd =3D &nd_table[i]; const char *default_devaddr =3D NULL; =20 @@ -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); =20 - /* We do not support flash operation, just loading pmon.bin as raw BIO= S. - * 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 BIO= S. + * Please use -L to set the BIOS path and -bios to set bios name. + */ =20 if (kernel_filename) { loaderparams.ram_size =3D ram_size; loaderparams.kernel_filename =3D kernel_filename; loaderparams.kernel_cmdline =3D kernel_cmdline; loaderparams.initrd_filename =3D initrd_filename; - kernel_entry =3D load_kernel (env); + kernel_entry =3D load_kernel(env); write_bootloader(env, memory_region_get_ram_ptr(bios), kernel_entr= y); } else { if (bios_name =3D=3D NULL) { --=20 2.7.4