From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511174; cv=none; d=zohomail.com; s=zohoarc; b=AQ416iP1u05SAkTxq2P5QqiXN6dig3dmrCZLz/5H0aPE8VhA3ZsGx6dKg0MJNExDuMKPtaShJzgiqjD5ea6AL8RoyUOy84we9DsX4TfwfFVB29JMqldyWVZZo97fbC3N+BA5pEZag4WjNOeGYPxXDsWoIAEqtLET12zG6LNhkDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511174; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XBnfgWtJMOT8mPH1nfALqedm/L7Aa2ZlVIQfLmCDLhk=; b=W/aE+2GZq6xVtgAmgqJxf2M5cofumnhd5+lQO91GvniNsK3ek09a9SQYZxCVBVJsCiRELin72OHm907p5XlcGjQceBJ1RJNn10IiRaPqKPMFvGtbDxUf7Z3BLj42/eO+Y3uEiYz7iZEhBFWUdSluXpW/Y/Tp3/V/9Ju4NQowpp8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 16345111747471015.4253998453897; Sun, 17 Oct 2021 15:52:54 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id g25so37711326wrb.2 for ; Sun, 17 Oct 2021 15:52:54 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id o23sm10946237wms.18.2021.10.17.15.52.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:52:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XBnfgWtJMOT8mPH1nfALqedm/L7Aa2ZlVIQfLmCDLhk=; b=IHWqW9qcdAF+qdq1BDK1lv8mXVsoZu69zPkgiaKdD9Xo1w0aqoqn3xMomEMjkEtiPM GUrjtENWTm7xveNQgOqGLXL8++r32u7KwVSGYdS+QZ/i99Od/0gm4g6KAtBXhn0SBUAz ba3eQPzDhiTDM73+xFbEr9Xy6bCZEUpEC0LtAVsXBlh1B5wnaOSbl23k3F69flB3bqjo 8OZnZ34M+VMg8JyIZHjnrQCaYhs270ulUWyUquxAna/cNSEBQ6mi5ekFhHqmrsXWx89g BPu0CpBJTv2EJDSBFejX4FqtxJrZ2NzfXJ8bliQqD8APBJrIUKnkLp6OYaZ1g+4B97IN CNzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=XBnfgWtJMOT8mPH1nfALqedm/L7Aa2ZlVIQfLmCDLhk=; b=Jzlx+nleR5NfrOYyO+w0hhJ+E9wj9OcxYxQcqquSQfVnyHPQxrOilXKAsz2XOGMqRp oeWJLr+HdcdG6S2buVN8q+jumG7sQvEoU1WlL95IYNJuZjWbUln4j4xxA1KOXflZQCGO OoDakT2+yXCVYRAhBhT41+wO2OHkjrB4nrimVuL8GM2iwjutBVPTSeyQmYRjhF9PxMBh ohP90oFzhks+Gw2rw/7rty15e72p7YJIBRB2pX5UM9WaLu02Gb6/pqQoqy/ZwQVRI5zK dkkNKSVRANFt2/GQcpAJ77fed6XDqxcajQmmLl0chKp0qI4+cnAgiJv8jgx5R+j5Tzhr 02EA== X-Gm-Message-State: AOAM530Nx6tXjU4kko9bzgWP2GAsTe7tDG58SSHvKvIapKF7zQtvGPyG /QsiTo9rsH2E8js092Dqgsg= X-Google-Smtp-Source: ABdhPJwCxufwQs6gG61U+MsD5esm5pR2qMqMvXQFMHneqHI8qNDbQ/QisJP8RSnkSQh3npppcDC7XA== X-Received: by 2002:a05:6000:18a3:: with SMTP id b3mr31492511wri.178.1634511172958; Sun, 17 Oct 2021 15:52:52 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 01/17] target/mips: Check nanoMIPS DSP MULT[U] accumulator with Release 6 Date: Mon, 18 Oct 2021 00:52:29 +0200 Message-Id: <20211017225245.2618892-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511176359100001 Per the "MIPS Architecture Extension: nanoMIPS32 DSP TRM" rev 0.04, MULT and MULTU opcodes: The value of ac selects an accumulator numbered from 0 to 3. When ac=3D0, this refers to the original HI/LO register pair of the MIPS32 architecture. In Release 6 of the MIPS Architecture, accumulators are eliminated from MIPS32. Ensure pre-Release 6 is restricted to HI/LO registers pair. Fixes: 8b3698b2947 ("target/mips: Add emulation of DSP ASE for nanoMIPS - p= art 4") Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/tcg/nanomips_translate.c.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/mips/tcg/nanomips_translate.c.inc b/target/mips/tcg/nan= omips_translate.c.inc index ccbcecad093..2c022a49f24 100644 --- a/target/mips/tcg/nanomips_translate.c.inc +++ b/target/mips/tcg/nanomips_translate.c.inc @@ -1868,6 +1868,9 @@ static void gen_pool32axf_2_nanomips_insn(DisasContex= t *ctx, uint32_t opc, TCGv_i32 t2 =3D tcg_temp_new_i32(); TCGv_i32 t3 =3D tcg_temp_new_i32(); =20 + if (acc || ctx->insn_flags & ISA_MIPS_R6) { + check_dsp_r2(ctx); + } gen_load_gpr(t0, rs); gen_load_gpr(t1, rt); tcg_gen_trunc_tl_i32(t2, t0); @@ -1925,6 +1928,9 @@ static void gen_pool32axf_2_nanomips_insn(DisasContex= t *ctx, uint32_t opc, TCGv_i32 t2 =3D tcg_temp_new_i32(); TCGv_i32 t3 =3D tcg_temp_new_i32(); =20 + if (acc || ctx->insn_flags & ISA_MIPS_R6) { + check_dsp_r2(ctx); + } gen_load_gpr(t0, rs); gen_load_gpr(t1, rt); tcg_gen_trunc_tl_i32(t2, t0); --=20 2.31.1 From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511179; cv=none; d=zohomail.com; s=zohoarc; b=NhNGgf1jEtNV5a4GH4SXh5cjgKCnMADzmKkdGIZmWNhbLDZn/zj1ClASvnnbvp+CsiKb/CSls7hm+EBLH0lZekZuVKNMjkDHMkn0O+Yelv5DHyiWLcB3GX7H7sMr+TxNC1c0228omTg7abf/5DzjX48AdOP8Ue5iQ+vKDTCLIK8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511179; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UMDhCXCDbzxJyYdvKoRXl+1jB8zw3v1bjW6eZPBvW4k=; b=Rb9cijNbrXLzaMqzBwFaRP53qvEiB7oGAiMKI6QHXpXzYlV0MwopOmB9vPE1dDjc2om+16J66nNfr1bFoynfSve6+xYcYqUFzKWFbe3EA9Zte3PAkIWAB+ZoXU7LLBcXgt+BPkSOeM0ER+OrRlYNhc1M8lrd3Flt+W4CiXjVdIc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1634511179838301.64347232983914; Sun, 17 Oct 2021 15:52:59 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id k7so37640138wrd.13 for ; Sun, 17 Oct 2021 15:52:59 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id c185sm10992864wma.8.2021.10.17.15.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:52:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UMDhCXCDbzxJyYdvKoRXl+1jB8zw3v1bjW6eZPBvW4k=; b=anEVRsDz+1QcpVYRL2+QJ9RHMCMkVTuDMkazq8Xssg1KX5R9dBUE/FPNCs79ofkP0z dExoj91l7MvxE/2GXSDwN+8MLD+BVo2VwMdvMSaR8jRtAKTkKaDSjxDPmjwmaWfQwRpg E+zNOgKHjiTz3hHib3DLZKdZW9pGmNj5lb5ITULwI0/c25E4VVnc0q3NCrznkMb36pPv Xqqi6O+AfRdfcYrur0no7YEcezyAYSUkobhxX0iQXnAoOYQq4X4JqDEl9Dn+zPiIqXXS VGZHFtbtiQpQVQl9FHu12sTGN7mUq89QY2cncR+/jPT9/IQFrXE5wsSpxWX79RFQrh7E MDhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UMDhCXCDbzxJyYdvKoRXl+1jB8zw3v1bjW6eZPBvW4k=; b=2cDVVFdRDR8xfVrAlhQjlI9e/Vf58lm4AXBtygaM0+XfH8zH2D3IVMooWhnJbg3u/w uqejfePaUuKwhUkv0KdpRmN+F+h5DGrpN8uf/iCwcmDzafmU1SZ2nL0zTEgsJZBOrOcb ahN+zp+Dy54wrtKGk1YK3USLfOlj8nrYfN7ClYGk55hGro/1pxaMZBK8xioBGazIoNwA 6NcAGrhw8vN7HbXFdfYBRKUXlsLG7fMEUbXojFS3blH3S2sbWb31CTMtIYqHRYlNdoR2 /UAos1xcaOyMlms5HMpak80nahIoaaTfO4dEadOcgrMOrRDe7py8i+rasPLSqZzF+1Ly vJqQ== X-Gm-Message-State: AOAM532g9h7EHE20UbNeoie6pIl59HQPnBGjgOL0Odmd+AZkqDsnzrJ3 gq2Gdpmv29PLnbYcKSbt3aM= X-Google-Smtp-Source: ABdhPJx1tcYowVmrM2PxhoF38B3rIfExYgZYD33a8EvVY5qSZvWhIdx1yZbgjL23pYFT31xm5V4TmQ== X-Received: by 2002:a5d:6dce:: with SMTP id d14mr31481507wrz.363.1634511178006; Sun, 17 Oct 2021 15:52:58 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang Subject: [PULL 02/17] hw/mips/boston: Massage memory map information Date: Mon, 18 Oct 2021 00:52:30 +0200 Message-Id: <20211017225245.2618892-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511180814100001 From: Jiaxun Yang Use memmap array to uinfy address of memory map. That would allow us reuse address information for FDT generation. Signed-off-by: Jiaxun Yang Reviewed-by: Philippe Mathieu-Daud=C3=A9 [PMD: Use local 'regaddr' in gen_firmware(), fix coding style] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211002184539.169-2-jiaxun.yang@flygoat.com> --- hw/mips/boston.c | 108 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 80 insertions(+), 28 deletions(-) diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 20b06865b2b..37b8278623e 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -64,6 +64,44 @@ struct BostonState { hwaddr fdt_base; }; =20 +enum { + BOSTON_LOWDDR, + BOSTON_PCIE0, + BOSTON_PCIE1, + BOSTON_PCIE2, + BOSTON_PCIE2_MMIO, + BOSTON_CM, + BOSTON_GIC, + BOSTON_CDMM, + BOSTON_CPC, + BOSTON_PLATREG, + BOSTON_UART, + BOSTON_LCD, + BOSTON_FLASH, + BOSTON_PCIE1_MMIO, + BOSTON_PCIE0_MMIO, + BOSTON_HIGHDDR, +}; + +static const MemMapEntry boston_memmap[] =3D { + [BOSTON_LOWDDR] =3D { 0x0, 0x10000000 }, + [BOSTON_PCIE0] =3D { 0x10000000, 0x2000000 }, + [BOSTON_PCIE1] =3D { 0x12000000, 0x2000000 }, + [BOSTON_PCIE2] =3D { 0x14000000, 0x2000000 }, + [BOSTON_PCIE2_MMIO] =3D { 0x16000000, 0x100000 }, + [BOSTON_CM] =3D { 0x16100000, 0x20000 }, + [BOSTON_GIC] =3D { 0x16120000, 0x20000 }, + [BOSTON_CDMM] =3D { 0x16140000, 0x8000 }, + [BOSTON_CPC] =3D { 0x16200000, 0x8000 }, + [BOSTON_PLATREG] =3D { 0x17ffd000, 0x1000 }, + [BOSTON_UART] =3D { 0x17ffe000, 0x20 }, + [BOSTON_LCD] =3D { 0x17fff000, 0x8 }, + [BOSTON_FLASH] =3D { 0x18000000, 0x8000000 }, + [BOSTON_PCIE1_MMIO] =3D { 0x20000000, 0x20000000 }, + [BOSTON_PCIE0_MMIO] =3D { 0x40000000, 0x40000000 }, + [BOSTON_HIGHDDR] =3D { 0x80000000, 0x0 }, +}; + enum boston_plat_reg { PLAT_FPGA_BUILD =3D 0x00, PLAT_CORE_CL =3D 0x04, @@ -275,24 +313,24 @@ type_init(boston_register_types) =20 static void gen_firmware(uint32_t *p, hwaddr kernel_entry, hwaddr fdt_addr) { - const uint32_t cm_base =3D 0x16100000; - const uint32_t gic_base =3D 0x16120000; - const uint32_t cpc_base =3D 0x16200000; + uint64_t regaddr; =20 /* Move CM GCRs */ - bl_gen_write_ulong(&p, - cpu_mips_phys_to_kseg1(NULL, GCR_BASE_ADDR + GCR_BA= SE_OFS), - cm_base); + regaddr =3D cpu_mips_phys_to_kseg1(NULL, GCR_BASE_ADDR + GCR_BASE_OFS), + bl_gen_write_ulong(&p, regaddr, + boston_memmap[BOSTON_CM].base); =20 /* Move & enable GIC GCRs */ - bl_gen_write_ulong(&p, - cpu_mips_phys_to_kseg1(NULL, cm_base + GCR_GIC_BASE= _OFS), - gic_base | GCR_GIC_BASE_GICEN_MSK); + regaddr =3D cpu_mips_phys_to_kseg1(NULL, boston_memmap[BOSTON_CM].base + + GCR_GIC_BASE_OFS), + bl_gen_write_ulong(&p, regaddr, + boston_memmap[BOSTON_GIC].base | GCR_GIC_BASE_GICEN= _MSK); =20 /* Move & enable CPC GCRs */ - bl_gen_write_ulong(&p, - cpu_mips_phys_to_kseg1(NULL, cm_base + GCR_CPC_BASE= _OFS), - cpc_base | GCR_CPC_BASE_CPCEN_MSK); + regaddr =3D cpu_mips_phys_to_kseg1(NULL, boston_memmap[BOSTON_CM].base + + GCR_CPC_BASE_OFS), + bl_gen_write_ulong(&p, regaddr, + boston_memmap[BOSTON_CPC].base | GCR_CPC_BASE_CPCEN= _MSK); =20 /* * Setup argument registers to follow the UHI boot protocol: @@ -333,8 +371,9 @@ static const void *boston_fdt_filter(void *opaque, cons= t void *fdt_orig, ram_low_sz =3D MIN(256 * MiB, machine->ram_size); ram_high_sz =3D machine->ram_size - ram_low_sz; qemu_fdt_setprop_sized_cells(fdt, "/memory@0", "reg", - 1, 0x00000000, 1, ram_low_sz, - 1, 0x90000000, 1, ram_high_sz); + 1, boston_memmap[BOSTON_LOWDDR].base, 1, ram_low_s= z, + 1, boston_memmap[BOSTON_HIGHDDR].base + ram_low_sz, + 1, ram_high_sz); =20 fdt =3D g_realloc(fdt, fdt_totalsize(fdt)); qemu_fdt_dumpdtb(fdt, fdt_sz); @@ -438,11 +477,15 @@ static void boston_mach_init(MachineState *machine) sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->cps), 0, 0, 1); =20 flash =3D g_new(MemoryRegion, 1); - memory_region_init_rom(flash, NULL, "boston.flash", 128 * MiB, - &error_fatal); - memory_region_add_subregion_overlap(sys_mem, 0x18000000, flash, 0); + memory_region_init_rom(flash, NULL, "boston.flash", + boston_memmap[BOSTON_FLASH].size, &error_fatal); + memory_region_add_subregion_overlap(sys_mem, + boston_memmap[BOSTON_FLASH].base, + flash, 0); =20 - memory_region_add_subregion_overlap(sys_mem, 0x80000000, machine->ram,= 0); + memory_region_add_subregion_overlap(sys_mem, + boston_memmap[BOSTON_HIGHDDR].base, + machine->ram, 0); =20 ddr_low_alias =3D g_new(MemoryRegion, 1); memory_region_init_alias(ddr_low_alias, NULL, "boston_low.ddr", @@ -451,32 +494,41 @@ static void boston_mach_init(MachineState *machine) memory_region_add_subregion_overlap(sys_mem, 0, ddr_low_alias, 0); =20 xilinx_pcie_init(sys_mem, 0, - 0x10000000, 32 * MiB, - 0x40000000, 1 * GiB, + boston_memmap[BOSTON_PCIE0].base, + boston_memmap[BOSTON_PCIE0].size, + boston_memmap[BOSTON_PCIE0_MMIO].base, + boston_memmap[BOSTON_PCIE0_MMIO].size, get_cps_irq(&s->cps, 2), false); =20 xilinx_pcie_init(sys_mem, 1, - 0x12000000, 32 * MiB, - 0x20000000, 512 * MiB, + boston_memmap[BOSTON_PCIE1].base, + boston_memmap[BOSTON_PCIE1].size, + boston_memmap[BOSTON_PCIE1_MMIO].base, + boston_memmap[BOSTON_PCIE1_MMIO].size, get_cps_irq(&s->cps, 1), false); =20 pcie2 =3D xilinx_pcie_init(sys_mem, 2, - 0x14000000, 32 * MiB, - 0x16000000, 1 * MiB, + boston_memmap[BOSTON_PCIE2].base, + boston_memmap[BOSTON_PCIE2].size, + boston_memmap[BOSTON_PCIE2_MMIO].base, + boston_memmap[BOSTON_PCIE2_MMIO].size, get_cps_irq(&s->cps, 0), true); =20 platreg =3D g_new(MemoryRegion, 1); memory_region_init_io(platreg, NULL, &boston_platreg_ops, s, - "boston-platregs", 0x1000); - memory_region_add_subregion_overlap(sys_mem, 0x17ffd000, platreg, 0); + "boston-platregs", + boston_memmap[BOSTON_PLATREG].size); + memory_region_add_subregion_overlap(sys_mem, + boston_memmap[BOSTON_PLATREG].base, platreg, 0); =20 - s->uart =3D serial_mm_init(sys_mem, 0x17ffe000, 2, + s->uart =3D serial_mm_init(sys_mem, boston_memmap[BOSTON_UART].base, 2, get_cps_irq(&s->cps, 3), 10000000, serial_hd(0), DEVICE_NATIVE_ENDIAN); =20 lcd =3D g_new(MemoryRegion, 1); memory_region_init_io(lcd, NULL, &boston_lcd_ops, s, "boston-lcd", 0x8= ); - memory_region_add_subregion_overlap(sys_mem, 0x17fff000, lcd, 0); + memory_region_add_subregion_overlap(sys_mem, + boston_memmap[BOSTON_LCD].base, lc= d, 0); =20 chr =3D qemu_chr_new("lcd", "vc:320x240", NULL); qemu_chr_fe_init(&s->lcd_display, chr, NULL); --=20 2.31.1 From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511185; cv=none; d=zohomail.com; s=zohoarc; b=Q1YXQM8Na69zCmiqIRVNrsmo8RhziLqaPI7iEZrKMBu3ErwFIpRSKceA7z+im3Q3Lc3JK9GtvhUQmXyA5Ar+IGJoawbbuis86phQgRUW/kpH0mZTtsHBhU9b+YOs2qyS50ktcdw8sKD/DfTkrfCmq1wYnDvjIyLu8igaFkPQpE4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511185; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=R1/oedjGS4mKEBWW5SpNNRDaCNET4hY7MjnW9POQmQ4=; b=U/QAdLLLlW1AAd06bkkczvjYyGC85qvj/mjX03SPAP760NGcPeHrL8RArjntaVnHzBh6pm5apjtXCUQ5z17P4eVADhNRg587js3kRWHw7rmCKvHbYNReFIoDa9FfLd3xk1H5NB0inxlob1Wn2OU8Y1avQefJ4Qj2e5L08toZwAg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1634511185122807.0120233793655; Sun, 17 Oct 2021 15:53:05 -0700 (PDT) Received: by mail-wm1-f51.google.com with SMTP id n40-20020a05600c3ba800b0030da2439b21so8617767wms.0 for ; Sun, 17 Oct 2021 15:53:04 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id c7sm13529363wmq.13.2021.10.17.15.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:53:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R1/oedjGS4mKEBWW5SpNNRDaCNET4hY7MjnW9POQmQ4=; b=etqbIeE7D0XYwDVkM/4oy9M26KSiRdgJi0AjXJZuzKbYF2FBxw4faUujTSTgofRgL3 0En9IGhcCev0SwlCAM+nk03cR0bg+MYAh3aEGEEHtJCq9xUsG0m+Xtg2rbqHToimqvhg 7PYmWQdab/EMGVgF2nfw/eGLHGhj/ZWhyktHopLEslpN3P28NkJQ1Xyyh0v2YmOywG3/ pSEVHRhJ0yDZzHhsPabNDZybJmmIOt+U90sL0mDb92R8/UCgKvMDm7+ZnMzGneRyLHp6 NgChiDjGi28DuMk0Cw93Pkq0IHp53o9xo9h3L2pm4O+bqiAtJgqBU12oVUfXvKzhdx+P Wwfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=R1/oedjGS4mKEBWW5SpNNRDaCNET4hY7MjnW9POQmQ4=; b=D6R2zOAVeJWuHuWvTbeSBmyaLNXFjICBK+hLt32BsPkPtQqfEJ8onzbwMdFPrEIv8U 9hBRuIhOwh5Zxm2vBLrkZ0hqZMoB1SG5N+FwSd+TL4R4+L+3vIx9yyhjvbZseQw6wlMh HlZNeUoWN26xAvuMg6Ko8N5wy77vZwXfJ+aZj32qPZVpeUKUB7zok6rZ+mQpzDuRjVUo PcsqiotPVe7hydxfQVHcuaLvjyczz8iGfhm76Do0+4eiW50Ef/bsjI27Ndi8/0KUk1QW iPGSw74oU5lNqJqnHdCLDsxVn+LTXPDqXjWAlZDXh7IakZDdyb3XO3/317JZMXGQoOqJ 9nHw== X-Gm-Message-State: AOAM532khYb703mIxuK2yJRi9oM2DNTm3GrrkN9JvK/i8wza0ZAbOtJt 0CCuK/dClA9lCzX0EbaalIA= X-Google-Smtp-Source: ABdhPJzWWl4GubzGSU6ev2KhMMUMy6EBOdXfHTnv7hNw+M5Y+RFXcvDwiNiKY5QC2UxFoXTwaDEQKA== X-Received: by 2002:a1c:7d56:: with SMTP id y83mr40798704wmc.86.1634511183363; Sun, 17 Oct 2021 15:53:03 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang Subject: [PULL 03/17] hw/mips/boston: Allow loading elf kernel and dtb Date: Mon, 18 Oct 2021 00:52:31 +0200 Message-Id: <20211017225245.2618892-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511186531100001 From: Jiaxun Yang ELF kernel allows us debugging much easier with DWARF symbols. Signed-off-by: Jiaxun Yang Reviewed-by: Philippe Mathieu-Daud=C3=A9 [PMD: Fix coding style] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211002184539.169-3-jiaxun.yang@flygoat.com> --- hw/mips/boston.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 37b8278623e..7374bb5da4d 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" =20 +#include "elf.h" #include "hw/boards.h" #include "hw/char/serial.h" #include "hw/ide/pci.h" @@ -551,10 +552,37 @@ static void boston_mach_init(MachineState *machine) exit(1); } } else if (machine->kernel_filename) { - fit_err =3D load_fit(&boston_fit_loader, machine->kernel_filename,= s); - if (fit_err) { - error_report("unable to load FIT image"); - exit(1); + uint64_t kernel_entry, kernel_high, kernel_size; + + kernel_size =3D load_elf(machine->kernel_filename, NULL, + cpu_mips_kseg0_to_phys, NULL, + &kernel_entry, NULL, &kernel_high, + NULL, 0, EM_MIPS, 1, 0); + + if (kernel_size) { + hwaddr dtb_paddr =3D QEMU_ALIGN_UP(kernel_high, 64 * KiB); + hwaddr dtb_vaddr =3D cpu_mips_phys_to_kseg0(NULL, dtb_paddr); + + s->kernel_entry =3D kernel_entry; + if (machine->dtb) { + int dt_size; + g_autofree const void *dtb_file_data, *dtb_load_data; + + dtb_file_data =3D load_device_tree(machine->dtb, &dt_size); + dtb_load_data =3D boston_fdt_filter(s, dtb_file_data, + NULL, &dtb_vaddr); + + /* Calculate real fdt size after filter */ + dt_size =3D fdt_totalsize(dtb_load_data); + rom_add_blob_fixed("dtb", dtb_load_data, dt_size, dtb_padd= r); + } + } else { + /* Try to load file as FIT */ + fit_err =3D load_fit(&boston_fit_loader, machine->kernel_filen= ame, s); + if (fit_err) { + error_report("unable to load kernel image"); + exit(1); + } } =20 gen_firmware(memory_region_get_ram_ptr(flash) + 0x7c00000, --=20 2.31.1 From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511190; cv=none; d=zohomail.com; s=zohoarc; b=UXj+SdiYLhNBP++P5JppqtHG09sWpokJT0CTrm/PygIcuYJ5ZYHcOce3ysc0uXUFThVjw0bMW7/ocPiGjQXayxt/Ms4CJPMSVClxxhUXfQS6Zn1Pu1XJhDWMSMHGoR1Ajj1SL+298VJG0PBDPiJeCcmBhfvZVpuoz4UGXG950hk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511190; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=h1iHf2kDwn8LzMNDc3apAwvo6I02QYP6FBZ32aF9Pzw=; b=NYOvtNeIsFgeW04tQG6K4BO7bJkh8Dzk5gPXp5yIWvCZYan9dZk+bMwmN7TlCQgKk/ni0CGaaBp7xUQJ7245bjxEMaen1dgVLb3sEx4gU2amlFDP70cHY/k/snWCnqXcC2b0QTQvme0Cw0eVeDF39jtpTVs2Epb32uaFwlByE0U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 1634511190110963.1352889355194; Sun, 17 Oct 2021 15:53:10 -0700 (PDT) Received: by mail-wm1-f46.google.com with SMTP id p21so7141951wmq.1 for ; Sun, 17 Oct 2021 15:53:09 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id t1sm648804wre.32.2021.10.17.15.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h1iHf2kDwn8LzMNDc3apAwvo6I02QYP6FBZ32aF9Pzw=; b=GEswyGDoegGDy6FscBt++5t7rRfpGn4/oAUvDH3SnujadmzZEvnjBhW3jKVdTADRju fkPUqE8besl9QJOwZ+AJ21+a28cLDzzvWl6iwnGtyJfVncy0BqG28xzXnmhz19+gTWLm NWivqcXhBx3HRISghXnSy+IvE6KOG1YxD2Dh0GZTUPLQRaOFIFLaiXWbsL+Tw9InSr6A HmXRpt4LRj5nJpxQ8S4K0ppwLBVh4SV8El/7Z+jcpByOZ4Cz6r7+YupLfGyE7uMXJsdb 4a5dVVGtfeTA7mjIYbQiNUKscX3kIdRzAua3TcNvR9ekMnkncX1GllHmKVwE8Rgb6pdn xovw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=h1iHf2kDwn8LzMNDc3apAwvo6I02QYP6FBZ32aF9Pzw=; b=O82vBCWtUXaK0pgxZ8ojD7x4r+9k1t1XLeEH7o+kRIyTN+hXq+/f4ZwQB4GnORMIOO P/tTG7VQqFsWIH5r12Ywy57+ArG+TKzjrQ6u8tRpC7MxiIb931Rrend4in9tXeupPMMc 5p5mWKF0HxiR+dIzbBubChJspdz5tCqYzp4MzhbygBE5dqyik4j6EUjqT/tO8nkDypqV W4KOEQVBsyUNWblD+GhW2e0vs4H2QPUmCa6G1o3tU5SDNCWkihDzyz0f5wI4+85C1xyo y6FjXd8OP9jX6PA2q77x3fO82lmJyaGQN4XDXCeVKIbjNY/SV9e2+QJ+RVwP6DhmsF0E qgnA== X-Gm-Message-State: AOAM530Y0xuVSszDwH6XnG9Ywh+WJvJstGfYlDh6/xcW3PZWdqhEVfo8 FE/oGkMxcrjfE5rm9mtfCS0zK9fA1Us= X-Google-Smtp-Source: ABdhPJyJsXCCSsOkGqOR3cHFuEiRyhy0f0+fBsPOviQ6g720nNyHDRnbhbM2Kjy///5A9UidOSnLQg== X-Received: by 2002:a05:600c:4305:: with SMTP id p5mr342489wme.185.1634511188278; Sun, 17 Oct 2021 15:53:08 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang Subject: [PULL 04/17] hw/mips/boston: Add FDT generator Date: Mon, 18 Oct 2021 00:52:32 +0200 Message-Id: <20211017225245.2618892-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511190767100001 From: Jiaxun Yang Generate FDT on our own if no dtb argument supplied. Avoid introducing unused device in FDT with user supplied dtb. Signed-off-by: Jiaxun Yang [PMD: Fix coding style] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211002184539.169-4-jiaxun.yang@flygoat.com> --- hw/mips/boston.c | 245 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 236 insertions(+), 9 deletions(-) diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 7374bb5da4d..0e3cca55118 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -49,6 +49,15 @@ typedef struct BostonState BostonState; DECLARE_INSTANCE_CHECKER(BostonState, BOSTON, TYPE_BOSTON) =20 +#define FDT_IRQ_TYPE_NONE 0 +#define FDT_IRQ_TYPE_LEVEL_HIGH 4 +#define FDT_GIC_SHARED 0 +#define FDT_GIC_LOCAL 1 +#define FDT_BOSTON_CLK_SYS 1 +#define FDT_BOSTON_CLK_CPU 2 +#define FDT_PCI_IRQ_MAP_PINS 4 +#define FDT_PCI_IRQ_MAP_DESCS 6 + struct BostonState { SysBusDevice parent_obj; =20 @@ -437,6 +446,222 @@ xilinx_pcie_init(MemoryRegion *sys_mem, uint32_t bus_= nr, return XILINX_PCIE_HOST(dev); } =20 + +static void fdt_create_pcie(void *fdt, int gic_ph, int irq, hwaddr reg_bas= e, + hwaddr reg_size, hwaddr mmio_base, hwaddr mmio= _size) +{ + int i; + char *name, *intc_name; + uint32_t intc_ph; + uint32_t interrupt_map[FDT_PCI_IRQ_MAP_PINS][FDT_PCI_IRQ_MAP_DESCS]; + + intc_ph =3D qemu_fdt_alloc_phandle(fdt); + name =3D g_strdup_printf("/soc/pci@%" HWADDR_PRIx, reg_base); + qemu_fdt_add_subnode(fdt, name); + qemu_fdt_setprop_string(fdt, name, "compatible", + "xlnx,axi-pcie-host-1.00.a"); + qemu_fdt_setprop_string(fdt, name, "device_type", "pci"); + qemu_fdt_setprop_cells(fdt, name, "reg", reg_base, reg_size); + + qemu_fdt_setprop_cell(fdt, name, "#address-cells", 3); + qemu_fdt_setprop_cell(fdt, name, "#size-cells", 2); + qemu_fdt_setprop_cell(fdt, name, "#interrupt-cells", 1); + + qemu_fdt_setprop_cell(fdt, name, "interrupt-parent", gic_ph); + qemu_fdt_setprop_cells(fdt, name, "interrupts", FDT_GIC_SHARED, irq, + FDT_IRQ_TYPE_LEVEL_HIGH); + + qemu_fdt_setprop_cells(fdt, name, "ranges", 0x02000000, 0, mmio_base, + mmio_base, 0, mmio_size); + qemu_fdt_setprop_cells(fdt, name, "bus-range", 0x00, 0xff); + + + + intc_name =3D g_strdup_printf("%s/interrupt-controller", name); + qemu_fdt_add_subnode(fdt, intc_name); + qemu_fdt_setprop(fdt, intc_name, "interrupt-controller", NULL, 0); + qemu_fdt_setprop_cell(fdt, intc_name, "#address-cells", 0); + qemu_fdt_setprop_cell(fdt, intc_name, "#interrupt-cells", 1); + qemu_fdt_setprop_cell(fdt, intc_name, "phandle", intc_ph); + + qemu_fdt_setprop_cells(fdt, name, "interrupt-map-mask", 0, 0, 0, 7); + for (i =3D 0; i < FDT_PCI_IRQ_MAP_PINS; i++) { + uint32_t *irqmap =3D interrupt_map[i]; + + irqmap[0] =3D cpu_to_be32(0); + irqmap[1] =3D cpu_to_be32(0); + irqmap[2] =3D cpu_to_be32(0); + irqmap[3] =3D cpu_to_be32(i + 1); + irqmap[4] =3D cpu_to_be32(intc_ph); + irqmap[5] =3D cpu_to_be32(i + 1); + } + qemu_fdt_setprop(fdt, name, "interrupt-map", + &interrupt_map, sizeof(interrupt_map)); + + g_free(intc_name); + g_free(name); +} + +static const void *create_fdt(BostonState *s, + const MemMapEntry *memmap, int *dt_size) +{ + void *fdt; + int cpu; + MachineState *mc =3D s->mach; + uint32_t platreg_ph, gic_ph, clk_ph; + char *name, *gic_name, *platreg_name, *stdout_name; + static const char * const syscon_compat[2] =3D { + "img,boston-platform-regs", "syscon" + }; + + fdt =3D create_device_tree(dt_size); + if (!fdt) { + error_report("create_device_tree() failed"); + exit(1); + } + + platreg_ph =3D qemu_fdt_alloc_phandle(fdt); + gic_ph =3D qemu_fdt_alloc_phandle(fdt); + clk_ph =3D qemu_fdt_alloc_phandle(fdt); + + qemu_fdt_setprop_string(fdt, "/", "model", "img,boston"); + qemu_fdt_setprop_string(fdt, "/", "compatible", "img,boston"); + qemu_fdt_setprop_cell(fdt, "/", "#size-cells", 0x1); + qemu_fdt_setprop_cell(fdt, "/", "#address-cells", 0x1); + + + qemu_fdt_add_subnode(fdt, "/cpus"); + qemu_fdt_setprop_cell(fdt, "/cpus", "#size-cells", 0x0); + qemu_fdt_setprop_cell(fdt, "/cpus", "#address-cells", 0x1); + + for (cpu =3D 0; cpu < mc->smp.cpus; cpu++) { + name =3D g_strdup_printf("/cpus/cpu@%d", cpu); + qemu_fdt_add_subnode(fdt, name); + qemu_fdt_setprop_string(fdt, name, "compatible", "img,mips"); + qemu_fdt_setprop_string(fdt, name, "status", "okay"); + qemu_fdt_setprop_cell(fdt, name, "reg", cpu); + qemu_fdt_setprop_string(fdt, name, "device_type", "cpu"); + qemu_fdt_setprop_cells(fdt, name, "clocks", clk_ph, FDT_BOSTON_CLK= _CPU); + g_free(name); + } + + qemu_fdt_add_subnode(fdt, "/soc"); + qemu_fdt_setprop(fdt, "/soc", "ranges", NULL, 0); + qemu_fdt_setprop_string(fdt, "/soc", "compatible", "simple-bus"); + qemu_fdt_setprop_cell(fdt, "/soc", "#size-cells", 0x1); + qemu_fdt_setprop_cell(fdt, "/soc", "#address-cells", 0x1); + + fdt_create_pcie(fdt, gic_ph, 2, + memmap[BOSTON_PCIE0].base, memmap[BOSTON_PCIE0].size, + memmap[BOSTON_PCIE0_MMIO].base, memmap[BOSTON_PCIE0_MMIO].= size); + + fdt_create_pcie(fdt, gic_ph, 1, + memmap[BOSTON_PCIE1].base, memmap[BOSTON_PCIE1].size, + memmap[BOSTON_PCIE1_MMIO].base, memmap[BOSTON_PCIE1_MMIO].= size); + + fdt_create_pcie(fdt, gic_ph, 0, + memmap[BOSTON_PCIE2].base, memmap[BOSTON_PCIE2].size, + memmap[BOSTON_PCIE2_MMIO].base, memmap[BOSTON_PCIE2_MMIO].= size); + + /* GIC with it's timer node */ + gic_name =3D g_strdup_printf("/soc/interrupt-controller@%" HWADDR_PRIx, + memmap[BOSTON_GIC].base); + qemu_fdt_add_subnode(fdt, gic_name); + qemu_fdt_setprop_string(fdt, gic_name, "compatible", "mti,gic"); + qemu_fdt_setprop_cells(fdt, gic_name, "reg", memmap[BOSTON_GIC].base, + memmap[BOSTON_GIC].size); + qemu_fdt_setprop(fdt, gic_name, "interrupt-controller", NULL, 0); + qemu_fdt_setprop_cell(fdt, gic_name, "#interrupt-cells", 3); + qemu_fdt_setprop_cell(fdt, gic_name, "phandle", gic_ph); + + name =3D g_strdup_printf("%s/timer", gic_name); + qemu_fdt_add_subnode(fdt, name); + qemu_fdt_setprop_string(fdt, name, "compatible", "mti,gic-timer"); + qemu_fdt_setprop_cells(fdt, name, "interrupts", FDT_GIC_LOCAL, 1, + FDT_IRQ_TYPE_NONE); + qemu_fdt_setprop_cells(fdt, name, "clocks", clk_ph, FDT_BOSTON_CLK_CPU= ); + g_free(name); + g_free(gic_name); + + /* CDMM node */ + name =3D g_strdup_printf("/soc/cdmm@%" HWADDR_PRIx, memmap[BOSTON_CDMM= ].base); + qemu_fdt_add_subnode(fdt, name); + qemu_fdt_setprop_string(fdt, name, "compatible", "mti,mips-cdmm"); + qemu_fdt_setprop_cells(fdt, name, "reg", memmap[BOSTON_CDMM].base, + memmap[BOSTON_CDMM].size); + g_free(name); + + /* CPC node */ + name =3D g_strdup_printf("/soc/cpc@%" HWADDR_PRIx, memmap[BOSTON_CPC].= base); + qemu_fdt_add_subnode(fdt, name); + qemu_fdt_setprop_string(fdt, name, "compatible", "mti,mips-cpc"); + qemu_fdt_setprop_cells(fdt, name, "reg", memmap[BOSTON_CPC].base, + memmap[BOSTON_CPC].size); + g_free(name); + + /* platreg and it's clk node */ + platreg_name =3D g_strdup_printf("/soc/system-controller@%" HWADDR_PRI= x, + memmap[BOSTON_PLATREG].base); + qemu_fdt_add_subnode(fdt, platreg_name); + qemu_fdt_setprop_string_array(fdt, platreg_name, "compatible", + (char **)&syscon_compat, + ARRAY_SIZE(syscon_compat)); + qemu_fdt_setprop_cells(fdt, platreg_name, "reg", + memmap[BOSTON_PLATREG].base, + memmap[BOSTON_PLATREG].size); + qemu_fdt_setprop_cell(fdt, platreg_name, "phandle", platreg_ph); + + name =3D g_strdup_printf("%s/clock", platreg_name); + qemu_fdt_add_subnode(fdt, name); + qemu_fdt_setprop_string(fdt, name, "compatible", "img,boston-clock"); + qemu_fdt_setprop_cell(fdt, name, "#clock-cells", 1); + qemu_fdt_setprop_cell(fdt, name, "phandle", clk_ph); + g_free(name); + g_free(platreg_name); + + /* reboot node */ + name =3D g_strdup_printf("/soc/reboot"); + qemu_fdt_add_subnode(fdt, name); + qemu_fdt_setprop_string(fdt, name, "compatible", "syscon-reboot"); + qemu_fdt_setprop_cell(fdt, name, "regmap", platreg_ph); + qemu_fdt_setprop_cell(fdt, name, "offset", 0x10); + qemu_fdt_setprop_cell(fdt, name, "mask", 0x10); + g_free(name); + + /* uart node */ + name =3D g_strdup_printf("/soc/uart@%" HWADDR_PRIx, memmap[BOSTON_UART= ].base); + qemu_fdt_add_subnode(fdt, name); + qemu_fdt_setprop_string(fdt, name, "compatible", "ns16550a"); + qemu_fdt_setprop_cells(fdt, name, "reg", memmap[BOSTON_UART].base, + memmap[BOSTON_UART].size); + qemu_fdt_setprop_cell(fdt, name, "reg-shift", 0x2); + qemu_fdt_setprop_cell(fdt, name, "interrupt-parent", gic_ph); + qemu_fdt_setprop_cells(fdt, name, "interrupts", FDT_GIC_SHARED, 3, + FDT_IRQ_TYPE_LEVEL_HIGH); + qemu_fdt_setprop_cells(fdt, name, "clocks", clk_ph, FDT_BOSTON_CLK_SYS= ); + + qemu_fdt_add_subnode(fdt, "/chosen"); + stdout_name =3D g_strdup_printf("%s:115200", name); + qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", stdout_name); + g_free(stdout_name); + g_free(name); + + /* lcd node */ + name =3D g_strdup_printf("/soc/lcd@%" HWADDR_PRIx, memmap[BOSTON_LCD].= base); + qemu_fdt_add_subnode(fdt, name); + qemu_fdt_setprop_string(fdt, name, "compatible", "img,boston-lcd"); + qemu_fdt_setprop_cells(fdt, name, "reg", memmap[BOSTON_LCD].base, + memmap[BOSTON_LCD].size); + g_free(name); + + name =3D g_strdup_printf("/memory@0"); + qemu_fdt_add_subnode(fdt, name); + qemu_fdt_setprop_string(fdt, name, "device_type", "memory"); + g_free(name); + + return fdt; +} + static void boston_mach_init(MachineState *machine) { DeviceState *dev; @@ -560,22 +785,24 @@ static void boston_mach_init(MachineState *machine) NULL, 0, EM_MIPS, 1, 0); =20 if (kernel_size) { + int dt_size; + g_autofree const void *dtb_file_data, *dtb_load_data; hwaddr dtb_paddr =3D QEMU_ALIGN_UP(kernel_high, 64 * KiB); hwaddr dtb_vaddr =3D cpu_mips_phys_to_kseg0(NULL, dtb_paddr); =20 s->kernel_entry =3D kernel_entry; if (machine->dtb) { - int dt_size; - g_autofree const void *dtb_file_data, *dtb_load_data; - dtb_file_data =3D load_device_tree(machine->dtb, &dt_size); - dtb_load_data =3D boston_fdt_filter(s, dtb_file_data, - NULL, &dtb_vaddr); - - /* Calculate real fdt size after filter */ - dt_size =3D fdt_totalsize(dtb_load_data); - rom_add_blob_fixed("dtb", dtb_load_data, dt_size, dtb_padd= r); + } else { + dtb_file_data =3D create_fdt(s, boston_memmap, &dt_size); } + + dtb_load_data =3D boston_fdt_filter(s, dtb_file_data, + NULL, &dtb_vaddr); + + /* Calculate real fdt size after filter */ + dt_size =3D fdt_totalsize(dtb_load_data); + rom_add_blob_fixed("dtb", dtb_load_data, dt_size, dtb_paddr); } else { /* Try to load file as FIT */ fit_err =3D load_fit(&boston_fit_loader, machine->kernel_filen= ame, s); --=20 2.31.1 From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511194; cv=none; d=zohomail.com; s=zohoarc; b=dxwuiE6FrsQtSYGRPqyGrg5YJsZ6Go3lm9SS6z6qCdGLGhk3pug+no1Jpl8HM3rD0WRt4e6qE/FybfN0miXElBbdcBn43OxOu3LovVUWDukvpzj1J0HfKrL8S1Z6mjNQzFbwcZrfaslrOy3O+jtOS+lyrqNFG29Mj8owwoD23xA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511194; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qWW6jaAc1xuKmuHwt0Vz/fW3KIsJVwuG8QDNEQr3f7g=; b=kLZ7KYjlUrIyHNuR0pgJEPekMD6s5802hC9nJ3ayrQ0TwfyN6UYBB1n7w2xZSaJaE5gVYjhhXTpSBzqyx4TAjmDYnlyAZBn+Hn3v8ehOKMJWJm545uFg85x6cdlMnhXtcMRU5zdBkHJR8owyAa6KlxF6an7+yjwRjfUNq0uEUZo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1634511194883785.7672501524668; Sun, 17 Oct 2021 15:53:14 -0700 (PDT) Received: by mail-wm1-f49.google.com with SMTP id 67-20020a1c1946000000b0030d4c90fa87so6945437wmz.2 for ; Sun, 17 Oct 2021 15:53:14 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id z6sm11193001wro.25.2021.10.17.15.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qWW6jaAc1xuKmuHwt0Vz/fW3KIsJVwuG8QDNEQr3f7g=; b=RZSODLe+syIUlFYLRz+oPdliMxQcyA5tQ4bFBkXNGhgw/jPeqU6pwm5ZakSBDSza4/ kFunzYPh0bJNeTSX0rJzAp5c6jxV+bSQx4w1HKHAYFkBQDtFsl7JOAKQE5kNhBW/TIx2 WmJcJebIDcxAEKeB4xS0RLzBGa7POAF9FM5fcobvB68aLGYhxTDPLVQmeV2uuvkkFxLf cVe6eD/0lIgfSDDlVSG7A8yI4EEcYaMztftqDUi9bCtRHxHIr0WJrOrxkBRb20cRP6p2 nh2XBGs7muIgM3osmh8uDzxJS5xhjpmq3aqpp6I/rnDsp5Mge5IqSF/ilbW3EN24Id9E TjYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qWW6jaAc1xuKmuHwt0Vz/fW3KIsJVwuG8QDNEQr3f7g=; b=uqHeEvOnF33fvdYNTBNfYeuqRkEbNG+TawfiIH0aqPw39HKA2uR7YwhQ74Ioeu4pv+ rv50Gha52sOzgq9w2rhQ3VC02LX0k5LYf3clPpLIVPHFzu1FqbmT5UqJw6SbLabAFK/j jSVxH/QeNvYHRJb68TfNUHJPglPEa+tiI1YAX82IpGbVLw/pwbyjXm02+edik2R/Umfq YFkbK3j83h0nwOrUIP/1xsUba9hVxIlT8MEfCn/jCZKxVHk5Pp4SynDxwKekyyVrsNX3 Qij2VIA8P5U1/PRz2GJfVU+8ez/fcfwjEyaxOolVSYCxPsQjc0TIGqhAxcEEcR0nngVg LYRQ== X-Gm-Message-State: AOAM531mlIqxX4YCX/aqG2rPhF265iIZ3p88mbVUhzZ1LGApkUtCb7ZI QnSowyzT6CcvbvEjjFXJoEk= X-Google-Smtp-Source: ABdhPJxUreoZ8svBH9LF6ksCA/G1iZdAsrk8Wlhv6qxsUnzQlesUt/xFinaqvD+d0xM86LRlIpBdVw== X-Received: by 2002:a05:600c:299:: with SMTP id 25mr27633481wmk.22.1634511193075; Sun, 17 Oct 2021 15:53:13 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 05/17] target/mips: Remove unused register from MSA 2R/2RF instruction format Date: Mon, 18 Oct 2021 00:52:33 +0200 Message-Id: <20211017225245.2618892-6-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511196828100001 Commits cbe50b9a8e7 ("target-mips: add MSA VEC/2R format instructions") and 3bdeb68866e ("target-mips: add MSA 2RF format instructions") added the MSA 2R/2RF instructions. However these instructions don't use any target vector register, so remove the unused TCG temporaries. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211003175743.3738710-2-f4bug@amsat.org> --- target/mips/tcg/msa_translate.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index 8170a8df26b..ee6424126f7 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -1942,13 +1942,11 @@ static void gen_msa_2r(DisasContext *ctx) { #define MASK_MSA_2R(op) (MASK_MSA_MINOR(op) | (op & (0x1f << 21)) | \ (op & (0x7 << 18))) - uint8_t wt =3D (ctx->opcode >> 16) & 0x1f; uint8_t ws =3D (ctx->opcode >> 11) & 0x1f; uint8_t wd =3D (ctx->opcode >> 6) & 0x1f; uint8_t df =3D (ctx->opcode >> 16) & 0x3; TCGv_i32 twd =3D tcg_const_i32(wd); TCGv_i32 tws =3D tcg_const_i32(ws); - TCGv_i32 twt =3D tcg_const_i32(wt); TCGv_i32 tdf =3D tcg_const_i32(df); =20 switch (MASK_MSA_2R(ctx->opcode)) { @@ -2018,7 +2016,6 @@ static void gen_msa_2r(DisasContext *ctx) =20 tcg_temp_free_i32(twd); tcg_temp_free_i32(tws); - tcg_temp_free_i32(twt); tcg_temp_free_i32(tdf); } =20 @@ -2026,13 +2023,11 @@ static void gen_msa_2rf(DisasContext *ctx) { #define MASK_MSA_2RF(op) (MASK_MSA_MINOR(op) | (op & (0x1f << 21)) | \ (op & (0xf << 17))) - uint8_t wt =3D (ctx->opcode >> 16) & 0x1f; uint8_t ws =3D (ctx->opcode >> 11) & 0x1f; uint8_t wd =3D (ctx->opcode >> 6) & 0x1f; uint8_t df =3D (ctx->opcode >> 16) & 0x1; TCGv_i32 twd =3D tcg_const_i32(wd); TCGv_i32 tws =3D tcg_const_i32(ws); - TCGv_i32 twt =3D tcg_const_i32(wt); /* adjust df value for floating-point instruction */ TCGv_i32 tdf =3D tcg_const_i32(df + 2); =20 @@ -2089,7 +2084,6 @@ static void gen_msa_2rf(DisasContext *ctx) =20 tcg_temp_free_i32(twd); tcg_temp_free_i32(tws); - tcg_temp_free_i32(twt); tcg_temp_free_i32(tdf); } =20 --=20 2.31.1 From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511199; cv=none; d=zohomail.com; s=zohoarc; b=jNoaoFgpHvvX8WX+VKpLL1kbeY02i4uGyVCb8A/r7u66rCRhYqEw3t2QEGic1BDhaBCNXX8VxkqVgBcXk+aPzzXM4/b9LMCQyAlIA/GQgfsS5XANLhtDIxJrnoU86pmWUIM1N2zwoNcokQXsVIgYsK3hKsDW4HJ6U9JLMArOG/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511199; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nQpq/LuTsNrIIgRzswUPgI1mEqmSmKFQ34DGfTp2hjI=; b=igsVkIyAseX5sB2gHwq9G1B8bWuUk9za0xyEUNClmiRN1CdalLQkSL/EHyxLjMMhFy+A2K342AHy3nGyMviJ7x058kXF1KHwb4lvVTg86mH6kDAfsrFkqMA4o1DV7OxKqpm3hJARMucffFyzOGYbpaKL9cozLWUdSUrvmevJ/jg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1634511199739948.1668308429715; Sun, 17 Oct 2021 15:53:19 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id z77-20020a1c7e50000000b0030db7b70b6bso8613750wmc.1 for ; Sun, 17 Oct 2021 15:53:19 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id d9sm10906085wrm.96.2021.10.17.15.53.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:53:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nQpq/LuTsNrIIgRzswUPgI1mEqmSmKFQ34DGfTp2hjI=; b=E6eJK1D59/pQwYGPwm+vR7jbjH+sxv9gweH+0/81xFt63kNaiBoC+SQAMDOzzdG+HP 4e6vE0OJS2k58A793ix/0GeXDB9NZkloLRSkPBN99I5xCfwjrZLh3rVCgwOFEINQGRLs VITz4TxjHXe98ZYPna6Rxb54pTzkf094lv5UaFheppQwcs/Z/ccLtFQrPWWPgpx5XphY uA2541e/KRhFHZOMoVVIT3Kg9zEhNu24oRl3HhVlyFwdpy8qZNbfha94Pd04ndZZRlgo iL4eNiq1uO2XhU1zCNyQbVECyDFBhDgfbx1vUgwJDGeSloPdM1VKK88yYFxEK0c7almB S09g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nQpq/LuTsNrIIgRzswUPgI1mEqmSmKFQ34DGfTp2hjI=; b=JZ5ZnXoiv4NNFe0JpAcO05gveXFXnYb4TrfmyxNUHsBv2fkuUorgkglMnylfyGVv7h 8qGeugF8LRpzBBqM9JIZky/agkvjb0dy7xqULlbfPGwEveovw7X/kgL9RpgfBphe5zFQ IKUT8idoR198DCF6fLBzf6dmPKZ1KyepCFco7OBDBKAlwFZgEgdzXu2EPzwOgsb026KX VYN51/RI2bWLBIcrFQcd84NGlWAA7hY1hyEEsg6p2iomj5jt8HKp0dNtI+MwxjQDtMCD Ja+QXLwyBq9bd3Rx8onamGoQn5Ev3NxvQbldH+fOR/LMJ/PWDneXpFOp8A8tPAQVkLch CZcQ== X-Gm-Message-State: AOAM530eAMZVp3QAJp9zE1jZgPdpO9iFxP87zi3kHez1Yezs8ROxG9G7 dKfWSp4tnN9y0UT9sB7RC1Y= X-Google-Smtp-Source: ABdhPJw7QQpR8iST+Kc44duehWYj+HGVEsJpJU3oaMABr8p9tgbTIhyk7Aq6/m4KXPWFc4obSr7BaQ== X-Received: by 2002:a1c:4e0f:: with SMTP id g15mr42026478wmh.54.1634511197979; Sun, 17 Oct 2021 15:53:17 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 06/17] target/mips: Use tcg_constant_i32() in gen_msa_elm_df() Date: Mon, 18 Oct 2021 00:52:34 +0200 Message-Id: <20211017225245.2618892-7-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511200813100001 Data Format is a 2-bit constant value. Avoid using a TCG temporary by moving it to the constant pool. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20211003175743.3738710-3-f4bug@amsat.org> --- target/mips/tcg/msa_translate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index ee6424126f7..20036ae4968 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -1650,7 +1650,7 @@ static void gen_msa_elm_df(DisasContext *ctx, uint32_= t df, uint32_t n) TCGv_i32 tws =3D tcg_const_i32(ws); TCGv_i32 twd =3D tcg_const_i32(wd); TCGv_i32 tn =3D tcg_const_i32(n); - TCGv_i32 tdf =3D tcg_const_i32(df); + TCGv_i32 tdf =3D tcg_constant_i32(df); =20 switch (MASK_MSA_ELM(ctx->opcode)) { case OPC_SLDI_df: @@ -1748,7 +1748,6 @@ static void gen_msa_elm_df(DisasContext *ctx, uint32_= t df, uint32_t n) tcg_temp_free_i32(twd); tcg_temp_free_i32(tws); tcg_temp_free_i32(tn); - tcg_temp_free_i32(tdf); } =20 static void gen_msa_elm(DisasContext *ctx) --=20 2.31.1 From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511204; cv=none; d=zohomail.com; s=zohoarc; b=Gg6TK6nrwqtFpM6ywWjpcAmgx5KgwmamGAzBcRBb9zbgQ1B4grRuxeEZIOtMol/5FFoWOAQxnAib3h63SgAAJhpyVJD4cQhOiGXt1EnraCAiN8WHAW7rvASp3+8lhj9D8jwnHweUm+3s7HPwLBfWNMb9j1k44NaMK3Un7Y0c0GU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511204; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=R+vpKgozfTgGwcsxxqzQt2Abc5pKt4wV9EGNm7o9fLM=; b=BwlK6EkOhdwU6mRY3vWB3AeTpBcauHe/8V+PtsuFvrsESDwb8KpNr+EvFh7Jo59giESXItI3hVIYuNJRgf2iIVY4JFQOhItWrfo7Umtpue2QglToLieaeVQ4juCr8B6qrYiIBqoK7/CfhlrHRWdQ9NhqZc9EydwOyI6VNriDrYQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1634511204494779.200833568282; Sun, 17 Oct 2021 15:53:24 -0700 (PDT) Received: by mail-wm1-f42.google.com with SMTP id m42so7143802wms.2 for ; Sun, 17 Oct 2021 15:53:23 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id n9sm2274116wmq.6.2021.10.17.15.53.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:53:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R+vpKgozfTgGwcsxxqzQt2Abc5pKt4wV9EGNm7o9fLM=; b=ZxmsuFENZWIElSbYhRXaRqemtLRRqGYyy/aL5cua0+pRYNAhwNuX68m+ExaNyD2V1E 8fKPGHgtsux7bHwVuwANZHJV4WrukKSRj2S1nyGd4+9vOEAZGTPOrmzSnAhZ+2PYofuP cQ+qFp9OMfgZ2c6I/h52hQFYCoatuDxN1B/z48BgoXb4nVjcqRIyk2a6EM76AmeKQShU mrxqz/cNm63badrZ8JO+xPuszglxzLe0eU8G7koahAJ0U/znkoqwHOthhyHuVAc/fw+7 bBhp/hLalle2pjQQjbKJH+Ga7uj7GFNZ8vKhvRnkIX38za9Efp+BK7tuuACUEPf4VlMI DkKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=R+vpKgozfTgGwcsxxqzQt2Abc5pKt4wV9EGNm7o9fLM=; b=IfGAFcfmeKpevWObRkNST21yqlCseG7kqTgEQS7DWCmAkzCjLpP1Sxawdiv9z1Cmt8 h4hkO6Dk/NQECAxDtdq/UfrCYhDujemVCbd55Lwo5xo34cm76a9/m0fUr/KIYYsdmNEI wQxNCtz20tCEO+/aa3MSw3EP1QOyI63ScYdEvpxYa7xCqehv6oefjQpKRpTGL+JZWMMQ EkdkUqneJdFJEN74GIVYjKziF6VO00Ua3gb7dIXJwuWwLnYw452/KTpxk08qWdyeyT8G 4zi5pO1RjtAqDedAwZzIZIZxSZXY3G05p7fzXW6DSkX5EUemNK5DrXOG2lX8W4c4KxR+ sNSA== X-Gm-Message-State: AOAM530iRupcOUkz9tippHyH/vUcw/uPOt5vlQAE5w4xX68X2AUVNWPh ePabHF1hMeNS2XjBQ08K5wYNs8S0mkQ= X-Google-Smtp-Source: ABdhPJynSIc5oH9CwdPfByYoTsDQAz/WM8HGkFmXV+BwR9EjWtbKL6UIsHz99vVnwjYgnv4jc/wBHA== X-Received: by 2002:a7b:c359:: with SMTP id l25mr40516669wmj.84.1634511202719; Sun, 17 Oct 2021 15:53:22 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 07/17] target/mips: Use tcg_constant_i32() in gen_msa_2rf() Date: Mon, 18 Oct 2021 00:52:35 +0200 Message-Id: <20211017225245.2618892-8-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511204901100001 Avoid using a TCG temporary by moving Data Format to the constant pool. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20211003175743.3738710-4-f4bug@amsat.org> --- target/mips/tcg/msa_translate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index 20036ae4968..5e8f80f2f23 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -2028,7 +2028,7 @@ static void gen_msa_2rf(DisasContext *ctx) TCGv_i32 twd =3D tcg_const_i32(wd); TCGv_i32 tws =3D tcg_const_i32(ws); /* adjust df value for floating-point instruction */ - TCGv_i32 tdf =3D tcg_const_i32(df + 2); + TCGv_i32 tdf =3D tcg_constant_i32(df + 2); =20 switch (MASK_MSA_2RF(ctx->opcode)) { case OPC_FCLASS_df: @@ -2083,7 +2083,6 @@ static void gen_msa_2rf(DisasContext *ctx) =20 tcg_temp_free_i32(twd); tcg_temp_free_i32(tws); - tcg_temp_free_i32(tdf); } =20 static void gen_msa_vec_v(DisasContext *ctx) --=20 2.31.1 From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511209; cv=none; d=zohomail.com; s=zohoarc; b=Uo4+C0j66zKrjWfdx8XGAroQ3fnWEiJu9mFjrZoscOhCG3owCE+S/DvXQqd5awYGumyewoeu4h4H6wMM1sp5u4ICkudb1LMAWyJL5amvfaZlL7duitEZZ8WjbJGNlS11eEnOs/V1PJ4bafFqWPIOp04YTTL73o1u/5xxMHEO/30= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511209; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=azrawipGm8tqQsryYd1KLjXl2gKWLCaASF3igLFnDCc=; b=HXAZXFSLWQ75xmZKh0weX6DFI6+IYqv2rSLcya8YyGlbWl0adKqU8UTfiOgh4ocdRYXuo6cK1SzmPEZpOgDECPnCiCxwlx4esC62pMYhROxVkYhmv/UgozNW0wrA7ZD7wHLqplXGrueNyOpeLGYtqjG/zywR42bRxTUG6SA6990= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1634511209310414.2668645212908; Sun, 17 Oct 2021 15:53:29 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id o20so37911786wro.3 for ; Sun, 17 Oct 2021 15:53:28 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id i203sm13414931wma.48.2021.10.17.15.53.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:53:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=azrawipGm8tqQsryYd1KLjXl2gKWLCaASF3igLFnDCc=; b=jVe1PZEkPEVz46EilisjDWClUcjuJyJmyVKh9/tsGjdGwgfLV55wv/Ti9TqUmuDGJ9 bhR6FLUi6DcGcvjAm8hIidDPyI4t/YLembK7fGV5AqstpmRcsQ9/ur5ElLXjeJpNHM73 TFYuuNdsxtCHeUQFNBy57a6d41UnbzJMzAcvGdbaqMZNk0H7UtEGUNNDvoQ64zk7gvNL H6pN73zHMzyvcSg1heHj0hDsdmYRYla+d7YqiP3wcK5t9k7Ok+o+C8TNiXqpjFk2+whx bLPYeRtUdPWX5hd5ASRxr1yNaV56Vfta9BrKHqtxSIoKUOjdlpOoXZg+dZo94IT9F3gh 5nkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=azrawipGm8tqQsryYd1KLjXl2gKWLCaASF3igLFnDCc=; b=aNABsCcLPPBIIZZHnSEg4vAtlV+dzGL/DPUrSATaQAtrqaf2dNeO9d330AOjwva04K lnUPmbg+StKgK0ywgZxXQtvNBcDJ5pP+ju425DLIYXsKfMa7lNWM/Qlrm2v+CTMlSAFr rmacUdkfQpDdA9TVfBDlwfv2vWbmYuRSJ2J49ZCCEZY2djv+P/aN8YURLzf+v5EnQEFw nLG2Q80B8HmwNvFHprFi+ApK07ws7cnE7BEXtY1voSDrXf1D9Dn8e8bCALsQSpV5ZYhP dRmMxGY2vyC+DcsRqmLtdB/wNEF6wvCZUkEdg2l1YfeE4kSlJZ5GInxsH7cJqz2OL0zD lU+Q== X-Gm-Message-State: AOAM530GYCTs8mO4ZfdSItHCi0C+ovqyVZZ17IXpqrwpuRUKAunwKRSw KzDTZHubnWwxp0xgPE9mbRI= X-Google-Smtp-Source: ABdhPJyV/kp2pK2eMIhUKfekBTDsIYuV0bzhxYJeWXY5GQbnQ1EQea/IHTI/BiwE/x3t7mmnPOIduQ== X-Received: by 2002:a5d:6c65:: with SMTP id r5mr30596549wrz.26.1634511207561; Sun, 17 Oct 2021 15:53:27 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 08/17] target/mips: Use tcg_constant_i32() in gen_msa_2r() Date: Mon, 18 Oct 2021 00:52:36 +0200 Message-Id: <20211017225245.2618892-9-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511211077100001 Avoid using a TCG temporary by moving Data Format to the constant pool. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20211003175743.3738710-5-f4bug@amsat.org> --- target/mips/tcg/msa_translate.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index 5e8f80f2f23..bbe9146513a 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -1946,7 +1946,6 @@ static void gen_msa_2r(DisasContext *ctx) uint8_t df =3D (ctx->opcode >> 16) & 0x3; TCGv_i32 twd =3D tcg_const_i32(wd); TCGv_i32 tws =3D tcg_const_i32(ws); - TCGv_i32 tdf =3D tcg_const_i32(df); =20 switch (MASK_MSA_2R(ctx->opcode)) { case OPC_FILL_df: @@ -1957,7 +1956,8 @@ static void gen_msa_2r(DisasContext *ctx) break; } #endif - gen_helper_msa_fill_df(cpu_env, tdf, twd, tws); /* trs */ + gen_helper_msa_fill_df(cpu_env, tcg_constant_i32(df), + twd, tws); /* trs */ break; case OPC_NLOC_df: switch (df) { @@ -2015,7 +2015,6 @@ static void gen_msa_2r(DisasContext *ctx) =20 tcg_temp_free_i32(twd); tcg_temp_free_i32(tws); - tcg_temp_free_i32(tdf); } =20 static void gen_msa_2rf(DisasContext *ctx) --=20 2.31.1 From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) client-ip=209.85.128.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511214; cv=none; d=zohomail.com; s=zohoarc; b=Ysdk2AmNpW2ioyUKNxP2xRelmtOdDfN6PGtKKrzCqLXlREBrVSRwntdThID+p7NlweqIb9UV8R5WGObZx3cBYy/DRm7Fa6CMXpbzFVtxu3YGMKso5jT4UEW7cVmIQca1ZNIwysVFI8s1RlyugDn9oM74i621d3otH/C3mZqMo8c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511214; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vP1k7G6kYb0ZSEIWtvfL0SOPPZNd2sVy+iXF6U+13xE=; b=FvtODFFIIKZJj5Htldt7kn2jlZN6zAOND0ggkqJYZhCBqkJQMzfvX7sRt5LIMZv0f6lKmqEZK9Vp8lo3+6uN0l1W4nnEAEylKAOYB9Or/BMBW6KNpSsZvfoHxRddE/CA/EdPB3JR8ZkPkzSzWjXnBJZD2/VwXpm+mrDRfIXdZIc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.zohomail.com with SMTPS id 1634511214231638.9317691272412; Sun, 17 Oct 2021 15:53:34 -0700 (PDT) Received: by mail-wm1-f54.google.com with SMTP id j75-20020a1c234e000000b00323023159e1so559862wmj.2 for ; Sun, 17 Oct 2021 15:53:33 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id o26sm16626125wmc.17.2021.10.17.15.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:53:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vP1k7G6kYb0ZSEIWtvfL0SOPPZNd2sVy+iXF6U+13xE=; b=NkJff89eRufUKp/yPO1QySa0M4DqQH+XB/DYT24lT55dE29ss3f2cla725XlBtRo74 ESjHcpceKVtueuXUvkBx67QoqIkcicdBcFIHkDrJZCQBTX8CiQtRPYZsByL/RcMy+MIX VB5dBcdxc2y4Jhl2laW4zyiXEG6zk7KPdiqYTbH+LbU0u15WFoRzC1JRV7I9mhlZCBH2 eyK6CLS0bbze+I0Oe556ohsymFiLJS7i00HfmDrV+13bFhMPy6+K0fElWyaqPW8IMEFy 3UeBHwcaT3Lq6DUTkt9Gy2VnDMJGLwcAZp5bKeaDlTb4nFNubVcUUcn23DoPz19qjoWR 8hEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vP1k7G6kYb0ZSEIWtvfL0SOPPZNd2sVy+iXF6U+13xE=; b=hz/6fxdGEQxYKRRaHmopfKgC+Q9HLVhrRY/OoLV/qBCnB7G8KibvBnXbG5k0h1LMo5 RpIUORcR2pyawbKVizXPajTuI1AJ0WElkiM7Y2jehrTL2zMP4ANqHUlNTQt6IU5C4JFw wSWm2Zd9Bx7mmq0cOoAJNfppC1XD1UmC/mLTf8gmp6n5hfZfwfzB613nwTNC6pBwxHtP uifeQPWNaJar6NFr7VidKIDP00B5Y5eGv9nKaszKtDwCDumueWCFCUIUV+YMxnx5k8T5 xQpME1ryAwvW7chRYWe2Kzg7a5xK+O3t/ADQre7RzHCv0SbpK8vMN0x5e1/T7m62mRWh ophQ== X-Gm-Message-State: AOAM533l54VIYXIITLMOrpKWV8OzBWVbvvHpyiOqK+P1My/LrWKPs/d/ xOdYn4erL91szlNSOKkxmvTsc7R81eE= X-Google-Smtp-Source: ABdhPJx8GRp/kZZSmQKWdaQlN6JZlmmKuXUqIhaHCV1QieOPYUIdh9FDPzypJXLqXzM/bxGP+pAyOQ== X-Received: by 2002:a1c:cc0f:: with SMTP id h15mr26788505wmb.37.1634511212463; Sun, 17 Oct 2021 15:53:32 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 09/17] target/mips: Use tcg_constant_i32() in gen_msa_3rf() Date: Mon, 18 Oct 2021 00:52:37 +0200 Message-Id: <20211017225245.2618892-10-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511215188100001 Avoid using a TCG temporary by moving Data Format to the constant pool. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20211003175743.3738710-6-f4bug@amsat.org> --- target/mips/tcg/msa_translate.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index bbe9146513a..e107cad57ee 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -1790,10 +1790,22 @@ static void gen_msa_3rf(DisasContext *ctx) TCGv_i32 twd =3D tcg_const_i32(wd); TCGv_i32 tws =3D tcg_const_i32(ws); TCGv_i32 twt =3D tcg_const_i32(wt); - TCGv_i32 tdf =3D tcg_temp_new_i32(); + TCGv_i32 tdf; =20 /* adjust df value for floating-point instruction */ - tcg_gen_movi_i32(tdf, df + 2); + switch (MASK_MSA_3RF(ctx->opcode)) { + case OPC_MUL_Q_df: + case OPC_MADD_Q_df: + case OPC_MSUB_Q_df: + case OPC_MULR_Q_df: + case OPC_MADDR_Q_df: + case OPC_MSUBR_Q_df: + tdf =3D tcg_constant_i32(df + 1); + break; + default: + tdf =3D tcg_constant_i32(df + 2); + break; + } =20 switch (MASK_MSA_3RF(ctx->opcode)) { case OPC_FCAF_df: @@ -1836,7 +1848,6 @@ static void gen_msa_3rf(DisasContext *ctx) gen_helper_msa_fmadd_df(cpu_env, tdf, twd, tws, twt); break; case OPC_MUL_Q_df: - tcg_gen_movi_i32(tdf, df + 1); gen_helper_msa_mul_q_df(cpu_env, tdf, twd, tws, twt); break; case OPC_FCULT_df: @@ -1846,14 +1857,12 @@ static void gen_msa_3rf(DisasContext *ctx) gen_helper_msa_fmsub_df(cpu_env, tdf, twd, tws, twt); break; case OPC_MADD_Q_df: - tcg_gen_movi_i32(tdf, df + 1); gen_helper_msa_madd_q_df(cpu_env, tdf, twd, tws, twt); break; case OPC_FCLE_df: gen_helper_msa_fcle_df(cpu_env, tdf, twd, tws, twt); break; case OPC_MSUB_Q_df: - tcg_gen_movi_i32(tdf, df + 1); gen_helper_msa_msub_q_df(cpu_env, tdf, twd, tws, twt); break; case OPC_FCULE_df: @@ -1896,7 +1905,6 @@ static void gen_msa_3rf(DisasContext *ctx) gen_helper_msa_fmin_df(cpu_env, tdf, twd, tws, twt); break; case OPC_MULR_Q_df: - tcg_gen_movi_i32(tdf, df + 1); gen_helper_msa_mulr_q_df(cpu_env, tdf, twd, tws, twt); break; case OPC_FSULT_df: @@ -1906,7 +1914,6 @@ static void gen_msa_3rf(DisasContext *ctx) gen_helper_msa_fmin_a_df(cpu_env, tdf, twd, tws, twt); break; case OPC_MADDR_Q_df: - tcg_gen_movi_i32(tdf, df + 1); gen_helper_msa_maddr_q_df(cpu_env, tdf, twd, tws, twt); break; case OPC_FSLE_df: @@ -1916,7 +1923,6 @@ static void gen_msa_3rf(DisasContext *ctx) gen_helper_msa_fmax_df(cpu_env, tdf, twd, tws, twt); break; case OPC_MSUBR_Q_df: - tcg_gen_movi_i32(tdf, df + 1); gen_helper_msa_msubr_q_df(cpu_env, tdf, twd, tws, twt); break; case OPC_FSULE_df: @@ -1934,7 +1940,6 @@ static void gen_msa_3rf(DisasContext *ctx) tcg_temp_free_i32(twd); tcg_temp_free_i32(tws); tcg_temp_free_i32(twt); - tcg_temp_free_i32(tdf); } =20 static void gen_msa_2r(DisasContext *ctx) --=20 2.31.1 From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511219; cv=none; d=zohomail.com; s=zohoarc; b=TUYiDA+bq3CmRqVGij6UxrEViSuRFv7/RoZoNRlqmwhwCQ4R4smdbnMasO7GgAXU9WBmflH91RpJaiWaqsFwsuRinSnOECY5LUwKr0sRJQThC7kkz+HaZ05Ec0GvLKTwtSm+BKtLWYIGw9rSyI+aEP6drXssImyuzIZwNifo++I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511219; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=E7ZOWz1dqlyuDuaBH4MOae8nY6kvv2jHAcqCGnp8bCU=; b=IRXJE/7K4Lj7o55zT7/6HOWaCotAQYeDM3kT7y/VPKMTtS4J+OZNg3ky7Xt7RtpEvHcnHZL9MGPeMXBL57ZfZCokJotGhipNsk5I3OEwZnTrTlZ8scfPPSEiEPZ2A69SkPI3E6FwP6VH7qpDCnX1VKOkHk/zf7sOtD2RBbPgrXQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1634511219132238.73243600675994; Sun, 17 Oct 2021 15:53:39 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id r7so37874288wrc.10 for ; Sun, 17 Oct 2021 15:53:38 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id v3sm11035849wrg.23.2021.10.17.15.53.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:53:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E7ZOWz1dqlyuDuaBH4MOae8nY6kvv2jHAcqCGnp8bCU=; b=GLkhx14j8yQC1rw4qmvomPHcyZ9v8dJ9LdsoupN8IXdIuxDPwF4l4CX/Nx1Mk2zmsH 150ygLCC/4be7CplfAyf+JbQ7IdYI4p44AEo8c7whH8onwvQjWSzkXh+E3vhigAhSqdO 2HrMEQ51UD3SE4F6vzyHFybtSemuYF8wjb9wh9vkvbtMsi/3bWCPOp0K5tV/HhEUZgbD nM/MSHPJFhq+4JYd2BNdDZ89CN78zA4PmZ22VdSOdKTVjii96Fv23Tcck3a5lH1Ecyx6 ht0grXQRf0LOXkMhUk5ErMuIkcAp4xh22ZdBrZgTYq8Asi/waqt7Q+sdgxd6lNRKr2jY xQTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=E7ZOWz1dqlyuDuaBH4MOae8nY6kvv2jHAcqCGnp8bCU=; b=XW7iKcQSUQGavnrc6sOr+XerdoAdoUBW+uKjxZlw7SiHvb5LV+Dkrwv/N6d+i0TP56 Of90sje4XLwL9pSyPXlr/pj0fo2FJsDgX/hry4CljKSYe5ezLDmwRSA1KGMyn5ve5LPp 5TWO55Bb2P51dcnkRVk2vggP6P8KkE9WHoTy80z/E9zUBxgMxYB0YPi27fy2tmeqwH5U 5fUFEDEW058MKJgrb8M/pks4hBe6S+LUuGFq0xo0W1cEW0blKx765ABjuBu1+x9nx47h g71dky3oSAkvTzLaZWV45aU4MwIkPf74f0HYxAe5oMPLxN/O9BDM73vtGTOM4WsFfdrZ eN2w== X-Gm-Message-State: AOAM532g1z8+Gde7K+bGh1jz5AqVV8+9koCnEIsH948P780ljkIcVOZs 5Gzc6eaT6h8hoblZbDhUshM= X-Google-Smtp-Source: ABdhPJzx9hldujAUa8dVJlq5IHwVOvAonR5lXX6CYHOs+rvgwYiYvuOrJTYHvyEYi9/X5c24WF36jg== X-Received: by 2002:adf:a455:: with SMTP id e21mr30657937wra.232.1634511217399; Sun, 17 Oct 2021 15:53:37 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 10/17] target/mips: Use explicit extract32() calls in gen_msa_i5() Date: Mon, 18 Oct 2021 00:52:38 +0200 Message-Id: <20211017225245.2618892-11-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511221217100001 We already use sextract32(), use extract32() for completeness instead of open-coding it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20211003175743.3738710-7-f4bug@amsat.org> --- target/mips/tcg/msa_translate.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index e107cad57ee..3ef912da6b8 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -473,15 +473,12 @@ static void gen_msa_i8(DisasContext *ctx) static void gen_msa_i5(DisasContext *ctx) { #define MASK_MSA_I5(op) (MASK_MSA_MINOR(op) | (op & (0x7 << 23))) - uint8_t df =3D (ctx->opcode >> 21) & 0x3; int8_t s5 =3D (int8_t) sextract32(ctx->opcode, 16, 5); - uint8_t u5 =3D (ctx->opcode >> 16) & 0x1f; - uint8_t ws =3D (ctx->opcode >> 11) & 0x1f; - uint8_t wd =3D (ctx->opcode >> 6) & 0x1f; + uint8_t u5 =3D extract32(ctx->opcode, 16, 5); =20 - TCGv_i32 tdf =3D tcg_const_i32(df); - TCGv_i32 twd =3D tcg_const_i32(wd); - TCGv_i32 tws =3D tcg_const_i32(ws); + TCGv_i32 tdf =3D tcg_const_i32(extract32(ctx->opcode, 21, 2)); + TCGv_i32 twd =3D tcg_const_i32(extract32(ctx->opcode, 11, 5)); + TCGv_i32 tws =3D tcg_const_i32(extract32(ctx->opcode, 6, 5)); TCGv_i32 timm =3D tcg_temp_new_i32(); tcg_gen_movi_i32(timm, u5); =20 --=20 2.31.1 From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511224; cv=none; d=zohomail.com; s=zohoarc; b=Cwpj4VXtWIc2asXi5jkv0BqfB1T9hjmXTXbNNXVz4G2tSKSIakOfYhps0tM5a39yxBlMdPKi7QDty5wKKdZCUbSzOLVWAavzQ1bGi7ztw/pyh4Rw1b9RBb0x87jhgkAlBGGATDyEKBVFmsxO7qhsKGOdDQe1CBs3Q/0fl7dpdcQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511224; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VkAqLI31u+CpladBFCKFa8JbOaSADiFIq/q3d5+qh7s=; b=ZG6KBwcCSdk/JcZSwfLzB85kaaZADhy70gyPoKaShIGCBkcCf29b6K7R/0hyYjvzt0dRNaaUDtEkfi7MTqw+e1Yv7Y8ZW8Ctohu4tcpP/yOcKDNeDkhaspn1tfWKXb9YI/kMWvNH7gaqi+DlEEzX1yybnJkt4IasTvgpxxKaXHk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1634511224026904.7539045454835; Sun, 17 Oct 2021 15:53:44 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id m22so38016123wrb.0 for ; Sun, 17 Oct 2021 15:53:43 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id u2sm10576007wrr.35.2021.10.17.15.53.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:53:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VkAqLI31u+CpladBFCKFa8JbOaSADiFIq/q3d5+qh7s=; b=hve08zlhs31YAjBCzR3Cvsleh7PeaGkfVzYLFAtZfQSZDd/v57xpxFCP1j6sROamUU e5RBkAFCrFR9CfBSYiRrgvv9QU2W+DTlEHWEHKtTcAY++cEhaz8/SDi4pjOAPOaWVkXK vzk1c5zVwuq1vlELiEo3GBGHTNUi4hWKs6jpV2jeq4WGZTtPs4GYELt/iK/biXVqSz/4 uUPVQolhmf3gdYTiRPS5y6gW1/wXhVGfllP78ai1e+eynVvm/CzM8Z/SbCoauy+zex+p zmC36QDsJg27ygX+cHIjroLPZytR/PeVvfHtxAT47pZCAHvdoBy8IDxW73dbKqTqSrMw db1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=VkAqLI31u+CpladBFCKFa8JbOaSADiFIq/q3d5+qh7s=; b=YqfhXp046LHziw6LVI4bzMAU06S5rGZaPAej2hNHJP0wrMBDGZYiHwPSNTf/H0MBYi 9/Jzr7g1uxc6mczhkve4/S52naDW3GDoVsyp3RkGJpZRgB8hgfM9aJkwtXA6xgxdIJAk Y/wSCww9NHdPSfSR0FKMQdp8Ib/jVeVzyb6XTFvA+CYguifRc1mKSuRf4Luda1oOpwFR PreV6ghqtjxaAw8S44iFAtFmb3lLChql57Q+QAYhcyRXHTQqP+z1kXA1eMWHwppYtqv/ kW06w+Ja8off0S0W62cNkPSTWbmvZDRViCi6EisWqWOslHjK+Tm7m6GsMPjUEUNM2gXA QtQA== X-Gm-Message-State: AOAM530BDuZAhLQfeFb2dBat/YuyYEGDwPgdII56+XTRTc8sYYXMXy0t GYCmS7aVPPtf6FKpUJbtLUjsV/fGM0k= X-Google-Smtp-Source: ABdhPJxniw/9/5vLHSrcTDXfkzuB/lQvEtS7tdMeRhbKlhONEj/MA58JMEW9J32/z5hj6wyRLMi8kQ== X-Received: by 2002:a05:6000:188e:: with SMTP id a14mr30174981wri.223.1634511222277; Sun, 17 Oct 2021 15:53:42 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 11/17] target/mips: Use tcg_constant_tl() in gen_compute_compact_branch() Date: Mon, 18 Oct 2021 00:52:39 +0200 Message-Id: <20211017225245.2618892-12-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511225368100001 The offset is constant and read-only: move it to the constant pool. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20211003175743.3738710-9-f4bug@amsat.org> --- target/mips/tcg/translate.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 0e59b97190f..5fdeb67e82b 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -11857,13 +11857,11 @@ static void gen_compute_compact_branch(DisasConte= xt *ctx, uint32_t opc, } else { /* OPC_JIC, OPC_JIALC */ TCGv tbase =3D tcg_temp_new(); - TCGv toffset =3D tcg_temp_new(); + TCGv toffset =3D tcg_constant_tl(offset); =20 gen_load_gpr(tbase, rt); - tcg_gen_movi_tl(toffset, offset); gen_op_addr_add(ctx, btarget, tbase, toffset); tcg_temp_free(tbase); - tcg_temp_free(toffset); } break; default: --=20 2.31.1 From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511228; cv=none; d=zohomail.com; s=zohoarc; b=Si7WHfgRkFEryGQgZ4r6qHZlvcJaXhe0dtWMI1Bx9eZc41TGdOouzBdQSgJhowyst7+Qxz5d199npCDvMiIKIHmtizflvD31KECN8Yc41vvyVf2cyyGVC4AdWE1XRZilN47Q/4lMhBUEDqblufLsSxPjZJB1AFYg+JV2Z3e/DkU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511228; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1Ipg4rEL1PD1s9Pg/ZyG3hwX3rS3qq/i9aj3O/bGivs=; b=B5hqTTTymGo/BDsf53hGnSk4Uhnmd2w7cBlfIKAot7NkVl+wuOCdmQMbt2g0FE4cISUDByzGd8bBs6Z2SL77be345fIKnd7lLOVmqx56EQyCAmlXNmfoftHHrJgeOIFoh/gkGvuDyozVjqUxGigNoJgkLMUiXL4PD4569iw+D6o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 1634511228993483.22125557032655; Sun, 17 Oct 2021 15:53:48 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id m42so7144152wms.2 for ; Sun, 17 Oct 2021 15:53:48 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id n66sm10900177wmn.2.2021.10.17.15.53.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:53:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1Ipg4rEL1PD1s9Pg/ZyG3hwX3rS3qq/i9aj3O/bGivs=; b=eYN/K4JpcuYYkOIJQId9wHXAcgg0kdev+hCPY/k2ITLRGsSIAEl7MFsbswb/QOLtu0 42EdAjzLqYNODGb0S+xT/ZmUrdywU1Ze3sx3gC/DbXqd7Bx4jypqe4OdTOccyEoGaTBN +zSggBWU8ALrfdc9Ri3lwlMgGQmhaumFJ0q7C8IOHlT+bWnLmHmw9qO9bXwVrNtf9jh7 PEqwx6ldAK1EXaQq5Nrm6eYfjDlh1rXfxkTeed7u6jeHCegL1VxMvlUzq5QOw/V+/VNa DtuYHKwam2Q6bTWozmYOA1bw93d8xfhUNmieHcLgA3cHDh8LGcnDXQLS9ccZqRwH8CxQ lHdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1Ipg4rEL1PD1s9Pg/ZyG3hwX3rS3qq/i9aj3O/bGivs=; b=MGiYIznduqyd5wbT4+YTzca0z/XbAV2UlCNqBdZPcFPPecvJ5w9gI0pcKf+yJWPzWN tcCHPv+XLrUdL7x1Mr4n5TwLjm30HFK5LvyeQqgkjsO7Ol7Z+3C5cZM9SPFcnMCr0YvL iZHuP9xy0V8SdOhjt2+OWlsjiWnvr6KicZUxhYYA9VJ/ukRA52J8LEhLWCciidkwqUfT /eGBaCzav4j6D5EGeh2bJ5UzunppqGKtmy3WyRtkhZjwKam+9ovo2fB/GIc/3E5RaszS n1EdT8PemO7XOZUvQPG8NThYOVWURNf6lCh3CBtlyt4lvcbTodZuh4JdsXg8Rw4BEbbj IniA== X-Gm-Message-State: AOAM53369GqWYULjBR71zBOwS1WZS8YNLLcvpL5Gkc0uprCTT++0Hy0t gMfuACfO4ROtBlBW/AESpCU= X-Google-Smtp-Source: ABdhPJxiFwBkoj2/Gl4WPOlNP1fv0JbciIWgHQJ1JkD7uq7yvMDDZVF56o/sZyeZBl1aCsvMcLG3+g== X-Received: by 2002:a05:600c:a45:: with SMTP id c5mr26644248wmq.79.1634511227238; Sun, 17 Oct 2021 15:53:47 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 12/17] target/mips: Fix DEXTRV_S.H DSP opcode Date: Mon, 18 Oct 2021 00:52:40 +0200 Message-Id: <20211017225245.2618892-13-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511229479100001 While for the DEXTR_S.H opcode: "The shift argument is provided in the instruction." For the DEXTRV_S.H opcode we have: "The five least-significant bits of register rs provide the shift argument, interpreted as a five-bit unsigned integer; the remaining bits in rs are ignored." While 't1' contains the 'rs' register content (the shift value for DEXTR_S.H), we need to load the value of 'rs' for DEXTRV_S.H. We can directly use the v1_t TCG register which already contains this shift value. Fixes: b53371ed5d4 ("target-mips: Add ASE DSP accumulator instructions") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20211013215652.1764551-1-f4bug@amsat.org> --- target/mips/tcg/translate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 5fdeb67e82b..519b00121f6 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -13796,8 +13796,7 @@ static void gen_mipsdsp_accinsn(DisasContext *ctx, = uint32_t op1, uint32_t op2, break; case OPC_DEXTRV_S_H: tcg_gen_movi_tl(t0, v2); - tcg_gen_movi_tl(t1, v1); - gen_helper_dextr_s_h(cpu_gpr[ret], t0, t1, cpu_env); + gen_helper_dextr_s_h(cpu_gpr[ret], t0, v1_t, cpu_env); break; case OPC_DEXTRV_L: tcg_gen_movi_tl(t0, v2); --=20 2.31.1 From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511233; cv=none; d=zohomail.com; s=zohoarc; b=ZdOFaI6XRpWmm+Q3K4R4pWJEOiIXZBQZkaDr2YDHZGuIvPuMXcbCpRItTihb44GNFVFVlr9i6eZ4SW33bx6CuPZrgS5Apx6/70zw6gj9O5wVgEp+YoSbTT4XzDVV1ss0Bo5qgJxdloWiamo9cknRTRqkB/ZiAEfO6YWJnnztQlQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511233; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=V5ecwZIjQPcMPlzfLcDdSG9JAyAH90tSzn0afe0CfSU=; b=RpVp7jJakYhwpxzwB77PBintpHgvqUZ5NbG112bbpsI55zX/+d0QhtJ3m97wDFLMQ9gkw+wUXEz5mQdutTpGITWAFq/hFeGw44OMvtpwqsADkrA70YzqAwKJr68C0KCT/K3saclC9mQQQq9BOuDMB/ofhmhcw0MNW6DZXFR0Ao4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1634511233627104.934085421963; Sun, 17 Oct 2021 15:53:53 -0700 (PDT) Received: by mail-wm1-f51.google.com with SMTP id z77-20020a1c7e50000000b0030db7b70b6bso8614513wmc.1 for ; Sun, 17 Oct 2021 15:53:53 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id p18sm10303859wmq.4.2021.10.17.15.53.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:53:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V5ecwZIjQPcMPlzfLcDdSG9JAyAH90tSzn0afe0CfSU=; b=B0sC1bdFDafsOKiyBTmDdm9zG6voIEC3p2b71eebdmhHzwZB4dfH1lrTSFVisFehql hNo0TKCUuv+1ehp0AI9XnjCPV2bSs+bZ2nHcWubzGjTdPAl8Nel2tn5SixHOxbQ+d9FD HbfICIzbAwfDLUvoRR8f7i3Sbqf522tZ9K9dYB0kaC4Kgp0hvsxHMx5koNbPpTqn13fY WGGclx36o6EBoMkqJMvDSMNegEr1s8SZplrT1QkgYut5r8Z6hYniW5pDEFN6qEcb61GK HQirJ4iHGrpk2/AkZa/NTEBKxk/Xl7TzLRF0xS3IOlgu1HtVE9BVbzke7+uzwHauW7jD uB8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=V5ecwZIjQPcMPlzfLcDdSG9JAyAH90tSzn0afe0CfSU=; b=cK7xGBhxw9iQEokjOGMHl9X7MCxz1ZBRQWZwkOnauAuoybJSMxDjZQ3/v6O4IYx9ni t4iiTXcxwKmXfVmCj4rg3iQQuED/1b2vDY7Yjp2d8Zy7FREiQevJj+BqVNS1KWRiBSHE Rw4G5xwNEq4L1jgUJY3Nh0DWfoGZ9mcNGUlDjqwiigLPxO1zLjvADWR1thqm3SWlYZ/t cvGJcXHDH+T3Mm2l3KL1cd+45YkOtu2S/22FIXmUlYnuMb1pSMcubirfGszCxAwzHI/f FDCaxPB0hyJF/c0ZhjQ/c4NNugyaLODr5hpb7t1ZPnWZm3Pz+KRJa/kduOJrm0Dnbcp6 JfPw== X-Gm-Message-State: AOAM5334w8mftHIxrPMBXZG4hWHSCLrDH86aDeCmZF7qQzmzIa+es+o5 L2oj4j4xqaDHAh0iHegYBS8= X-Google-Smtp-Source: ABdhPJzvONWNmHBldQ5b1SBDJKHVPma3Mz06TFfFfwc9YPXMNo2yEp54ZJKC93x0jCNGBYuHBpuvzw== X-Received: by 2002:a1c:751a:: with SMTP id o26mr27737476wmc.94.1634511231893; Sun, 17 Oct 2021 15:53:51 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 13/17] target/mips: Remove unused TCG temporary in gen_mipsdsp_accinsn() Date: Mon, 18 Oct 2021 00:52:41 +0200 Message-Id: <20211017225245.2618892-14-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511235652100001 Since gen_mipsdsp_accinsn() got added in commit b53371ed5d4 ("target-mips: Add ASE DSP accumulator instructions"), the 'v2_t' TCG temporary has never been used. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20211014224551.2204949-1-f4bug@amsat.org> --- target/mips/tcg/translate.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 519b00121f6..47db35d7dd9 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -13616,7 +13616,6 @@ static void gen_mipsdsp_accinsn(DisasContext *ctx, = uint32_t op1, uint32_t op2, TCGv t0; TCGv t1; TCGv v1_t; - TCGv v2_t; int16_t imm; =20 if ((ret =3D=3D 0) && (check_ret =3D=3D 1)) { @@ -13627,10 +13626,8 @@ static void gen_mipsdsp_accinsn(DisasContext *ctx,= uint32_t op1, uint32_t op2, t0 =3D tcg_temp_new(); t1 =3D tcg_temp_new(); v1_t =3D tcg_temp_new(); - v2_t =3D tcg_temp_new(); =20 gen_load_gpr(v1_t, v1); - gen_load_gpr(v2_t, v2); =20 switch (op1) { case OPC_EXTR_W_DSP: @@ -13830,7 +13827,6 @@ static void gen_mipsdsp_accinsn(DisasContext *ctx, = uint32_t op1, uint32_t op2, tcg_temp_free(t0); tcg_temp_free(t1); tcg_temp_free(v1_t); - tcg_temp_free(v2_t); } =20 /* End MIPSDSP functions. */ --=20 2.31.1 From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511238; cv=none; d=zohomail.com; s=zohoarc; b=CUZetta3BOL+PaWdo2SYPVbWPEtdoJ3rqBj0//lHGCK/B8X7Mnmwje3FoaBQeRdoa2RpB3tRyW1PSPsI/8hxg8YJUBzSkg3kZknVzfB00mouSDrc0jrr2SAvGbnjT36Y4BPwIwC6UZQw4Csu8iCxXLSflIX0ZUb1rknfsjMhSpM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511238; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xdfW+2Fy/Jo2WjZ+b7J2DKNaJQHEsPw1hJ7QxxRA4jo=; b=OzZt6l6Xxl3ziabIKiQIEgGVbOpq2vUQbjZ5I7Zc7QTM2Ivf5QFkpfIQ/DJp5GWpK1AE+QbzEMyjkqlXkVMoR+YaYMEgzgHuMHexmoi/4TfI3IiYLHkVldiP8pREXR6qkP2u5ZcE2798ZUNsc/1I/3gxiefPT6hXx6ELdoehiTw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1634511238407316.5441141223513; Sun, 17 Oct 2021 15:53:58 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id e12so37844068wra.4 for ; Sun, 17 Oct 2021 15:53:57 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id u2sm10576354wrr.35.2021.10.17.15.53.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:53:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xdfW+2Fy/Jo2WjZ+b7J2DKNaJQHEsPw1hJ7QxxRA4jo=; b=ISxTmcDeJGRzAakXDnuthC82AuemQzyNEJ+gE10INR4bvfI7SLcMuX+uSc3BUCNRiU /FAu3cIk29ggnqjsiax/HNU6xkNtg6HXDIvZWF828T/lrXoDBZihYwEJsCXZN5uPQXlH WhIHuI8Fo5Uzu2NdIu6WLRRm/uRE3Q4alVGwXfFVILhMdlBCJscP8tB6cEok+vzIASnE 9R0gNWhN3/JUiakyfAvuG/1UIKs378S7UJuLlAILJje/6MJy5LZUqkJBpovtg05Rzunp efrVx22Hqd6wLCOiyQT2YRwJj5s523lHln0t1Hp6V5PS/1IYRqUqoyF8OZG2wJCrNoTQ XsHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xdfW+2Fy/Jo2WjZ+b7J2DKNaJQHEsPw1hJ7QxxRA4jo=; b=GXDjjVTj2ChpaX1IwsobUYmbBBt+qWIYMtu3e41Hl7vO2JKochRHbY+C20xo0LsH75 KeeINrbTS4a3msLVNVy4AmFd4lkUD0huBXm/lwZE5WUpD/wMNj/e5GKgUVTjUBxwI+Lf ji4J8qmmNyx9JN4O5h/f28YKrSI4OpPhXEDbh/4MRhOsbHO0GcymwlvcgpxMIFs4CiKT gO6vk7CsLMGJ03rHKCnVscmHpT5l0lEtoDPBAmDiob5xWVEDz1T8lBplgglp5+UkUIGz pjPMBtQCvks+HqmUB4nGSNJC3aKbZ1OjSQqj/595a3ROKDAyI0ddhJ1NW5HLIeVu1L0C mfxA== X-Gm-Message-State: AOAM530XE2+5/Lob4JQyT8W2A04mG9PASpD4WxGRmhYW3qXQAGTMtoDQ CmwTTtyt8OT8vZEsdXz/tHA= X-Google-Smtp-Source: ABdhPJwctVCd9Odll9VjvhqVmiSH4mXu72/0aCSHJlKfNwpAipCgTPtZXUZvoBdQA3vb3ULXMNKxhw== X-Received: by 2002:adf:a48f:: with SMTP id g15mr30137469wrb.259.1634511236651; Sun, 17 Oct 2021 15:53:56 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 14/17] via-ide: Set user_creatable to false Date: Mon, 18 Oct 2021 00:52:42 +0200 Message-Id: <20211017225245.2618892-15-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511239845100001 From: BALATON Zoltan This model only works as a function of the via superio chip not as a standalone PCI device. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211015092159.3E863748F57@zero.eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ide/via.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/ide/via.c b/hw/ide/via.c index 94cc2142c70..e91dad632a9 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -217,6 +217,9 @@ static void via_ide_class_init(ObjectClass *klass, void= *data) =20 dc->reset =3D via_ide_reset; dc->vmsd =3D &vmstate_ide_pci; + /* Reason: only works as function of VIA southbridge */ + dc->user_creatable =3D false; + k->realize =3D via_ide_realize; k->exit =3D via_ide_exitfn; k->vendor_id =3D PCI_VENDOR_ID_VIA; --=20 2.31.1 From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511243; cv=none; d=zohomail.com; s=zohoarc; b=MMfJlq53R4S3mK+8kxy3bD10FIGHb+SyaMqTakbdwb1TWRfG8MQ4E77juZhGxQZaM7BZtp3mZK6kFAbc2bMgg3LamECfD0wWl/V525eJaUTm821a/rFmRQcAnWJpd8oOWhEAKArY11G2UDgLyENrEYz0NlFv/SuOI+dat62d7OY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511243; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HT2y45thDApYFYQhE//tKIiE8Gj9xsHtdBaSSlAZAp0=; b=FxOD/Ej7oLSV5/sW7YFmD5D1/1w7m9oVUfzaAiHxhabUtzLolWNkC6WkDaDe/trtQh5rUKpvGBjQ3iCiDXnksPu4USFF5AiWuH+lVQbJ46I4AZ9excHcGS4aVQZiM0nI5sqQXJLWl8f+7pAcM3b92m9qMzCpfWaghIlbpc238sk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1634511243356369.7347955436094; Sun, 17 Oct 2021 15:54:03 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id y3so37971968wrl.1 for ; Sun, 17 Oct 2021 15:54:02 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id c7sm13530647wmq.13.2021.10.17.15.54.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:54:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HT2y45thDApYFYQhE//tKIiE8Gj9xsHtdBaSSlAZAp0=; b=KScBiuuRAxYL498OkjbjC/hpKcjLQm8LawQUqXixE6J1MCvB675BwkFSXNzuYWm00U eX9kUOaysAubgag6z6n2x3GI0ys2pWGjZIi1q3PgFT5FfoFfAAGJY7cGrApgp7b7GFUu xR4/oW6s3btGrAhDnDJbO5TyHi6Qe+VZ3+p3S5l3JiP71wa05E7iaN/Gt5g/D6CyatGu lSX3RDNjYqs21B1vxD2R9++/rih7EioP/INXABzUFuDbYwK9eoTyrg5J56d4+cZMqfup gFesed3VhDFDY9W+tucP9QzZe+khprsWpRd+OKDvlzJqqCOVUOqgogEI3U8UMEBt8jlS TUHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=HT2y45thDApYFYQhE//tKIiE8Gj9xsHtdBaSSlAZAp0=; b=6iqbbwpJzJs92/wdpK4voG0zuQfJSryap23E2oVk57COijyeIHTI3FPkJAmjvlCIlF rfx7SuJeH3afQF/4cO6yZ9yqKQaX1ujTls2jQlqN7U25ZBhzYIVdqrEuT5sDrs3PCie/ yPCcnxks5NOiDI/cNygdHFXOhDC+GkHxa1UoIizAYmwTCOyLSHf9BMhAetzA34Mr3mck NA3Cdad6fi89NBnIUZ9+Z1qeoYbBd49mq9sbwYFPJbryodxkE5NXBeNOKKUMVZLJpBrR maDVYEUqT2cFAM11MZLjbGFDe1MQfMeMvZbpeJ3et/OnOoWx86EDC7u9gbDmgfenxuZR K+3A== X-Gm-Message-State: AOAM532hwDQ5BQ6dDrsC6ouUL5SvwKW8KKEfD/XbwthJNjsj6kHft7RN uk6Hkyj48LB2RJSRDl8+4bI= X-Google-Smtp-Source: ABdhPJzn3Rfd8WUfGtzYuDhhrAUDqULmyYe6ggC4rjcbp1BYyGDpoaopo7vFH77/LsZ2B+yYlLshDQ== X-Received: by 2002:a05:6000:1567:: with SMTP id 7mr31799648wrz.408.1634511241556; Sun, 17 Oct 2021 15:54:01 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 15/17] vt82c686: Move common code to via_isa_realize Date: Mon, 18 Oct 2021 00:52:43 +0200 Message-Id: <20211017225245.2618892-16-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511243850100001 From: BALATON Zoltan The vt82c686b_realize and vt8231_realize methods are almost identical, factor out the common parts to a via_isa_realize function to avoid code duplication. Signed-off-by: BALATON Zoltan Reviewed-by: Jiaxun Yang Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <7cb7a16ff4daf8f48d576246255bea1fd355207c.1634259980.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 67 ++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index f57f3e70679..5b41539f2cd 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -542,6 +542,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(ViaISAState, VIA_ISA) struct ViaISAState { PCIDevice dev; qemu_irq cpu_intr; + ISABus *isa_bus; ViaSuperIOState *via_sio; }; =20 @@ -572,6 +573,29 @@ static void via_isa_request_i8259_irq(void *opaque, in= t irq, int level) qemu_set_irq(s->cpu_intr, level); } =20 +static void via_isa_realize(PCIDevice *d, Error **errp) +{ + ViaISAState *s =3D VIA_ISA(d); + DeviceState *dev =3D DEVICE(d); + qemu_irq *isa_irq; + int i; + + qdev_init_gpio_out(dev, &s->cpu_intr, 1); + isa_irq =3D qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1); + s->isa_bus =3D isa_bus_new(dev, get_system_memory(), pci_address_space= _io(d), + &error_fatal); + isa_bus_irqs(s->isa_bus, i8259_init(s->isa_bus, *isa_irq)); + i8254_pit_init(s->isa_bus, 0x40, 0, NULL); + i8257_dma_init(s->isa_bus, 0); + mc146818_rtc_init(s->isa_bus, 2000, NULL); + + for (i =3D 0; i < PCI_CONFIG_HEADER_SIZE; i++) { + if (i < PCI_COMMAND || i >=3D PCI_REVISION_ID) { + d->wmask[i] =3D 0; + } + } +} + /* TYPE_VT82C686B_ISA */ =20 static void vt82c686b_write_config(PCIDevice *d, uint32_t addr, @@ -610,27 +634,10 @@ static void vt82c686b_isa_reset(DeviceState *dev) static void vt82c686b_realize(PCIDevice *d, Error **errp) { ViaISAState *s =3D VIA_ISA(d); - DeviceState *dev =3D DEVICE(d); - ISABus *isa_bus; - qemu_irq *isa_irq; - int i; =20 - qdev_init_gpio_out(dev, &s->cpu_intr, 1); - isa_irq =3D qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1); - isa_bus =3D isa_bus_new(dev, get_system_memory(), pci_address_space_io= (d), - &error_fatal); - isa_bus_irqs(isa_bus, i8259_init(isa_bus, *isa_irq)); - i8254_pit_init(isa_bus, 0x40, 0, NULL); - i8257_dma_init(isa_bus, 0); - s->via_sio =3D VIA_SUPERIO(isa_create_simple(isa_bus, + via_isa_realize(d, errp); + s->via_sio =3D VIA_SUPERIO(isa_create_simple(s->isa_bus, TYPE_VT82C686B_SUPERIO)); - mc146818_rtc_init(isa_bus, 2000, NULL); - - for (i =3D 0; i < PCI_CONFIG_HEADER_SIZE; i++) { - if (i < PCI_COMMAND || i >=3D PCI_REVISION_ID) { - d->wmask[i] =3D 0; - } - } } =20 static void vt82c686b_class_init(ObjectClass *klass, void *data) @@ -691,26 +698,10 @@ static void vt8231_isa_reset(DeviceState *dev) static void vt8231_realize(PCIDevice *d, Error **errp) { ViaISAState *s =3D VIA_ISA(d); - DeviceState *dev =3D DEVICE(d); - ISABus *isa_bus; - qemu_irq *isa_irq; - int i; =20 - qdev_init_gpio_out(dev, &s->cpu_intr, 1); - isa_irq =3D qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1); - isa_bus =3D isa_bus_new(dev, get_system_memory(), pci_address_space_io= (d), - &error_fatal); - isa_bus_irqs(isa_bus, i8259_init(isa_bus, *isa_irq)); - i8254_pit_init(isa_bus, 0x40, 0, NULL); - i8257_dma_init(isa_bus, 0); - s->via_sio =3D VIA_SUPERIO(isa_create_simple(isa_bus, TYPE_VT8231_SUPE= RIO)); - mc146818_rtc_init(isa_bus, 2000, NULL); - - for (i =3D 0; i < PCI_CONFIG_HEADER_SIZE; i++) { - if (i < PCI_COMMAND || i >=3D PCI_REVISION_ID) { - d->wmask[i] =3D 0; - } - } + via_isa_realize(d, errp); + s->via_sio =3D VIA_SUPERIO(isa_create_simple(s->isa_bus, + TYPE_VT8231_SUPERIO)); } =20 static void vt8231_class_init(ObjectClass *klass, void *data) --=20 2.31.1 From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511248; cv=none; d=zohomail.com; s=zohoarc; b=m16dtVGgaCXBBoqrZ8jfo9XO/nXndpE/VAHMZknaYhbsiiyc1yggg3Uk2YP68Bzwx75bn2L9cyUMHBUUvhKKg8e8PGgxRD2Sn7WfIsybvG1uKqhigwX9V80Pitu3jQFP6EBv7p9AEKzkRg5SlCIVXu07YdsMR/TyxhaNTSuevEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511248; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=V8ZpI5eO1h5iZyQqojzaX5rdJOdSqouiAi2NLl6N19U=; b=PdpvqsTLYTpbgCotonvBwm9aB4k6VVW9/LEDWuEJmme99bJlRdXNGSHTkSZI+s2TOggpXg866IjJwv/4pV3f8Wl8e2RgtN7wpXRpDLlBCXA9Zr1S44fb6W2ZbHw2ZBitXka3Y6Aljxg4IFq00iBndYtJ4MFcECQo5XUGrQpOhGU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1634511248231555.9394238240975; Sun, 17 Oct 2021 15:54:08 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id r18so37840014wrg.6 for ; Sun, 17 Oct 2021 15:54:07 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id p8sm10491575wmg.15.2021.10.17.15.54.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:54:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V8ZpI5eO1h5iZyQqojzaX5rdJOdSqouiAi2NLl6N19U=; b=i8K4MIUhuL69gV0amn+Bu5Engg+HX4IJp3tuegO4JN/zRQRaGD5AnSytXDTEd0tZId Wdreg05TApJhy5S/miE6XcPJ2o1VLm0BYgr2pAv02FRIwfqxzIPJ54epu9M3Gq/G5Gsb tUBgbqgw9UNJmMEI/a3Ub/XmK309kNkSkWTtWvJJbRt2QgVKYtzOZwYrikqPABqhRttB eC+TZjT21iELb9q+T3OorZ/PJl6x24QReN6BWLuRzPmTnlsB7o8yHUGL8aqjWYCwAUtO dHEK82P6ElcfqqMAqysqbkDqolt6SZ57BRijzsiB/+j4Zd0fLAgGwvaCBWbwSjHI4aP5 TYOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=V8ZpI5eO1h5iZyQqojzaX5rdJOdSqouiAi2NLl6N19U=; b=NhVoO/dsqL8R0+5BxL15y5Lb2GRfGAqmBH+hYFRWFOJGrozydRdf2KuD23iBlbb498 O/hdogfHygUFZTW8WaUriLF9IGXkn5ePXMTdKPlhWJdjAip1i0k4TfTwNwG6tNV1ZVJQ cXEXKi82iVK2djIEaeKhKXUJFFfFWurjAWd0SP6XpCfw163TO9A0GVMDMh8ATsnxbqHF ZxAmUCMFiIPB9Zzn6xankvyaNbMs6w9XW8YZlzPVqq9sxAFtsIcUA1ZE6XIaAsdAZFal KHFfa4hJV0lA8PGipxElvR3verk00WhiQaQ6pkdjaCoKhFkV2EXdRff4miNNW4qLxM86 2kRA== X-Gm-Message-State: AOAM5313pz4deoG4FgI6jz5IwekXzvijXyvkG2wItBPlP1lB/CxCVUof ajiFti+B/m9hUBpd9Y0KveQ= X-Google-Smtp-Source: ABdhPJy41G201ju9RbwW6oYBMdL7QE84d2plvvZBAFeLXzSaTAxnHQqfhYGUWJGNh6v6zD/uPMfOfw== X-Received: by 2002:adf:a294:: with SMTP id s20mr31838342wra.34.1634511246456; Sun, 17 Oct 2021 15:54:06 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 16/17] vt82c686: Add a method to VIA_ISA to raise ISA interrupts Date: Mon, 18 Oct 2021 00:52:44 +0200 Message-Id: <20211017225245.2618892-17-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511249948100001 From: BALATON Zoltan Other functions in the VT82xx chips need to raise ISA interrupts. Keep a reference to them in the device state and add via_isa_set_irq() to allow setting their state. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Jiaxun Yang Message-Id: <778c04dc2c8affac060b8edf9e8d7dab3c3e04eb.1634259980.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/isa/vt82c686.h | 4 ++++ hw/isa/vt82c686.c | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h index 0f01aaa4710..56ac141be38 100644 --- a/include/hw/isa/vt82c686.h +++ b/include/hw/isa/vt82c686.h @@ -1,6 +1,8 @@ #ifndef HW_VT82C686_H #define HW_VT82C686_H =20 +#include "hw/pci/pci.h" + #define TYPE_VT82C686B_ISA "vt82c686b-isa" #define TYPE_VT82C686B_PM "vt82c686b-pm" #define TYPE_VT8231_ISA "vt8231-isa" @@ -8,4 +10,6 @@ #define TYPE_VIA_AC97 "via-ac97" #define TYPE_VIA_MC97 "via-mc97" =20 +void via_isa_set_irq(PCIDevice *d, int n, int level); + #endif diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 5b41539f2cd..8f656251b8d 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -542,6 +542,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(ViaISAState, VIA_ISA) struct ViaISAState { PCIDevice dev; qemu_irq cpu_intr; + qemu_irq *isa_irqs; ISABus *isa_bus; ViaSuperIOState *via_sio; }; @@ -567,6 +568,12 @@ static const TypeInfo via_isa_info =3D { }, }; =20 +void via_isa_set_irq(PCIDevice *d, int n, int level) +{ + ViaISAState *s =3D VIA_ISA(d); + qemu_set_irq(s->isa_irqs[n], level); +} + static void via_isa_request_i8259_irq(void *opaque, int irq, int level) { ViaISAState *s =3D opaque; @@ -584,7 +591,8 @@ static void via_isa_realize(PCIDevice *d, Error **errp) isa_irq =3D qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1); s->isa_bus =3D isa_bus_new(dev, get_system_memory(), pci_address_space= _io(d), &error_fatal); - isa_bus_irqs(s->isa_bus, i8259_init(s->isa_bus, *isa_irq)); + s->isa_irqs =3D i8259_init(s->isa_bus, *isa_irq); + isa_bus_irqs(s->isa_bus, s->isa_irqs); i8254_pit_init(s->isa_bus, 0x40, 0, NULL); i8257_dma_init(s->isa_bus, 0); mc146818_rtc_init(s->isa_bus, 2000, NULL); --=20 2.31.1 From nobody Tue May 21 17:42:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511253; cv=none; d=zohomail.com; s=zohoarc; b=V9YdRAPGX+e51wpTSEH6HAFkiWohjpgRKbowh8aTAf9zYwic8R8bakGfcYlFpbqjhFhidnPi1XexRrTCVUopFLLaHKiBSrzhO4P+IJDzeoLoY5eODxT/ZoUCw/kSTfvpnlGMwH5MBwZdO7IjWlvTIYw9dhEuJEZNOSzgrUDmKss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511253; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cAlFbLE9wEpuh6Lb0mTS+p4wTMdHmTaWF5EoIoUfJp4=; b=OJsclY+AqoSMf1BecHvMcV5/R35u4QLL37TUE6gbxmuSdG1qYaJhpGIyB6eFJyz1WpCzFFQeEqgX7bMz/OqtVNZPNFJ70VwvUk4EUT+JeIQKTTU3QL5dNpq5i8P1ut6KsoT3K5d0FQPGfkmorrt/J7xZpYe1GsB1uQQJ+qivfDI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1634511253432191.47830692111972; Sun, 17 Oct 2021 15:54:13 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id d198-20020a1c1dcf000000b00322f53b9b89so3223662wmd.0 for ; Sun, 17 Oct 2021 15:54:12 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id c15sm10875404wrs.19.2021.10.17.15.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:54:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cAlFbLE9wEpuh6Lb0mTS+p4wTMdHmTaWF5EoIoUfJp4=; b=LcMHtS2NLYBgKbbJDnucsTIEwbiSYGW6a1OgF/VztCro4kj1MwU7CcVajezRk4R0yV RnvcrwLaNC6gugouQf7JBWWciBbcB1ifV43vXwO+HI+LD+OuNH99SN9Qb3b7znh+OatS /ZuMqsFD5GCoYAUaQVrGhhIWz9OQorf3/OCQCKlDMcOfZiFbqhsv2KCf5AjrBSJadYNF QoWOCrAt5Slm6cDD0k528Q//WIT+ic9PMR+gwoZwiDc/knnGr2j7LGDgK0oDFXduJDj+ HPA26aCzUjbnXmXzKXCuwZ4lWpefHTj81Gd7kZkp8xOacQm1MbC6rYHQ9B52BjdAhvLj 3fiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cAlFbLE9wEpuh6Lb0mTS+p4wTMdHmTaWF5EoIoUfJp4=; b=LaJYxQWZVrIbp9FL7vXr0+Ce0SEhxahYBIWpspOX2/oRv2D6yZtL/PBKEuiIvUlnEL YUbCWIMo5bhPqXlu2bkwwA2hDr5p7R09I18kYB0+BIond26Lg+AJCyMhlH0xumI4crq7 aNx8C5Kee/G5wajCFl1Hl3Zb9Hf53pBWqx823vnBwIIds4vYweIIxomzBTeAoCxvjmUZ H2XThFvD/axgI71npFTMGwNm4AtkSCSF0z6OuQ/7h/sdvZVQVt/7WIWyUekxdBvngO+p AptIJCfXdfj6SM52STuvlzYoQop3CKWQzsNRP3iBuTkDSld6UV/Ff6swgenLoprhvVDJ O0Hw== X-Gm-Message-State: AOAM531nlSvoJzUo5iX1nBB15gHRDmh5LN/cJP4xFeaVCtybl4RuL+F3 2FDVDyyaRSxjeztmEPW0OwE= X-Google-Smtp-Source: ABdhPJyj6inFirO95zb/Hm0mYjH7e4EQubGQ75m7F35xXVQ7UsbfYvabVtp3w26Y8vNADgQgh6XGOA== X-Received: by 2002:a7b:c386:: with SMTP id s6mr41152667wmj.183.1634511251578; Sun, 17 Oct 2021 15:54:11 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 17/17] via-ide: Avoid using isa_get_irq() Date: Mon, 18 Oct 2021 00:52:45 +0200 Message-Id: <20211017225245.2618892-18-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511254486100001 From: BALATON Zoltan Use via_isa_set_irq() which better encapsulates irq handling in the vt82xx model and avoids using isa_get_irq() that has a comment saying it should not be used. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <26cb1848c9fc0360df7a57c2c9ba5e03c4a692b5.1634259980.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ide/via.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ide/via.c b/hw/ide/via.c index e91dad632a9..82def819c41 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -29,7 +29,7 @@ #include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/dma.h" - +#include "hw/isa/vt82c686.h" #include "hw/ide/pci.h" #include "trace.h" =20 @@ -112,7 +112,7 @@ static void via_ide_set_irq(void *opaque, int n, int le= vel) d->config[0x70 + n * 8] &=3D ~0x80; } =20 - qemu_set_irq(isa_get_irq(NULL, 14 + n), level); + via_isa_set_irq(pci_get_function_0(d), 14 + n, level); } =20 static void via_ide_reset(DeviceState *dev) --=20 2.31.1