From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918082; cv=none; d=zohomail.com; s=zohoarc; b=Fa1Nxm55cUDO/IF4umHslRiP/ZkFt4scwOorA5dFTbox27VLC9197yb20/nrqjgcF/sM8RmP3qRnyVsqAxST23hWzB0BMs3FI/Xc0xGmqRmCTg0wrqXbmV0SJoFMVxwEmrMazESx1xz0QqHAL+eT0h1Db1hd+hVdOQh76yKff+c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918082; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9CfmWBlvH060L9/ARfTTbpqHH/Yspstc9lZifjtcI/8=; b=OSPsJf7SojZzSScOv3yNrAfpaVHzu298qqRfLQYwUJPBFdgOc546U9TXATje1VW3xmIqxNbEAsUGyOJtkayZu7I9nJGFZ52OnxjV6LgzB0c6wx8P488AB2JhEQ+5OJn477vbUrQB9mXA4gnq3QlLq9bd+TZqz7v25J0FIs0sfxA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1613918081902838.5978952825773; Sun, 21 Feb 2021 06:34:41 -0800 (PST) Received: by mail-wr1-f54.google.com with SMTP id v1so16331336wrd.6 for ; Sun, 21 Feb 2021 06:34:41 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id y6sm22449049wma.10.2021.02.21.06.34.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:34:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9CfmWBlvH060L9/ARfTTbpqHH/Yspstc9lZifjtcI/8=; b=RE5SkasnriaNbBDz2pEhQ6YlMr9mlXRCVVsxq3ShcY254pa16DBqAg5M5at+sXf1B9 9PlETr6qlb20k7mJDHS2uDbWRmuPmNgxoY04HMkwyjpZrVGepIa76F+APMGe9Na/SPdR A9zeD6wG7eEQAEX0TdzaFCxDrfcmiUhmmT8WbUVJmgUyT/sLOmuNml9R1r0UUco3xr5S hNRnTxpCkItFliRB4MiR5GVQo0MwOrX3otbzAXZmpuAHwppNuQUE+zauZ5FVE8Mtvb30 gm+SlGAO+SGdkVRAllqdvGscO2SEknrtGDo1QJK8AxAG867Nl3hDVYlj5+a+WEYJkqIL hmSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9CfmWBlvH060L9/ARfTTbpqHH/Yspstc9lZifjtcI/8=; b=Dth2q1EMDVrP1gYFDm7h65X4xifvVEZl0GgULvhNXPcSRugvimD7k8Jx/E4xRC/tdr Y8hzFBTbVvNTi90IdOzS8Nwb8CVOhmEBQj2FllSqJGPa4JUqMkRNvRnaymMc3NP00pOS 497xJrc+1Vd6jFUUTyiWRnb+5wKloQBIJSuGCG21dQ6uQTagdMh9pEJPF64/StZFfpoq 7B8AVZ/4AL5JPaubaf8agQNECp+kL5b1DyGL9LpscWS1PJr7/wgIdpvyWue9Z6uXHNgl TA3EB2rVDtR7KfhIEK7CbMlMBlzIjLmlcCrgifKBMi+y9wbLU/r1UF2TgnHx5SaEBlaK +v9A== X-Gm-Message-State: AOAM532QvyePZkHinaCR2SJ1oVzpL8ci/fZTIGs78oN3Kh5MoIsZe4of vJ53i6Y1Y1GkPWlMyyBRKhQ= X-Google-Smtp-Source: ABdhPJwzeFWU4HL7GtbFCl+8apNo6id30JjLsfgEQBjEiyL+J++jOPjWEkLH+PPsfq1WTYfP5EwKUQ== X-Received: by 2002:adf:dd81:: with SMTP id x1mr17462187wrl.233.1613918080102; Sun, 21 Feb 2021 06:34:40 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Bin Meng Subject: [PULL 01/43] hw/mips: loongson3: Drop 'struct MemmapEntry' Date: Sun, 21 Feb 2021 15:33:50 +0100 Message-Id: <20210221143432.2468220-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: Bin Meng There is already a MemMapEntry type defined in hwaddr.h. Let's drop the loongson3 defined `struct MemmapEntry` and use the existing one. Signed-off-by: Bin Meng Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210122122404.11970-1-bmeng.cn@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/loongson3_bootp.h | 7 +------ hw/mips/loongson3_virt.c | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/mips/loongson3_bootp.h b/hw/mips/loongson3_bootp.h index 09f8480abff..d525ab745a6 100644 --- a/hw/mips/loongson3_bootp.h +++ b/hw/mips/loongson3_bootp.h @@ -228,12 +228,7 @@ enum { LOADER_PARAM, }; =20 -struct MemmapEntry { - hwaddr base; - hwaddr size; -}; - -extern const struct MemmapEntry virt_memmap[]; +extern const MemMapEntry virt_memmap[]; void init_loongson_params(struct loongson_params *lp, void *p, uint64_t cpu_freq, uint64_t ram_size); void init_reset_system(struct efi_reset_system_t *reset); diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index d4a82fa5367..b15071defc6 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -72,7 +72,7 @@ #define RTC_IRQ 1 #define PCIE_IRQ_BASE 2 =20 -const struct MemmapEntry virt_memmap[] =3D { +const MemMapEntry virt_memmap[] =3D { [VIRT_LOWMEM] =3D { 0x00000000, 0x10000000 }, [VIRT_PM] =3D { 0x10080000, 0x100 }, [VIRT_FW_CFG] =3D { 0x10080100, 0x100 }, @@ -86,13 +86,13 @@ const struct MemmapEntry virt_memmap[] =3D { [VIRT_HIGHMEM] =3D { 0x80000000, 0x0 }, /* Variable */ }; =20 -static const struct MemmapEntry loader_memmap[] =3D { +static const MemMapEntry loader_memmap[] =3D { [LOADER_KERNEL] =3D { 0x00000000, 0x4000000 }, [LOADER_INITRD] =3D { 0x04000000, 0x0 }, /* Variable */ [LOADER_CMDLINE] =3D { 0x0ff00000, 0x100000 }, }; =20 -static const struct MemmapEntry loader_rommap[] =3D { +static const MemMapEntry loader_rommap[] =3D { [LOADER_BOOTROM] =3D { 0x1fc00000, 0x1000 }, [LOADER_PARAM] =3D { 0x1fc01000, 0x10000 }, }; --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 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=1613918087; cv=none; d=zohomail.com; s=zohoarc; b=CxXGk+UX1Ov82L8yQwcE4ccOLqvkMcvM5VrCjw39CMqyZyPJYwa88ym/O2dZ6pN/GUi+i0OXXmSCL0h45dAXKqQQpxdAlwX6wp+qqqGXhBHo8D2nsqu1V2sE0YrF0CaEzMIwy02lpqS8JOzXJIDKhM6Yi8vLTx0ybR+P7qU/uM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918087; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ve8RjuoAWGH2WX8beLgrtVqqJfaNMmArR28tW7YrT0s=; b=aPZd9QrYbsiDlrAxP9vHIMy/xCVlIwd3vfz1bB8VEXEtWEfieTaE7nQMe4z8E+gVTrlA8GmIu4cV+pdh/5uv0ouhXn10Rj7e04sIPBmKL/qb4Q0oDHuZefzzk3Mzj9Hjqi3+fV0WToU2IwIqHjEnIm3uTz2KWUMysVY+PuGJEUI= 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 1613918086754632.4818036574974; Sun, 21 Feb 2021 06:34:46 -0800 (PST) Received: by mail-wr1-f42.google.com with SMTP id l12so16346968wry.2 for ; Sun, 21 Feb 2021 06:34:46 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id h12sm30179756wru.18.2021.02.21.06.34.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:34:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ve8RjuoAWGH2WX8beLgrtVqqJfaNMmArR28tW7YrT0s=; b=UUNH9uxqgXaRs57RPjjFwJAG39rMW2go8Qxf+b0opm/VMO1TOqKTBO6glgNjY5yPWb Lt2t8GMcWHDNm+7vX6l3Yl3frRXHSO2vfkjE4VtJ49WAEF39XTGYXsYRURVkxjgIOv7n u/QxNoetzuB74l+GmFETMrtoBJl97N3/kAjMqWEfaIwdASZ/GOuGz804p4j3ElrAwpKo daS2OB3h3qX8l6USdUmzmV2dhyeRA98Xc535L02jQc1rqCDZuIvBc9XhX0iP+xjvNow0 CVDB9nbDBlkn6qEzH99HpQu7HwkxEUj3Wv+Cl0etrBlcWbEWslF5zOO5t+Fd7MBZncw0 378g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Ve8RjuoAWGH2WX8beLgrtVqqJfaNMmArR28tW7YrT0s=; b=CjHqvBBvT1BsdMnLOrx6gj5PZwrPI+9gHf5RU+rbqTTNgv9VQUJyJcpZzIIXxwgTSz CBg7n+T0iRKLH/yt6c4w9D63Zd9A8qxE4b0TFoYW8zt3wRzfY/d1ldfYbUpbSdQhqA3S YZkYXC9v6OSNkgeO3i7fwqunmKpOPyTh9aiskgNSSzM7Fmb1PU75m9YPTEu5MAFqPEPe qt4WjHrcrfoEKD9NjNpafRHwARB8a6U0Srol80uBIwnl2UeSxlr4y2n5AqFF3l6wKEwr 6ZLAyi1tfoLgCBV5UEjTW0ftrEABW5c/k/XktyJdQlUSQhrQu/dT6LVTynw0JuheRdKa CDEQ== X-Gm-Message-State: AOAM533ddmZ/9u91wsmWpxSU6ScLvtZl81RfQ78Tfhq0qznEUwU92WMa DNFikDiPzT0L2hINhWmeeZs= X-Google-Smtp-Source: ABdhPJzTkxyEAOaOdIjUzNO4NIke6Q5FeJDqOGNncqXHzCh5qkUn5tHKnJ/KZz9Y/UmMyEgdVxIAog== X-Received: by 2002:adf:f089:: with SMTP id n9mr18012900wro.98.1613918084981; Sun, 21 Feb 2021 06:34:44 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang Subject: [PULL 02/43] hw/mips: Add a bootloader helper Date: Sun, 21 Feb 2021 15:33:51 +0100 Message-Id: <20210221143432.2468220-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: Jiaxun Yang Add a bootloader helper to generate simple bootloaders for kernel. It can help us reduce inline hex hack and also keep MIPS release 6 compatibility easier. Signed-off-by: Jiaxun Yang Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210127065424.114125-2-jiaxun.yang@flygoat.com> [PMD: Restricted bl_reg enum to C source, inverted bl_gen_write() args] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/mips/bootloader.h | 14 +++ hw/mips/bootloader.c | 200 +++++++++++++++++++++++++++++++++++ hw/mips/meson.build | 2 +- 3 files changed, 215 insertions(+), 1 deletion(-) create mode 100644 include/hw/mips/bootloader.h create mode 100644 hw/mips/bootloader.c diff --git a/include/hw/mips/bootloader.h b/include/hw/mips/bootloader.h new file mode 100644 index 00000000000..88eb9f49180 --- /dev/null +++ b/include/hw/mips/bootloader.h @@ -0,0 +1,14 @@ +#ifndef HW_MIPS_BOOTLOADER_H +#define HW_MIPS_BOOTLOADER_H + +#include "exec/cpu-defs.h" + +void bl_gen_jump_to(uint32_t **p, target_ulong jump_addr); +void bl_gen_jump_kernel(uint32_t **p, target_ulong sp, target_ulong a0, + target_ulong a1, target_ulong a2, target_ulong a3, + target_ulong kernel_addr); +void bl_gen_write_ulong(uint32_t **p, target_ulong addr, target_ulong val); +void bl_gen_write_u32(uint32_t **p, target_ulong addr, uint32_t val); +void bl_gen_write_u64(uint32_t **p, target_ulong addr, uint64_t val); + +#endif diff --git a/hw/mips/bootloader.c b/hw/mips/bootloader.c new file mode 100644 index 00000000000..6ec83144909 --- /dev/null +++ b/hw/mips/bootloader.c @@ -0,0 +1,200 @@ +/* + * Utility for QEMU MIPS to generate it's simple bootloader + * + * Instructions used here are carefully selected to keep compatibility with + * MIPS Release 6. + * + * Copyright (C) 2020 Jiaxun Yang + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/bitops.h" +#include "cpu.h" +#include "hw/mips/bootloader.h" + +typedef enum bl_reg { + BL_REG_ZERO =3D 0, + BL_REG_AT =3D 1, + BL_REG_V0 =3D 2, + BL_REG_V1 =3D 3, + BL_REG_A0 =3D 4, + BL_REG_A1 =3D 5, + BL_REG_A2 =3D 6, + BL_REG_A3 =3D 7, + BL_REG_T0 =3D 8, + BL_REG_T1 =3D 9, + BL_REG_T2 =3D 10, + BL_REG_T3 =3D 11, + BL_REG_T4 =3D 12, + BL_REG_T5 =3D 13, + BL_REG_T6 =3D 14, + BL_REG_T7 =3D 15, + BL_REG_S0 =3D 16, + BL_REG_S1 =3D 17, + BL_REG_S2 =3D 18, + BL_REG_S3 =3D 19, + BL_REG_S4 =3D 20, + BL_REG_S5 =3D 21, + BL_REG_S6 =3D 22, + BL_REG_S7 =3D 23, + BL_REG_T8 =3D 24, + BL_REG_T9 =3D 25, + BL_REG_K0 =3D 26, + BL_REG_K1 =3D 27, + BL_REG_GP =3D 28, + BL_REG_SP =3D 29, + BL_REG_FP =3D 30, + BL_REG_RA =3D 31, +} bl_reg; + +static bool bootcpu_supports_isa(uint64_t isa_mask) +{ + return cpu_supports_isa(&MIPS_CPU(first_cpu)->env, isa_mask); +} + +/* Base types */ +static void bl_gen_nop(uint32_t **p) +{ + stl_p(*p, 0); + *p =3D *p + 1; +} + +static void bl_gen_r_type(uint32_t **p, uint8_t opcode, + bl_reg rs, bl_reg rt, bl_reg rd, + uint8_t shift, uint8_t funct) +{ + uint32_t insn =3D 0; + + insn =3D deposit32(insn, 26, 6, opcode); + insn =3D deposit32(insn, 21, 5, rs); + insn =3D deposit32(insn, 16, 5, rt); + insn =3D deposit32(insn, 11, 5, rd); + insn =3D deposit32(insn, 6, 5, shift); + insn =3D deposit32(insn, 0, 6, funct); + + stl_p(*p, insn); + *p =3D *p + 1; +} + +static void bl_gen_i_type(uint32_t **p, uint8_t opcode, + bl_reg rs, bl_reg rt, uint16_t imm) +{ + uint32_t insn =3D 0; + + insn =3D deposit32(insn, 26, 6, opcode); + insn =3D deposit32(insn, 21, 5, rs); + insn =3D deposit32(insn, 16, 5, rt); + insn =3D deposit32(insn, 0, 16, imm); + + stl_p(*p, insn); + *p =3D *p + 1; +} + +/* Single instructions */ +static void bl_gen_dsll(uint32_t **p, bl_reg rd, bl_reg rt, uint8_t sa) +{ + if (bootcpu_supports_isa(ISA_MIPS3)) { + bl_gen_r_type(p, 0, 0, rt, rd, sa, 0x38); + } else { + g_assert_not_reached(); /* unsupported */ + } +} + +static void bl_gen_jalr(uint32_t **p, bl_reg rs) +{ + bl_gen_r_type(p, 0, rs, 0, BL_REG_RA, 0, 0x09); +} + +static void bl_gen_lui(uint32_t **p, bl_reg rt, uint16_t imm) +{ + /* R6: It's a alias of AUI with RS =3D 0 */ + bl_gen_i_type(p, 0x0f, 0, rt, imm); +} + +static void bl_gen_ori(uint32_t **p, bl_reg rt, bl_reg rs, uint16_t imm) +{ + bl_gen_i_type(p, 0x0d, rs, rt, imm); +} + +static void bl_gen_sw(uint32_t **p, bl_reg rt, uint8_t base, uint16_t offs= et) +{ + bl_gen_i_type(p, 0x2b, base, rt, offset); +} + +static void bl_gen_sd(uint32_t **p, bl_reg rt, uint8_t base, uint16_t offs= et) +{ + if (bootcpu_supports_isa(ISA_MIPS3)) { + bl_gen_i_type(p, 0x3f, base, rt, offset); + } else { + g_assert_not_reached(); /* unsupported */ + } +} + +/* Pseudo instructions */ +static void bl_gen_li(uint32_t **p, bl_reg rt, uint32_t imm) +{ + bl_gen_lui(p, rt, extract32(imm, 16, 16)); + bl_gen_ori(p, rt, rt, extract32(imm, 0, 16)); +} + +static void bl_gen_dli(uint32_t **p, bl_reg rt, uint64_t imm) +{ + bl_gen_li(p, rt, extract64(imm, 32, 32)); + bl_gen_dsll(p, rt, rt, 16); + bl_gen_ori(p, rt, rt, extract64(imm, 16, 16)); + bl_gen_dsll(p, rt, rt, 16); + bl_gen_ori(p, rt, rt, extract64(imm, 0, 16)); +} + +static void bl_gen_load_ulong(uint32_t **p, bl_reg rt, target_ulong imm) +{ + if (bootcpu_supports_isa(ISA_MIPS3)) { + bl_gen_dli(p, rt, imm); /* 64bit */ + } else { + bl_gen_li(p, rt, imm); /* 32bit */ + } +} + +/* Helpers */ +void bl_gen_jump_to(uint32_t **p, target_ulong jump_addr) +{ + bl_gen_load_ulong(p, BL_REG_T9, jump_addr); + bl_gen_jalr(p, BL_REG_T9); + bl_gen_nop(p); /* delay slot */ +} + +void bl_gen_jump_kernel(uint32_t **p, target_ulong sp, target_ulong a0, + target_ulong a1, target_ulong a2, target_ulong a3, + target_ulong kernel_addr) +{ + bl_gen_load_ulong(p, BL_REG_SP, sp); + bl_gen_load_ulong(p, BL_REG_A0, a0); + bl_gen_load_ulong(p, BL_REG_A1, a1); + bl_gen_load_ulong(p, BL_REG_A2, a2); + bl_gen_load_ulong(p, BL_REG_A3, a3); + + bl_gen_jump_to(p, kernel_addr); +} + +void bl_gen_write_ulong(uint32_t **p, target_ulong addr, target_ulong val) +{ + bl_gen_load_ulong(p, BL_REG_K0, val); + bl_gen_load_ulong(p, BL_REG_K1, addr); + bl_gen_sd(p, BL_REG_K0, BL_REG_K1, 0x0); +} + +void bl_gen_write_u32(uint32_t **p, target_ulong addr, uint32_t val) +{ + bl_gen_li(p, BL_REG_K0, val); + bl_gen_load_ulong(p, BL_REG_K1, addr); + bl_gen_sw(p, BL_REG_K0, BL_REG_K1, 0x0); +} + +void bl_gen_write_u64(uint32_t **p, target_ulong addr, uint64_t val) +{ + bl_gen_dli(p, BL_REG_K0, val); + bl_gen_load_ulong(p, BL_REG_K1, addr); + bl_gen_sd(p, BL_REG_K0, BL_REG_K1, 0x0); +} diff --git a/hw/mips/meson.build b/hw/mips/meson.build index ee19cc204dc..1195716dc73 100644 --- a/hw/mips/meson.build +++ b/hw/mips/meson.build @@ -1,5 +1,5 @@ mips_ss =3D ss.source_set() -mips_ss.add(files('mips_int.c')) +mips_ss.add(files('bootloader.c', 'mips_int.c')) mips_ss.add(when: 'CONFIG_FW_CFG_MIPS', if_true: files('fw_cfg.c')) mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c')) mips_ss.add(when: 'CONFIG_LOONGSON3V', if_true: files('loongson3_bootp.c',= 'loongson3_virt.c')) --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918091; cv=none; d=zohomail.com; s=zohoarc; b=KeBRtIX/OaFpM/SyaTuyMEVEFI83GfMt4Wa0TZBWtRXV7OxG3k16+JLjw0N5YJI3BNpLZ/d+Q8Sr7RdNcEMgq2S7VrS3Ruxuk4wxg1gMKmFDs1Pc7x12MMGnkXcroBVa1rdSroEwIIJmOvYtEcnC1Ntuq+vTT+tRxDa0sQk6k/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918091; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SMk/f13/82FH+4mZ3X6jV05kfzCIC4xjh/U9w/KcQk4=; b=Q0qLr1hxqKCle6QtA9eSaPdCCn5gvAEg+cQkAs/Dj0xPiP97xAVlRzTTchthCHM8ZyD70d7d+iLcji+q6tNK5OHwD87gGEb5fAgT2GqRp9/XFMsnCuZBAvMVLx/I2PxsljcdvdFQpO7sbiUN4vmNnrhApXlv0Cq9enhIPDnaLRA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 16139180914681014.0029644751004; Sun, 21 Feb 2021 06:34:51 -0800 (PST) Received: by mail-wr1-f47.google.com with SMTP id n8so16289045wrm.10 for ; Sun, 21 Feb 2021 06:34:50 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id q140sm27543553wme.0.2021.02.21.06.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:34:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SMk/f13/82FH+4mZ3X6jV05kfzCIC4xjh/U9w/KcQk4=; b=fDIWa8vSDQOqJQF3A64csXV9w8NMpyRXy4TP5VOUZG8RwQ63JRHOYAEOS7hClZ7R19 3n6yelh1RE4q6D8rNgxjjGCyDN+1vMGDE1Rkcczf2z9z2s+MTAGepA/TrxRq4DD8yx+b slBdTGvIvXsZh8jNCo0LXbEOL3ZbLclbhhGxgU69Xj79ErUKOHZ3UjtCPlFB5KIIoFMT YVERB2H8azWTVto50GHF6cSQ4hXRBJ24vCwk+ZdWPUUz9SBtreKsI/BBRj/nqoE9ghLp Zg6dR4UfEhvXagMuTulnJRdEQiISpv6OnIz2BmJDUGYobz92vj/KcwsN5yuzp/DZM6FE +fBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=SMk/f13/82FH+4mZ3X6jV05kfzCIC4xjh/U9w/KcQk4=; b=COj+ZWu9+P/nZVVSkhIHIbJVgHC5cn1Vqrd6HJ3IKec6qB475T6Q3lYTmIggkqmli2 /rTs9qvzKRCuEEAhq1fRp0hh9hLPs+kodOsgLWviNMnr6UhqMhcDCRexVrKY2fi56lbh XnHpWLFQUiPK04ouiOrA25bbyFLuLrwem36swYRuu8bh1JYlPESHgd1EJugwvsfRlv32 ZSvxYkjcFY6OpLgqqTG5T5uay4BA9ahtUkYrKsN9CRVUKP0k5p19lSorkfEu/onZFdVt 04VaBCfq/Wmjyr+hFSvjEgv2tk+VQKDhQUf7TUPZv9tmxtJrjKILjS/0PaekRzs7scEj k8FQ== X-Gm-Message-State: AOAM532KdoabvhaKtqriWNZx9+ApNAcOM2DiFIcXYItbXrFWr1CJ2bMR MdedqVkt4ksvjU1/dd+mhb0= X-Google-Smtp-Source: ABdhPJzm146o5gtgca9hGSvQTMycm1s6b9oJanHG3C1MGga1NcECk3tWUZqJU+KEP4uC2kxHTmiWzA== X-Received: by 2002:adf:92c4:: with SMTP id 62mr17707227wrn.245.1613918089800; Sun, 21 Feb 2021 06:34:49 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang Subject: [PULL 03/43] hw/mips/fuloong2e: Use bl_gen_kernel_jump to generate bootloaders Date: Sun, 21 Feb 2021 15:33:52 +0100 Message-Id: <20210221143432.2468220-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: Jiaxun Yang Replace embedded binary with generated code. Signed-off-by: Jiaxun Yang Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20201215064507.30148-2-jiaxun.yang@flygoat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 [PMD: Split original patch as one for each machine (here fuloong2e)] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/fuloong2e.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index bac2adbd5ae..1f3680fda3e 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -33,6 +33,7 @@ #include "hw/i2c/smbus_eeprom.h" #include "hw/block/flash.h" #include "hw/mips/mips.h" +#include "hw/mips/bootloader.h" #include "hw/mips/cpudevs.h" #include "hw/pci/pci.h" #include "qemu/log.h" @@ -185,30 +186,8 @@ static void write_bootloader(CPUMIPSState *env, uint8_= t *base, /* Second part of the bootloader */ p =3D (uint32_t *)(base + 0x040); =20 - /* lui a0, 0 */ - stl_p(p++, 0x3c040000); - /* ori a0, a0, 2 */ - stl_p(p++, 0x34840002); - /* lui a1, high(ENVP_VADDR) */ - stl_p(p++, 0x3c050000 | ((ENVP_VADDR >> 16) & 0xffff)); - /* ori a1, a0, low(ENVP_VADDR) */ - stl_p(p++, 0x34a50000 | (ENVP_VADDR & 0xffff)); - /* lui a2, high(ENVP_VADDR + 8) */ - stl_p(p++, 0x3c060000 | (((ENVP_VADDR + 8) >> 16) & 0xffff)); - /* ori a2, a2, low(ENVP_VADDR + 8) */ - stl_p(p++, 0x34c60000 | ((ENVP_VADDR + 8) & 0xffff)); - /* lui a3, high(env->ram_size) */ - stl_p(p++, 0x3c070000 | (loaderparams.ram_size >> 16)); - /* ori a3, a3, low(env->ram_size) */ - stl_p(p++, 0x34e70000 | (loaderparams.ram_size & 0xffff)); - /* lui ra, high(kernel_addr) */ - stl_p(p++, 0x3c1f0000 | ((kernel_addr >> 16) & 0xffff)); - /* ori ra, ra, low(kernel_addr) */ - stl_p(p++, 0x37ff0000 | (kernel_addr & 0xffff)); - /* jr ra */ - stl_p(p++, 0x03e00008); - /* nop */ - stl_p(p++, 0x00000000); + bl_gen_jump_kernel(&p, ENVP_VADDR - 64, 2, ENVP_VADDR, ENVP_VADDR + 8, + loaderparams.ram_size, kernel_addr); } =20 static void main_cpu_reset(void *opaque) --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918097; cv=none; d=zohomail.com; s=zohoarc; b=WwjsNlugIt1LKnh+19FcXFuVhSu5I8OaAM+nGrEGIADbZWDluR48K4zVD66i/hGSEvgXUIQvzQxpzUUYRItVR5VU44QOkxdteAONz4B9im5zkmGpuj2faI4FR5TE+nB3Pe6o5tLMytVBBMv3Gei9dY6fzMrbjb1AfDQRe3LyjwY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918097; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iQCdnP7/+IinBGfjLqtzcKPEH1MPJ2eJ7nepr+C+eeM=; b=YZwV6erCnJlKsFBY5W43ti9ymOlMsUac4cY0JWmM4VS0rJzsO8/+HvWY0TxPBMWVMtpKoZmi58VEnaqVpg2DNMKeDWaGwLaFSMNvm0CH4eFF6t/9ahc4PG9GY0L0wfNoyurS78B1ZnrpgYoZMciGh3w0Qz7mRLbF8D4Iy0aeJv0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1613918097371783.4100916919856; Sun, 21 Feb 2021 06:34:57 -0800 (PST) Received: by mail-wr1-f48.google.com with SMTP id v1so16331757wrd.6 for ; Sun, 21 Feb 2021 06:34:55 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id f7sm21771819wmh.39.2021.02.21.06.34.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:34:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iQCdnP7/+IinBGfjLqtzcKPEH1MPJ2eJ7nepr+C+eeM=; b=eiEpgAH/wSedsja1tL1Cilo5NZNM2Z2YK4YzlX87nvNAQeVIecIAEfKqmC39E9eVvU sdWGXdwEg0SkM1rI5BxaiCIK/J+8EY5odN81eC49Wb8rIBCRvPUwrWRaSxox9ls/YT5W HeBfyMubdKQOto1oleXSDUW1S4rfI0GwMxuYRnYoZ3FM/5JfFM1CDHUN21di6Fs/Roy0 zDFDKgsC4uLWVv4XzGdR98tjQTcuIusRqkgJD8uDWj+YmwSHXEdoVF7l59gq63PaRDfZ 3FhZZMO79orEQ7/Ft/Tg7aaV1n2qhpixemNjtR/v7DVoRLxuDi/hTNLCcEakf3L/8ABC BATA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=iQCdnP7/+IinBGfjLqtzcKPEH1MPJ2eJ7nepr+C+eeM=; b=TQd8u0ATvOQUHWpm4XMFdsC6YMvBnT7xzZXcFETlV6PpjyyDN8N+6nrIVKNGUdNxd8 0XOyWpiQXfpaVu9YfOS1bADg6qvwDE8XKsQtzLpK4uo+InNLbrAQpKyAY2jPiyDiYLPj uYaS1GrbtJrk50x+Lh0Jryz7x791obMMbS91dlqlG+lI4iClzVKZMzlQVqjID9WEQ4vP VoPEg3nD/PaxahIJTeV03vTUPrOV+QlGdCa0o0x25b5xb9Zzmhq/isWevAfafP07yoJv 1fmBiPnaIKJ1rpj/GlRbenEaTAMVsT6FI04kqkczh+g9HwReJtXRh80+KXFg8nFQl2rt EPXQ== X-Gm-Message-State: AOAM533nAzTSBJzPeQmm060xBJEPyLVPrImoXZ8S4i5IaikkwwSGWurG T4f9fk48Oll92Uqbbs/0PJrKOpkHBPs= X-Google-Smtp-Source: ABdhPJzA/6G5P5PBGJ/Ri4PNBP9SdqRKfnyRdFI92XZ3IlaMAKaGIqE3iUFC+BWewf1LaMkISGQ1Cg== X-Received: by 2002:adf:ea48:: with SMTP id j8mr17622014wrn.197.1613918094717; Sun, 21 Feb 2021 06:34:54 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang Subject: [PULL 04/43] hw/mips/boston: Use bl_gen_kernel_jump to generate bootloaders Date: Sun, 21 Feb 2021 15:33:53 +0100 Message-Id: <20210221143432.2468220-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: Jiaxun Yang Replace embedded binary with generated code. Signed-off-by: Jiaxun Yang Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20201215064507.30148-2-jiaxun.yang@flygoat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 [PMD: Split original patch as one for each machine (here boston)] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/boston.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 467fbc1c8be..b976c8199a1 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -27,6 +27,7 @@ #include "hw/ide/ahci.h" #include "hw/loader.h" #include "hw/loader-fit.h" +#include "hw/mips/bootloader.h" #include "hw/mips/cps.h" #include "hw/pci-host/xilinx-pcie.h" #include "hw/qdev-clock.h" @@ -324,21 +325,7 @@ static void gen_firmware(uint32_t *p, hwaddr kernel_en= try, hwaddr fdt_addr, * a2/$6 =3D 0 * a3/$7 =3D 0 */ - stl_p(p++, 0x2404fffe); /* li $4, -2 */ - /* lui $5, hi(fdt_addr) */ - stl_p(p++, 0x3c050000 | ((fdt_addr >> 16) & 0xffff)); - if (fdt_addr & 0xffff) { /* ori $5, lo(fdt_addr) */ - stl_p(p++, 0x34a50000 | (fdt_addr & 0xffff)); - } - stl_p(p++, 0x34060000); /* li $6, 0 */ - stl_p(p++, 0x34070000); /* li $7, 0 */ - - /* Load kernel entry address & jump to it */ - /* lui $25, hi(kernel_ent= ry) */ - stl_p(p++, 0x3c190000 | ((kernel_entry >> 16) & 0xffff)); - /* ori $25, lo(kernel_ent= ry) */ - stl_p(p++, 0x37390000 | (kernel_entry & 0xffff)); - stl_p(p++, 0x03200009); /* jr $25 */ + bl_gen_jump_kernel(&p, 0, (int32_t)-2, fdt_addr, 0, 0, kernel_entry); } =20 static const void *boston_fdt_filter(void *opaque, const void *fdt_orig, --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918102; cv=none; d=zohomail.com; s=zohoarc; b=Y8R9F8Rp1sYVLhpHeoeUhEQ9Ob6OIdNTWxD6Fdts/fIIQaZL0QBLtsfeZR2OP7P0N4DZTSH2gL6xMxpkp0eI+wvboY48idf6+5AYTFcwr/W3WhH+FingwKXrBcJJfBeTqryCwg8AnTKpXTbUsSkdWY1E9uf1dDDPANV1LJeTB1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918102; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=E7DRDKNSGD/us0voOP/ZXhoAB8cYrh0GTxFyBXftfzA=; b=YOcTGhrsvXhZ/nVdgS6kCtvl9cWK6hJO71hNd7+LC+t9jv5OAw7xPovKDWiC+h5fgeq86vEJavLCtk27YL5howH0cWwyb85y6m7T310gkMbPmORrwm2pRyBpbXC+/VxkgMYkuLKw9o2Zby054cXsWqv357UJWTe7ilsSANmbXHY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1613918101600527.02043577612; Sun, 21 Feb 2021 06:35:01 -0800 (PST) Received: by mail-wr1-f46.google.com with SMTP id u14so16353198wri.3 for ; Sun, 21 Feb 2021 06:35:01 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id q15sm25794695wrr.58.2021.02.21.06.34.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:34:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E7DRDKNSGD/us0voOP/ZXhoAB8cYrh0GTxFyBXftfzA=; b=gYXRzm9ifE5MCFmSHKQv+YdOWBkUbXId13Qv4h+XFvkCxtnxOFnQC5RLcL1BF8LIr4 TbfnAbBFAEHWbbyFP3jnFo6oIoyw08W/iuLBr8qZiCesIGJoCcPOKIHrQLqc+mz+6urr GyVlwv/MfdiAIobNy6g0lD6HxBjrSeDy7xemDu/gveoGtg2RKTTuW0fjame23bqf8Vfa eqIoJlSJfIsL5w7k2XyNR//IEV4OKQCKyH2/UGwJ4t4xnRHo/KJ8AFZPvvdM6j5uP2t6 AytoqcAbYqWZApjHU7orx/wpPxFLcUVAEf1tOLUHIaoHRYmgsBtjDVD3hnwH0YFvC8Mt H++Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=E7DRDKNSGD/us0voOP/ZXhoAB8cYrh0GTxFyBXftfzA=; b=JAT+jWd6EjAWuPWSYh7Q2tBKx3EIneR1uYcAIVVKVPNkeXHuEXR0aIFTWWB7u5lwRA 2nofYI1JFq4fNwKfMjgreYu4cSDWTfGG3pRbKFgMoKQRr177HfkURu+ASpxwSmj1EZf3 uDAWFUdUONEsmNFMwOms29M7vWrp8dfviDMQ2oSMb5S8h6mYQZK4M6wcbQjvb2+2TUad ZsTKJ417seBIaKw/ammV67I+yuaWJLzigrbWwCwYJ2Vra7Z+UbcpEfVHwwISpDfcTqUU ygQp7lpx+mjy7UFnF3xx2Ph/qx8qXHcEfwK1wNvFEroAGgui7/v6iqbeB6ACbqPlVTS/ mYBg== X-Gm-Message-State: AOAM532hsIkM8Ym0mxZ9lsepwoAapeZyrKUl4TshOUpJsaLaVFbKQpDg 5Cej/3L0/MKFgRvz9l0fOWw= X-Google-Smtp-Source: ABdhPJxSQHyAnnXpLwCMkR/TqXUkC1R7w4cSjBKXySLeOckkCOHYnHEAEkzojdIYGHTn2mhzcmEnOQ== X-Received: by 2002:adf:fb03:: with SMTP id c3mr17801908wrr.395.1613918099828; Sun, 21 Feb 2021 06:34:59 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang Subject: [PULL 05/43] hw/mips/boston: Use bootloader helper to set GCRs Date: Sun, 21 Feb 2021 15:33:54 +0100 Message-Id: <20210221143432.2468220-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: Jiaxun Yang Translate embedded assembly into IO writes which is more readable. Also hardcode cm_base at boot time instead of reading from CP0. Signed-off-by: Jiaxun Yang Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210127065424.114125-5-jiaxun.yang@flygoat.com> [PMD: Kept code comments] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/boston.c | 45 +++++++++++---------------------------------- 1 file changed, 11 insertions(+), 34 deletions(-) diff --git a/hw/mips/boston.c b/hw/mips/boston.c index b976c8199a1..ac2e93a05aa 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -274,48 +274,26 @@ static void boston_register_types(void) } type_init(boston_register_types) =20 -static void gen_firmware(uint32_t *p, hwaddr kernel_entry, hwaddr fdt_addr, - bool is_64b) +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; =20 /* Move CM GCRs */ - if (is_64b) { - stl_p(p++, 0x40287803); /* dmfc0 $8, CMGCRBase */ - stl_p(p++, 0x00084138); /* dsll $8, $8, 4 */ - } else { - stl_p(p++, 0x40087803); /* mfc0 $8, CMGCRBase */ - stl_p(p++, 0x00084100); /* sll $8, $8, 4 */ - } - stl_p(p++, 0x3c09a000); /* lui $9, 0xa000 */ - stl_p(p++, 0x01094025); /* or $8, $9 */ - stl_p(p++, 0x3c0a0000 | (cm_base >> 16)); /* lui $10, cm_base >> 16= */ - if (is_64b) { - stl_p(p++, 0xfd0a0008); /* sd $10, 0x8($8) */ - } else { - stl_p(p++, 0xad0a0008); /* sw $10, 0x8($8) */ - } - stl_p(p++, 0x012a4025); /* or $8, $10 */ + bl_gen_write_ulong(&p, + cpu_mips_phys_to_kseg1(NULL, GCR_BASE_ADDR + GCR_BA= SE_OFS), + cm_base); =20 /* Move & enable GIC GCRs */ - stl_p(p++, 0x3c090000 | (gic_base >> 16)); /* lui $9, gic_base >> 16= */ - stl_p(p++, 0x35290001); /* ori $9, 0x1 */ - if (is_64b) { - stl_p(p++, 0xfd090080); /* sd $9, 0x80($8) */ - } else { - stl_p(p++, 0xad090080); /* sw $9, 0x80($8) */ - } + bl_gen_write_ulong(&p, + cpu_mips_phys_to_kseg1(NULL, cm_base + GCR_GIC_BASE= _OFS), + gic_base | GCR_GIC_BASE_GICEN_MSK); =20 /* Move & enable CPC GCRs */ - stl_p(p++, 0x3c090000 | (cpc_base >> 16)); /* lui $9, cpc_base >> 16= */ - stl_p(p++, 0x35290001); /* ori $9, 0x1 */ - if (is_64b) { - stl_p(p++, 0xfd090088); /* sd $9, 0x88($8) */ - } else { - stl_p(p++, 0xad090088); /* sw $9, 0x88($8) */ - } + bl_gen_write_ulong(&p, + cpu_mips_phys_to_kseg1(NULL, cm_base + GCR_CPC_BASE= _OFS), + cpc_base | GCR_CPC_BASE_CPCEN_MSK); =20 /* * Setup argument registers to follow the UHI boot protocol: @@ -529,8 +507,7 @@ static void boston_mach_init(MachineState *machine) } =20 gen_firmware(memory_region_get_ram_ptr(flash) + 0x7c00000, - s->kernel_entry, s->fdt_base, - cpu_type_is_64bit(machine->cpu_type)); + s->kernel_entry, s->fdt_base); } else if (!qtest_enabled()) { error_report("Please provide either a -kernel or -bios argument"); exit(1); --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918106; cv=none; d=zohomail.com; s=zohoarc; b=ZxwjgjS+xFz0h3ME/eB2C7/9gn3BlVC58/Nz3aIFZwZSAR7L/UFA2NGspgMSZMWjCKfmawa4dzzvjaVZK36ucLon2OcnZE2QuSwcQQdUl5PWm6b9msoziPUaFSnqSSbazt/L6n+wsv22Zv7Yc9y26eNm+DcU3wsxq0FMUjc5Y+0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918106; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2T22PSlc3zWYY+N/sqvIVsDv+5hyrx8dL5ATa6HQsLQ=; b=eopE/iEJGu3X0dkkkDbVBUFmzHlFa0ziKgZKJ5ig4rleE0ZVYOfjXn/F+WT9uCOPXplC9VlyM+y+O6U2TVBTTL1/tm9QFnbDi1tfeaKbSXBRvHUyGBeLBrLUjf43wNrtwo1W6c2Yjfbs0ic47riu7rLpkgEUt+2fUN1+uzZIN3g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1613918106445840.789361281914; Sun, 21 Feb 2021 06:35:06 -0800 (PST) Received: by mail-wm1-f48.google.com with SMTP id a207so12079294wmd.1 for ; Sun, 21 Feb 2021 06:35:05 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id q25sm17091796wmq.15.2021.02.21.06.35.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:35:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2T22PSlc3zWYY+N/sqvIVsDv+5hyrx8dL5ATa6HQsLQ=; b=GyWALZ+NtZQXEw1s09Ch58Ww9zTA1O7tUI2Fa5CtI+xfYe06YxGbG/sebTNkyH9FW9 Mz3sBfSMhdZ/fwnH1Jqrv+d0W/m1ZqeuKTBBxyuNRlzut4lOirjyJk+CCFdsRtQvey8M wFtOBFpFLWeoueBtb+CxgU68OButJJI+36blZlevoGKjue3M/XVFoN6vW1nSL16uRY5v 37lOMzhJEPkn3V1+G07/NqEX+lfTlbru7XwdKWNie0JcVf6SBPKCCtLEoNOCDHNU3lHK MgIz+nHOZNJWfVfeGXgQmPEAMUqNmqQXRpxPM3Z12S4qStcL1wndkuS93+mMoi9jsIV+ P0jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2T22PSlc3zWYY+N/sqvIVsDv+5hyrx8dL5ATa6HQsLQ=; b=jPdiHb0+loxZUTJe9ioTHVv906MZcLl7sbQEqc89wGcqJV6nNZ5gNoCWTNw518E9aH RTyfQPG0PkFWCJEuiercn62cgwqsESjKDp5Q5uttPRamGgrFl4MKy2ESqmhXUeMT0EXa ao2XeptNHuS7sKczrDz4P47cwzmZmJ0Id0SZJuJ59RhKpSIo2LxVguSQmIA2kIRkzxAA eBMyJV6xDs9ChhcR6p4Yai2uJ7synOf5OGYCn1NLOc2sdKl2AhWdUs+92W1FoslhGVzO cijSadWOCJ7plJ1UoSEGlTEgbZTYh7+qmu5QBn8LSNUYpAiAZKw2W5ouoHFkLdmRIZ7a seeg== X-Gm-Message-State: AOAM5324Aj7ehEHPogfsAILBobHqoLL/xqS5ohbuHuv97h6E/mZas/h5 vJ/9x6Lo3ACPo8iEI5x4vjU= X-Google-Smtp-Source: ABdhPJyOWyvZ7IZomi4JYQATp/tuqiatJbvteY4agtIF0C2fU7dUsJmkAJsSBDIZ5aE1lUNDE9KaAw== X-Received: by 2002:a7b:c397:: with SMTP id s23mr16156014wmj.10.1613918104747; Sun, 21 Feb 2021 06:35:04 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang Subject: [PULL 06/43] hw/intc/loongson_liointc: Fix per core ISR handling Date: Sun, 21 Feb 2021 15:33:55 +0100 Message-Id: <20210221143432.2468220-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: Jiaxun Yang Per core ISR is a set of 32-bit registers spaced by 8 bytes. This patch fixed calculation of it's size and also added check of alignment at reading & writing. Fixes: Coverity CID 1438965 and CID 1438967 Signed-off-by: Jiaxun Yang Reviewed-by: Huacai Chen Message-Id: <20210112012527.28927-1-jiaxun.yang@flygoat.com> [PMD: Added Coverity CID] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/intc/loongson_liointc.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/intc/loongson_liointc.c b/hw/intc/loongson_liointc.c index f823d484e08..cc11b544cb4 100644 --- a/hw/intc/loongson_liointc.c +++ b/hw/intc/loongson_liointc.c @@ -41,7 +41,7 @@ #define R_IEN_CLR 0x2c #define R_ISR_SIZE 0x8 #define R_START 0x40 -#define R_END 0x64 +#define R_END (R_START + R_ISR_SIZE * NUM_CORES) =20 struct loongson_liointc { SysBusDevice parent_obj; @@ -125,7 +125,12 @@ liointc_read(void *opaque, hwaddr addr, unsigned int s= ize) } =20 if (addr >=3D R_START && addr < R_END) { - int core =3D (addr - R_START) / R_ISR_SIZE; + hwaddr offset =3D addr - R_START; + int core =3D offset / R_ISR_SIZE; + + if (offset % R_ISR_SIZE) { + goto out; + } r =3D p->per_core_isr[core]; goto out; } @@ -169,7 +174,12 @@ liointc_write(void *opaque, hwaddr addr, } =20 if (addr >=3D R_START && addr < R_END) { - int core =3D (addr - R_START) / R_ISR_SIZE; + hwaddr offset =3D addr - R_START; + int core =3D offset / R_ISR_SIZE; + + if (offset % R_ISR_SIZE) { + goto out; + } p->per_core_isr[core] =3D value; goto out; } --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 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=1613918111; cv=none; d=zohomail.com; s=zohoarc; b=D1N++cEZpu6DgP4BPPsbCA8nwRPIj8a7M27KUGdjAv1B9g2iKCVJ5xOksg9qFZ+sFNJ8djme1K5T3yZdqUtg9/9FovclM1dbv8plxQPRDnuoIfqDy2SlsdggOeTIeYYP5gHjIq073GyWDfhTk0bnUKe5sZ++Nwiv2iaY+lsweSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918111; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GefIUIucR0eRh0lP5QC7o6lpm/SLTSnsXd1+B06MwyI=; b=eVvaRxcfkFwfreVqLOytNG3e8TEMJ+2ujSB8oeXoWT4BrG+5zsTQuovwb02mAepzOioQsCaCb7ww4YBmf1BcFNHPBN4c5VLCwZ9b+6C1pdpT5XctakwsNRmLmswApboK5JeZh5aHUosukX8ZFLRaFYhIaBFDO+6Ly5m9ZSni7BU= 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 1613918111337174.85717851637025; Sun, 21 Feb 2021 06:35:11 -0800 (PST) Received: by mail-wm1-f54.google.com with SMTP id w4so11176600wmi.4 for ; Sun, 21 Feb 2021 06:35:10 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id y62sm26200321wmy.9.2021.02.21.06.35.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:35:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GefIUIucR0eRh0lP5QC7o6lpm/SLTSnsXd1+B06MwyI=; b=hF1BvT4jNHjcvMRKIWYRbtK48vkBrOTEQqv5UKNg9i5bs4zxc3MV2OyqK7cQbCgs2Q xx7hEu2rdKbLdt3c4iGVGQeiZZCzzDB1Mxno1DBFVcByp5tbp1VqA+Z0DrHDQW2oVeo4 en2ax4OvyXovWKwfFXZWT7Xy+Y6my1MhIzYHBr8G83dDC2fDfkCtcprU4WEGcB2IbAl9 mePNKXlK1F49lmCdJkiFh8ocWZh/a5s5oIOaR8nE4o8Q3sF/VvK1AhA4OGB6EV1sAJmG UFlHcM9ilAiBO7XwNW/Pv/QtifHlerBhWSrsIX4vtrnf+ec8AX4Ps0MXpSzVs59kihav DgRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GefIUIucR0eRh0lP5QC7o6lpm/SLTSnsXd1+B06MwyI=; b=ZTXJXfkhdz8EnPusgmSU7XoYVToEUXWp/1CTVCk/0WuXEWuq3PxNEi/Wwstdqw7+gD oeiaJMXmitIYj+fdiXd0PmPhSY6Ul0tcdVLhXudQ++zvRH4e25ojuOFyNY1Oo68kEQ49 8nrYP4O+sAOAMm2/Jdw8MpYPmg8/2igDR0VdFS6+DexR8zRZdgJvwBVshfbj6qwJr3Gz 8zt3g0Ru+s62ZRPgaWLt0BnFg6YPWLUX0Pg+Nw/llZ52BlL4Ri2B6SqKnmug5havFJFh TGdPdeETkD/HEf/bKw6zFTjB/LhHol3D+rujt4jvHBgCr2Jc/H0wZtR4wPiDEfK2TbJv kYwQ== X-Gm-Message-State: AOAM531C5E0WsccyR2MO9nzB7QaDfqB0lKoh6mHMBWlnr7s/joFWRlnT C3KMCxapgkASzJLeaPf2+a0= X-Google-Smtp-Source: ABdhPJyKRun7f+5Uq6uhxOxzMevQlN/TiRBEPE2TxGcI7yirduaC0X6mHWsQ+8bqpKgLyC/CjPP6bw== X-Received: by 2002:a05:600c:22d1:: with SMTP id 17mr1098944wmg.168.1613918109573; Sun, 21 Feb 2021 06:35:09 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang Subject: [PULL 07/43] tests/acceptance: Test PMON with Loongson-3A1000 CPU Date: Sun, 21 Feb 2021 15:33:56 +0100 Message-Id: <20210221143432.2468220-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: Jiaxun Yang Test booting of PMON bootloader on loongson3-virt platform. $ (venv) AVOCADO_ALLOW_UNTRUSTED_CODE=3D1 \ avocado --show=3Dapp,console \ run -t machine:loongson3-virt tests/acceptance Fetching asset from tests/acceptance/machine_mips_loongson3v.py:MipsLoongso= n3v.test_pmon_serial_console JOB ID : 8e202b3727847c9104d0d3d6546ed225d35f6706 JOB LOG : /home/flygoat/avocado/job-results/job-2021-01-12T10.02-8e202b3= /job.log (1/1) tests/acceptance/machine_mips_loongson3v.py:MipsLoongson3v.test_pmon= _serial_console: console: PMON2000 MIPS Initializing. Standby... console: 00000000Jump to 9fc console: Init Memory done. console: The uncache data is: console: 00000000: 5555555555555555 console: 00000008: aaaaaaaaaaaaaaaa console: 00000010: 3333333333333333 console: 00000018: cccccccccccccccc console: 00000020: 7777777777777777 console: 00000028: 8888888888888888 console: 00000030: 1111111111111111 console: 00000038: eeeeeeeeeeeeeeee console: The cached data is: console: 00000000: 5555555555555555 console: 00000008: aaaaaaaaaaaaaaaa console: 00000010: 3333333333333333 console: 00000018: cccccccccccccccc console: 00000020: 7777777777777777 console: 00000028: 8888888888888888 console: 00000030: 1111111111111111 console: 00000038: eeeeeeeeeeeeeeee console: Copy PMON to execute location... console: start =3D 0x8f900000 console: s0 =3D 0x30300000 console: _edata =3D 0x8f989010 console: _end =3D 0x8f98a028copy text section done. console: Copy PMON to execute location done. console: sp=3D8f8fc000 console: Uncompressing Bios................................................= ............................OK,Booting Bios console: FREQ console: DONE console: DEVI console: ENVI console: MAPV console: NVRAM@8f7ff898 console: STDV console: 80100000: memory between 8f7ff400-8f800000 is already been alloc= ated,heap is already above this point console: SBDD console: P12PCIH console: PCIH console: PCID console: setting up 1 bus console: PCI bus 0 slot 1: probe...completed console: PCI bus 0 slot 1/0: vendor/product: 0x106b/0x003f (serialbus, USB,= interface: 0x10, revision: 0x00) console: PCI bus 0 slot 1/0: reg 0x10 =3D 0xffffff00 console: PCI bus 0 slot 2: probe...completed console: PCI bus 0 slot 2/0: vendor/product: 0x1af4/0x1000 (network, ethern= et, interface: 0x00, revision: 0x00) console: PCI bus 0 slot 2/0: reg 0x10 =3D 0xffffffe1 console: PCI bus 0 slot 2/0: reg 0x14 =3D 0xfffff000 console: PCI bus 0 slot 2/0: reg 0x20 =3D 0xffffc00c console: PCI bus 0 slot 2/0: reg 0x30 =3D 0xfffc0000 console: PCI bus 0 slot 3: probe...completed console: PCI bus 0 slot 4: probe...completed console: PCI bus 0 slot 5: probe...completed console: PCI bus 0 slot 6: probe...completed console: PCI bus 0 slot 7: probe...completed console: PCI bus 0 slot 8: probe...completed console: PCI bus 0 slot 9: probe...completed console: PCI bus 0 slot 10: probe...completed console: PCI bus 0 slot 11: probe...completed console: PCI bus 0 slot 12: probe...completed console: PCI bus 0 slot 13: probe...completed console: PCI bus 0 slot 14: probe...completed console: PCI bus 0 slot 15: probe...completed console: PCI bus 0 slot 16: probe...completed console: PCI bus 0 slot 17: probe...completed console: PCI bus 0 slot 18: probe...completed console: PCI bus 0 slot 19: probe...completed console: PCI bus 0 slot 20: probe...completed console: PCI bus 0 slot 21: probe...completed console: PCI bus 0 slot 22: probe...completed console: PCI bus 0 slot 23: probe...completed console: PCI bus 0 slot 24: probe...completed console: PCI bus 0 slot 25: probe...completed console: PCI bus 0 slot 26: probe...completed console: PCI bus 0 slot 27: probe...completed console: PCI bus 0 slot 28: probe...completed console: PCI bus 0 slot 29: probe...completed console: PCI bus 0 slot 30: probe...completed console: PCI bus 0 slot 31: probe...completed console: PCIS console: PCIR console: PCIW console: PCI bus 0 slot 2/0: mem @0x40000000, reg 0x30 262144 bytes console: PCI bus 0 slot 2/0: mem @0x40040000, reg 0x20 16384 bytes console: PCI bus 0 slot 2/0: mem @0x40044000, reg 0x14 4096 bytes console: PCI bus 0 slot 1/0: mem @0x40045000, reg 0x10 256 bytes console: PCI bus 0 slot 2/0: exp @0x40000000, 262144 bytes console: PCI bus 0 slot 2/0: i/o @0x00004000, reg 0x10 32 bytes console: NETI console: RTCL console: PCID console: VGAI console: memorysize=3Dc000000,base=3D8f6ff508,sysMem=3D8f6ef500 console: in setup_int_vect!done!VESA console: vga bios init failed, rc=3D-1 console: in configure console: mainbus0 (root) console: localbus0 at mainbus0 console: loopdev0 at mainbus0pcibr0 at mainbus0 console: pci0 at pcibr0 bus 0 console: ohci0 at pci0 dev 1 function 0 vendor/product: 0x106b/0x003f (seri= albus, USB, interface: 0x10, revision: 0x00)usb base addr : 0xc0045000, bus= _base is : 0xc0000000 console: OHCI revision: 0x00000010 console: RH: a: 0x00000203 b: 0x00000000 console: early period(0x0) console: OHCI 8c01ec00 initialized ok console: New Device 0 console: usb_get_descriptor console: bLength =3D 12 console: bDescriptorType =3D1 console: bcdUSB =3D 110 console: bDeviceClass =3D9 console: bDeviceSubClass =3D0 console: bDeviceProtocol =3D0 console: bMaxPacketSize0 =3D8 console: set address 1 console: usb_get_descriptor console: bLength =3D 12 console: bDescriptorType =3D1 console: bcdUSB =3D 110 console: bDeviceClass =3D9 console: bDeviceSubClass =3D0 console: bDeviceProtocol =3D0 console: bMaxPacketSize0 =3D8 console: idVendor =3D0 console: idProduct =3D0 console: bcdDevice =3D0 console: iManufacturer=3D0 console: iProduct =3D1 console: iSerialNumber=3D0 console: bNumConfigurations=3D1 console: usb_get_descriptor console: usb_get_descriptor console: get_conf_no 0 Result 25, wLength 25 console: if 0, ep 0 console: bLength=3D9 console: bDescriptorType=3D2 console: wTotalLength=3D19 console: bNumInterfaces=3D1 console: bConfigurationValue=3D1 console: iConfiguration=3D0 console: bmAttributes=3D40 console: MaxPower=3D0 console: 09 04 00 00 01 09 00 00 00 07 05 81 03 02 00 ff console: ##EP epmaxpacketin[1] =3D 2 console: set configuration 1 console: new device strings: Mfr=3D0, Product=3D1, SerialNumber=3D0 console: USB device number 1 default language ID 0x409 console: Manufacturer console: Product OHCI Root Hub console: SerialNumber console: New Device 1 console: usb_get_descriptor -console: bLength =3D 12 console: bDescriptorType =3D1 console: bcdUSB =3D 200 console: bDeviceClass =3D0 console: bDeviceSubClass =3D0 console: bDeviceProtocol =3D0 console: bMaxPacketSize0 =3D8 console: set address 2 console: usb_get_descriptor console: bLength =3D 12 console: bDescriptorType =3D1 console: bcdUSB =3D 200 console: bDeviceClass =3D0 console: bDeviceSubClass =3D0 console: bDeviceProtocol =3D0 console: bMaxPacketSize0 =3D8 console: idVendor =3D627 console: idProduct =3D1 console: bcdDevice =3D0 console: iManufacturer=3D1 console: iProduct =3D4 console: iSerialNumber=3Db console: bNumConfigurations=3D1 console: usb_get_descriptor console: usb_get_descriptor console: get_conf_no 0 Result 34, wLength 34 console: unknown Description Type : 21 console: 09 21 11 01 00 01 22 3F 00 console: if 0, ep 0 console: bLength=3D9 console: bDescriptorType=3D2 console: wTotalLength=3D22 console: bNumInterfaces=3D1 console: bConfigurationValue=3D1 console: iConfiguration=3D8 console: bmAttributes=3Da0 console: MaxPower=3D32 console: 09 04 00 00 01 03 01 01 00 09 21 11 01 00 01 22 3f 00 07 05 81 03 = 08 00 0a console: ##EP epmaxpacketin[1] =3D 8 console: set configuration 1 console: new device strings: Mfr=3D1, Product=3D4, SerialNumber=3D11 console: USB device number 2 default language ID 0x409 console: Manufacturer QEMU console: Product QEMU USB Keyboard console: SerialNumber 68284-0000:00:01.0-1 console: drive at ohci0 devnum 2, Product QEMU USB Keyboard console: not configured console: New Device 2 console: usb_get_descriptor console: bLength =3D 12 console: bDescriptorType =3D1 console: bcdUSB =3D 200 console: bDeviceClass =3D0 console: bDeviceSubClass =3D0 console: bDeviceProtocol =3D0 console: bMaxPacketSize0 =3D8 console: set address 3 console: usb_get_descriptor console: bLength =3D 12 console: bDescriptorType =3D1 console: bcdUSB =3D 200 console: bDeviceClass =3D0 console: bDeviceSubClass =3D0 console: bDeviceProtocol =3D0 console: bMaxPacketSize0 =3D8 console: idVendor =3D627 console: idProduct =3D1 console: bcdDevice =3D0 console: iManufacturer=3D1 console: iProduct =3D3 console: iSerialNumber=3Da console: bNumConfigurations=3D1 console: usb_get_descriptor console: usb_get_descriptor console: get_conf_no 0 Result 34, wLength 34 console: unknown Description Type : 21 console: 09 21 01 00 00 01 22 4A 00 console: if 0, ep 0 console: bLength=3D9 console: bDescriptorType=3D2 console: wTotalLength=3D22 console: bNumInterfaces=3D1 console: bConfigurationValue=3D1 console: iConfiguration=3D7 console: bmAttributes=3Da0 console: MaxPower=3D32 console: 09 04 00 00 01 03 00 00 00 09 21 01 00 00 01 22 4a 00 07 05 81 03 = 08 00 0a console: ##EP epmaxpacketin[1] =3D 8 console: set configuration 1 console: new device strings: Mfr=3D1, Product=3D3, SerialNumber=3D10 console: USB device number 3 default language ID 0x409 console: Manufacturer QEMU console: Product QEMU USB Tablet console: SerialNumber 28754-0000:00:01.0-2 console: drive at ohci0 devnum 3, Product QEMU USB Tablet console: not configured console: drive at ohci0 devnum 1, Product OHCI Root Hub console: not configured console: vendor/product: 0x1af4/0x1000 (network, ethernet, interface: 0x00,= revision: 0x00) at pci0 dev 2 function 0 not configured console: out configure console: Press to set BIOS,waiting for 3 seconds here..... |console: devconfig done. console: ifinit done. console: domaininit done. console: init_proc.... console: HSTI console: SYMI console: SBDE console: [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[= [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ console: [[ [[[[[[[[[ [[[[[ [[[[ [[[[[ [[[[[ [[[[[ = [[[[[ [[[[ [[[[[ [[ console: [[ [[[[[[[[ [[[[ [[[ [[[[ [[[ [[[[ [[[[ [[[[ [[[ [[= [[ [[[ [[[[ [[[ [[[[ [[ console: [[ [[[[[[[[ [[[[[[ [[[ [[[[[[ [[[ [ [[[ [[[ [[[[[[[[[[[[ = [[[[[[[ [[[[[[ [[[ [ [[[ [[ console: [[ [[[[[[[[ [[[[[[ [[[ [[[[[[ [[[ [[ [[ [[[ [[[ [[[[[[[ = [[[[ [[[[[[ [[[ [[ [[ [[ console: [[ [[[[[[[[ [[[[[[ [[[ [[[[[[ [[[ [[[ [ [[[ [[[[[ [[[[[[[[= [[ [[[ [[[[[[ [[[ [[[ [ [[ console: [[ [[[[[[[[ [[[[ [[[ [[[[ [[[ [[[[ [[[ [[[[ [[[ [[= [ [[[[ [[[[ [[[ [[[[ [[ console: [[ [[[[ [[[[[ [[[[ [[[[[ [[[[ [[[[[ = [[[[[[ [[[[ [[[[[ [[ console: [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[2011 Loongson][[[[[[[[[[[[= [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ console: Configuration [Bonito,EL,NET,SCSI,IDE] console: Version: PMON2000 3.3 (Bonito) #0: Tue Dec 22 01:58:09 UTC 2020 co= mmit b3ece66234adbf7d4e453f0ba4f326c099ac2a76 Author: Jiaxun Yang Date: Tue Dec 22 09:51:10 2020 +0800 . console: Supported loaders [txt, srec, elf, bin] console: Supported filesystems [net, fat, fs, disk, iso9660, socket, tty, r= am] console: This software may be redistributed under the BSD copyright. console: Copyright 2000-2002, Opsycon AB, Sweden. console: Copyright 2005, ICT CAS. console: CPU GODSON3 BogoMIPS: 1327 PASS (3.89 s) RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CA= NCEL 0 JOB TIME : 4.38 s Signed-off-by: Jiaxun Yang Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210112020708.62922-1-jiaxun.yang@flygoat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 1 + tests/acceptance/machine_mips_loongson3v.py | 39 +++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 tests/acceptance/machine_mips_loongson3v.py diff --git a/MAINTAINERS b/MAINTAINERS index 5eeba79c5a3..ac411c27f93 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1183,6 +1183,7 @@ F: hw/intc/loongson_liointc.c F: hw/mips/loongson3_bootp.c F: hw/mips/loongson3_bootp.h F: hw/mips/loongson3_virt.c +F: tests/acceptance/machine_mips_loongson3v.py =20 Boston M: Paul Burton diff --git a/tests/acceptance/machine_mips_loongson3v.py b/tests/acceptance= /machine_mips_loongson3v.py new file mode 100644 index 00000000000..5700d9d4620 --- /dev/null +++ b/tests/acceptance/machine_mips_loongson3v.py @@ -0,0 +1,39 @@ +# Functional tests for the Generic Loongson-3 Platform. +# +# Copyright (c) 2021 Jiaxun Yang +# +# This work is licensed under the terms of the GNU GPL, version 2 or later. +# See the COPYING file in the top-level directory. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os +import time + +from avocado import skipUnless +from avocado_qemu import Test +from avocado_qemu import wait_for_console_pattern + +class MipsLoongson3v(Test): + @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code= ') + def test_pmon_serial_console(self): + """ + :avocado: tags=3Darch:mips64el + :avocado: tags=3Dendian:little + :avocado: tags=3Dmachine:loongson3-virt + :avocado: tags=3Dcpu:Loongson-3A1000 + :avocado: tags=3Ddevice:liointc + :avocado: tags=3Ddevice:goldfish_rtc + """ + + pmon_hash =3D '7c8b45dd81ccfc55ff28f5aa267a41c3' + pmon_path =3D self.fetch_asset('https://github.com/loongson-commun= ity/pmon/' + 'releases/download/20210112/pmon-3avir= t.bin', + asset_hash=3Dpmon_hash, algorithm=3D'= md5') + + self.vm.set_console() + self.vm.add_args('-bios', pmon_path) + self.vm.launch() + wait_for_console_pattern(self, 'PMON2000 MIPS Initializing. Standb= y...') + wait_for_console_pattern(self, 'Copy PMON to execute location done= .') + wait_for_console_pattern(self, 'CPU GODSON3 BogoMIPS:') --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918116; cv=none; d=zohomail.com; s=zohoarc; b=gXfMlsQYudXU1ohRWJJ7Rv4YRAQrwD6K40Z1eJaERUuG+YxzAPzR/a/GCHosWv9GDNhpbvrRMeWLtxUX3SoVUz1nPKsyK3oU+wRMH3J1EyjjWl7aWJpP6CbgHnsp3EDiVAhU7tzPHDaTPM0kKuoQ5TRXecxlq1jrO0il+b5+1lk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918116; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EQuLPLB77gZv1TslkqbImF1RKczoOzqyp5dpx+bERaM=; b=PpRFsX7mfxxKdQSoziSgWf6ixjNeN65ROcyaLsPFlUHQGCCeWnNRQf5AZX1Bq4Em4bG0pIzbAZU5T1dnkjC4BlviabgRgt5wrgSluNd7oL7yt0AdTwg6ChZIeQanBfJhcWg74oZcmAvw12GpXewfI6MAy+7pDOc4Yfdy2DBXoyk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1613918116139167.3303853396992; Sun, 21 Feb 2021 06:35:16 -0800 (PST) Received: by mail-wm1-f52.google.com with SMTP id v62so12041118wmg.4 for ; Sun, 21 Feb 2021 06:35:15 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id o13sm27293866wro.15.2021.02.21.06.35.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:35:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EQuLPLB77gZv1TslkqbImF1RKczoOzqyp5dpx+bERaM=; b=DOjfbkJJrIA/aBmmkSMNqv6kxCXvTDfmYroKMSIGk3Mf2fxYcwP8ajVKmJFw6LRvWW FnY5tCYE4d8kdKOs1qlHH8oTvHA/f3/GBVTszNzmkKYa7s1lK10OepaDPvo1fZ2PGqwv tw057k0UOAqvD3CB33WmIvc37je69G4eAjAQo+ZjSBabYK+DvLagB6iSgCuantc9+Xit gDExgaVDkMIeklvD3iyMy/xpk5Iv6sC962WHZxmWgLnjW3CN+p3VgGHoT9LFnHLg0hNi VXK/ws3vZWba1MyZ2xzdQUp1TuJjFFj0xEJ9t5IQRV6DYhg17LXTar0835f/6lBvAbX3 MchQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=EQuLPLB77gZv1TslkqbImF1RKczoOzqyp5dpx+bERaM=; b=acKTjZAOj0r1LnH2OAUyH5zWF8RxtMEr3fA3ODx3ePlyFBCbwzMZ1UPrY0kUi6UQcd d6mEk9VoqpJt9mkppEbFNqqQSXo01epPOqqhr8yXLyzJ4Svpu5FSR+PmvCwvX54WSmWT aF5yt4Tn46WxgoTSkjqJI1F1H/6GNErXbj0Q+pOdIl/8ZVdviF5hvEcoq1O1VZ/AFOcB 9R8euyCKKjLTSHw57SwQ5Lrrax2+VWV7H5VujVzlDrmo2tIBxGrbVPg2W3+lzmydkNpT 5EIxYQr9CiFNgH6x+/aJs4E8gPR0eDZKV/nUyEXvQ1b7vcZOvHN2S5rKhgzfwQoY9ZgA e0qw== X-Gm-Message-State: AOAM533yJuWt2LsbZAMvErrFpxv6z9SesYbDrAjFeWcj/TqOuMeGActS oVT8Uu3EfgL3NUAQMDMcklA= X-Google-Smtp-Source: ABdhPJzic8LozV321AXCHc/j5v7RfZ1nrGUsZz4yTwK1dhEy9FDaLy5cej+FqjinR9249MQrj+f8PQ== X-Received: by 2002:a7b:cd0d:: with SMTP id f13mr1956200wmj.74.1613918114401; Sun, 21 Feb 2021 06:35:14 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 08/43] target/mips: fetch code with translator_ld Date: Sun, 21 Feb 2021 15:33:57 +0100 Message-Id: <20210221143432.2468220-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) Similarly to commits ae82adc8e29..7f93879e444, use the translator_ld*() API introduced in commit 409c1a0bf0f to fetch the code on the MIPS target. Reviewed-by: Jiaxun Yang Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210125105818.2707067-1-f4bug@amsat.org> --- target/mips/translate.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/mips/translate.c b/target/mips/translate.c index a5cf1742a8b..a6e835809aa 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -26,7 +26,7 @@ #include "cpu.h" #include "internal.h" #include "tcg/tcg-op.h" -#include "exec/cpu_ldst.h" +#include "exec/translator.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" #include "hw/semihosting/semihost.h" @@ -13911,7 +13911,7 @@ static void decode_i64_mips16(DisasContext *ctx, =20 static int decode_extended_mips16_opc(CPUMIPSState *env, DisasContext *ctx) { - int extend =3D cpu_lduw_code(env, ctx->base.pc_next + 2); + int extend =3D translator_lduw(env, ctx->base.pc_next + 2); int op, rx, ry, funct, sa; int16_t imm, offset; =20 @@ -14161,7 +14161,7 @@ static int decode_mips16_opc(CPUMIPSState *env, Dis= asContext *ctx) /* No delay slot, so just process as a normal instruction */ break; case M16_OPC_JAL: - offset =3D cpu_lduw_code(env, ctx->base.pc_next + 2); + offset =3D translator_lduw(env, ctx->base.pc_next + 2); offset =3D (((ctx->opcode & 0x1f) << 21) | ((ctx->opcode >> 5) & 0x1f) << 16 | offset) << 2; @@ -16295,7 +16295,7 @@ static void decode_micromips32_opc(CPUMIPSState *en= v, DisasContext *ctx) uint32_t op, minor, minor2, mips32_op; uint32_t cond, fmt, cc; =20 - insn =3D cpu_lduw_code(env, ctx->base.pc_next + 2); + insn =3D translator_lduw(env, ctx->base.pc_next + 2); ctx->opcode =3D (ctx->opcode << 16) | insn; =20 rt =3D (ctx->opcode >> 21) & 0x1f; @@ -21350,7 +21350,7 @@ static int decode_nanomips_32_48_opc(CPUMIPSState *= env, DisasContext *ctx) int offset; int imm; =20 - insn =3D cpu_lduw_code(env, ctx->base.pc_next + 2); + insn =3D translator_lduw(env, ctx->base.pc_next + 2); ctx->opcode =3D (ctx->opcode << 16) | insn; =20 rt =3D extract32(ctx->opcode, 21, 5); @@ -21469,7 +21469,7 @@ static int decode_nanomips_32_48_opc(CPUMIPSState *= env, DisasContext *ctx) break; case NM_P48I: { - insn =3D cpu_lduw_code(env, ctx->base.pc_next + 4); + insn =3D translator_lduw(env, ctx->base.pc_next + 4); target_long addr_off =3D extract32(ctx->opcode, 0, 16) | insn = << 16; switch (extract32(ctx->opcode, 16, 5)) { case NM_LI48: @@ -29087,17 +29087,17 @@ static void mips_tr_translate_insn(DisasContextBa= se *dcbase, CPUState *cs) =20 is_slot =3D ctx->hflags & MIPS_HFLAG_BMASK; if (ctx->insn_flags & ISA_NANOMIPS32) { - ctx->opcode =3D cpu_lduw_code(env, ctx->base.pc_next); + ctx->opcode =3D translator_lduw(env, ctx->base.pc_next); insn_bytes =3D decode_nanomips_opc(env, ctx); } else if (!(ctx->hflags & MIPS_HFLAG_M16)) { - ctx->opcode =3D cpu_ldl_code(env, ctx->base.pc_next); + ctx->opcode =3D translator_ldl(env, ctx->base.pc_next); insn_bytes =3D 4; decode_opc(env, ctx); } else if (ctx->insn_flags & ASE_MICROMIPS) { - ctx->opcode =3D cpu_lduw_code(env, ctx->base.pc_next); + ctx->opcode =3D translator_lduw(env, ctx->base.pc_next); insn_bytes =3D decode_micromips_opc(env, ctx); } else if (ctx->insn_flags & ASE_MIPS16) { - ctx->opcode =3D cpu_lduw_code(env, ctx->base.pc_next); + ctx->opcode =3D translator_lduw(env, ctx->base.pc_next); insn_bytes =3D decode_mips16_opc(env, ctx); } else { gen_reserved_instruction(ctx); --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918121; cv=none; d=zohomail.com; s=zohoarc; b=he8EeoUWSG82z1il2PkZUwEbA/vu7EVTueuwbXK76vEKXDCGbvCvEO6mz3bJF7wO0w2f7E403OUjUZkYLbF9r41JMNX0dYCvLxyVp1ZbOq4Ufq14uwZJgPPfKlWCKFE+DC4/zS/iymLZ2jHI41mSg3QzEhRQrBNuqDkaM0LaInY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918121; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GYl+8CWL6PT+OOiW+f+gON8b+09cumwTEA/5uUAsIxU=; b=H3YUOBuQ9x59EyA4+GYUAtUtBu/RGKV4+04ahE4GRqoe8kAK7/RPPcoN+ECbDsEcy4kePq4DygessjMNCvUYuxqZyVPMqiEgXRhYTWjpe0ckh0Aaj/YHacMBRD4hd5guDjGe+6Xt7BQ0+gLizVSScXX/WEv9y3PHW3qcu8kpF0k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1613918121091669.054340434506; Sun, 21 Feb 2021 06:35:21 -0800 (PST) Received: by mail-wr1-f50.google.com with SMTP id a4so14113170wro.8 for ; Sun, 21 Feb 2021 06:35:20 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id r12sm14570843wrt.69.2021.02.21.06.35.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:35:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GYl+8CWL6PT+OOiW+f+gON8b+09cumwTEA/5uUAsIxU=; b=WdFyiHnzJxqOVp4rUZfnxgMCUmW/T+ySyNeJrMCvta6p9P0D+4QeQEJKCg4J1febIM qE6tauzmbPIlCD6drJ5DbLyUN+ueqLKmqwtWNBGVmHWWvhWgvU/r+yEbNd5dIwxTsxNW NLjN5A+SGnPY305k4Np4xGlOGZRw4EZ47bQ06qnTwUVTzK5s26N8sP3Pt0uFjUnL87eH ng11Up23ttbetBsB2qJGsu7Q4IIu5ac7WMbwHBEA4TNX410CWo5X2DTJiHzi6Iug/qgG swVr4EFCLLPNh9RoIos3/aIm08t6u3dCr0CCbPnOtBED9W8NU0m+5t7AmBA4CfzG83L9 aCKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GYl+8CWL6PT+OOiW+f+gON8b+09cumwTEA/5uUAsIxU=; b=c/7cNo42WOCa3ukmLykHHfu1A7ue6K3sSzxnms9/0ycTI64EmC1hPSnljuUO3vllm1 PXAFhtRAE+ialcxqFqU/JnZF/OzA+5sV6UuAsuvhHmozrb3Y91usOmDwMYesz0kReHKB EPVX+CTl33+oRIDHzFGPp6F+g4FOJ/k5KYWANlmFLH8PSdlZnrBCvSPIIUtpN4NIoME0 Nkhu6Aso8DzDPPCV+z/y7Zfg3RweqPVfcUIxqoJv2o5TcKigwJ42ucz8prW52BmHHK2j 4OpoqDw1jpZUBsRjoPvPAa1X+I7RYnKM5Fdj5ThwAehb0ygvRmF5VzseG7oSKOZ/NJLF Tivg== X-Gm-Message-State: AOAM533F0QXQUgCsdUwTBdrkp4CBlortll50zyPaaAUQmm4IJJ28b/Ta 5iYn8NaKSdWPRkk+xVYccPc= X-Google-Smtp-Source: ABdhPJy3hPOH9dJOsWTGepvFnIijzQYnbXIhmH/W3fsRxUGsTlPsgeZ1ybXJzE3WJhKpLU/7IMjqew== X-Received: by 2002:adf:f6c3:: with SMTP id y3mr17723834wrp.24.1613918119427; Sun, 21 Feb 2021 06:35:19 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 09/43] target/mips: Remove access_type argument from map_address() handler Date: Sun, 21 Feb 2021 15:33:58 +0100 Message-Id: <20210221143432.2468220-10-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) TLB map_address() handlers don't use the 'access_type' argument, remove it to simplify. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Message-Id: <20210128144125.3696119-2-f4bug@amsat.org> --- target/mips/internal.h | 8 ++++---- target/mips/tlb_helper.c | 15 +++++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index 5dd17ff7333..d09afded5ea 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -111,7 +111,7 @@ struct CPUMIPSTLBContext { uint32_t nb_tlb; uint32_t tlb_in_use; int (*map_address)(struct CPUMIPSState *env, hwaddr *physical, int *pr= ot, - target_ulong address, int rw, int access_type); + target_ulong address, int rw); void (*helper_tlbwi)(struct CPUMIPSState *env); void (*helper_tlbwr)(struct CPUMIPSState *env); void (*helper_tlbp)(struct CPUMIPSState *env); @@ -126,11 +126,11 @@ struct CPUMIPSTLBContext { }; =20 int no_mmu_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw, int access_type); + target_ulong address, int rw); int fixed_mmu_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw, int access_type); + target_ulong address, int rw); int r4k_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw, int access_type); + target_ulong address, int rw); void r4k_helper_tlbwi(CPUMIPSState *env); void r4k_helper_tlbwr(CPUMIPSState *env); void r4k_helper_tlbp(CPUMIPSState *env); diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index 082c17928d3..1af2dc969d6 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -39,7 +39,7 @@ enum { =20 /* no MMU emulation */ int no_mmu_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw, int access_type) + target_ulong address, int rw) { *physical =3D address; *prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; @@ -48,7 +48,7 @@ int no_mmu_map_address(CPUMIPSState *env, hwaddr *physica= l, int *prot, =20 /* fixed mapping MMU emulation */ int fixed_mmu_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw, int access_type) + target_ulong address, int rw) { if (address <=3D (int32_t)0x7FFFFFFFUL) { if (!(env->CP0_Status & (1 << CP0St_ERL))) { @@ -68,7 +68,7 @@ int fixed_mmu_map_address(CPUMIPSState *env, hwaddr *phys= ical, int *prot, =20 /* MIPS32/MIPS64 R4000-style MMU emulation */ int r4k_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw, int access_type) + target_ulong address, int rw) { uint16_t ASID =3D env->CP0_EntryHi & env->CP0_EntryHi_ASID_mask; uint32_t MMID =3D env->CP0_MemoryMapID; @@ -234,8 +234,7 @@ static int get_seg_physical_address(CPUMIPSState *env, = hwaddr *physical, return mapped; } else if (mapped) { /* The segment is TLB mapped */ - return env->tlb->map_address(env, physical, prot, real_address, rw, - access_type); + return env->tlb->map_address(env, physical, prot, real_address, rw= ); } else { /* The segment is unmapped */ *physical =3D physical_base | (real_address & segmask); @@ -314,7 +313,7 @@ static int get_physical_address(CPUMIPSState *env, hwad= dr *physical, /* xuseg */ if (UX && address <=3D (0x3FFFFFFFFFFFFFFFULL & env->SEGMask)) { ret =3D env->tlb->map_address(env, physical, prot, - real_address, rw, access_type); + real_address, rw); } else { ret =3D TLBRET_BADADDR; } @@ -323,7 +322,7 @@ static int get_physical_address(CPUMIPSState *env, hwad= dr *physical, if ((supervisor_mode || kernel_mode) && SX && address <=3D (0x7FFFFFFFFFFFFFFFULL & env->SEGMask)) { ret =3D env->tlb->map_address(env, physical, prot, - real_address, rw, access_type); + real_address, rw); } else { ret =3D TLBRET_BADADDR; } @@ -364,7 +363,7 @@ static int get_physical_address(CPUMIPSState *env, hwad= dr *physical, if (kernel_mode && KX && address <=3D (0xFFFFFFFF7FFFFFFFULL & env->SEGMask)) { ret =3D env->tlb->map_address(env, physical, prot, - real_address, rw, access_type); + real_address, rw); } else { ret =3D TLBRET_BADADDR; } --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918126; cv=none; d=zohomail.com; s=zohoarc; b=St6swaCI0wkI6Dfrp81RzOuu/wXfHRZlXIXXRaydE518vT8bRUVhmyq6x2GGm9J5fgcgrVeMWOgcIfOuacdsgvddwuRXcFW18HDsJVrxDSGQCr6Ta6YGcDcqHxERKYMYX2aDFmQpNv48y2vqZKzkBR0Pt1AY+fn5+a++Tr6Sxlc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918126; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mLacx+SK7+r33Ueo5eRwEHfvzZ5TV5s+TzirBVeah3g=; b=SqzbhDGu2MC5Iz8Lz6Bws8/qLPrWnGjxqfmfOQk7KRQyZY+HmvH6QHvk1oJN9JwyY3VexEgw+Y7G53pabWwlvMqEZBq/fdOns0oDKFc0XBahZhH4cJiE+zSuyvLWREr72X3b5UFsZ+jOD2rpxAnvGaapyi10aHAkPfkPk8Jj1yY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 161391812595771.27589443585782; Sun, 21 Feb 2021 06:35:25 -0800 (PST) Received: by mail-wm1-f43.google.com with SMTP id o82so11218957wme.1 for ; Sun, 21 Feb 2021 06:35:25 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id i7sm71893079wmq.2.2021.02.21.06.35.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:35:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mLacx+SK7+r33Ueo5eRwEHfvzZ5TV5s+TzirBVeah3g=; b=I3w6xQ6fuO8wapi1xn7mQon7PT0aGcEBLfng9EwF0voCP71mO3SF6r6h0zb+iuM37v PhkYp+0ZO0EXLq94mIg+kR1UJofoclEdbDoIb9A5GX+P5kZoAnDsjk2sCpJ1xeaFUzxD 7WmAjmwZiCksyQYSg0PNaPxuYQo2PGdcGCX+i0bFgA34eHq/eFEFIZjyKuWvoPswyUBt UHyYY3CQM7nvhvfgwBOpF3r1Sod7Vlha8TT97/UfbpAYoaNN1YLweLN8X3woPZ2k1Fwc /okkHAkJUfEcX4TKiIYPgkl5NXD53BQNS/V/F6NOcG+x83Nxm13dphXg8LZd8ZbqoswI tgTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mLacx+SK7+r33Ueo5eRwEHfvzZ5TV5s+TzirBVeah3g=; b=acjWRpgDn9o2kKE4Hh3uK5DjhSGb22q6lck+YWEyI1IJGw2PQA5CoZDagzO8VUqiOq Y7j3K709B3sKAT0YdrLEs4aKgx4Y77iIllLybU2H4NfXWEW2tdzeSRTSlTl2802qV7Zr Sepnnvr79306VDpPyPKqVlX9O6uqnMHra1RHCFuiP4081adsAlMb8ianiKB5yPn9ne8R nnZntFAXxn9oxwfXhj0lwvTR/A8zeJUw7L+5Q3WoV9WQ+pfCmlpgnairxLJdi7ev/XQG wJWK6Wn1h7iyjhJCUYe68I4EOnwC70NuWwOsyvmj5nku9+89hG4ypPIYwwMa6j9f5HUC oKhQ== X-Gm-Message-State: AOAM533oMjEyy4rmywj1EPE7QCmJBO3HgAaEbkE7OZ+WmBFCu2hGke+T 5L9N8yaAVNON8a6/OjUTnwQ= X-Google-Smtp-Source: ABdhPJz4Mo2dwogZ9FSgQ2qyZ99OW3pOczeN7XC7R+CgnVi1ZmfV8TsTUvbPCV/j+SCZ0NP68QYiVw== X-Received: by 2002:a1c:25c2:: with SMTP id l185mr16140812wml.62.1613918124274; Sun, 21 Feb 2021 06:35:24 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 10/43] target/mips: Remove access_type argument from get_seg_physical_address Date: Sun, 21 Feb 2021 15:33:59 +0100 Message-Id: <20210221143432.2468220-11-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) get_seg_physical_address() doesn't use the 'access_type' argument, remove it to simplify. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Message-Id: <20210128144125.3696119-3-f4bug@amsat.org> --- target/mips/tlb_helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index 1af2dc969d6..9906292440c 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -222,7 +222,7 @@ static int is_seg_am_mapped(unsigned int am, bool eu, i= nt mmu_idx) =20 static int get_seg_physical_address(CPUMIPSState *env, hwaddr *physical, int *prot, target_ulong real_address, - int rw, int access_type, int mmu_idx, + int rw, int mmu_idx, unsigned int am, bool eu, target_ulong segmask, hwaddr physical_base) @@ -253,7 +253,7 @@ static int get_segctl_physical_address(CPUMIPSState *en= v, hwaddr *physical, hwaddr pa =3D ((hwaddr)segctl & CP0SC_PA_MASK) << 20; =20 return get_seg_physical_address(env, physical, prot, real_address, rw, - access_type, mmu_idx, am, eu, segmask, + mmu_idx, am, eu, segmask, pa & ~(hwaddr)segmask); } =20 @@ -349,7 +349,7 @@ static int get_physical_address(CPUMIPSState *env, hwad= dr *physical, /* Does CP0_Status.KX/SX/UX permit the access mode (am) */ if (env->CP0_Status & am_ksux[am]) { ret =3D get_seg_physical_address(env, physical, prot, - real_address, rw, access_ty= pe, + real_address, rw, mmu_idx, am, false, env->PA= Mask, 0); } else { --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918131; cv=none; d=zohomail.com; s=zohoarc; b=fGrTCk6wj1v5yO1MLETy5jdyPMBBNQnP4aPKtbfHhFVXkKVbNHYOp0Yv5Jlq4OXxuDHFOvjVnNtqzHrWVeCGkAM9RSiBINX8W0qBFUQCutCbGj+ryQTz4KkDuQ0W6PX07qEtaJmdsYYo9f8CjP5t/RcNwQVENdCRph2a1OvzZkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918131; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PQxDBZO7sFXhWDGEGkug3RCjC8QMl+zjRYDt8T67Y9E=; b=ephXfdVpWtPi2CBq1kxIYoDqMYhJGTcuTo61kvwL0+hZlcpNwQonHsfBKJt/1nfhhvBmJ1/sqcVBVS17nDPLr/Y/a4BlqatJjPvPU6YyxWPL/YmgTIm1hBBcuXLiBXZ52cXqbDkXn9BFKCiPI2wpYs7oP/q7yTmmZhNbog859pA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1613918131070975.4750708797108; Sun, 21 Feb 2021 06:35:31 -0800 (PST) Received: by mail-wr1-f43.google.com with SMTP id n4so16374674wrx.1 for ; Sun, 21 Feb 2021 06:35:30 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id v10sm19179559wrq.22.2021.02.21.06.35.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:35:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PQxDBZO7sFXhWDGEGkug3RCjC8QMl+zjRYDt8T67Y9E=; b=gAvmYfI8awH4B02RRSR0SsXo58Kz77aeS/NbXj9BSbFTt3+8AQsS2P8MP+jYUou8eB LqLE1731G+QvU2+EmZdlz4Umbfmo1vkbMy6lHsSlR9nbYpjAnOtgwFA8MR98CZpwtxmu J5Es6R3wLTLVtPwDVlQ4QwhhLFkzkbEdu3rG5WQ8sbSVoSWZpH3MBTeC7Hxrn5gJ64M2 AErjkWlUKc45KtbEKLlwLbinaGfa8INZ9H01+cTGuHMws1guAYLBzB2By8Q6s7q5qckq x3Eh3XNWykuGokyZ0FBE77yAmriABlqSD+ekIPNJo8iu3uDZdbMYYoHDcmUyZeD185+I iEuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PQxDBZO7sFXhWDGEGkug3RCjC8QMl+zjRYDt8T67Y9E=; b=V0zXoiutdWsutNyGM65J2z8my+SrZY5hzV+smmolp2X1um6mbaToGuwyBfEqgD/BQy TxN/pyZreHRGi2aZNkoB9FeOuBuLyyYsxN9pA96ecW6yF1QyqHapVFXkQcwYWfvEIDhR yQlWE+LJ3HAePWiAmPENC/XzIlFhFzxcgS5HvbJLNSmVeKx2uv+uLMm35qvZ5jKDc1iv YUb5i2SI+yCYgQ9BRaHwSs3/Qo7f2p5Qe6q3D/aa7Z4S9AUm9eha1OFbMtSX6N8YnYjR xzQ5IPyoQtc4fxEJ5Tl43p0FqRacwkagOuAPTMbDWQDtOEKO5NEe1nz3oAC1uteTZcCZ h+Dg== X-Gm-Message-State: AOAM530gomotLsH1us5qecOUdVVfhwfb0u1BPiN7wILOD4mm+uxKi4vZ sFZod69KbHYLPWZfdB5jYEg= X-Google-Smtp-Source: ABdhPJxfPIk+bnQPMdiYgV01q6uTtkB8gpU/Aq9m9BsBPKuVEZHWZeKDC/97vKP1dA+848l1NaPIBw== X-Received: by 2002:a05:6000:1542:: with SMTP id 2mr17839526wry.356.1613918129347; Sun, 21 Feb 2021 06:35:29 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 11/43] target/mips: Remove access_type arg from get_segctl_physical_address() Date: Sun, 21 Feb 2021 15:34:00 +0100 Message-Id: <20210221143432.2468220-12-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) get_segctl_physical_address() doesn't use the 'access_type' argument, remove it to simplify. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Message-Id: <20210128144125.3696119-4-f4bug@amsat.org> --- target/mips/tlb_helper.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index 9906292440c..d89ad87cb9d 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -245,7 +245,7 @@ static int get_seg_physical_address(CPUMIPSState *env, = hwaddr *physical, =20 static int get_segctl_physical_address(CPUMIPSState *env, hwaddr *physical, int *prot, target_ulong real_addres= s, - int rw, int access_type, int mmu_id= x, + int rw, int mmu_idx, uint16_t segctl, target_ulong segma= sk) { unsigned int am =3D (segctl & CP0SC_AM_MASK) >> CP0SC_AM; @@ -306,7 +306,7 @@ static int get_physical_address(CPUMIPSState *env, hwad= dr *physical, segctl =3D env->CP0_SegCtl2 >> 16; } ret =3D get_segctl_physical_address(env, physical, prot, - real_address, rw, access_type, + real_address, rw, mmu_idx, segctl, 0x3FFFFFFF); #if defined(TARGET_MIPS64) } else if (address < 0x4000000000000000ULL) { @@ -370,26 +370,26 @@ static int get_physical_address(CPUMIPSState *env, hw= addr *physical, #endif } else if (address < KSEG1_BASE) { /* kseg0 */ - ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, rw, - access_type, mmu_idx, + ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, + rw, mmu_idx, env->CP0_SegCtl1 >> 16, 0x1FFFFF= FF); } else if (address < KSEG2_BASE) { /* kseg1 */ - ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, rw, - access_type, mmu_idx, + ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, + rw, mmu_idx, env->CP0_SegCtl1, 0x1FFFFFFF); } else if (address < KSEG3_BASE) { /* sseg (kseg2) */ - ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, rw, - access_type, mmu_idx, + ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, + rw, mmu_idx, env->CP0_SegCtl0 >> 16, 0x1FFFFF= FF); } else { /* * kseg3 * XXX: debug segment is not emulated */ - ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, rw, - access_type, mmu_idx, + ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, + rw, mmu_idx, env->CP0_SegCtl0, 0x1FFFFFFF); } return ret; --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 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=1613918136; cv=none; d=zohomail.com; s=zohoarc; b=GqMnlEFxXNrIWJyOgpwuSX0sTDlNsf0ujHf3/5D1E3PIr1/jvXBBDfto2r8NiRS2p35bCHsjF17kQ3Ji6zu+nuj9jOkGgITuPJEPbMwWoBpUWqtSIK/r7DtbMaLgaJNGj0YPUA3qFeIpUIpjPDk/Hln1J43HghsDJjGAHdY1cSU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918136; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Kvgdf6CrEywh2p1Z7lUVw89ToUYIfaIA15k0msXPWKQ=; b=Y1oF9lkWZK98WApjveieMYnrb4VrtBUWdsyVxeOX2w4Qy4pchZlnePJx1kIlVr0jR7yEsnY8aWcEZNGZjo0Yw9AZAJNFDtMkaj+9kVALVdQorY7/PsMtbtadlYBXu542OrLz7M0tfvfKZJ0cShU89JVoJnNjC8LzsR3PZskT3eo= 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 1613918136001518.5982417644418; Sun, 21 Feb 2021 06:35:36 -0800 (PST) Received: by mail-wm1-f54.google.com with SMTP id m1so12068473wml.2 for ; Sun, 21 Feb 2021 06:35:35 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id j17sm21874256wmc.28.2021.02.21.06.35.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:35:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Kvgdf6CrEywh2p1Z7lUVw89ToUYIfaIA15k0msXPWKQ=; b=JHC1Bndyw69cHqot8243bASvuNju7MoSv6/TNf5JFEVwXnD5XaF8pZXpy/fYVESeXT 1qXIGnmbBCDzZAJZMBCCUHip61/332MUn7cRTzaI/n00Qb3rSQJyJLD/qKNvIAKUdZal uNyJtJ65brswp6tDBIbstfSZbjvKkNLrx0Wd0WkrPVDKiZMq4arwv5FWCf0DWrEYnxRh H6TDcQtH+U8blBqb6Ie5sY3iij3bwg838+iNIeW2cayGQujRi0rwhQkym+baxnop+keb nu3S5pBKy00Tp+XehX2tZquB3XAxE2El4YV+Se4+TVrttDHmJUV+NrnMWus6Po4tlpHl 6j6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Kvgdf6CrEywh2p1Z7lUVw89ToUYIfaIA15k0msXPWKQ=; b=TEi2ArpVplaQB1vWkyQ/Db/FBd8veArZ2e5B3X60gPEx2RZRdKPKC37PrM9n7cVYVJ MagXfJszc2633wEVK7H+h6KgVxcTINElo34T5jDjvSlK7P21sKMPxX4T2N1PA+3DlBGY B03dA4zvzukNuto+ucy4tOJg/72cueD5L3oDBD+Hnma6+7wWyFl1FD2WRcrZn3X+BxTv J7uogl+pqUKfH2RDYZGN/nE3lDmICL1hygQljVe+erHSpTnlqIO/axL9akCg8V5QayP1 NaAQCPbecgZs/hhnE3M004ZDWwkLOx644ToLeamSaP9WyfAZY0+d3Tf1Lur0IRwdzToX Yh8w== X-Gm-Message-State: AOAM533nQ/LE7FRD6NEAP6PEfBudvzuZ679rET7UysI0zCbAk1hv7eHe 29AxjZmDNs46Z1yMLRAe3tI= X-Google-Smtp-Source: ABdhPJx5GCwILYx/0Fs9vJRxtSvGWNRuYNUHCVJxkGiRl+k8zi51ZaXFVsI1jrxl+xWz6s0ZoFM2YA== X-Received: by 2002:a1c:28c1:: with SMTP id o184mr15886861wmo.183.1613918134319; Sun, 21 Feb 2021 06:35:34 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 12/43] target/mips: Remove access_type argument from get_physical_address() Date: Sun, 21 Feb 2021 15:34:01 +0100 Message-Id: <20210221143432.2468220-13-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) get_physical_address() doesn't use the 'access_type' argument, remove it to simplify. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Message-Id: <20210128144125.3696119-5-f4bug@amsat.org> --- target/mips/tlb_helper.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index d89ad87cb9d..c9535b7f72f 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -259,7 +259,7 @@ static int get_segctl_physical_address(CPUMIPSState *en= v, hwaddr *physical, =20 static int get_physical_address(CPUMIPSState *env, hwaddr *physical, int *prot, target_ulong real_address, - int rw, int access_type, int mmu_idx) + int rw, int mmu_idx) { /* User mode can only access useg/xuseg */ #if defined(TARGET_MIPS64) @@ -492,7 +492,7 @@ hwaddr mips_cpu_get_phys_page_debug(CPUState *cs, vaddr= addr) hwaddr phys_addr; int prot; =20 - if (get_physical_address(env, &phys_addr, &prot, addr, 0, ACCESS_INT, + if (get_physical_address(env, &phys_addr, &prot, addr, 0, cpu_mmu_index(env, false)) !=3D 0) { return -1; } @@ -570,7 +570,7 @@ static int walk_directory(CPUMIPSState *env, uint64_t *= vaddr, uint64_t w =3D 0; =20 if (get_physical_address(env, &paddr, &prot, *vaddr, MMU_DATA_LOAD, - ACCESS_INT, cpu_mmu_index(env, false)) !=3D + cpu_mmu_index(env, false)) !=3D TLBRET_MATCH) { /* wrong base address */ return 0; @@ -598,7 +598,7 @@ static int walk_directory(CPUMIPSState *env, uint64_t *= vaddr, *pw_entrylo0 =3D entry; } if (get_physical_address(env, &paddr, &prot, vaddr2, MMU_DATA_= LOAD, - ACCESS_INT, cpu_mmu_index(env, false)= ) !=3D + cpu_mmu_index(env, false)) !=3D TLBRET_MATCH) { return 0; } @@ -752,7 +752,7 @@ static bool page_table_walk_refill(CPUMIPSState *env, v= addr address, int rw, /* Leaf Level Page Table - First half of PTE pair */ vaddr |=3D ptoffset0; if (get_physical_address(env, &paddr, &prot, vaddr, MMU_DATA_LOAD, - ACCESS_INT, cpu_mmu_index(env, false)) !=3D + cpu_mmu_index(env, false)) !=3D TLBRET_MATCH) { return false; } @@ -765,7 +765,7 @@ static bool page_table_walk_refill(CPUMIPSState *env, v= addr address, int rw, /* Leaf Level Page Table - Second half of PTE pair */ vaddr |=3D ptoffset1; if (get_physical_address(env, &paddr, &prot, vaddr, MMU_DATA_LOAD, - ACCESS_INT, cpu_mmu_index(env, false)) !=3D + cpu_mmu_index(env, false)) !=3D TLBRET_MATCH) { return false; } @@ -843,16 +843,14 @@ bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, i= nt size, #if !defined(CONFIG_USER_ONLY) hwaddr physical; int prot; - int mips_access_type; #endif int ret =3D TLBRET_BADADDR; =20 /* data access */ #if !defined(CONFIG_USER_ONLY) /* XXX: put correct access by using cpu_restore_state() correctly */ - mips_access_type =3D ACCESS_INT; ret =3D get_physical_address(env, &physical, &prot, address, - access_type, mips_access_type, mmu_idx); + access_type, mmu_idx); switch (ret) { case TLBRET_MATCH: qemu_log_mask(CPU_LOG_MMU, @@ -884,7 +882,7 @@ bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int= size, env->hflags |=3D mode; if (ret_walker) { ret =3D get_physical_address(env, &physical, &prot, address, - access_type, mips_access_type, mmu_= idx); + access_type, mmu_idx); if (ret =3D=3D TLBRET_MATCH) { tlb_set_page(cs, address & TARGET_PAGE_MASK, physical & TARGET_PAGE_MASK, prot, @@ -909,12 +907,10 @@ hwaddr cpu_mips_translate_address(CPUMIPSState *env, = target_ulong address, { hwaddr physical; int prot; - int access_type; int ret =3D 0; =20 /* data access */ - access_type =3D ACCESS_INT; - ret =3D get_physical_address(env, &physical, &prot, address, rw, acces= s_type, + ret =3D get_physical_address(env, &physical, &prot, address, rw, cpu_mmu_index(env, false)); if (ret !=3D TLBRET_MATCH) { raise_mmu_exception(env, address, rw, ret); --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918141; cv=none; d=zohomail.com; s=zohoarc; b=SUL67l0sTDoJtFkivVm81F9fxjrHYi5tO7wUfdMwK2aZh7mT2wqWypqCcSAuf6swMg3ftXVoBw3hXjkqI7fRJAg9rvPXnGlhIqM/PllcI01ALSJGpOSexio80fNPnfRGIqk9P7jr1Ry/drrh2SaR5Awnm/xtLdfTUNc6pTQXC4o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918141; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I7FzUWgPpmSJZkPTExnEQPI5szq/O1dFay0LjvrSkVU=; b=k+E4MOwJ7VXaIBP+Qirf/C88ROphJ+8YGZB38y42b+hvUhXUArRzLDyi2P7aDSLkXJnasQBqnJhq9CLDeUzdkPT/U4xaUIZSVDHspPsPcgUBXupnui2ywUyM8KRU3dFDlFer4GiQ1Q908q8MWKGfDC1Q4bgN8hUBjClBYSA7Ack= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1613918140773649.5304432204648; Sun, 21 Feb 2021 06:35:40 -0800 (PST) Received: by mail-wr1-f43.google.com with SMTP id h98so11532385wrh.11 for ; Sun, 21 Feb 2021 06:35:40 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id l7sm25547127wrn.11.2021.02.21.06.35.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:35:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I7FzUWgPpmSJZkPTExnEQPI5szq/O1dFay0LjvrSkVU=; b=TyTM35sLXK7H5jAQKkF/oCNmWOsxKzEqrtX27C3DQId3bXtHe9FLIxkZDdNWpVNazd lRquG3izleNP7A7e3wzitOa1AR7GCyf2ojaf5fzx3HSRUXaEJkGbb6bIUSiSsUEW5Euq jWH17i/1RdmAjhAb+OD35yAFnCpfLJNFG6LWkawIeJxTYWJ34ZkHGTidXi3tZKmzePcv VBgzAlkg3V6Pqg9+R7xnqsl1FATTSr2QsoH0r7sGuPknlHv7yDRgRFVxXcJJUXCLyAbu 5vyU9CQRWyutM7FlsK6uNn657gDO4/boI37rA8Qga1LKCwgcHS5LeAWa29ml+Ypv1Z6V VGpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=I7FzUWgPpmSJZkPTExnEQPI5szq/O1dFay0LjvrSkVU=; b=oouchii+avKcwg0o726hkisZAqNquCHlanJ8KBAHeXvXlFgtEvLBjmxalnmyzU04Wg EVtX7YxOQOFpRmf53UA4E2fD45YBW8gMBLV0p50VBbwUAZLf0RphSRqY9kKpWiQj8H+6 AJxLvQa4KJEDezMM495Ys0/ekbaUuH55IcqHWTOwkyituWD5BT5flIposgQE7yCJ5l1q D8jdIsHAsIG97RipWekyARVGwP5HiV1AhFq0pgraCeqqR3TtguPt65q6l2CNEni+dINU N8KVAkZB4y28RB2Scvh/kzOvupx2Jxfp3eL+NVn7KkTSCOV3a7HbsKlPOJMwZ1HVSAKk SmRw== X-Gm-Message-State: AOAM5305IEicRxY42307Q7sKn02Vyr36rYnsYuR+HNcoO4FQzv7hXEmX Ln+C16zPutSqVlRbCNPUql4= X-Google-Smtp-Source: ABdhPJxbbfFoS0byAptYvE4PCbKlzhAhaiEU6iVpv5ggkHJUEdHA/+0AtFaP/PZ+xTCxUyglVu7XGQ== X-Received: by 2002:adf:fac7:: with SMTP id a7mr17107623wrs.206.1613918139126; Sun, 21 Feb 2021 06:35:39 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 13/43] target/mips: Remove unused MMU definitions Date: Sun, 21 Feb 2021 15:34:02 +0100 Message-Id: <20210221143432.2468220-14-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) Remove these confusing and unused definitions. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Message-Id: <20210128144125.3696119-6-f4bug@amsat.org> --- target/mips/cpu.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index b9e227a30e9..9e6028f8e63 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1220,22 +1220,6 @@ typedef MIPSCPU ArchCPU; =20 #include "exec/cpu-all.h" =20 -/* - * Memory access type : - * may be needed for precise access rights control and precise exceptions. - */ -enum { - /* 1 bit to define user level / supervisor access */ - ACCESS_USER =3D 0x00, - ACCESS_SUPER =3D 0x01, - /* 1 bit to indicate direction */ - ACCESS_STORE =3D 0x02, - /* Type of instruction that generated the access */ - ACCESS_CODE =3D 0x10, /* Code fetch access */ - ACCESS_INT =3D 0x20, /* Integer load/store access */ - ACCESS_FLOAT =3D 0x30, /* floating point load/store access */ -}; - /* Exceptions */ enum { EXCP_NONE =3D -1, --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918146; cv=none; d=zohomail.com; s=zohoarc; b=kLwJNDEjQOiTlqNxAzJyNwvzOokH9njmy/w4J0V3PZL8d26M+WSkNSNutdlvYssQAL3CP0KU3d/axD0XHUqHDBcW8wS+1N3jGWFZv/yy5GHvh30ZSxo7XyVFEgXKm0CCpBFxDnE6j8raQQYJo5zIkV0hQuB+QbXRfFcggoxdZbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918146; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rkRbXmPS0Gpk9tVt7dCY7HZiKmDYtTUDDEqCizKmF24=; b=FjScVa3bHIr0bU97TwyPDhsXwf33VGgOtPCDwYL3TZOkKSUbAw0taSVhoz/5sLGtoLqWuuw3zSC8PGqyqPFeYp5ZbLa4DhUvkNTBKa0jOc644/U1dIr+mRegVVyK9TqR46VLHuWzIZURUzWdQ0mc1tIRsmCjr4w1kG3aZRkv7MQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1613918145754604.6238845184884; Sun, 21 Feb 2021 06:35:45 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id v15so16349370wrx.4 for ; Sun, 21 Feb 2021 06:35:45 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id g1sm24772365wrq.30.2021.02.21.06.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:35:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rkRbXmPS0Gpk9tVt7dCY7HZiKmDYtTUDDEqCizKmF24=; b=a7bzSKi10IC4hzs4086tFw6cCQf6pSHz07l7F/BJQ/221IK8uAYQB0mEeIghUxb0yE KlXl4F2QPzqvbx9QjG62wA9tlezIaTjWfNI+cfLut0a0hgAG9cGH2olMJhJFIoQJOueX wvrPrzdHWVlg1FzBEhKFBhAYJZ/C4jgq9CV0GkwSx6Tvb5BJyyLNK/1YD6z9dQsjr4DO g8kpTO170VJzElIJYij3nwrFvsj2wIS/RrDT+yIv52fiNEmR9jnl3st9MukCcWXFARad IMjV83I25AG475zorzA74GDa7QaguZvvWpnq1bWId14eDNIke5eH8/zhcdUyji+7qYKX GyPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rkRbXmPS0Gpk9tVt7dCY7HZiKmDYtTUDDEqCizKmF24=; b=Wy/jsMCLm5oobshiqJiKQue1lrT9ja0VOOxyjbfS71UdWeR9t1gPaCVCOjlNdgNO7A kLq6yb0x0Iz7+DWrL4CDZxvTr+/gVDg5gWigpf/X8CwzTqmFRyy+i0GIfWBimlpyrzFI GQvtrwDAF33Vir65+p2vdSX07zynO9xjpqNaYFWL9lHH9lpg1bYq77HVDCBw4eObM/C/ RhBno5vNWLEP8M4aao6WQtKn4xhH/PJ4PMFIBxw55+BcQzFkde7bAf6DH12EJACu780j eccn6cFJyXGqI+ga9e3n9UYOuwNATpSMAc2UXOWh5EOuZTP1FJnP+3bYpQPdk6nN7OnC mcHg== X-Gm-Message-State: AOAM531XAjrgT3xmBM8JVTZ6FH3RMu8nGJ2D3JeEzKg4JrvpxiOtcdYN Hmzm4sTDN/E5g40AoEBekHQ= X-Google-Smtp-Source: ABdhPJz3KzKC+ragn0DGqITOboqPNO1rZwyJFV+JnI6ThU5njbP9Y5gMMsh4YzwWKT7Nq5rzLDxE3Q== X-Received: by 2002:adf:e7c4:: with SMTP id e4mr15805778wrn.167.1613918144068; Sun, 21 Feb 2021 06:35:44 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 14/43] target/mips: Replace magic value by MMU_DATA_LOAD definition Date: Sun, 21 Feb 2021 15:34:03 +0100 Message-Id: <20210221143432.2468220-15-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Message-Id: <20210128144125.3696119-7-f4bug@amsat.org> --- target/mips/op_helper.c | 2 +- target/mips/tlb_helper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c index 89c7d4556a0..9fce0194b3e 100644 --- a/target/mips/op_helper.c +++ b/target/mips/op_helper.c @@ -312,7 +312,7 @@ target_ulong helper_##name(CPUMIPSState *env, target_ul= ong arg, int mem_idx) \ } = \ do_raise_exception(env, EXCP_AdEL, GETPC()); = \ } = \ - env->CP0_LLAddr =3D do_translate_address(env, arg, 0, GETPC()); = \ + env->CP0_LLAddr =3D do_translate_address(env, arg, MMU_DATA_LOAD, GETP= C()); \ env->lladdr =3D arg; = \ env->llval =3D do_cast cpu_##insn##_mmuidx_ra(env, arg, mem_idx, GETPC= ()); \ return env->llval; = \ diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index c9535b7f72f..9216c7a91b3 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -492,7 +492,7 @@ hwaddr mips_cpu_get_phys_page_debug(CPUState *cs, vaddr= addr) hwaddr phys_addr; int prot; =20 - if (get_physical_address(env, &phys_addr, &prot, addr, 0, + if (get_physical_address(env, &phys_addr, &prot, addr, MMU_DATA_LOAD, cpu_mmu_index(env, false)) !=3D 0) { return -1; } --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918150; cv=none; d=zohomail.com; s=zohoarc; b=c0feIVC+Eac8uXITdI7x18hv5JxKf4S7g79AYVR8XIOaxCJ/NWaa1aImYV0qDZ9epf50/N36XT2wl7dYijWLhOiX5pftaMH/NTfyI0/hqj0j1UbrzykjC2EeQ2tha2nL0m60ngwvSNIg2y02Q1CH0nO1eoSpyAsfpAzBmBUzlt8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918150; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D6VYexV1cpoyJ2slRh52R88zZ65uYGwbs5LIn6CZfrA=; b=CV0rHnGCWlonhlUNZeDsARI3e2EhUiYv3pC5HPO1QmCxF33ApbHp9uVCigIGd5k3Pud1kWCEm5ALEGvlUWO2lr1ekh59Z3wOkfBBPs5+Zs0HoDreDI8h1kPS0mvNa1VBYQdVTdCwgs8Mvx4xgcWQFfv6lm2vAEAxNLeUZP2OFnw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1613918150558708.5531614333348; Sun, 21 Feb 2021 06:35:50 -0800 (PST) Received: by mail-wr1-f50.google.com with SMTP id h98so11532684wrh.11 for ; Sun, 21 Feb 2021 06:35:50 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id z13sm2276073wrh.65.2021.02.21.06.35.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:35:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D6VYexV1cpoyJ2slRh52R88zZ65uYGwbs5LIn6CZfrA=; b=Kwc3YhJ2HVeRK47bimLkMJdPy5Al26U2B4fn2XwD2+siH1013miOzfuclWO8ZWPmda YvNEZ3H3gwGXzJVk7A8zM/jINq+gCQ32tcyOHkL/hHub3Fb4oPm6iNU8Z8wZTuamwZgy FuHlTsUr4Gu+y3rp0Ao0q4qQt7JBfkmgtxOn6iQXVXJZNj9fx0CERvwkmmaGR7lnl17H oS8YjmMYLK622i5MoEXlcCGI6w3u6+lJ00YQoiQAceKqpYeD1oRUjNhVTw9zhL1bRlLu XPfuyuvzRsXtj1tYHrqmyY/MLX84MbWF69ktWsNK44uo6ldEsg2751xlEfTTJN4Eg3YE 0xXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=D6VYexV1cpoyJ2slRh52R88zZ65uYGwbs5LIn6CZfrA=; b=G32wSPM7eWtgFG5ehmSQ+9HmitGDRvtkCMJe+nzSmq2VQeWZhYZYY2qn1xsFXTlLau FHYWVKAnmOpKPBCcVMty2eNtF2r3T5oqLGd9YLmghDdxgIwBrKwrN303Yui1bs7fSlQE lAGp5+ZkBuMC01olsWlvKEutG+N30MVk04qPgzbvBGStD7/7QFFbLkpGQLPCtD7YCCCE 03pRSr+iE1fAOPkFm37iewBmZXjR28mYI6E9IpfkK+Wg7P4Las/NdS+6mL+ljrJgKgwS iX6R+LyOEZ2uEO3J9WEIOPiBaZMfnoNhm+2V0xAeb+uUFdmUqS+VcoZmLBWsL3a+bRPB MRPA== X-Gm-Message-State: AOAM530TSmPUj3HlN0Ri+4lafNSb4mTX1VT5gBaWgN2dd5GPBasKX15X 8sWH7f6JSFu2Yyo4ZC2kgBs= X-Google-Smtp-Source: ABdhPJy42raJalYXebbYQkkHS1WUscl2cCV7GhsKnBJILSGWF3l4V3XaPcN0KLBG9iyt1eSqyMV5hw== X-Received: by 2002:adf:ef86:: with SMTP id d6mr17695840wro.419.1613918148911; Sun, 21 Feb 2021 06:35:48 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 15/43] target/mips: Let do_translate_address() take MMUAccessType argument Date: Sun, 21 Feb 2021 15:34:04 +0100 Message-Id: <20210221143432.2468220-16-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) The single caller, HELPER_LD_ATOMIC(), passes MMUAccessType to do_translate_address(). Let the prototype use it as argument, as it is stricter than an integer. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Message-Id: <20210128144125.3696119-9-f4bug@amsat.org> --- target/mips/op_helper.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c index 9fce0194b3e..b80e8f75401 100644 --- a/target/mips/op_helper.c +++ b/target/mips/op_helper.c @@ -288,13 +288,14 @@ target_ulong helper_rotx(target_ulong rs, uint32_t sh= ift, uint32_t shiftx, #ifndef CONFIG_USER_ONLY =20 static inline hwaddr do_translate_address(CPUMIPSState *env, - target_ulong address, - int rw, uintptr_t re= taddr) + target_ulong address, + MMUAccessType access_type, + uintptr_t retaddr) { hwaddr paddr; CPUState *cs =3D env_cpu(env); =20 - paddr =3D cpu_mips_translate_address(env, address, rw); + paddr =3D cpu_mips_translate_address(env, address, access_type); =20 if (paddr =3D=3D -1LL) { cpu_loop_exit_restore(cs, retaddr); --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 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; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1613918156; cv=none; d=zohomail.com; s=zohoarc; b=Le+pDvcaBvtcEZQ1PtrNBMU35lam87d7tiZ9mI7bbXUQokmUVViDJW+pB4XZR4f/PCL2h0VWRR/HiePZqiDBc3zhuqlyplAjs+ERr9OdYrzcJV5t9H5rr8ibCmVWkBj97dymp71d+FtKtdQZfB0B9dC0XsWcdGX0EDoqswPFMTk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918156; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tPkF9LN3MCz1YIoG8cZ34rc1Sah2fHk5nIfuBciZdSU=; b=khx2FkGDQYRBmfaZ2o0j5fpDrgQKuWBLIbVa1xT6hD1eCZRDLjZ8f2zUyPzylFdLOSAVhjL5G/FmJR5PtyluGHemByYvPbdFMmnXLw2sNuARp/kBBbFGQGA8AszZygkwSVGmFp4HJiRqUouPv+QGYz5uIcxCpS24M7GrcZs/vf8= 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; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.zohomail.com with SMTPS id 1613918156570543.9479428719136; Sun, 21 Feb 2021 06:35:56 -0800 (PST) Received: by mail-wm1-f54.google.com with SMTP id w4so11177565wmi.4 for ; Sun, 21 Feb 2021 06:35:54 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id e1sm24940417wrd.44.2021.02.21.06.35.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:35:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tPkF9LN3MCz1YIoG8cZ34rc1Sah2fHk5nIfuBciZdSU=; b=kVTHHJUBDVtUidxrAzcFp44lszCy/6gk5SYk8NCc1O3Zzc9+sXluPSniI7PXtWt4Xj h/UW7IVz5a97Es8sMRZF7C+Diw5gVdPqdWrDRCbx0PvdqhGdJ1jB4BbgVG1a7oJhVZYq MxWFslp7TrHSNbsuPXLmzmQdXXvoLeeAmsIEZBg3aSvhAaq3EUXi1Bf3RxX9VqXTBxA4 dqSdpd/YEaqKw2ymXVh8xn+qLcQesjZxJ5g4ContxRcu0J5XHAVtcNXgOajN5aj0cikV IHirvX/2UJn80DR5xc5VcycSAwm5cneplNPoSMVO8u9+U/jRANCHckpIL0wonup5IZD1 y0Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tPkF9LN3MCz1YIoG8cZ34rc1Sah2fHk5nIfuBciZdSU=; b=RoDb6IvfHkUddGR85zjrKjbKL82I8mvy5OyBSDidL5jtwTMqdkzIyLflYY5+OVyAEn YFmB/wnr6/p/kjCFb4niGDg4Uvb2GReJhmTq51KyychcnXsu/0Rrqp6z9h7yYbzhtba1 yhCf4fpKUsWbaNsjTrg1uUE6VMPfqwnijHPi85Qvw/C+JxAlW6j0isUB4vsi6uo6gZe2 dUfWj7bqZGKhbTFaRmRvqbl6akUuTFWQwwHX/39CrFdXyTmP8Su6CebsN9Oxk7jyzw/q 82HPrdbBZcFiFnnP9LIrwghYg8Au0LjRiql00aiCp+VGzE1QhdNXO7Di22khZJF79HrW hJGA== X-Gm-Message-State: AOAM531J3gL/82BfU1NCBvxGJgHXZExCCSSOJjegene/8SZLNXWuBnDs W8UztVf/BhYVNOtZ6TtIYbc= X-Google-Smtp-Source: ABdhPJyt/T8eun1LPzCiVwQWBPEyYVHYU4Mbj4FjnITCS3wOrckY2GLOcDmmI8jQq/lqamawd4PptA== X-Received: by 2002:a1c:5419:: with SMTP id i25mr16878734wmb.166.1613918153815; Sun, 21 Feb 2021 06:35:53 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 16/43] target/mips: Let cpu_mips_translate_address() take MMUAccessType arg Date: Sun, 21 Feb 2021 15:34:05 +0100 Message-Id: <20210221143432.2468220-17-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) The single caller, do_translate_address(), passes MMUAccessType to cpu_mips_translate_address(). Let the prototype use it as argument, as it is stricter than an integer. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Message-Id: <20210128144125.3696119-10-f4bug@amsat.org> --- target/mips/internal.h | 2 +- target/mips/tlb_helper.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index d09afded5ea..34915c275c4 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -146,7 +146,7 @@ void mips_cpu_do_transaction_failed(CPUState *cs, hwadd= r physaddr, int mmu_idx, MemTxAttrs attrs, MemTxResult response, uintptr_t retadd= r); hwaddr cpu_mips_translate_address(CPUMIPSState *env, target_ulong address, - int rw); + MMUAccessType access_type); #endif =20 #define cpu_signal_handler cpu_mips_signal_handler diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index 9216c7a91b3..9bb635885dd 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -903,17 +903,17 @@ bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, i= nt size, =20 #ifndef CONFIG_USER_ONLY hwaddr cpu_mips_translate_address(CPUMIPSState *env, target_ulong address, - int rw) + MMUAccessType access_type) { hwaddr physical; int prot; int ret =3D 0; =20 /* data access */ - ret =3D get_physical_address(env, &physical, &prot, address, rw, + ret =3D get_physical_address(env, &physical, &prot, address, access_ty= pe, cpu_mmu_index(env, false)); if (ret !=3D TLBRET_MATCH) { - raise_mmu_exception(env, address, rw, ret); + raise_mmu_exception(env, address, access_type, ret); return -1LL; } else { return physical; --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 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=1613918160; cv=none; d=zohomail.com; s=zohoarc; b=E4uQIT/+y2p9Ys9zIVVyfw+sk04k/KKtbl9wu5o7G5Jzkgs8qvjxQGZ4lD6/+2GG6XGlGTCVzp9vJdDbEq/59+Q9NLuVkhCFvM7GD/MNnZkIUkhdKQdKn6KZUrzVo7b1bjBq+qbzvZuNQf6L37b+3A0WJXUIaoHSgWpMNOQ+Wzk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918160; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=A0/ujJTeBMNKa2bOzyTsl8jur83d23ulbZmLvhVWOXE=; b=ZNTd4biCpPxjZIoKQJs892OH7HXHBIYxhfu+/xtJnzBvlWL+KrqPLfVs4F+2odiU0G+l+NP4KhBJUF0y9BPtzFTtz08b4kNCrzVmu4pjYmV5EICmpjMNZ1e3jQ1FZBDnzBMmycPqRDiu9x0orSexMkNPXaXrcDA4YJB9GVrpn64= 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 1613918160468133.2597490886685; Sun, 21 Feb 2021 06:36:00 -0800 (PST) Received: by mail-wm1-f45.google.com with SMTP id a132so11244819wmc.0 for ; Sun, 21 Feb 2021 06:35:59 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id h13sm24926189wrv.20.2021.02.21.06.35.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:35:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A0/ujJTeBMNKa2bOzyTsl8jur83d23ulbZmLvhVWOXE=; b=duvzXNJ48QDW9hlzkMFxS+nwJtQYqaQY3K57JeT6iaIqQWIrxgxUkqvBefo6VPGYyh bGleEsPHvtDUMfhfeu8NXuT2HAtpeeTRMHSgeAJcx+s0KYwEfTnBNxyUa/o0Ssg0i1dW 8lrVHTc1A+c0mxnckabgfhM8FySH9tTFS9IUzuTTjqpfoVdY29Ww5xBjRlWRI7gxEQJ3 3/Qt4TTpTwQLMBEg1lhUHTGmw0X1dElbSSbxaxoG+NBp8qIg6KFWCijBwscNnM8pKOja EdSzk+RbFzzbxO/ExHplolq1s6kryzH9yXgs99YG4b/DnJ4DF1ls1hqPIGUPEQHAoVna OVdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=A0/ujJTeBMNKa2bOzyTsl8jur83d23ulbZmLvhVWOXE=; b=Jbj8UKXUAfnJQF2aUwnx/ZW0eVcnM10EFSngMhC8sRymUzMYmHZlnxkuACKKX7NQ3X u5FHY8tTARAhNc/Khop8750QPEOHT5lKQquaSxnenowNamEKi4cE6jZCG1mYCIGqMfFd pGsOLh/Yl79Z0sV5dZOjwmzf2TcDi3jfx+Q4KHrIPARXZLflendyL+5cye4C7RzyPG8X VBhXemWtMGaGDRbOV8YzJYiqOmlDT3V/bkgSGLTHVEe3xAE1Mh9e/YovqMcvv9OHWx27 yhHzUlfMv3AyIiWCaxD/zjmP6N1JAFi48onGzjpUu+dR9WcbnxEcP9FJcCzBMy8OPYeY TZpw== X-Gm-Message-State: AOAM5306RdTt6/45TaadUIHwL6nXLrKZJwaynWT7uIsXvq5UFFjCfZtV f1LgNdS6ilLFtELOLaOLgLg= X-Google-Smtp-Source: ABdhPJybQ2IL8sgBHY5alJHiietVAA3el1eZDu43P2Ybe7uQk7W/N+xpze9hwEL+4SFhE1Ejnmsu8A== X-Received: by 2002:a1c:7f46:: with SMTP id a67mr16129407wmd.94.1613918158661; Sun, 21 Feb 2021 06:35:58 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 17/43] target/mips: Let raise_mmu_exception() take MMUAccessType argument Date: Sun, 21 Feb 2021 15:34:06 +0100 Message-Id: <20210221143432.2468220-18-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) Both mips_cpu_tlb_fill() and cpu_mips_translate_address() pass MMUAccessType to raise_mmu_exception(). Let the prototype use it as argument, as it is stricter than an integer. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Message-Id: <20210128144125.3696119-11-f4bug@amsat.org> --- target/mips/tlb_helper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index 9bb635885dd..0ad2d51b11c 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -405,12 +405,12 @@ void cpu_mips_tlb_flush(CPUMIPSState *env) #endif /* !CONFIG_USER_ONLY */ =20 static void raise_mmu_exception(CPUMIPSState *env, target_ulong address, - int rw, int tlb_error) + MMUAccessType access_type, int tlb_error) { CPUState *cs =3D env_cpu(env); int exception =3D 0, error_code =3D 0; =20 - if (rw =3D=3D MMU_INST_FETCH) { + if (access_type =3D=3D MMU_INST_FETCH) { error_code |=3D EXCP_INST_NOTAVAIL; } =20 @@ -419,7 +419,7 @@ static void raise_mmu_exception(CPUMIPSState *env, targ= et_ulong address, case TLBRET_BADADDR: /* Reference to kernel address from user mode or supervisor mode */ /* Reference to supervisor address from user mode */ - if (rw =3D=3D MMU_DATA_STORE) { + if (access_type =3D=3D MMU_DATA_STORE) { exception =3D EXCP_AdES; } else { exception =3D EXCP_AdEL; @@ -427,7 +427,7 @@ static void raise_mmu_exception(CPUMIPSState *env, targ= et_ulong address, break; case TLBRET_NOMATCH: /* No TLB match for a mapped address */ - if (rw =3D=3D MMU_DATA_STORE) { + if (access_type =3D=3D MMU_DATA_STORE) { exception =3D EXCP_TLBS; } else { exception =3D EXCP_TLBL; @@ -436,7 +436,7 @@ static void raise_mmu_exception(CPUMIPSState *env, targ= et_ulong address, break; case TLBRET_INVALID: /* TLB match with no valid bit */ - if (rw =3D=3D MMU_DATA_STORE) { + if (access_type =3D=3D MMU_DATA_STORE) { exception =3D EXCP_TLBS; } else { exception =3D EXCP_TLBL; --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 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=1613918165; cv=none; d=zohomail.com; s=zohoarc; b=MlsSw1JFjVzdaH2qfwvwNiZ/HAw5kGTdw8KcqETmzjB5zM9EzTyI3z/fJH9eII/na0wKxLa5jZdNJNR7dRUa7EH2moQNhACENdLFoeg1Q00A2gOncUP4clMJ5QspEjppQ2HhRgqGx09xVJJeLJmgNNXBAdkWxTv7AvtBVS2ulNo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918165; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qiY3Lxu/BW+EniHEYptriDgJF2WkErM7WKpxb8HLVBM=; b=kdTfLPIK6AIOzWvv+skBDInf5c4oyjGEPqq7qM32MJlI/1DlScO76ncC3Vh3dogBv4WAZdTXDupdcgrihMkbKUSA7pHQQpFhXXXTewsYEpOJYPiHT/0H9gOknZp0xs7pe+4GgqhIcCTgNF4AXaekSfCfzbnF6SD/KxO40TvDBlk= 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 161391816525299.19665853808021; Sun, 21 Feb 2021 06:36:05 -0800 (PST) Received: by mail-wm1-f51.google.com with SMTP id v62so12042171wmg.4 for ; Sun, 21 Feb 2021 06:36:04 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id a21sm25684358wmb.5.2021.02.21.06.36.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:36:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qiY3Lxu/BW+EniHEYptriDgJF2WkErM7WKpxb8HLVBM=; b=u/kcG6OkhUxDPYbhrrr8jPC3RTHtfxYoAFX1HKGBgTD9RdYWV6Gzq4/4Y+rWulk7Y0 0VraqMS9p+DoOWSiKnP1+oZZISWSdD8XCIrC7hcruWofqYMKIsmPKV1e6gBIS9+XqQAI 5iCVr0ZMzJe8KF8lc8NKc5+oZkzMCBrgBo9G7sEvjKr+8GGlmlgmTby8rhwmUucJaP7+ UFRUQnWZELLAOfr9wMpoIawkhH33X0UszoZAuNSHdM+C5Y1mlVsis9Y26DbcDhFB7+uc xhzKlDnkVsgtbwOUOv1TV/+BgH9AXPN6ZJXzc9DScRBYYUSOBSyebZFVJjSYgkTYV8+R Aogw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qiY3Lxu/BW+EniHEYptriDgJF2WkErM7WKpxb8HLVBM=; b=ZwthgdQVOSep+4+rz5YeqYQTF7k+LB+7F4HcUNxwuVGiBFf+4iwxU91XnxtowlkWJO wgitsdRBL92GHnZu9mMB2WcAX27rNoBIaYIlpArxlwyVJvnkT6RgcA82t6OTiMNKLJID JVrt5u3r+fvXwXKdDZfwQTCQGswrgbwWvABPKgawHhyUHpfXZx67+c/lIOtRvoFFZXo+ +CwzVMPAiY7DjVw/mEcgzrNAmaB9kJPgfLK64i/1DDi9ykiwL/EK3wPraKetwiriXBS1 e0O6sZ7wt/mD8JxTyX0nkOJxR9vSCflm6jVpHNsS3R0ZvZxVNi4zHZRJPemK/lptuiYo e3PA== X-Gm-Message-State: AOAM531QPquJUt5QdGxNOKgPxj2UpNTkInuQdaflbfbhMS87kgdr8fy6 hGfQbMw4JfGWVaOz9TZkeM0= X-Google-Smtp-Source: ABdhPJxCZihkeyILZWEazvn7ExUU7qadoQ52NwqlPmMgSg01AsU3yp1Pe07R3stv9nkp+y+NVBC2vQ== X-Received: by 2002:a05:600c:3551:: with SMTP id i17mr16382748wmq.92.1613918163586; Sun, 21 Feb 2021 06:36:03 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 18/43] target/mips: Let get_physical_address() take MMUAccessType argument Date: Sun, 21 Feb 2021 15:34:07 +0100 Message-Id: <20210221143432.2468220-19-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) All these functions: - mips_cpu_get_phys_page_debug() - cpu_mips_translate_address() - mips_cpu_tlb_fill() - page_table_walk_refill() - walk_directory() call get_physical_address() passing a MMUAccessType type. Let the prototype use it as argument, as it is stricter than an integer. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Message-Id: <20210128144125.3696119-12-f4bug@amsat.org> --- target/mips/tlb_helper.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index 0ad2d51b11c..f15cc48a062 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -259,7 +259,7 @@ static int get_segctl_physical_address(CPUMIPSState *en= v, hwaddr *physical, =20 static int get_physical_address(CPUMIPSState *env, hwaddr *physical, int *prot, target_ulong real_address, - int rw, int mmu_idx) + MMUAccessType access_type, int mmu_idx) { /* User mode can only access useg/xuseg */ #if defined(TARGET_MIPS64) @@ -306,14 +306,14 @@ static int get_physical_address(CPUMIPSState *env, hw= addr *physical, segctl =3D env->CP0_SegCtl2 >> 16; } ret =3D get_segctl_physical_address(env, physical, prot, - real_address, rw, + real_address, access_type, mmu_idx, segctl, 0x3FFFFFFF); #if defined(TARGET_MIPS64) } else if (address < 0x4000000000000000ULL) { /* xuseg */ if (UX && address <=3D (0x3FFFFFFFFFFFFFFFULL & env->SEGMask)) { ret =3D env->tlb->map_address(env, physical, prot, - real_address, rw); + real_address, access_type); } else { ret =3D TLBRET_BADADDR; } @@ -322,7 +322,7 @@ static int get_physical_address(CPUMIPSState *env, hwad= dr *physical, if ((supervisor_mode || kernel_mode) && SX && address <=3D (0x7FFFFFFFFFFFFFFFULL & env->SEGMask)) { ret =3D env->tlb->map_address(env, physical, prot, - real_address, rw); + real_address, access_type); } else { ret =3D TLBRET_BADADDR; } @@ -349,7 +349,7 @@ static int get_physical_address(CPUMIPSState *env, hwad= dr *physical, /* Does CP0_Status.KX/SX/UX permit the access mode (am) */ if (env->CP0_Status & am_ksux[am]) { ret =3D get_seg_physical_address(env, physical, prot, - real_address, rw, + real_address, access_type, mmu_idx, am, false, env->PA= Mask, 0); } else { @@ -363,7 +363,7 @@ static int get_physical_address(CPUMIPSState *env, hwad= dr *physical, if (kernel_mode && KX && address <=3D (0xFFFFFFFF7FFFFFFFULL & env->SEGMask)) { ret =3D env->tlb->map_address(env, physical, prot, - real_address, rw); + real_address, access_type); } else { ret =3D TLBRET_BADADDR; } @@ -371,17 +371,17 @@ static int get_physical_address(CPUMIPSState *env, hw= addr *physical, } else if (address < KSEG1_BASE) { /* kseg0 */ ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, - rw, mmu_idx, + access_type, mmu_idx, env->CP0_SegCtl1 >> 16, 0x1FFFFF= FF); } else if (address < KSEG2_BASE) { /* kseg1 */ ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, - rw, mmu_idx, + access_type, mmu_idx, env->CP0_SegCtl1, 0x1FFFFFFF); } else if (address < KSEG3_BASE) { /* sseg (kseg2) */ ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, - rw, mmu_idx, + access_type, mmu_idx, env->CP0_SegCtl0 >> 16, 0x1FFFFF= FF); } else { /* @@ -389,7 +389,7 @@ static int get_physical_address(CPUMIPSState *env, hwad= dr *physical, * XXX: debug segment is not emulated */ ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, - rw, mmu_idx, + access_type, mmu_idx, env->CP0_SegCtl0, 0x1FFFFFFF); } return ret; --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) client-ip=209.85.128.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918170; cv=none; d=zohomail.com; s=zohoarc; b=emqjF6RcFbrrcJwMk6OYwbYOt2fYeqktGTZgYL6GKZrokdPEX3rh9ixsYpuXqfsLJiuR/+7VS7XkBfxcoGx5ODJHFaOkVdZixnMGq3JJWVvLFHltDk7/PxMYv7XfKt8jNgkEzc9TgzUmTZ1EQCuUwo3udTi/u/d6HKRnKTChVks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918170; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wfNdRFst6LfLn0VNAb4bbFY7EBizJDIkL87O+WLW55E=; b=XedbX7f06DaB6/edyYBvtSGG2EVog4h7x97XYJrSjCx9tagO2jr3nW8znz8GXemk1u8UFIpQ/bMhYo3cVvni4BwrxreTZ16lfAfwKqMQJhcwyi9M8+GWgJnIORrWucq1RHB46Fk7Kgq30mmeW4ZyeVLDB3hj0E+83GfFpQEGl4c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.zohomail.com with SMTPS id 1613918170231843.8295644469687; Sun, 21 Feb 2021 06:36:10 -0800 (PST) Received: by mail-wm1-f41.google.com with SMTP id w4so11177900wmi.4 for ; Sun, 21 Feb 2021 06:36:09 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id s11sm21388671wme.22.2021.02.21.06.36.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:36:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wfNdRFst6LfLn0VNAb4bbFY7EBizJDIkL87O+WLW55E=; b=YGx1C8/Lgapx6r+HfbjwLjKjnunq1C8sJnKv23a/u4LgnsqNPsqCO+y0kCjL/ZvkcV 1FWiblsbq1eRp042IJ2g+9LBciVH1QupZvYU9Xgkcx91zMWwbGOfV3BH76+UmeYBWVm7 L8JHgPqK5r3wC7+TSBuy9oc7us2cNLCQzLvqfrbczV1Rp2FBDs58bW1hOtHBZGaXXGrb 5LUV3LHe3qeFJyEVvLbrDyIHtUaVFxg6dGBbusC3+5baSbhGc9LHI47BSqRu7/zuev8z zIhhb4MbmCH5L3R3dOi4jVU+nNoVtT6UCmjuB5T7nFSfArYCsJ+1TsxfB4x6dS0+yu63 QqWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wfNdRFst6LfLn0VNAb4bbFY7EBizJDIkL87O+WLW55E=; b=gtrTCqObUk+EDhkUttF6OtheS39rlJDLOwA7L7kG1akYs9gYFj9JFXbhSOipEVnPJp Ism4QaVu8maliuDivv0GLcPBHMoTzG4HTpfwQFUYRkRxGJuQ07saOV4nbhkUY9XkJHQH ov8UPpmwLljDpVoX3kG+I+vO4Ich1DUQ0MiXJ5JEfdiwahfRIc8Vf0OSb/8B0YiQUA6M T4NVGei0myfkmAOAhMa2S2YtbQwApPekbjEzqPlWIIEIeWEX+atq2Hw4EdDyLxczaJOO gb8Y+p5iuw2XsjfLP1UhfqivZJ1EzlnQvrMNlztpFEd6yjRUHAZGWqWqSVaAG9AUIDzB jCWA== X-Gm-Message-State: AOAM530xN5VIyMZG/pdaFS5oTVWZHAEIUvJq+aYIdrJttMGLefjsrkYn Ro8qqkA1o3E5xbabLnIQ8lk= X-Google-Smtp-Source: ABdhPJxxcilPx80bgWpMFNgWWdKQx05Oy036cMxEsnAeg2jynAzK7FFxmGorOR7ILMQ58CuSFtTNIg== X-Received: by 2002:a1c:4386:: with SMTP id q128mr16402247wma.184.1613918168555; Sun, 21 Feb 2021 06:36:08 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 19/43] target/mips: Let get_seg*_physical_address() take MMUAccessType arg Date: Sun, 21 Feb 2021 15:34:08 +0100 Message-Id: <20210221143432.2468220-20-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) get_physical_address() calls get_seg_physical_address() and get_segctl_physical_address() passing a MMUAccessType type. Let the prototypes use it as argument, as it is stricter than an integer. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Message-Id: <20210128144125.3696119-13-f4bug@amsat.org> --- target/mips/tlb_helper.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index f15cc48a062..4db8a7582d4 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -222,7 +222,7 @@ static int is_seg_am_mapped(unsigned int am, bool eu, i= nt mmu_idx) =20 static int get_seg_physical_address(CPUMIPSState *env, hwaddr *physical, int *prot, target_ulong real_address, - int rw, int mmu_idx, + MMUAccessType access_type, int mmu_idx, unsigned int am, bool eu, target_ulong segmask, hwaddr physical_base) @@ -234,7 +234,8 @@ static int get_seg_physical_address(CPUMIPSState *env, = hwaddr *physical, return mapped; } else if (mapped) { /* The segment is TLB mapped */ - return env->tlb->map_address(env, physical, prot, real_address, rw= ); + return env->tlb->map_address(env, physical, prot, real_address, + access_type); } else { /* The segment is unmapped */ *physical =3D physical_base | (real_address & segmask); @@ -245,15 +246,15 @@ static int get_seg_physical_address(CPUMIPSState *env= , hwaddr *physical, =20 static int get_segctl_physical_address(CPUMIPSState *env, hwaddr *physical, int *prot, target_ulong real_addres= s, - int rw, int mmu_idx, + MMUAccessType access_type, int mmu_= idx, uint16_t segctl, target_ulong segma= sk) { unsigned int am =3D (segctl & CP0SC_AM_MASK) >> CP0SC_AM; bool eu =3D (segctl >> CP0SC_EU) & 1; hwaddr pa =3D ((hwaddr)segctl & CP0SC_PA_MASK) << 20; =20 - return get_seg_physical_address(env, physical, prot, real_address, rw, - mmu_idx, am, eu, segmask, + return get_seg_physical_address(env, physical, prot, real_address, + access_type, mmu_idx, am, eu, segmask, pa & ~(hwaddr)segmask); } =20 --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918175; cv=none; d=zohomail.com; s=zohoarc; b=iy7YoF40zuGQlgvbkcSUcxM/uXWhjIkMezYPt1G9TrV1G9n/oOBbNm9OVPofeU4KrqANc/dzaT5238NvdxAkgx4eTQCXGIrlIHHLxow7Wu4TYrgBh9olDY/nDybq3pc4deX97P950dD9bcK+txjpwvnGBLjr4UaZZYiC1y1Vb5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918175; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=e15Rl8H6DBZJO0DusLxuCaUW4jtuBTP32AnE0pOPNJQ=; b=Y3uKYVJ9BwYifdPUqMShgwa629Kvyv/yu32JFP6DRh+UCbjl1z17TRYJSh6eAoCGNvLZUaGk4TWbspVlCHktRGgvHdl2+0fQt7VhDLsap8ndNXLRd7pSH3+zFt9csewY0wIuIsRbB2T5f39V4E74t/vl8WNRWokRIq8O7KCgs0M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1613918175330945.1116523977652; Sun, 21 Feb 2021 06:36:15 -0800 (PST) Received: by mail-wr1-f47.google.com with SMTP id v15so16350167wrx.4 for ; Sun, 21 Feb 2021 06:36:14 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id w11sm2368961wru.3.2021.02.21.06.36.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:36:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=e15Rl8H6DBZJO0DusLxuCaUW4jtuBTP32AnE0pOPNJQ=; b=IukHqDdKdtDtwISKpz81Lw3mG0CFu5xp37eyql53GVtGluo81mPuzbQiwm78I/5jIk MaQG2yl4GnHxdHnTDKIQJJQgzSnfZtWLmILk9NS0wVqayHFtmlYtyBybu/QQfzmcZn80 CrJPn9/VrfdIpaibcGR60aGt8JQ6MVI1QRkZdLEeNxuzGpEtEeYaEVCbpeB20BxG5jg6 o3T1bqFNROtIbg7bBQPf17YQjv+lW9sxTUQ8xL3/cvQAv+pg9M+fW0Rd/XLDB3EQEIzJ yBJDBtaQG1ax1fuJQIvykhMmFS5KDzln0Ou79/zmu6w3sif+mNWp+sKltVvhryX/8wxZ Nt7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=e15Rl8H6DBZJO0DusLxuCaUW4jtuBTP32AnE0pOPNJQ=; b=qN+Y1j5Z4sLfNPB2PmXbxZ1GZ0gOCs08JJxkvhyFG6tLSEa1wD7tPd2wAKWH7f3/wF gtwWSmju3/56HzqKg5J/TZiCEcXNivarha2p+XuFdoHVnu4hx+Kh7e8CiTeqn/xvR3Iu 13yU0yPFeXm63hgbiiOn8AfQNcQ28sGB31IDUkvjesp9bNlLwxz0JzePGnCphkibU7EF mexIGubv35bod3PLyOWrxkQCm2Nky+E8kaWtZdl4aVXqiPZMHsf9N/Op357ut0oIUTle Msesk/rb0Q3T/5AJOY0rBUBgbnO1FnWZnMrvFzjFf+KudnOAhObxtLwPp+hYhFU+aEEt ceEQ== X-Gm-Message-State: AOAM533cpRdkk0KuwnkCdwtTGk9jDqnGK/uciztDI4kivd9MfHN/w1EB 5YKrA3MaBRZvAT92lPPa9BA= X-Google-Smtp-Source: ABdhPJwtPA+o/TU9bXQVUC1AoPsz3ex5WRN8P8yAR64fSszXOy6LNhCRhWNM1nkqFcEiiS0XgXNTgw== X-Received: by 2002:a05:6000:18ac:: with SMTP id b12mr17792373wri.77.1613918173574; Sun, 21 Feb 2021 06:36:13 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 20/43] target/mips: Let CPUMIPSTLBContext::map_address() take MMUAccessType Date: Sun, 21 Feb 2021 15:34:09 +0100 Message-Id: <20210221143432.2468220-21-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) get_seg_physical_address() calls CPUMIPSTLBContext::map_address() handlers passing a MMUAccessType type. Update the prototype handlers to take a MMUAccessType argument, as it is stricter than an integer. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Message-Id: <20210128144125.3696119-14-f4bug@amsat.org> --- target/mips/internal.h | 8 ++++---- target/mips/tlb_helper.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index 34915c275c4..99264b8bf6a 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -111,7 +111,7 @@ struct CPUMIPSTLBContext { uint32_t nb_tlb; uint32_t tlb_in_use; int (*map_address)(struct CPUMIPSState *env, hwaddr *physical, int *pr= ot, - target_ulong address, int rw); + target_ulong address, MMUAccessType access_type); void (*helper_tlbwi)(struct CPUMIPSState *env); void (*helper_tlbwr)(struct CPUMIPSState *env); void (*helper_tlbp)(struct CPUMIPSState *env); @@ -126,11 +126,11 @@ struct CPUMIPSTLBContext { }; =20 int no_mmu_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw); + target_ulong address, MMUAccessType access_type); int fixed_mmu_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw); + target_ulong address, MMUAccessType access_type); int r4k_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw); + target_ulong address, MMUAccessType access_type); void r4k_helper_tlbwi(CPUMIPSState *env); void r4k_helper_tlbwr(CPUMIPSState *env); void r4k_helper_tlbp(CPUMIPSState *env); diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index 4db8a7582d4..b48f892a513 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -39,7 +39,7 @@ enum { =20 /* no MMU emulation */ int no_mmu_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw) + target_ulong address, MMUAccessType access_type) { *physical =3D address; *prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; @@ -48,7 +48,7 @@ int no_mmu_map_address(CPUMIPSState *env, hwaddr *physica= l, int *prot, =20 /* fixed mapping MMU emulation */ int fixed_mmu_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw) + target_ulong address, MMUAccessType access_type) { if (address <=3D (int32_t)0x7FFFFFFFUL) { if (!(env->CP0_Status & (1 << CP0St_ERL))) { @@ -68,7 +68,7 @@ int fixed_mmu_map_address(CPUMIPSState *env, hwaddr *phys= ical, int *prot, =20 /* MIPS32/MIPS64 R4000-style MMU emulation */ int r4k_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw) + target_ulong address, MMUAccessType access_type) { uint16_t ASID =3D env->CP0_EntryHi & env->CP0_EntryHi_ASID_mask; uint32_t MMID =3D env->CP0_MemoryMapID; @@ -97,13 +97,13 @@ int r4k_map_address(CPUMIPSState *env, hwaddr *physical= , int *prot, if (!(n ? tlb->V1 : tlb->V0)) { return TLBRET_INVALID; } - if (rw =3D=3D MMU_INST_FETCH && (n ? tlb->XI1 : tlb->XI0)) { + if (access_type =3D=3D MMU_INST_FETCH && (n ? tlb->XI1 : tlb->= XI0)) { return TLBRET_XI; } - if (rw =3D=3D MMU_DATA_LOAD && (n ? tlb->RI1 : tlb->RI0)) { + if (access_type =3D=3D MMU_DATA_LOAD && (n ? tlb->RI1 : tlb->R= I0)) { return TLBRET_RI; } - if (rw !=3D MMU_DATA_STORE || (n ? tlb->D1 : tlb->D0)) { + if (access_type !=3D MMU_DATA_STORE || (n ? tlb->D1 : tlb->D0)= ) { *physical =3D tlb->PFN[n] | (address & (mask >> 1)); *prot =3D PAGE_READ; if (n ? tlb->D1 : tlb->D0) { --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918180; cv=none; d=zohomail.com; s=zohoarc; b=Jb2bQUfJonF6l8eIpn8jgXgppel+sxMhHxd6y0j/5UKWipEoqL9GLv5eSGo4Vgzx0EIc1tNEtQ/kQgpgAG/bEsgD6Qp7m/ect+LrQ8IR8DE1niDLtI6ek5fx83W6LQqV8jAQnQv5IIsMimurW9hgxX/wKILOat+nhDJMTTojgrE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918180; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MC5oi9TPKAczNKXq5Uj4eOA8fenPPAC5Jz7BQ2K2UHA=; b=G2cc97eOqN1TMdYxLtyJYBTwACChNSkdG12ZFvKa1XMqQqB3p67YtkDtgn1HhIR4tNsEHh/tn5f5V60320nOqhWdHkF6SC91FWD+czBiSzxoZDzCfKvIlPgJv+WJl2MtiLHTVHb/1P2CzFK+Ek33sfRhkKFSaGrzT6ptq67mVSQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1613918180186345.3045559854313; Sun, 21 Feb 2021 06:36:20 -0800 (PST) Received: by mail-wr1-f50.google.com with SMTP id 7so16362370wrz.0 for ; Sun, 21 Feb 2021 06:36:19 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id x13sm7695051wrt.21.2021.02.21.06.36.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:36:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MC5oi9TPKAczNKXq5Uj4eOA8fenPPAC5Jz7BQ2K2UHA=; b=G5MwtcUasLf6Auc4IBP/XfCNv8xWuerft2SMqxGjOnKwf+uJF1DqXol81+0jIAHWcy b7HBqq9+fDEnZGjSKnHhAakNr7ChFRPNYrfsYPW9es7cJDlyfK+57fPqUnnbdy8Ypm/s OuvAe45F8doPAdByra16Ct6NyyTPNjS8u46GhkLfHfBC/+FJ70yKwJ3AV4DpLq+KfWov 7txSYbkHIsZY10hfzMWaZxVPQ7WDCdsO7wxCgq0GcMwGhx65v79SwhiLIXTRxMBhAe6P 7YDRYkvHcfbBtVcQFEcRX34ZnW9M9mNq9+6dHHbT/Ql4Y5aFwyCM3uDYzkkbHpPxA1q4 MyCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=MC5oi9TPKAczNKXq5Uj4eOA8fenPPAC5Jz7BQ2K2UHA=; b=aZFDpoOykYqpJK0Lc3uZXg3WQe/PYzulfiYLOr3Kk7ZatWENR0Q1tZYjenqQ4UOG7f f6ExmNYF6Q2quu+Uv2MEsSK7eBBFDA7aM2KWW3J/q4/DUNHh+dj2MYcL6OSC91vJNY/b 8YyZkwUtA8QQRaEwN7ywAJoUySubh1d3H1faZO8mr64qbGLDGHbg25ZOus6g4Mx0QRJc HS0DAWhssRwy7tir7X+3s0HAA3qA9Myc8uDvNgq8Kr1sUPqhC/kZT0zqCYQscb8OR+lx QrhsyLDTd76Zdg5wdrtkOcDm7TzlYtWCaowcjowkg8kPN4PSbjahF8xk9x8VG//Y/XfJ Bg1g== X-Gm-Message-State: AOAM531l6V46wZDrpU7zw902VRqCk0afIzEqGuWl2mtE2Z/2U2LL6zs7 VusfTi7I/Hxg8AMuPS/wegE= X-Google-Smtp-Source: ABdhPJxQPzndsGHkSrSwqpqWvZs3tHHrsuC7VMdlBOrbZREdzEgziDQ426ui0a8XjFsNYXEH468Czg== X-Received: by 2002:a5d:4848:: with SMTP id n8mr1015337wrs.241.1613918178483; Sun, 21 Feb 2021 06:36:18 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 21/43] target/mips: Remove unused 'rw' argument from page_table_walk_refill() Date: Sun, 21 Feb 2021 15:34:10 +0100 Message-Id: <20210221143432.2468220-22-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) As the 'rw' argument is unused, remove it. Reported-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210220202026.2305667-1-f4bug@amsat.org> --- target/mips/tlb_helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index b48f892a513..8d3ea497803 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -622,8 +622,8 @@ static int walk_directory(CPUMIPSState *env, uint64_t *= vaddr, } } =20 -static bool page_table_walk_refill(CPUMIPSState *env, vaddr address, int r= w, - int mmu_idx) +static bool page_table_walk_refill(CPUMIPSState *env, vaddr address, + int mmu_idx) { int gdw =3D (env->CP0_PWSize >> CP0PS_GDW) & 0x3F; int udw =3D (env->CP0_PWSize >> CP0PS_UDW) & 0x3F; @@ -879,7 +879,7 @@ bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int= size, int mode =3D (env->hflags & MIPS_HFLAG_KSU); bool ret_walker; env->hflags &=3D ~MIPS_HFLAG_KSU; - ret_walker =3D page_table_walk_refill(env, address, access_type, m= mu_idx); + ret_walker =3D page_table_walk_refill(env, address, mmu_idx); env->hflags |=3D mode; if (ret_walker) { ret =3D get_physical_address(env, &physical, &prot, address, --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 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=1613918185; cv=none; d=zohomail.com; s=zohoarc; b=GUTM21nMxwg/+PJWryu1kloZXDu/a4o8+VRCy9AjDAqv2lKeuyX01ATr50GTM/Zb49peVawLi+uc8q/G8WMQVgyUeGygUD0c/cPENY6EqOcDQ9prIcKPfsnmKHcO08nlSJti21aeS9u7XgOgDlpZSzuriHjD1k3OdA3M2xZKlGo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918185; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mTEXW5LTfQRgc4V4bZmD0GoSDNu+cidmCKPRdeIGV08=; b=AhzY9oV2HKDYownNha9DPdaTOKxWZl4G3wNp7aD4HQd6/PqrO86kEwcvqgAuur7KBpQjIs1ciA+ZAx/4UKkHvLPkVbMSe3IEwvqHoeOYcgYzOLyMjZYTKj8DtzTwzG3gLnYDO6uqRMVhMDOTXrPbUdcK9RRkkg/AAm0Jo8f0nmU= 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 1613918185161443.7536658345384; Sun, 21 Feb 2021 06:36:25 -0800 (PST) Received: by mail-wr1-f49.google.com with SMTP id 7so16362520wrz.0 for ; Sun, 21 Feb 2021 06:36:24 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id t74sm26718292wmt.45.2021.02.21.06.36.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:36:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mTEXW5LTfQRgc4V4bZmD0GoSDNu+cidmCKPRdeIGV08=; b=TnzcuOE1b81LtnLzK1sU+dvhOL97LY4FhYz5yljj7nDTcYZTqiWUkaaHXve2+TK6un yjE7xpVItCCo4anRS+YB/eRQPu8ls1D93DcvjEHUDudAnILeFXCFlOzqqJ8iz9uleZX5 EIzrcS2gWOtrTWyX1k1PYJKeivKihVS5yBggs/RevPXsgVibPYgx7hvbbrCw8zcrKGwP J5ee1Di5slxGXa/hsqingnrYcQhZi9ZZ6ISuYM9aJAW05zc6c2vUZJ1/bCiju0lNm1IN MMeOKmBMjPFmhS2txAi78I3VdqzaKox/Q1n9bgW9dHfiwLd9KEljxAZG98lZNhvK7AY2 qz7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mTEXW5LTfQRgc4V4bZmD0GoSDNu+cidmCKPRdeIGV08=; b=pu4zg8QO0JuJa5bpqadzbpGdFMX3w2hW/65CQ091isNna/1YagjMaB3muIkm2EtFiE wH2qFNETo00pec/YhfnLLr6MO0QhyfmsbKP6X9gWc0RdlzlxueQE7smxPlK8qzXDoEN0 R9Pd8N2LmjtnElW3TFPmBtw5BtgC/U5LSJPblHAZT+6xjTyHIzjFp19y2dGx0Jz2fVag n98uF1SH4Y++h/duaP6AFAnHp59XFOpnpFnDquaBQzURad6UsDVqsYKcBg0W69ipTrbK JurNb5J+at91WcVLyW0i4lIxkPc4vhkHpkTwlBQEFXng+Q4sOhQX1DvKWO+ci3FxcJCY T2gA== X-Gm-Message-State: AOAM532eIJL69Gn/VUTHtxrSLt1yF2nCplstiu54H4oNCh0tts/774kV 9cc1VQ/zQqez03g/0tJ6ZzM= X-Google-Smtp-Source: ABdhPJxwbIIBDKT9Dlr1h05GaMkVlm59OycVz8htDJPwwAZX2o3Pnjzu5H4zIygUl6HPqQRoto2XWQ== X-Received: by 2002:a5d:5441:: with SMTP id w1mr17587242wrv.366.1613918183462; Sun, 21 Feb 2021 06:36:23 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang Subject: [PULL 22/43] target/mips: Include missing "tcg/tcg.h" header Date: Sun, 21 Feb 2021 15:34:11 +0100 Message-Id: <20210221143432.2468220-23-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) Commit 83be6b54123 ("Fix MSA instructions LD. on big endian host") introduced use of typedef/prototypes declared in "tcg/tcg.h" without including it. This was not a problem because "tcg/tcg.h" is pulled in by "exec/cpu_ldst.h". To be able to remove this header there, we first need to include it here in op_helper.c, else we get: [222/337] Compiling C object libqemu-mips-softmmu.fa.p/target_mips_msa_he= lper.c.o target/mips/msa_helper.c: In function =E2=80=98helper_msa_ld_b=E2=80=99: target/mips/msa_helper.c:8214:9: error: unknown type name =E2=80=98TCGMem= OpIdx=E2=80=99 8214 | TCGMemOpIdx oi =3D make_memop_idx(MO_TE | DF | MO_UNALN, = \ | ^~~~~~~~~~~ target/mips/msa_helper.c:8224:5: note: in expansion of macro =E2=80=98MEM= OP_IDX=E2=80=99 8224 | MEMOP_IDX(DF_BYTE) | ^~~~~~~~~ target/mips/msa_helper.c:8214:26: error: implicit declaration of function= =E2=80=98make_memop_idx=E2=80=99 [-Werror=3Dimplicit-function-declaration] 8214 | TCGMemOpIdx oi =3D make_memop_idx(MO_TE | DF | MO_UNALN, = \ | ^~~~~~~~~~~~~~ target/mips/msa_helper.c:8227:18: error: implicit declaration of function= =E2=80=98helper_ret_ldub_mmu=E2=80=99 [-Werror=3Dimplicit-function-declara= tion] 8227 | pwd->b[0] =3D helper_ret_ldub_mmu(env, addr + (0 << DF_BYTE= ), oi, GETPC()); | ^~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210207232310.2505283-4-f4bug@amsat.org> --- target/mips/msa_helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c index 1298a1917ce..4caefe29ad7 100644 --- a/target/mips/msa_helper.c +++ b/target/mips/msa_helper.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "internal.h" +#include "tcg/tcg.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" #include "exec/memop.h" --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 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; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1613918190; cv=none; d=zohomail.com; s=zohoarc; b=XbT2NcjpeY1pV/eqU3tzmUkELnK/q2mp3PU6wQtt2YfiJsIR/C0S8PkOdxvKHr+ww2NR1S3kOw7Sj0YK9WxjRXVdojMF266M3BU7muaNaFmGFEdJ4Q13PMduQapXvlbtFPh52FuG5oyJbWc7vK01cFxQsxQp7+rbSOGNi+8mybM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918190; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8H71CdRSoAovW6NsHJmiVRZtkb7u06YlcS4FCzZPkNU=; b=POVNLxFmP4dPZQcqy41RhtdIiwbYvFYVHoZjwSpioOCMnVYzW7Xh8i7ZImdiRSLH20qwiUGef7ul3j9raElw/iG+TnlWLKtq1CWKK8J/LdABpBz1GHOe48rFd7OvIT1Re6b59oj8rAZTN+4YjvoOGi+D1XpgDULyq8c4XNYI5xc= 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; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1613918190172500.56890613760095; Sun, 21 Feb 2021 06:36:30 -0800 (PST) Received: by mail-wr1-f45.google.com with SMTP id l30so655242wrb.12 for ; Sun, 21 Feb 2021 06:36:29 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id x13sm7695603wrt.21.2021.02.21.06.36.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:36:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8H71CdRSoAovW6NsHJmiVRZtkb7u06YlcS4FCzZPkNU=; b=LFJKHSCtp58C1h7Ts7Qp1UcFFCTcmFo6vFTwJ1ALxX5zHoA/pJw3mkIDZ4vu8kyAjF EwSbKlIlL2qN6YH0JG8y9bywgIaYjwQ1DCuAOI/LciS3GLbB4MZToH4cZCzH3vb9X5gW YSPVrKqpmESrDpHz8bkjrtfOTX0wQxUJ0BfyfzKQhvZG5JxKLLamLTADPteotMXSnnrU /BgdGpB9xAmbRSc5giR4JN/Mdvg/G2HgjKKC1+NjAa5nBbJGzK3j4WE/QA2DuHd2FbkJ wGYGQGlgXW9Zb8CjIpEM5sfwEwBQsj1U3tc1VmP1CkZfazqKRg0X93Y3IhP2yRV6XqNS 9GAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8H71CdRSoAovW6NsHJmiVRZtkb7u06YlcS4FCzZPkNU=; b=ShWYrwzjFLw1CF5tbSGFVO7VNWl1db+smrQVyELQNBFEG+w2EBH16rGbdWganisGUU rfjwVkmY7sxAsKixOtSunFXS+C3FXCR30x3OF1X9drxcjw0/MsefuA9+xokkYIxdCb/1 ihYS47Suo7miET3yhVD5rU+YR0wLNKM8NGZEvxUEWdv/WwW3lvCkkrx7EmDwsy0X9dn/ QttiXQPYYrDL3LftNZg62y3vmwrthBOPO5dvnALiEDY8NLPWFPnLL3qxUZWyWeBcP+vT t/Y8q13zVkFcymZdxO/x5PdpVrWMbxSbjBonfgSBXXK0k80K5Z4e6Byag6QKQ6KjaJ1j 8HcQ== X-Gm-Message-State: AOAM533pt6Ib/wH/Hl+w1zF5xChhuYFc5mIV5h2yOl+9N7cd3+Es0Rgs 4CrXcgLAWgQXoc/2ew9HBGA= X-Google-Smtp-Source: ABdhPJzdxX5rLYkAKBXFtq9pEP7Mf62Xy9qJAroxBcsqsTZt2g58uYKJZo7fqyoU9RSaavoUCRPk4Q== X-Received: by 2002:adf:fecc:: with SMTP id q12mr1115581wrs.317.1613918188475; Sun, 21 Feb 2021 06:36:28 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 23/43] target/mips: Make cpu_HI/LO registers public Date: Sun, 21 Feb 2021 15:34:12 +0100 Message-Id: <20210221143432.2468220-24-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) We will access the cpu_HI/LO registers outside of translate.c. Make them publicly accessible. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210214175912.732946-4-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/translate.h | 1 + target/mips/translate.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/target/mips/translate.h b/target/mips/translate.h index f47b5f2c8d0..2a1d8f570bb 100644 --- a/target/mips/translate.h +++ b/target/mips/translate.h @@ -145,6 +145,7 @@ bool gen_lsa(DisasContext *ctx, int rd, int rt, int rs,= int sa); bool gen_dlsa(DisasContext *ctx, int rd, int rt, int rs, int sa); =20 extern TCGv cpu_gpr[32], cpu_PC; +extern TCGv cpu_HI[MIPS_DSP_ACC], cpu_LO[MIPS_DSP_ACC]; extern TCGv_i32 fpu_fcr0, fpu_fcr31; extern TCGv_i64 fpu_f64[32]; extern TCGv bcond; diff --git a/target/mips/translate.c b/target/mips/translate.c index a6e835809aa..c20f630b7e7 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -2179,7 +2179,7 @@ enum { =20 /* global register indices */ TCGv cpu_gpr[32], cpu_PC; -static TCGv cpu_HI[MIPS_DSP_ACC], cpu_LO[MIPS_DSP_ACC]; +TCGv cpu_HI[MIPS_DSP_ACC], cpu_LO[MIPS_DSP_ACC]; static TCGv cpu_dspctrl, btarget; TCGv bcond; static TCGv cpu_lladdr, cpu_llval; --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918195; cv=none; d=zohomail.com; s=zohoarc; b=M7uFyqa5VilcrDGqq0N7W3oVpmKzO8aGvoSPnIgqbGHt1qF4lcZwlJOXg56NzASFChZyMBlscyyWaK/gvX5TLWsPruit99VPtv8vC+LYRldPncVwBYORGFBFn8FUz0PF76EdaXMa5pcgZZ3tCpH6Da49g0ra3OfN8/VT8StbGZs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918195; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rOF5MQDxPLOXQx0ibeRXNei5jJwKer3lL4/zvBaW5Vo=; b=jse05014Jea4djWs1OQo7SZS1rzDuT4nRWmOjPbNCqciCvCdBjKojDpKeL8Qu86MmDQK3WovJc/dGlhacSRHAKHTGl0HlSZ1IjAg+A8sPX48NdPITtNHWW7oeq0cfnhEY0BV/Kd3+Ymzz2hwYKlcyAf004UVvXBqO9xa7hb1GGA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 161391819532833.76730161108958; Sun, 21 Feb 2021 06:36:35 -0800 (PST) Received: by mail-wm1-f53.google.com with SMTP id m25so2580168wmi.3 for ; Sun, 21 Feb 2021 06:36:34 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id t2sm8283842wrx.23.2021.02.21.06.36.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:36:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rOF5MQDxPLOXQx0ibeRXNei5jJwKer3lL4/zvBaW5Vo=; b=Q1qWELqS7EuSV2vdbdH29F6ehgYhPKKzxcZP65ymUWpGYNJkYBD748SQwqGtEa7iNk dzSgATeHxwGwopK0VhAX+0p8A1ExJcl0K7LlzFM1/bZeHWuuFRyLynVzXshztBnJMhVX JH4F6UD6UfK2YHnED7nMJKiAxK4sYEuIXUlR9/TlmUxb3WGrVOhvMbMJZhaPAZ3lKQLN YQtOLGy/YRvQTGzXdsqU/0Th7SBzVjHL0faiiOx3X7gsPZJJVPFiH9znun86CRoxiduS WI+yq2/7S5M+CxedB62fprLLEVGcajJEWhTIbw8csDjryFA+4L5larpDr7lpNsbXMbTQ n9dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rOF5MQDxPLOXQx0ibeRXNei5jJwKer3lL4/zvBaW5Vo=; b=moIRSXO7RLmEc27TJua66cJ2ByZh6rAfo09Jeam89mxMpBucQJBmvoOcdzAMWEp+0E qqHZfOiaB6YZ0q1aVdCUjHJxkxNTwrt4hLHQXkuJwBUomHRT7sXhGsPWg/zirj86vohg YF68Wdmdfpub2q2mzb8+fWo4BZcxWgD08uB385RUVR/NZ1PJ7PXzDloYODFJx0wmmDC3 Hdlp1175lyMcbjjs1g8DPM9N4jYeVsLVp6ruT9sJ0ZaCRQE6x1TQHa0/+zHbZdnyrOqg IIXaicoMWnqNu5yaKX44wRJinIduYsVlX31uGfssgM0C4OtwVO5SmhhZmPUv901icGwM RQPQ== X-Gm-Message-State: AOAM530HaUPViochcsMZtlJUQSQfgRT9iImKnDwDMB2Y6JMuWAJO1xa3 n9vVp0fl7H+9Rp/WUkBP6Xc= X-Google-Smtp-Source: ABdhPJwF0+ZRc92TM7zriN+Khz8uWxvUscOcRar7pRTnuJxgiOgfTBx2KSdYbyQxe8CvOEpbStT3gw== X-Received: by 2002:a1c:7705:: with SMTP id t5mr9808915wmi.148.1613918193527; Sun, 21 Feb 2021 06:36:33 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 24/43] target/mips: Promote 128-bit multimedia registers as global ones Date: Sun, 21 Feb 2021 15:34:13 +0100 Message-Id: <20210221143432.2468220-25-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) The cpu::mmr[] array contains the upper halves of 128-bit GPR registers. While they are only used by the R5900 CPU, the concept is generic and could be used by another MIPS implementation. Rename 'cpu::mmr' as 'cpu::gpr_hi' and make them global. When the code is similar to the GPR lower halves, move it close by. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210214175912.732946-5-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/cpu.h | 10 ++++++--- target/mips/translate.h | 3 +++ target/mips/translate.c | 48 ++++++++++++++++++++--------------------- 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 9e6028f8e63..075c24abdad 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -460,6 +460,13 @@ typedef struct mips_def_t mips_def_t; typedef struct TCState TCState; struct TCState { target_ulong gpr[32]; +#if defined(TARGET_MIPS64) + /* + * For CPUs using 128-bit GPR registers, we put the lower halves in gp= r[]) + * and the upper halves in gpr_hi[]. + */ + uint64_t gpr_hi[32]; +#endif /* TARGET_MIPS64 */ target_ulong PC; target_ulong HI[MIPS_DSP_ACC]; target_ulong LO[MIPS_DSP_ACC]; @@ -505,9 +512,6 @@ struct TCState { =20 float_status msa_fp_status; =20 - /* Upper 64-bit MMRs (multimedia registers); the lower 64-bit are GPRs= */ - uint64_t mmr[32]; - #define NUMBER_OF_MXU_REGISTERS 16 target_ulong mxu_gpr[NUMBER_OF_MXU_REGISTERS - 1]; target_ulong mxu_cr; diff --git a/target/mips/translate.h b/target/mips/translate.h index 2a1d8f570bb..3014c20cadb 100644 --- a/target/mips/translate.h +++ b/target/mips/translate.h @@ -145,6 +145,9 @@ bool gen_lsa(DisasContext *ctx, int rd, int rt, int rs,= int sa); bool gen_dlsa(DisasContext *ctx, int rd, int rt, int rs, int sa); =20 extern TCGv cpu_gpr[32], cpu_PC; +#if defined(TARGET_MIPS64) +extern TCGv_i64 cpu_gpr_hi[32]; +#endif extern TCGv cpu_HI[MIPS_DSP_ACC], cpu_LO[MIPS_DSP_ACC]; extern TCGv_i32 fpu_fcr0, fpu_fcr31; extern TCGv_i64 fpu_f64[32]; diff --git a/target/mips/translate.c b/target/mips/translate.c index c20f630b7e7..2df76592470 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -2179,6 +2179,11 @@ enum { =20 /* global register indices */ TCGv cpu_gpr[32], cpu_PC; +/* + * For CPUs using 128-bit GPR registers, we put the lower halves in cpu_gp= r[]) + * and the upper halves in cpu_gpr_hi[]. + */ +TCGv_i64 cpu_gpr_hi[32]; TCGv cpu_HI[MIPS_DSP_ACC], cpu_LO[MIPS_DSP_ACC]; static TCGv cpu_dspctrl, btarget; TCGv bcond; @@ -2187,11 +2192,6 @@ static TCGv_i32 hflags; TCGv_i32 fpu_fcr0, fpu_fcr31; TCGv_i64 fpu_f64[32]; =20 -#if defined(TARGET_MIPS64) -/* Upper halves of R5900's 128-bit registers: MMRs (multimedia registers) = */ -static TCGv_i64 cpu_mmr[32]; -#endif - #if !defined(TARGET_MIPS64) /* MXU registers */ static TCGv mxu_gpr[NUMBER_OF_MXU_REGISTERS - 1]; @@ -24784,7 +24784,7 @@ static void gen_mmi_pcpyh(DisasContext *ctx) /* nop */ } else if (rt =3D=3D 0) { tcg_gen_movi_i64(cpu_gpr[rd], 0); - tcg_gen_movi_i64(cpu_mmr[rd], 0); + tcg_gen_movi_i64(cpu_gpr_hi[rd], 0); } else { TCGv_i64 t0 =3D tcg_temp_new(); TCGv_i64 t1 =3D tcg_temp_new(); @@ -24802,7 +24802,7 @@ static void gen_mmi_pcpyh(DisasContext *ctx) =20 tcg_gen_mov_i64(cpu_gpr[rd], t1); =20 - tcg_gen_andi_i64(t0, cpu_mmr[rt], mask); + tcg_gen_andi_i64(t0, cpu_gpr_hi[rt], mask); tcg_gen_movi_i64(t1, 0); tcg_gen_or_i64(t1, t0, t1); tcg_gen_shli_i64(t0, t0, 16); @@ -24812,7 +24812,7 @@ static void gen_mmi_pcpyh(DisasContext *ctx) tcg_gen_shli_i64(t0, t0, 16); tcg_gen_or_i64(t1, t0, t1); =20 - tcg_gen_mov_i64(cpu_mmr[rd], t1); + tcg_gen_mov_i64(cpu_gpr_hi[rd], t1); =20 tcg_temp_free(t0); tcg_temp_free(t1); @@ -24844,9 +24844,9 @@ static void gen_mmi_pcpyld(DisasContext *ctx) /* nop */ } else { if (rs =3D=3D 0) { - tcg_gen_movi_i64(cpu_mmr[rd], 0); + tcg_gen_movi_i64(cpu_gpr_hi[rd], 0); } else { - tcg_gen_mov_i64(cpu_mmr[rd], cpu_gpr[rs]); + tcg_gen_mov_i64(cpu_gpr_hi[rd], cpu_gpr[rs]); } if (rt =3D=3D 0) { tcg_gen_movi_i64(cpu_gpr[rd], 0); @@ -24885,13 +24885,13 @@ static void gen_mmi_pcpyud(DisasContext *ctx) if (rs =3D=3D 0) { tcg_gen_movi_i64(cpu_gpr[rd], 0); } else { - tcg_gen_mov_i64(cpu_gpr[rd], cpu_mmr[rs]); + tcg_gen_mov_i64(cpu_gpr[rd], cpu_gpr_hi[rs]); } if (rt =3D=3D 0) { - tcg_gen_movi_i64(cpu_mmr[rd], 0); + tcg_gen_movi_i64(cpu_gpr_hi[rd], 0); } else { if (rd !=3D rt) { - tcg_gen_mov_i64(cpu_mmr[rd], cpu_mmr[rt]); + tcg_gen_mov_i64(cpu_gpr_hi[rd], cpu_gpr_hi[rt]); } } } @@ -29285,6 +29285,16 @@ void mips_tcg_init(void) offsetof(CPUMIPSState, active_tc.gpr[i]), regnames[i]); +#if defined(TARGET_MIPS64) + cpu_gpr_hi[0] =3D NULL; + + for (unsigned i =3D 1; i < 32; i++) { + cpu_gpr_hi[i] =3D tcg_global_mem_new_i64(cpu_env, + offsetof(CPUMIPSState, + active_tc.gpr_hi[i= ]), + regnames[i]); + } +#endif /* !TARGET_MIPS64 */ for (i =3D 0; i < 32; i++) { int off =3D offsetof(CPUMIPSState, active_fpu.fpr[i].wr.d[0]); =20 @@ -29323,16 +29333,6 @@ void mips_tcg_init(void) cpu_llval =3D tcg_global_mem_new(cpu_env, offsetof(CPUMIPSState, llval= ), "llval"); =20 -#if defined(TARGET_MIPS64) - cpu_mmr[0] =3D NULL; - for (i =3D 1; i < 32; i++) { - cpu_mmr[i] =3D tcg_global_mem_new_i64(cpu_env, - offsetof(CPUMIPSState, - active_tc.mmr[i]), - regnames[i]); - } -#endif - #if !defined(TARGET_MIPS64) for (i =3D 0; i < NUMBER_OF_MXU_REGISTERS - 1; i++) { mxu_gpr[i] =3D tcg_global_mem_new(cpu_env, @@ -29344,7 +29344,7 @@ void mips_tcg_init(void) mxu_CR =3D tcg_global_mem_new(cpu_env, offsetof(CPUMIPSState, active_tc.mxu_cr), mxuregnames[NUMBER_OF_MXU_REGISTERS - 1]); -#endif +#endif /* !TARGET_MIPS64 */ } =20 void restore_state_to_opc(CPUMIPSState *env, TranslationBlock *tb, --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1613918200; cv=none; d=zohomail.com; s=zohoarc; b=la30q/ShCYn60YMj/RWi1UIu7S8Pvd+2raJG1JeFLib1ctdB1o/LHb1LtR8CYgwKzMj1AyZrF/7imS3Xx3Z75W4hD+u0nbZT71NZ3uYwDEhLE79bpTDU2B5cx2fVC/IAMZYipUUfFesnRi9e14ZM9CYiu9vcX3xtg/tMrQF51WY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918200; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zTn6ZsmcejvoOra5WBCUDClHszjsj5qnjYAoZR3mMug=; b=n5hwk7tg7DszpnaxI1PjdtHJsRfE+9GNOxzyTc0xARMjUfJBoROZiYjk/HYUjJak/kBtD25DDoMC5CCw+rbRCyykGg0gOcjzZbyVy0YgxR1HWamqCN433WXTP8FpzYtlAg6kmpl5t8+0sojF/sXFCb0E9UVDddomLrI7KEaJ+aU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1613918200195975.3785135112685; Sun, 21 Feb 2021 06:36:40 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id b3so16336107wrj.5 for ; Sun, 21 Feb 2021 06:36:39 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id p16sm1195271wmj.8.2021.02.21.06.36.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:36:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zTn6ZsmcejvoOra5WBCUDClHszjsj5qnjYAoZR3mMug=; b=SB+duIMhI8kp3GZZgLxWKsJ2wUAI/JeZ1P1+hBC+q+FPJSNgSJrYhsnow7p713ch6+ QOV/5F+1ooKGSsXSwE2TTixNPEvBEpR/tM8e0vmrIVEiLb6J5+K3DR6SSmWaHJJBI/8p 4O2RP+Xtz2+wlweEXa6iOft1Lw3/UwtKWbzvoZSxbomcTaVr2TDm13lgfVdUP6QS+MwK oi8lm3ciV+/X6hRU7479cnUdB3NeI+ZuV0se1gadjn4CsRBkU2KlG+IglYuGgLYdXk5R wr6hNVJ3s6M/0/d3Cj52vY7XMlsxiQDr2qDwrkczKeS7Z91ZyXJ/xk/f/kxlF3PmHKzi 6fWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zTn6ZsmcejvoOra5WBCUDClHszjsj5qnjYAoZR3mMug=; b=qSyIQ+X+J2qEPcOaFWkFhbqBLv1k0+/qwPbk3nTAKMLvOwBAYvxhKtysK+fHGRqpjr ZOJ1XTCOQ8vSKnsaArW1ci2GK9Naa8jmuPkRFnbo/bOZv+lHykGD6o5mDpx+V84GCjHs Q3a0Wl4dicfG95YWxB7wfiR+85sYhVaeNwhVb2ZbXsfUSw15fFu1ilHmMVheBqJhTY86 cElycVF8E7RuzrbXDlm3+mraGD4fh1o827n+E1NJW1LyEZ4wfoJU5x3YAOXGyW73yPsA pcaHbXbhjEfusdo0bB6s2ai1Smku8tHdGyE1+5f4gqAg81g/HYRVwh9xbA1wTQL2gRg3 68gg== X-Gm-Message-State: AOAM5334Q6nx5XnUYXciQ9oyoY1E+XLM5oDKbR5fi+gA9iJNaUkLtAa8 hAztVhCddaIMMB3P6mQ3m+o= X-Google-Smtp-Source: ABdhPJx42H5YpZv8dDL7sl7m+Y5nKw1vCpkYRGmrX8ErcrNqgGYf/FDWMv/o092WUWVvXl1y8yxRrg== X-Received: by 2002:a5d:460f:: with SMTP id t15mr17219235wrq.417.1613918198539; Sun, 21 Feb 2021 06:36:38 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 25/43] target/mips: Rename 128-bit upper halve GPR registers Date: Sun, 21 Feb 2021 15:34:14 +0100 Message-Id: <20210221143432.2468220-26-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) TCG displays the upper halve registers with the same name as their lower halves. Rename the upper halves with the '[hi]' suffix. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210214175912.732946-6-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/translate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/mips/translate.c b/target/mips/translate.c index 2df76592470..5228e040842 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -29289,10 +29289,12 @@ void mips_tcg_init(void) cpu_gpr_hi[0] =3D NULL; =20 for (unsigned i =3D 1; i < 32; i++) { + g_autofree char *rname =3D g_strdup_printf("%s[hi]", regnames[i]); + cpu_gpr_hi[i] =3D tcg_global_mem_new_i64(cpu_env, offsetof(CPUMIPSState, active_tc.gpr_hi[i= ]), - regnames[i]); + rname); } #endif /* !TARGET_MIPS64 */ for (i =3D 0; i < 32; i++) { --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1613918205; cv=none; d=zohomail.com; s=zohoarc; b=BbfMDbJ8Pt0SJhvmci73kMgq42NH6iWEkYeqductyfUxgZUmC5gaodNA7DMxI1SaCzrC7wWw0LwftazEnDuMQ3vSvNjTzraZf0tGYLPh+ptUvyOAt3EV1tbX1L2eJX8yJyqQ4jgx4KOtC/iKU2S7mzyB8ZS7dCVOC/wASAx4YMA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918205; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9Gr6hhYxcoFr5/GYlEJ6i23QC05JMKXDeduQE346qJE=; b=PuaTJPF3QrLswcbhYJbgSgaFyHOnYFY4uqWbRw1Ubagc+S9i16oZ+C3rqtNA21DdY1/lRy79x18MXl3fqLWlsXc39PsHo40OGCND8PuI1qNiuB+Flt6FrJ50uSTknUVVO5C+AUa82L2VPn2jSKCfwuaSR+dyIIHbwgDqzg2crC8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1613918205476760.7138005015146; Sun, 21 Feb 2021 06:36:45 -0800 (PST) Received: by mail-wm1-f52.google.com with SMTP id l13so2518291wmg.5 for ; Sun, 21 Feb 2021 06:36:44 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id c12sm13474247wru.71.2021.02.21.06.36.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:36:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9Gr6hhYxcoFr5/GYlEJ6i23QC05JMKXDeduQE346qJE=; b=VJC4PBoVn+iij9+qhSmonmdut68TwiLZuz72pQ8QVcrqgm3CrJ5dug3SWQC4Isx5FX SoYQbtqgNfKeQ4rX0sCPIOS0JzWdfaFb1zjxC4kvIGYujGTcv1IvTERWOmC0RSFVg02j G8aqWTecH45VuMt7CCJKu5TV1uN2yfC4zRPgj0yJ+PiVOdw6xS/CsoSLrvyuVvvt0jgH 9/Hy/zMy6lhuOsn6nFdPpm5WL0HxeNGPs18r+/+Dh1iY6VECdp4CXmnMwdAOcXGWvzVN Qr5f/s8q/lg5aX1yWcQtBbx76jCfO+yMSJOXp17xy42/5tKmBE49xDZExVXuD9ZwVp7f MAZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9Gr6hhYxcoFr5/GYlEJ6i23QC05JMKXDeduQE346qJE=; b=U8rD6GSsboftXwpjhYcMia4j+wIUPEztA/WFWLLGHgsy/wSPGbzz9n1O/dZsS7Bkn9 8cNfDfpt+Br0np1HCWVJ7JfJdKxBlX3uPtM1EIr4ThRtyhP2GGk2hzBwGeeF3eNjeAcq eoF/JOx7Oawcqw0JH+/aqaavjB75QYnYWwq7pA8RpLJcn81FfaUYsKQ2o62Pga4qHOfE twD+DzN5yTxC5zy//gUlI7RAn4aJz/znZVZw8UsfioDHgM9NPuCycK49sAqpUcheMaGL 1h3LH69YLe2udtyfEJkMS3q9H7mwAVGLDutgxNiJGrGZh7FefH40sub0KjMfSq6JluJJ q4oA== X-Gm-Message-State: AOAM531VglvogjerpY04YnbfJnc9EWQyJ5GN+YGoo8mBT91WuFH1wiLi AwQ70I4/jdulQuRrvYzX3B4= X-Google-Smtp-Source: ABdhPJyp1I7xroEGBvXD3A3+vxWuHobdCAdgTV+CBjV+nuOvAON3j530GEuFzs6LxHpOt73ZP3Lz7g== X-Received: by 2002:a05:600c:2652:: with SMTP id 18mr2967075wmy.96.1613918203770; Sun, 21 Feb 2021 06:36:43 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 26/43] target/mips: Introduce gen_load_gpr_hi() / gen_store_gpr_hi() helpers Date: Sun, 21 Feb 2021 15:34:15 +0100 Message-Id: <20210221143432.2468220-27-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210214175912.732946-7-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/translate.h | 4 ++++ target/mips/translate.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/target/mips/translate.h b/target/mips/translate.h index 3014c20cadb..468e29d7578 100644 --- a/target/mips/translate.h +++ b/target/mips/translate.h @@ -131,6 +131,10 @@ void gen_move_low32(TCGv ret, TCGv_i64 arg); void gen_move_high32(TCGv ret, TCGv_i64 arg); void gen_load_gpr(TCGv t, int reg); void gen_store_gpr(TCGv t, int reg); +#if defined(TARGET_MIPS64) +void gen_load_gpr_hi(TCGv_i64 t, int reg); +void gen_store_gpr_hi(TCGv_i64 t, int reg); +#endif /* TARGET_MIPS64 */ void gen_load_fpr32(DisasContext *ctx, TCGv_i32 t, int reg); void gen_load_fpr64(DisasContext *ctx, TCGv_i64 t, int reg); void gen_store_fpr32(DisasContext *ctx, TCGv_i32 t, int reg); diff --git a/target/mips/translate.c b/target/mips/translate.c index 5228e040842..a303c36be3f 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -2291,6 +2291,24 @@ void gen_store_gpr(TCGv t, int reg) } } =20 +#if defined(TARGET_MIPS64) +void gen_load_gpr_hi(TCGv_i64 t, int reg) +{ + if (reg =3D=3D 0) { + tcg_gen_movi_i64(t, 0); + } else { + tcg_gen_mov_i64(t, cpu_gpr_hi[reg]); + } +} + +void gen_store_gpr_hi(TCGv_i64 t, int reg) +{ + if (reg !=3D 0) { + tcg_gen_mov_i64(cpu_gpr_hi[reg], t); + } +} +#endif /* TARGET_MIPS64 */ + /* Moves to/from shadow registers. */ static inline void gen_load_srsgpr(int from, int to) { --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918210; cv=none; d=zohomail.com; s=zohoarc; b=dlTpf7sK4ibnfHRDrAkMq6lEwvQWnmqM+bfOq58RywPOI89UbeMX5P+lIunArGTNHrW1w3tNyZcvgl3WepVNO8cC2Te6L3WvQZo8U3CMT44RLb67TOlGHOMluMdT52qcqpPR/X54DimotEsCmwuHtS1Ayg5arETfNijAQJ9VRYY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918210; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uo9pUZwSgpzkENxQpsju87CnRF4+oGdspcjkbGETK70=; b=GIlf+3MPZ1NcRVzrGG8o3/WsixjmNTUuq6gj2gDWTooPK2/uustBlh+SuUzw9o7Rmm4Nbzm3uVdpE978mbTCA3miDwNP3VzcLvUeGwbOTiBBV43+hcJYTl7H96GloAQMvxE3qCnoEnJFTtpzFFaYkYmTUcjVy6e38+qdmI8UBFM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1613918210471116.75082942462859; Sun, 21 Feb 2021 06:36:50 -0800 (PST) Received: by mail-wr1-f43.google.com with SMTP id r3so4699186wro.9 for ; Sun, 21 Feb 2021 06:36:49 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id o13sm27300043wro.15.2021.02.21.06.36.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:36:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uo9pUZwSgpzkENxQpsju87CnRF4+oGdspcjkbGETK70=; b=OuVp1mYso22zPYoV0Qh8/0ZtZqJTXrEduxyq0u/JZl+KOguAD19JGDKmFKZ51zUFU2 RpOviGg4Cqb06gQJt7H5f7QytXYMsE31jq5GgRYJFSfc9pfOAmHAPTwvAuqbFhjfMBtx qwD8nPNMsR2n2rRfHYHekP598IEXKLdV1Mf3FCDKK/BOb+IVxWKlsncIZGVt4Cq7/UUj ryh/L/xYS7f5wrbLiooykGt52kukpmuGJVWGfoWIvI01fv0YSUPsw/yUwcDAaOfD/d6m xAjTYgKhDcu7qGRcCEGJaxxgHBkcA8ehwjCBRnwbM5AvvE892jJH8LvrrN+aMTGQsRGJ rFxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uo9pUZwSgpzkENxQpsju87CnRF4+oGdspcjkbGETK70=; b=Ob5LYoaMcHmUE89sY9e07M9RcEVdmFgQf1ItCOgvDVqiSMVzNQd85fgXthBD8zXuHz XIJQ2wVuhS2Zibq6WOmmmpvwBl1zuCFmFM7TdaGC4A2yW2huid0ccZLpf0xjY+Wst5D2 dteIoOTxDna0zgWVaqnFY81yrZSH9C9mxr2Bi6dUcWkt8MdDjXOGi2gaGeD1SZin9Qd9 tMY+giX/vcmfPmi40gTmXP+fjyV9ZlyqBuEAC/R/vXTuBYklndI2aCnxRoSDjdQgDyIs 4FLAOWvvdgjOiZqf0u5FSE66wZlB6TmS/nLb4Gfgj4fGLukNgLI4x3hsc3kD4LkSQaee B4/Q== X-Gm-Message-State: AOAM533t6WKcX3ilY7uiuwGaDuiIPgxLqtUW1gheE4mmdRWiuHPYQa49 +CFQniON4BrO6cmlO2DMljI= X-Google-Smtp-Source: ABdhPJyLL4YvKWg/mWBT43pEhvYkoh7k+af8hj53nUv537Glt/uomPtExgoAz1K73CtUac48EEpEIw== X-Received: by 2002:adf:ce06:: with SMTP id p6mr16194736wrn.406.1613918208746; Sun, 21 Feb 2021 06:36:48 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson Subject: [PULL 27/43] target/mips: Use GPR move functions in gen_HILO1_tx79() Date: Sun, 21 Feb 2021 15:34:16 +0100 Message-Id: <20210221143432.2468220-28-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) We have handy functions to access GPR. Use gen_store_gpr() for Move From HI/LO Register and gen_load_gpr() for Move To opcodes. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210214175912.732946-8-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/translate.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/target/mips/translate.c b/target/mips/translate.c index a303c36be3f..70891c37cdd 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -4126,31 +4126,18 @@ static void gen_shift(DisasContext *ctx, uint32_t o= pc, /* Copy GPR to and from TX79 HI1/LO1 register. */ static void gen_HILO1_tx79(DisasContext *ctx, uint32_t opc, int reg) { - if (reg =3D=3D 0 && (opc =3D=3D MMI_OPC_MFHI1 || opc =3D=3D MMI_OPC_MF= LO1)) { - /* Treat as NOP. */ - return; - } - switch (opc) { case MMI_OPC_MFHI1: - tcg_gen_mov_tl(cpu_gpr[reg], cpu_HI[1]); + gen_store_gpr(cpu_HI[1], reg); break; case MMI_OPC_MFLO1: - tcg_gen_mov_tl(cpu_gpr[reg], cpu_LO[1]); + gen_store_gpr(cpu_LO[1], reg); break; case MMI_OPC_MTHI1: - if (reg !=3D 0) { - tcg_gen_mov_tl(cpu_HI[1], cpu_gpr[reg]); - } else { - tcg_gen_movi_tl(cpu_HI[1], 0); - } + gen_load_gpr(cpu_HI[1], reg); break; case MMI_OPC_MTLO1: - if (reg !=3D 0) { - tcg_gen_mov_tl(cpu_LO[1], cpu_gpr[reg]); - } else { - tcg_gen_movi_tl(cpu_LO[1], 0); - } + gen_load_gpr(cpu_LO[1], reg); break; default: MIPS_INVAL("mfthilo1 TX79"); --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918217; cv=none; d=zohomail.com; s=zohoarc; b=YBDD+ibueGq+G2GYXTaHk8Ue2QjbCNeUbG7tqWhrxt+xdO6xMNxKXnPO6ayI9ZdkDwcXyySw4jtUyoo8z+hLq5v27SpBt85TnnVCMrIjbJR/IKGI3j7rXW+PMHW3dre+gJ0UcK69jlpI7IE4YWm9rWA0DfuAkkzbfcxmr9TImr8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918217; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YyNKszL48OLaM4ZNQExWphMxCaJDhi1vd5fOtm2espU=; b=Is7whuaf1vTQ+a3VMEH8yk+DCH/8pMOJA3RI5fZLVzJtQYlBTNJuAp0WmGFYJ/ndNg+dlyU5jpz5o1b+UKLsPWdV1Of11HM4T19MXDAhLTkTT+o9F/1bMKQ0JAyOHvlNiXxnUOBFhlEp/6v+JqECxB70niL8F98oX547R1ua/gc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 1613918217413680.7145275558017; Sun, 21 Feb 2021 06:36:57 -0800 (PST) Received: by mail-wm1-f53.google.com with SMTP id x16so11168476wmk.3 for ; Sun, 21 Feb 2021 06:36:54 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id o13sm27300383wro.15.2021.02.21.06.36.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:36:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YyNKszL48OLaM4ZNQExWphMxCaJDhi1vd5fOtm2espU=; b=HC/RGTL+hsGWRRRcmn7cw8NAOegAzgLc/H9Z1JZOHrFRseVuWEBaHwkJtkdP21+0OF V4osk0HcroAeDatkFqUG3IAYsxIBV2fwmG0qV177w5opVisCSUAil/4O3zBP6EKQ/XN3 /HgvVFcnoOdoElpRyGXPPBhw2YYIiiM/Wdp7+Y7r+s4Ajv2eL2Pacjlw9TMtvuLsqGPJ m8dHcCpN+xTTChgDlC2IJFXuTMV0Umt0w37H0m8yzBem6z1nZDH9D5YQ8wMDGYN6tKfC HKGnwD4c3473P86We+vaDfZqYdTLekQDvPWbJFrcai02MzZNsjXT1BeuHyNz0KTo+QRw 5glg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=YyNKszL48OLaM4ZNQExWphMxCaJDhi1vd5fOtm2espU=; b=Bv/Zn0doIyva5BriCO4UvW+FwythW1t4snqF4Mf+speJGieYCF60TRs1XPuIGHKK1A RfblNh8t4pnBNomMTRhAyNcATU2HUaEowBlCqlot1ynBrXpWzK11uHsKccZnPqVfX17C 0cA7WmdS/wgHpbq9P8zruvxmIQ1PSPlmZabhcnIi+jfhEaSbm91riSo9o+ZImZRMvatD rs9XtC+7bJk81Oik+R4/9PcQPF01VFYf2nyqwoj4VHjjA0xOtxNAhqtQf5DlJtd1az87 Fu7vvmLNZZIpEj/OIhvRrRijOsYh4E8gw+KEls2OivG6yJ/yal7uDOn1vTUl05qfIZQX dfGw== X-Gm-Message-State: AOAM531qm8Y90ftr6+UjmaDwWgJEv2jDC+GPsJdIWtsrk3DFJE9o84Bg qhJX8JPEck90MpomcMqVgas= X-Google-Smtp-Source: ABdhPJxirevuMfZpwLgMNzgagX+TnOifS3lzTsN8Z8knXpQzBXraeIZ8RKPEZsWYV/SSKQ6+qtsxPg== X-Received: by 2002:a05:600c:3516:: with SMTP id h22mr16346008wmq.35.1613918213689; Sun, 21 Feb 2021 06:36:53 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 28/43] vt82c686: Move superio memory region to SuperIOConfig struct Date: Sun, 21 Feb 2021 15:34:17 +0100 Message-Id: <20210221143432.2468220-29-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: BALATON Zoltan The superio memory region holds the io space index/data registers used to access the superio config registers that are implemented in struct SuperIOConfig. To keep these related things together move the memory region to SuperIOConfig and rename it accordingly. Also remove the unused "data" member of SuperIOConfig which is not needed as we store actual data values in the regs array. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Jiaxun Yang Message-Id: Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index a6f5a0843d0..30fe02f4c60 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -29,12 +29,11 @@ typedef struct SuperIOConfig { uint8_t regs[0x100]; uint8_t index; - uint8_t data; + MemoryRegion io; } SuperIOConfig; =20 struct VT82C686BISAState { PCIDevice dev; - MemoryRegion superio; SuperIOConfig superio_cfg; }; =20 @@ -128,8 +127,9 @@ static void vt82c686b_write_config(PCIDevice *d, uint32= _t addr, =20 trace_via_isa_write(addr, val, len); pci_default_write_config(d, addr, val, len); - if (addr =3D=3D 0x85) { /* enable or disable super IO configure */ - memory_region_set_enabled(&s->superio, val & 0x2); + if (addr =3D=3D 0x85) { + /* BIT(1): enable or disable superio config io ports */ + memory_region_set_enabled(&s->superio_cfg.io, val & BIT(1)); } } =20 @@ -311,15 +311,15 @@ static void vt82c686b_realize(PCIDevice *d, Error **e= rrp) } } =20 - memory_region_init_io(&s->superio, OBJECT(d), &superio_cfg_ops, - &s->superio_cfg, "superio", 2); - memory_region_set_enabled(&s->superio, false); + memory_region_init_io(&s->superio_cfg.io, OBJECT(d), &superio_cfg_ops, + &s->superio_cfg, "superio_cfg", 2); + memory_region_set_enabled(&s->superio_cfg.io, false); /* * The floppy also uses 0x3f0 and 0x3f1. * But we do not emulate a floppy, so just set it here. */ memory_region_add_subregion(isa_bus->address_space_io, 0x3f0, - &s->superio); + &s->superio_cfg.io); } =20 static void via_class_init(ObjectClass *klass, void *data) --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918220; cv=none; d=zohomail.com; s=zohoarc; b=lkDOY1qUrx8Bpy6W6OqDlrQZWWfbEHqBLe9jDbXzJ4dwsYEotfGmK3Iqhp/yWtf0sBpcAatEJ4xHvXuj5ktPg4vWiKp1DhE4hqqiayR7HA5TSrHaUKmByshDK7Tn1PhlrKhz6Qz0trtCbALtxPLWfoVXlrW6p7PbAc+WjX82jWs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918220; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0W6aGfZKIKjWp3v6QqcMHHh44Y6g4mIdHgaCTPn7oN8=; b=bsZiXSD025q2tZSrP30raoAkfEVlu2G/+6ptS6SkSyswucqJzeKirDNJZwoY7ejVpCj7PUdeRg/d8xoO4G4neKsxk7XUPl/Gx8ZqakC5uKCMFqp6zOvBWw7KBVcOBuFfnf+pfgwg52vzAcL6IU7QpHIGUEoiOf8zUaZJg6vEXJk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 161391822054463.91254892899997; Sun, 21 Feb 2021 06:37:00 -0800 (PST) Received: by mail-wr1-f43.google.com with SMTP id v15so16351467wrx.4 for ; Sun, 21 Feb 2021 06:36:59 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id p12sm20502064wmq.1.2021.02.21.06.36.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:36:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0W6aGfZKIKjWp3v6QqcMHHh44Y6g4mIdHgaCTPn7oN8=; b=icwcfoVRsVI5ttGpGg7pl0YLfKZUWdyKx+lxy392TGkLgom3f7I5UKQOD2PhzfxGaM Qwn38F37J2f7zvYXWMN4sYx4v507VHM1Fze5YMvrq4jjO5TIsXK7LTKRFlXFMaf84Cy9 3zDpwmZ+U106Tg0lVSDfGffGTa72Ix9vLjSet+ARzOtMefkoHjca+c8IbCdpbVOuGow7 FQB/nTqI0je+/k6P/tnomLGsLmfsK85tVJJhQyOdxFwnUyQMUVHuUXYDhJ2B+yAucuz9 XDEpRnjyjhe3Cm7wzL+HUY2mZ9ggJNZ9Vi/tijhg6Vgnf21EbiVFyQU44H27Q+5Li+a2 yiMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0W6aGfZKIKjWp3v6QqcMHHh44Y6g4mIdHgaCTPn7oN8=; b=eo5pYWaZ89LZoR/FRAoPEe0hvaChIVES3yz6lF4jQytK7HJCfKcBjXp5GSNmjcwyh7 cnlsd78rqK1weeKbd/aBKBYnXOlMy/UcNtL6pM50IIzwSx5VOr75aCSfqUhpmP+3HRUf egaO4XrRXxxQpbtFN6fd5mdFhSJf8Q7BEkj0I4Fu/0J8M/4ueCxi5+0gWbpOZ+yPlgjs pfFuhGuDoMvtRWfh/Aj5VtioaoMlWQZcs4FVFST8HXsMKt+ABxeEJiJPmMKP6dFm9Nfc d3/SN9rZR3mxbZTElXMuqjYWZtgihsokucSSsRNZ2Fj0pj9dWJEewV1rzd7nB2WVVHg1 xVLA== X-Gm-Message-State: AOAM532ov5vlk2qDn/AXvebIr45NnzNNp6mmbtj9MyFSvPoLQuA4JCuv PMdU++GlXxAi7qvp1ZNXspk= X-Google-Smtp-Source: ABdhPJw05sqNyF5aOEG69SEwIjLruYo/DJstOUqHrmlwpTMjtLXNQfU8TPLHd+EcCnU+jh+vM6QI7A== X-Received: by 2002:adf:aa08:: with SMTP id p8mr17208452wrd.232.1613918218735; Sun, 21 Feb 2021 06:36:58 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 29/43] vt82c686: Reorganise code Date: Sun, 21 Feb 2021 15:34:18 +0100 Message-Id: <20210221143432.2468220-30-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: BALATON Zoltan Move lines around so that object definitions become consecutive and not scattered around. This brings functions belonging to an object together so it's clearer what is defined and what parts belong to which object. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <9f942989dba46fc1c23b881f6cb135948f818c2f.1610223397.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 279 +++++++++++++++++++++++----------------------- 1 file changed, 140 insertions(+), 139 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 30fe02f4c60..fe8961b0573 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -26,112 +26,7 @@ #include "exec/address-spaces.h" #include "trace.h" =20 -typedef struct SuperIOConfig { - uint8_t regs[0x100]; - uint8_t index; - MemoryRegion io; -} SuperIOConfig; - -struct VT82C686BISAState { - PCIDevice dev; - SuperIOConfig superio_cfg; -}; - -OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA) - -static void superio_cfg_write(void *opaque, hwaddr addr, uint64_t data, - unsigned size) -{ - SuperIOConfig *sc =3D opaque; - - if (addr =3D=3D 0x3f0) { /* config index register */ - sc->index =3D data & 0xff; - } else { - bool can_write =3D true; - /* 0x3f1, config data register */ - trace_via_superio_write(sc->index, data & 0xff); - switch (sc->index) { - case 0x00 ... 0xdf: - case 0xe4: - case 0xe5: - case 0xe9 ... 0xed: - case 0xf3: - case 0xf5: - case 0xf7: - case 0xf9 ... 0xfb: - case 0xfd ... 0xff: - can_write =3D false; - break; - /* case 0xe6 ... 0xe8: Should set base port of parallel and serial= */ - default: - break; - - } - if (can_write) { - sc->regs[sc->index] =3D data & 0xff; - } - } -} - -static uint64_t superio_cfg_read(void *opaque, hwaddr addr, unsigned size) -{ - SuperIOConfig *sc =3D opaque; - uint8_t val =3D sc->regs[sc->index]; - - trace_via_superio_read(sc->index, val); - return val; -} - -static const MemoryRegionOps superio_cfg_ops =3D { - .read =3D superio_cfg_read, - .write =3D superio_cfg_write, - .endianness =3D DEVICE_NATIVE_ENDIAN, - .impl =3D { - .min_access_size =3D 1, - .max_access_size =3D 1, - }, -}; - -static void vt82c686b_isa_reset(DeviceState *dev) -{ - VT82C686BISAState *s =3D VT82C686B_ISA(dev); - uint8_t *pci_conf =3D s->dev.config; - - pci_set_long(pci_conf + PCI_CAPABILITY_LIST, 0x000000c0); - pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMO= RY | - PCI_COMMAND_MASTER | PCI_COMMAND_SPECIAL); - pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_DEVSEL_MEDIUM); - - pci_conf[0x48] =3D 0x01; /* Miscellaneous Control 3 */ - pci_conf[0x4a] =3D 0x04; /* IDE interrupt Routing */ - pci_conf[0x4f] =3D 0x03; /* DMA/Master Mem Access Control 3 */ - pci_conf[0x50] =3D 0x2d; /* PnP DMA Request Control */ - pci_conf[0x59] =3D 0x04; - pci_conf[0x5a] =3D 0x04; /* KBC/RTC Control*/ - pci_conf[0x5f] =3D 0x04; - pci_conf[0x77] =3D 0x10; /* GPIO Control 1/2/3/4 */ - - s->superio_cfg.regs[0xe0] =3D 0x3c; /* Device ID */ - s->superio_cfg.regs[0xe2] =3D 0x03; /* Function select */ - s->superio_cfg.regs[0xe3] =3D 0xfc; /* Floppy ctrl base addr */ - s->superio_cfg.regs[0xe6] =3D 0xde; /* Parallel port base addr */ - s->superio_cfg.regs[0xe7] =3D 0xfe; /* Serial port 1 base addr */ - s->superio_cfg.regs[0xe8] =3D 0xbe; /* Serial port 2 base addr */ -} - -/* write config pci function0 registers. PCI-ISA bridge */ -static void vt82c686b_write_config(PCIDevice *d, uint32_t addr, - uint32_t val, int len) -{ - VT82C686BISAState *s =3D VT82C686B_ISA(d); - - trace_via_isa_write(addr, val, len); - pci_default_write_config(d, addr, val, len); - if (addr =3D=3D 0x85) { - /* BIT(1): enable or disable superio config io ports */ - memory_region_set_enabled(&s->superio_cfg.io, val & BIT(1)); - } -} +OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM) =20 struct VT686PMState { PCIDevice dev; @@ -142,30 +37,6 @@ struct VT686PMState { uint32_t smb_io_base; }; =20 -OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM) - -static void pm_update_sci(VT686PMState *s) -{ - int sci_level, pmsts; - - pmsts =3D acpi_pm1_evt_get_sts(&s->ar); - sci_level =3D (((pmsts & s->ar.pm1.evt.en) & - (ACPI_BITMASK_RT_CLOCK_ENABLE | - ACPI_BITMASK_POWER_BUTTON_ENABLE | - ACPI_BITMASK_GLOBAL_LOCK_ENABLE | - ACPI_BITMASK_TIMER_ENABLE)) !=3D 0); - pci_set_irq(&s->dev, sci_level); - /* schedule a timer interruption if needed */ - acpi_pm_tmr_update(&s->ar, (s->ar.pm1.evt.en & ACPI_BITMASK_TIMER_ENAB= LE) && - !(pmsts & ACPI_BITMASK_TIMER_STATUS)); -} - -static void pm_tmr_timer(ACPIREGS *ar) -{ - VT686PMState *s =3D container_of(ar, VT686PMState, ar); - pm_update_sci(s); -} - static void pm_io_space_update(VT686PMState *s) { uint32_t pm_io_base; @@ -179,12 +50,6 @@ static void pm_io_space_update(VT686PMState *s) memory_region_transaction_commit(); } =20 -static void pm_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int= len) -{ - trace_via_pm_write(addr, val, len); - pci_default_write_config(d, addr, val, len); -} - static int vmstate_acpi_post_load(void *opaque, int version_id) { VT686PMState *s =3D opaque; @@ -210,7 +75,34 @@ static const VMStateDescription vmstate_acpi =3D { } }; =20 -/* vt82c686 pm init */ +static void pm_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int= len) +{ + trace_via_pm_write(addr, val, len); + pci_default_write_config(d, addr, val, len); +} + +static void pm_update_sci(VT686PMState *s) +{ + int sci_level, pmsts; + + pmsts =3D acpi_pm1_evt_get_sts(&s->ar); + sci_level =3D (((pmsts & s->ar.pm1.evt.en) & + (ACPI_BITMASK_RT_CLOCK_ENABLE | + ACPI_BITMASK_POWER_BUTTON_ENABLE | + ACPI_BITMASK_GLOBAL_LOCK_ENABLE | + ACPI_BITMASK_TIMER_ENABLE)) !=3D 0); + pci_set_irq(&s->dev, sci_level); + /* schedule a timer interruption if needed */ + acpi_pm_tmr_update(&s->ar, (s->ar.pm1.evt.en & ACPI_BITMASK_TIMER_ENAB= LE) && + !(pmsts & ACPI_BITMASK_TIMER_STATUS)); +} + +static void pm_tmr_timer(ACPIREGS *ar) +{ + VT686PMState *s =3D container_of(ar, VT686PMState, ar); + pm_update_sci(s); +} + static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp) { VT686PMState *s =3D VT82C686B_PM(dev); @@ -276,6 +168,87 @@ static const TypeInfo via_pm_info =3D { }, }; =20 + +typedef struct SuperIOConfig { + uint8_t regs[0x100]; + uint8_t index; + MemoryRegion io; +} SuperIOConfig; + +static void superio_cfg_write(void *opaque, hwaddr addr, uint64_t data, + unsigned size) +{ + SuperIOConfig *sc =3D opaque; + + if (addr =3D=3D 0x3f0) { /* config index register */ + sc->index =3D data & 0xff; + } else { + bool can_write =3D true; + /* 0x3f1, config data register */ + trace_via_superio_write(sc->index, data & 0xff); + switch (sc->index) { + case 0x00 ... 0xdf: + case 0xe4: + case 0xe5: + case 0xe9 ... 0xed: + case 0xf3: + case 0xf5: + case 0xf7: + case 0xf9 ... 0xfb: + case 0xfd ... 0xff: + can_write =3D false; + break; + /* case 0xe6 ... 0xe8: Should set base port of parallel and serial= */ + default: + break; + + } + if (can_write) { + sc->regs[sc->index] =3D data & 0xff; + } + } +} + +static uint64_t superio_cfg_read(void *opaque, hwaddr addr, unsigned size) +{ + SuperIOConfig *sc =3D opaque; + uint8_t val =3D sc->regs[sc->index]; + + trace_via_superio_read(sc->index, val); + return val; +} + +static const MemoryRegionOps superio_cfg_ops =3D { + .read =3D superio_cfg_read, + .write =3D superio_cfg_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .impl =3D { + .min_access_size =3D 1, + .max_access_size =3D 1, + }, +}; + + +OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA) + +struct VT82C686BISAState { + PCIDevice dev; + SuperIOConfig superio_cfg; +}; + +static void vt82c686b_write_config(PCIDevice *d, uint32_t addr, + uint32_t val, int len) +{ + VT82C686BISAState *s =3D VT82C686B_ISA(d); + + trace_via_isa_write(addr, val, len); + pci_default_write_config(d, addr, val, len); + if (addr =3D=3D 0x85) { + /* BIT(1): enable or disable superio config io ports */ + memory_region_set_enabled(&s->superio_cfg.io, val & BIT(1)); + } +} + static const VMStateDescription vmstate_via =3D { .name =3D "vt82c686b", .version_id =3D 1, @@ -286,7 +259,33 @@ static const VMStateDescription vmstate_via =3D { } }; =20 -/* init the PCI-to-ISA bridge */ +static void vt82c686b_isa_reset(DeviceState *dev) +{ + VT82C686BISAState *s =3D VT82C686B_ISA(dev); + uint8_t *pci_conf =3D s->dev.config; + + pci_set_long(pci_conf + PCI_CAPABILITY_LIST, 0x000000c0); + pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMO= RY | + PCI_COMMAND_MASTER | PCI_COMMAND_SPECIAL); + pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_DEVSEL_MEDIUM); + + pci_conf[0x48] =3D 0x01; /* Miscellaneous Control 3 */ + pci_conf[0x4a] =3D 0x04; /* IDE interrupt Routing */ + pci_conf[0x4f] =3D 0x03; /* DMA/Master Mem Access Control 3 */ + pci_conf[0x50] =3D 0x2d; /* PnP DMA Request Control */ + pci_conf[0x59] =3D 0x04; + pci_conf[0x5a] =3D 0x04; /* KBC/RTC Control*/ + pci_conf[0x5f] =3D 0x04; + pci_conf[0x77] =3D 0x10; /* GPIO Control 1/2/3/4 */ + + s->superio_cfg.regs[0xe0] =3D 0x3c; /* Device ID */ + s->superio_cfg.regs[0xe2] =3D 0x03; /* Function select */ + s->superio_cfg.regs[0xe3] =3D 0xfc; /* Floppy ctrl base addr */ + s->superio_cfg.regs[0xe6] =3D 0xde; /* Parallel port base addr */ + s->superio_cfg.regs[0xe7] =3D 0xfe; /* Serial port 1 base addr */ + s->superio_cfg.regs[0xe8] =3D 0xbe; /* Serial port 2 base addr */ +} + static void vt82c686b_realize(PCIDevice *d, Error **errp) { VT82C686BISAState *s =3D VT82C686B_ISA(d); @@ -354,6 +353,7 @@ static const TypeInfo via_info =3D { }, }; =20 + static void vt82c686b_superio_class_init(ObjectClass *klass, void *data) { ISASuperIOClass *sc =3D ISA_SUPERIO_CLASS(klass); @@ -372,11 +372,12 @@ static const TypeInfo via_superio_info =3D { .class_init =3D vt82c686b_superio_class_init, }; =20 + static void vt82c686b_register_types(void) { type_register_static(&via_pm_info); - type_register_static(&via_superio_info); type_register_static(&via_info); + type_register_static(&via_superio_info); } =20 type_init(vt82c686b_register_types) --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1613918225; cv=none; d=zohomail.com; s=zohoarc; b=LR0u/ElMAnl45eCHQ62fW4aSMK2iruz/5Lx56yJmb34h/fk0sPTLn8ZFCeV8+rs2GoNFRrW5a0Mflb33nO7jCvXSl4IB2iBa2xIuprDY3YaxuLwfWFyw4Fg3dtqtY/I0gntgXsNpM9AYIi78SSHyl14Hl5AbCDpGYjWCAEdsDtM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918225; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Fn2wgV+lTDENJfWcbIU51ctlhy1kkwhbv5mosNpy87A=; b=oKTUjEvyrLNBsheXR2Hc/Wjl6LTtz6rZKfW4TPUBzJiItSg6MFeKcytXFxWXiAUz9rUpgsGJluU/MQ9BMyUqC2CdGNVV3MdEnonHeUjd/EVXAL4ehAXfakdU2x6dDTojBg0UV/HbwSGeQkagYFhuUDPD8kn2UBWlS247Dxsr5to= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1613918225506946.8102940707032; Sun, 21 Feb 2021 06:37:05 -0800 (PST) Received: by mail-wm1-f48.google.com with SMTP id o10so6350058wmc.1 for ; Sun, 21 Feb 2021 06:37:04 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id b15sm23809109wrr.47.2021.02.21.06.37.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:37:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Fn2wgV+lTDENJfWcbIU51ctlhy1kkwhbv5mosNpy87A=; b=H7u49TBmnJguwv5gB1vnANUb0v6ZjR6GIhS0shW/bfl4kGFsFOOH1c73crawqpY1EI AUtjdlCl48o2QIRwy0L2RxudXjhKRKiwpTAS+d9LL8xetYVj+m7PTjNTitejoW6eql7N um2mERD6XtUt1pCPnzAjxZ4O+bKw7V0MDHt4BLpn6tLytr9gIJHQhiEKO28B6fyDJmpA e1e5A/Qb4uqVIdaGrt82AhsJ9EBcHi0/dXQpdxNHJL2UUzvcLXPl3EnEOHLT1EA65dz2 +yGX+Ln0cxV8MXcCHEOzeSDSlKNJ4cJuvonRsPI0HIFXht4O57hHQ6atUq5u2J6sMp4G KQXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Fn2wgV+lTDENJfWcbIU51ctlhy1kkwhbv5mosNpy87A=; b=NIepsGcXMde5NrETRMW4tFAtg49C1mrODs+6OnPmbgMtBcnXMYEio+YDbEceX85Met 0xN/Ru2Z41reMviz/Gsd/54UEeXmCdByVwQKABwRCcRgfBLV/K9O/UXRxxxSi6effudp Jv5P+MutRUziLbnuTOD2FynoRdk3+4JeyVEhf1Vk7ZuL+YgShpZMPHtQa5kYjJytN6BD /txND4YJutyhur9bFg56wE8+q6B85d3ZxEfLEwwhQhBewdIMk636Xsa/TvZc2oldAZ6h hPZv9LK1xM7fMz12KVKbai1u3RZg2iu8IEl+HUUvp0tWWoDjAZcOdlyfJho8jZsNBF/U aUNw== X-Gm-Message-State: AOAM532dG+PzcXosVzLFgNlBDS6MpZscjCtaqjSRTpswEMWkn0OaMDVr F2WS00EIE8bbWAbf7HzK/gM= X-Google-Smtp-Source: ABdhPJygGmSi6Qx4Zj3SRDnVfJXS7W5zElbSmb9YN6Z69GQeGRHUb32aNIrJ7ByjRSlkLQK8nT6gxw== X-Received: by 2002:a05:600c:294c:: with SMTP id n12mr258617wmd.118.1613918223723; Sun, 21 Feb 2021 06:37:03 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 30/43] vt82c686: Fix SMBus IO base and configuration registers Date: Sun, 21 Feb 2021 15:34:19 +0100 Message-Id: <20210221143432.2468220-31-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: BALATON Zoltan The base address of the SMBus io ports and its enabled status is set by registers in the PCI config space but this was not correctly emulated. Instead the SMBus registers were mapped on realize to the base address set by a property to the address expected by fuloong2e firmware. Fix the base and config register handling to more closely model hardware which allows to remove the property and allows the guest to control this mapping. Do all this in reset instead of realize so it's correctly updated on reset. Signed-off-by: BALATON Zoltan Reviewed-by: Jiaxun Yang Message-Id: Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 49 +++++++++++++++++++++++++++++++++------------ hw/mips/fuloong2e.c | 4 +--- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index fe8961b0573..9c4d1530225 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -22,6 +22,7 @@ #include "hw/i2c/pm_smbus.h" #include "qapi/error.h" #include "qemu/module.h" +#include "qemu/range.h" #include "qemu/timer.h" #include "exec/address-spaces.h" #include "trace.h" @@ -34,7 +35,6 @@ struct VT686PMState { ACPIREGS ar; APMState apm; PMSMBus smb; - uint32_t smb_io_base; }; =20 static void pm_io_space_update(VT686PMState *s) @@ -50,11 +50,22 @@ static void pm_io_space_update(VT686PMState *s) memory_region_transaction_commit(); } =20 +static void smb_io_space_update(VT686PMState *s) +{ + uint32_t smbase =3D pci_get_long(s->dev.config + 0x90) & 0xfff0UL; + + memory_region_transaction_begin(); + memory_region_set_address(&s->smb.io, smbase); + memory_region_set_enabled(&s->smb.io, s->dev.config[0xd2] & BIT(0)); + memory_region_transaction_commit(); +} + static int vmstate_acpi_post_load(void *opaque, int version_id) { VT686PMState *s =3D opaque; =20 pm_io_space_update(s); + smb_io_space_update(s); return 0; } =20 @@ -77,8 +88,18 @@ static const VMStateDescription vmstate_acpi =3D { =20 static void pm_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int= len) { + VT686PMState *s =3D VT82C686B_PM(d); + trace_via_pm_write(addr, val, len); pci_default_write_config(d, addr, val, len); + if (ranges_overlap(addr, len, 0x90, 4)) { + uint32_t v =3D pci_get_long(s->dev.config + 0x90); + pci_set_long(s->dev.config + 0x90, (v & 0xfff0UL) | 1); + } + if (range_covers_byte(addr, len, 0xd2)) { + s->dev.config[0xd2] &=3D 0xf; + smb_io_space_update(s); + } } =20 static void pm_update_sci(VT686PMState *s) @@ -103,6 +124,17 @@ static void pm_tmr_timer(ACPIREGS *ar) pm_update_sci(s); } =20 +static void vt82c686b_pm_reset(DeviceState *d) +{ + VT686PMState *s =3D VT82C686B_PM(d); + + /* SMBus IO base */ + pci_set_long(s->dev.config + 0x90, 1); + s->dev.config[0xd2] =3D 0; + + smb_io_space_update(s); +} + static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp) { VT686PMState *s =3D VT82C686B_PM(dev); @@ -116,13 +148,9 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error= **errp) /* 0x48-0x4B is Power Management I/O Base */ pci_set_long(pci_conf + 0x48, 0x00000001); =20 - /* SMB ports:0xeee0~0xeeef */ - s->smb_io_base =3D ((s->smb_io_base & 0xfff0) + 0x0); - pci_conf[0x90] =3D s->smb_io_base | 1; - pci_conf[0x91] =3D s->smb_io_base >> 8; - pci_conf[0xd2] =3D 0x90; pm_smbus_init(DEVICE(s), &s->smb, false); - memory_region_add_subregion(get_system_io(), s->smb_io_base, &s->smb.i= o); + memory_region_add_subregion(pci_address_space_io(dev), 0, &s->smb.io); + memory_region_set_enabled(&s->smb.io, false); =20 apm_init(dev, &s->apm, NULL, s); =20 @@ -135,11 +163,6 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error= **errp) acpi_pm1_cnt_init(&s->ar, &s->io, false, false, 2); } =20 -static Property via_pm_properties[] =3D { - DEFINE_PROP_UINT32("smb_io_base", VT686PMState, smb_io_base, 0), - DEFINE_PROP_END_OF_LIST(), -}; - static void via_pm_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -151,10 +174,10 @@ static void via_pm_class_init(ObjectClass *klass, voi= d *data) k->device_id =3D PCI_DEVICE_ID_VIA_ACPI; k->class_id =3D PCI_CLASS_BRIDGE_OTHER; k->revision =3D 0x40; + dc->reset =3D vt82c686b_pm_reset; dc->desc =3D "PM"; dc->vmsd =3D &vmstate_acpi; set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); - device_class_set_props(dc, via_pm_properties); } =20 static const TypeInfo via_pm_info =3D { diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 1f3680fda3e..94f4718147f 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -230,9 +230,7 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus,= int slot, qemu_irq intc, pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci"); pci_create_simple(pci_bus, PCI_DEVFN(slot, 3), "vt82c686b-usb-uhci"); =20 - dev =3D pci_new(PCI_DEVFN(slot, 4), TYPE_VT82C686B_PM); - qdev_prop_set_uint32(DEVICE(dev), "smb_io_base", 0xeee1); - pci_realize_and_unref(dev, pci_bus, &error_fatal); + dev =3D pci_create_simple(pci_bus, PCI_DEVFN(slot, 4), TYPE_VT82C686B_= PM); *i2c_bus =3D I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c")); =20 /* Audio support */ --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 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=1613918230; cv=none; d=zohomail.com; s=zohoarc; b=PtpznjN2fFPrwQZPPbGBpLg2ZUvGqHQXghWv/thIJl8a2i+y5N/lBU8sqPBxVC18MivKgJLFA4WOJux85q2VGQVFK9KnWWQW2LgelsQBfrr5r47ThwpLnAa/6ctxuNx5I6B8gxdeTZaG/JiZI9oKhqmWuLQZ7YQJcF5FL5EooUg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918230; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hED45YkFX7dQQtdpVYESE6TbcISGcjER5uTihGzAYxM=; b=JNYIfyU3rmirse0uXv5kw+hVe+uYqiFdXBhjrE8hGjhfqlUTfQYKGTJ8DhCFEvdMKKjJOMzYDTMSUv19nwyKVheiNwb9VIfDkOY/6OqIDUVvWJRlnwHStcQKh+7XlwfN2lPkwncAUqx3e0ZB5A+7M1RZPNRdDs0duOfuM9XSWSc= 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 1613918230575345.0946705089956; Sun, 21 Feb 2021 06:37:10 -0800 (PST) Received: by mail-wr1-f53.google.com with SMTP id h98so11535037wrh.11 for ; Sun, 21 Feb 2021 06:37:10 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id b13sm24044681wrs.35.2021.02.21.06.37.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:37:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hED45YkFX7dQQtdpVYESE6TbcISGcjER5uTihGzAYxM=; b=m8bcZ3L/FTfTpG9hoJr+1PuI6zyp9yMu3k0c1WE2jlwjRq+PXSMHUCufse/GGJ17nN HIJVJlbxWzpZvRDhCiCNGUap0Ek9E500lCiHYyDmBPR55vi6thU9RU6J9fWtUpfqluPG QMcJ8Z+8vSyV60j4FoWFPNvhr1JCfxi0mLxDKH9Jd50s9U1VweLZfgOF3xC3zhU8Ph+r RT9H5kCpjI4v3EDcv/mPpJKbKF5pucMWWayjzeFzAQsAHOo3juL8ofcDu++Oa1RAa7lE 5ucd+m1LivUx6MFTaUgVbS3D0YftlteIQIeQYdKKt4+zmrHf4FWgPRlqhKbVT6FlB8nh 5ZYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hED45YkFX7dQQtdpVYESE6TbcISGcjER5uTihGzAYxM=; b=DIGIg75gCjxkH4wO1CxNSMlv36roPO3q3nkIR8ztraQEp5tjWTJGq9WgRcZJvFAgvr 3V2pxKPbfBMhA3JTuivIOoUWegAMk+s9kCgdgDWCPlj0+KwRb4vqomXrOBLhG7MJYtFo y2e4d8N1MwloyQ/61CkC6eL9MAp0wikvNOcRRqUK755OJprEr2fTnxHofcrGa0WK1Ok7 Wt7lRoC1ypFmr+Q5lS8otKRcmaweubyqIBF9zFV6T4zaF0iT7BQR2jC7nnAf6TjW3386 xzPLl4lyitYnsI+VFo8VwnvjY0+hCh5PtoaZqruIf0xfIQMEBaIwD1WoBbCYVKkSTrDj Qqww== X-Gm-Message-State: AOAM531gtveCocrbO7KIfyxNCYbal5yxU64dN7g2ZLVlscH1Ufhnm6zs FE8/kUbW0FBNFqnptfKkm0c= X-Google-Smtp-Source: ABdhPJy1gbOXV8xT02RLql9pvOIsoCULv4x2M8OwxfKaVdEE1+EDDjSzWafw8ntHkm9X8x3u5nYk6w== X-Received: by 2002:adf:82b3:: with SMTP id 48mr17144476wrc.22.1613918228811; Sun, 21 Feb 2021 06:37:08 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 31/43] vt82c686: Make vt82c686-pm an I/O tracing region Date: Sun, 21 Feb 2021 15:34:20 +0100 Message-Id: <20210221143432.2468220-32-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: BALATON Zoltan Previously just an empty RAM region was mapped on realize, now we add an empty io range logging access instead. I think the pm timer should be hooked up here but not sure guests need it. PMON on fuloong2e sets a base address but does not seem to enable region; the pegasos2 firmware pokes some regs but continues anyway so don't know if anything would make use of these facilities. Therefore this is just a clean up of previous state for now and not intending to fully implement missing functionality which could be done later if some guests need it. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: [PMD: Split original patch, this is part 1/4 (make 'vt82c686-pm' an I/O tracing region)] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 26 ++++++++++++++++++++++++-- hw/isa/trace-events | 2 ++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 9c4d1530225..7e6a07fca48 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -102,6 +102,27 @@ static void pm_write_config(PCIDevice *d, uint32_t add= r, uint32_t val, int len) } } =20 +static void pm_io_write(void *op, hwaddr addr, uint64_t data, unsigned siz= e) +{ + trace_via_pm_io_write(addr, data, size); +} + +static uint64_t pm_io_read(void *op, hwaddr addr, unsigned size) +{ + trace_via_pm_io_read(addr, 0, size); + return 0; +} + +static const MemoryRegionOps pm_io_ops =3D { + .read =3D pm_io_read, + .write =3D pm_io_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .impl =3D { + .min_access_size =3D 1, + .max_access_size =3D 1, + }, +}; + static void pm_update_sci(VT686PMState *s) { int sci_level, pmsts; @@ -154,9 +175,10 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error= **errp) =20 apm_init(dev, &s->apm, NULL, s); =20 - memory_region_init(&s->io, OBJECT(dev), "vt82c686-pm", 64); + memory_region_init_io(&s->io, OBJECT(dev), &pm_io_ops, s, + "vt82c686-pm", 64); + memory_region_add_subregion(pci_address_space_io(dev), 0, &s->io); memory_region_set_enabled(&s->io, false); - memory_region_add_subregion(get_system_io(), 0, &s->io); =20 acpi_pm_tmr_init(&s->ar, pm_tmr_timer, &s->io); acpi_pm1_evt_init(&s->ar, pm_tmr_timer, &s->io); diff --git a/hw/isa/trace-events b/hw/isa/trace-events index d267d3e6524..641d69eedf7 100644 --- a/hw/isa/trace-events +++ b/hw/isa/trace-events @@ -17,5 +17,7 @@ apm_io_write(uint8_t addr, uint8_t val) "write addr=3D0x%= x val=3D0x%02x" # vt82c686.c via_isa_write(uint32_t addr, uint32_t val, int len) "addr 0x%x val 0x%x le= n 0x%x" via_pm_write(uint32_t addr, uint32_t val, int len) "addr 0x%x val 0x%x len= 0x%x" +via_pm_io_read(uint32_t addr, uint32_t val, int len) "addr 0x%x val 0x%x l= en 0x%x" +via_pm_io_write(uint32_t addr, uint32_t val, int len) "addr 0x%x val 0x%x = len 0x%x" via_superio_read(uint8_t addr, uint8_t val) "addr 0x%x val 0x%x" via_superio_write(uint8_t addr, uint32_t val) "addr 0x%x val 0x%x" --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918235; cv=none; d=zohomail.com; s=zohoarc; b=DPzDV+vTKsXorQDZXF8hLP5wyjBGgGATqShmkwRRS+IhO0IE/b16vtE09bVfCay8nnRpXYtlCxdlWFKhl3LO/StjLRDbtTRbG4YJc3thFpkVmsTOXTB9Gbuls7wxVw4cBW4bqRpi9+K4f41b6NKGhTtXrGuLWDSu5th8/YmG3Zw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918235; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=85nFzxomfBY0Wb6TMHkchJXfTbOBaI6sB3oIVJAaXrw=; b=Pl+Ig42+a5Ffx/wlkx8Fzq/Y6CSWBE9WgcZziBPzuJJPMdDmoEUF8gVANi+yUNqNeoEvqd/rvY/EQi7kt+VKe1YIML+Q/98sLVD47tOwH3WimsOCWUHNA2G3gsFdW+1EAyY4cO5vbkGB89v8kBAmPIAuymktm2BtCI8D9TLVIVU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 161391823529454.06801865349746; Sun, 21 Feb 2021 06:37:15 -0800 (PST) Received: by mail-wm1-f44.google.com with SMTP id v62so12043679wmg.4 for ; Sun, 21 Feb 2021 06:37:14 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id x4sm24885303wrn.64.2021.02.21.06.37.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:37:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=85nFzxomfBY0Wb6TMHkchJXfTbOBaI6sB3oIVJAaXrw=; b=AQUaGGXhtDhVsANDv0/7mafaRU7KhiCXrXaEMRQRYqUl30a39A4ZKQXwzjqsBM0hf3 Zb8j5cv4fJ9xhd4RUIzdx6BjND0iTdrGJunjzW+ZDa53WJgcz60OQH6LcvDkfaDHosTI v8IwBV3mUa+oRLYTahfKdtcK696FrzidXurclHiEVhz9RVWEjV4r3VPQ7efi2G9klt1w 5KTTAaOQETV5JEb1OG4rfHNXab/bDiprjQdWQX5pMO3/+bm7lyqrWj2hbrgS0xk/QfWB U7v4ysJ58a0pTNfVgawFslroWR9/5FMEjSjIuOad4m3ZrPCk443VO1Wv5BjnwLfhHb76 GJRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=85nFzxomfBY0Wb6TMHkchJXfTbOBaI6sB3oIVJAaXrw=; b=HIIqZhvPksx/zA5xjf8b92IDv3OH9F4vfHbNYPneXjbQHy1OMj2lHWygEYZ7SfQHJv vbltPhfQlsY+PKtNDmSLVOuPWrsQx5T+OsYjn0phvuVt8IQBHUm7eaOf9dinmvoqoXCH kaDYwVKcGYZvR/nytNDHGsVtDhcVwJcdsxdVSnK1W2Fh11F9LshfzVRyL/ZwYwHLWHUb DdrX38eCZ+jDWZk2cd9LNryW+Sd3wNJB30OZzBrNp2WX5Tp77ZLWAycUGPPSvQCYmI98 44RJeCk0RzEzxH1pM1UV0IiG3r2kIuY0YEvm7X9yY+fwK3dgiHna7xMQ0gtTn/xueTvJ xE0w== X-Gm-Message-State: AOAM530iPKKS2ZHQtr9aVQXjPUhHRTsXRIGcCFolo+d58BhuImg2yiRe z8gjUA9NTViIBuvWK0upx1c= X-Google-Smtp-Source: ABdhPJydyLuqdGMDIu06QseJzlRVvwr59u48z+RuySUsDHBCwgcW+pT9Y/mMdr5aG6fHHZm6thXhZw== X-Received: by 2002:a1c:5686:: with SMTP id k128mr16517514wmb.189.1613918233645; Sun, 21 Feb 2021 06:37:13 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 32/43] vt82c686: Correct vt82c686-pm I/O size Date: Sun, 21 Feb 2021 15:34:21 +0100 Message-Id: <20210221143432.2468220-33-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: BALATON Zoltan Section "Offset 4B-48 =E2=80=93 Power Management I/O Base" describes: Port Address for the base of the 128-byte Power Management I/O Register block. Correct the vt82c686-pm I/O region size. Signed-off-by: BALATON Zoltan Message-Id: [PMD: Split original patch, this is part 2/4, reduced size to 128B] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 7e6a07fca48..fe8ae24c421 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -176,7 +176,7 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error = **errp) apm_init(dev, &s->apm, NULL, s); =20 memory_region_init_io(&s->io, OBJECT(dev), &pm_io_ops, s, - "vt82c686-pm", 64); + "vt82c686-pm", 128); memory_region_add_subregion(pci_address_space_io(dev), 0, &s->io); memory_region_set_enabled(&s->io, false); =20 --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918240; cv=none; d=zohomail.com; s=zohoarc; b=OcSISKmXwdrTrI9G8Xe5WVz9wGXUg8EsyMG03mAsaoxAyOdmUQqRD9YHMX/zNDoH0l/jL0zgOZ9e1fMcSDdzzcGw7Q6IBX2jF3FAuPFjB3N7Ox+TcqsakWur5jOocNsTH0Xelr6Cr1w7QzbIevAdQImhiPGrPZUWA465lvEMMLc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918240; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=x9cE1zBzoVv13k5JjDSc8/IbSReFDXfoX7UFR/I2zeM=; b=PczmIzySiA+HslxvhSgp/p80KQ4DGSxw724m+gGtB9Phjt4zTi4/GrhezOb9ts+340BEc8KWipJWID+PQIIjNUh+4aNqpJoVpR4WYQAz+Qq9c/7JzcFR39JFOQ5Hc+erAKKmdyOZe2PP+yGOeueyQ6CJcDNGBpsBy0Eh3poFRlE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1613918240369337.03177177596353; Sun, 21 Feb 2021 06:37:20 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id b3so16337200wrj.5 for ; Sun, 21 Feb 2021 06:37:19 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id n5sm20626459wmq.7.2021.02.21.06.37.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:37:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=x9cE1zBzoVv13k5JjDSc8/IbSReFDXfoX7UFR/I2zeM=; b=Jxyly28LjAA+m7WMXz3VkeZJKj+1I0IQILxbwMnJLTLSwc0gGlcfAJHKjxJVpW2R1m up3Fu8Wv2yqnTqi5kRorauIxv5pvDISvYsAKnuNvknZ3lqlBHjgklFsiGBZ8p5mLRpGI I5uif8hmVoLt+DDSvfoLjfG+E4nAspYFDKPhh5U9gpkbc6E98L/8CYRTAjjl2V77JTvt KGD4ma1MKXPmUPb8OI/DhflAQAYp47ScjQksCVHkc6J18wPP+NlwFox9cu6eLivqYb3g SziggGdTJpE8chov4qIm+qs7C4V43QxVWPoW2OxvlZRncq0KTPolbVHifrzSOKNAN/aO jE4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=x9cE1zBzoVv13k5JjDSc8/IbSReFDXfoX7UFR/I2zeM=; b=uPgaPy1B6FzaRnsZRnAhOsRmCf+8+DvpZbTEknI585ZQcGOuqo83Fcku7JoJP3AqVB jp9HeWcsRI62mkRh+A+yrGEtCblUUGzsx4QyTtFzeEYW6KXsUvy8FksFTEcDJr2e/rVP t/JqHS0B6b3mGT30gBIW8G5muDh464gg4dm9/sOLUJSkHgNrKJdECgt/Ek0LBILcwv48 fJ3icggzfPgo+X4uWsXG+HhLbwYr//+WsPtSjPP+Q38wLDk9CQVf7AapWUqsuvmenKP/ ll3JyhsVIbnR2vIhhoUMgttIuUdv/v2qk2J5bqmKhYlJvxxVmUDnnsAeR2jiTW149TZP 2gqw== X-Gm-Message-State: AOAM530kuBP0nrMrENpk1rc3RqAalmA2L8RS8NrIrj8sLLX99/uegRo3 v2AnsiY0vC7gD4YjFSXPNok= X-Google-Smtp-Source: ABdhPJxxZFdQWjQL50Uep4LIQyICYd6ny+mTU3AnDBKR+HTZrROuGqmbD2TRDX8sKW8JDwnd49FM4w== X-Received: by 2002:adf:fe0d:: with SMTP id n13mr1414282wrr.224.1613918238691; Sun, 21 Feb 2021 06:37:18 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 33/43] vt82c686: Correctly reset all registers to default values on reset Date: Sun, 21 Feb 2021 15:34:22 +0100 Message-Id: <20210221143432.2468220-34-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: BALATON Zoltan Reset the registers in the DeviceReset() handler which is called on each device reset, not in DeviceRealize() which is called once. Bit 0 of 'Power Mgmt I/O Base' register (offset 0x48) is always set. Signed-off-by: BALATON Zoltan Message-Id: Reviewed-by: Philippe Mathieu-Daud=C3=A9 [PMD: Split original patch, this is part 3/4 (move to reset), document] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index fe8ae24c421..48ead5af551 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -149,9 +149,12 @@ static void vt82c686b_pm_reset(DeviceState *d) { VT686PMState *s =3D VT82C686B_PM(d); =20 + memset(s->dev.config + PCI_CONFIG_HEADER_SIZE, 0, + PCI_CONFIG_SPACE_SIZE - PCI_CONFIG_HEADER_SIZE); + /* Power Management IO base */ + pci_set_long(s->dev.config + 0x48, 1); /* SMBus IO base */ pci_set_long(s->dev.config + 0x90, 1); - s->dev.config[0xd2] =3D 0; =20 smb_io_space_update(s); } @@ -166,9 +169,6 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error = **errp) pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_FAST_BACK | PCI_STATUS_DEVSEL_MEDIUM); =20 - /* 0x48-0x4B is Power Management I/O Base */ - pci_set_long(pci_conf + 0x48, 0x00000001); - pm_smbus_init(DEVICE(s), &s->smb, false); memory_region_add_subregion(pci_address_space_io(dev), 0, &s->smb.io); memory_region_set_enabled(&s->smb.io, false); --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918245; cv=none; d=zohomail.com; s=zohoarc; b=QBJ/RxGDb+/oa0XDjqdZ8jlbhz69R5oH9GcnC8M/anlC+VW0ioLP4cLBlbrDPn/hE5Pin92ykwUtvtXTvJ3H00wFe5f5cOHYfS48tsmQ3e/XuVClzYsETl4r4e01893G7cngW+IRefed8WiHmA9icIsl8YO7/QnaFFUmssmQ5m8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918245; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sppNkwQg+FV7UXwg+g57hVZ/iROZ8L4Jx9aHSLoiTws=; b=br2Vg19u93JfepBGIEQnZSD2wOOJErRzOExWivfweNP5YIxplLDd5LE0FapWBwJFw3JPErE+OpQW+CufrS0GeCLTbKJlZvRFZaYB1JP20qali/giUWFYRfnyoWF6n7ZUAn8dVAyhHdiTisrmOEVm7EAvik0UMWfYofcc3HRmjvs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1613918245550271.8771798927862; Sun, 21 Feb 2021 06:37:25 -0800 (PST) Received: by mail-wr1-f46.google.com with SMTP id n8so16293628wrm.10 for ; Sun, 21 Feb 2021 06:37:25 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id d65sm12155782wmc.34.2021.02.21.06.37.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:37:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sppNkwQg+FV7UXwg+g57hVZ/iROZ8L4Jx9aHSLoiTws=; b=tefhZ9orcVUDuuTR5h+my7o9l/W224L8jwe81vR/x6ce8oVkvg7+OOG5MKTTSO60H1 ZA6UDCjp0JhHaTqSx5Kkw+osCpjfGAw2YFytlBa+0jiR98jeLuaiuPz76aihXuuDgPVP FONKe6oO/14nJBYc6L4VnGgYNF+LhF+1OzfoaolOnkpBpTWGymh8hbZMPoMopxBGKgeP K2DNA8oUhR1LCuCjaHv3b/ZnOFFnUvnQ1gEXyqozq4eSqXmS6BZvfj5ADNXPAHXkMZQY XsIP5WTwDvxqq0FA5eROiOCEXqho/ZMusQw7yQ5bU1D3tbk6iZcLvllvCAyYHSfh3OTg FyXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=sppNkwQg+FV7UXwg+g57hVZ/iROZ8L4Jx9aHSLoiTws=; b=RnidJ9rJYP40HlU0m3uC/wtLu7UOsvajPL8gZqbliLHJs+6qYKq+13pHCdWTr0B6DA 3zyl57DSVf+b/Ee9HhZ0YUGGg2nnvedOceunRUX5B4IjSOvQNHzLa67mz2p5co+SrkzS /pMIgNQES9h0GctCQfGCMIEj8BfcORokRKP+QnGsNjVcH8X113B/D+iHn1uIdNmOLyYn yxd5TZ/vVUWYZdV6wz5A9fknFN6RmEwf5c//G9pQZ+5ARWOTK0LYCj9/7C8IOloZFL2T q9Rs151eXLUKrh2QUdVSFI2zSBkNigwIxk8BP9UIvUszlekchpnNG30aW4LWttAqELVT XJ2A== X-Gm-Message-State: AOAM530m8N+NquedrQkYv0y4rFCTEkSInErOhxuUAMpyXBnjJuIvL70C nVP82CxizI/FlRJws4wkDR4= X-Google-Smtp-Source: ABdhPJzxPkTj1UPYzzQsR0gYb599rMR8yrM/NJ+afICjEKxWwEv4y3qR67EeyoEEk9xsEL61lZDDug== X-Received: by 2002:adf:9dcc:: with SMTP id q12mr17282035wre.213.1613918243820; Sun, 21 Feb 2021 06:37:23 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 34/43] vt82c686: Fix up power management io base and config Date: Sun, 21 Feb 2021 15:34:23 +0100 Message-Id: <20210221143432.2468220-35-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: BALATON Zoltan Similar to the SMBus io registers there is a power management io range that is set via similar base address reg and enable bit. Some handling of this was already there but with several problems: using the wrong registers and bits, wrong size range, not acually updating mapping and handling reset correctly, nor emulating any of the actual io registers. Some of these errors are fixed up here. After this patch we use the correct base address register, enable bit and region size and allow guests to map/unmap this region, but we still don't emulate any of the registers in this range. PMD notes regarding the Configuration Space Power Management Registers: - 0x40 General Configuration 0 - 0x41 General Configuration 1 . Bit 7: I/O Enable for ACPI I/O Base - 0x48 Power Mgmt I/O Base . Bit 0: Always set . Bits 7-15: Power Management I/O Register Base Address (this explains the change 0xffc0 -> 0xff80) Signed-off-by: BALATON Zoltan Message-Id: [PMD: Split original patch, this is part 4/4, added notes] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 48ead5af551..cb2f7142607 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -39,14 +39,11 @@ struct VT686PMState { =20 static void pm_io_space_update(VT686PMState *s) { - uint32_t pm_io_base; - - pm_io_base =3D pci_get_long(s->dev.config + 0x40); - pm_io_base &=3D 0xffc0; + uint32_t pmbase =3D pci_get_long(s->dev.config + 0x48) & 0xff80UL; =20 memory_region_transaction_begin(); - memory_region_set_enabled(&s->io, s->dev.config[0x80] & 1); - memory_region_set_address(&s->io, pm_io_base); + memory_region_set_address(&s->io, pmbase); + memory_region_set_enabled(&s->io, s->dev.config[0x41] & BIT(7)); memory_region_transaction_commit(); } =20 @@ -92,6 +89,13 @@ static void pm_write_config(PCIDevice *d, uint32_t addr,= uint32_t val, int len) =20 trace_via_pm_write(addr, val, len); pci_default_write_config(d, addr, val, len); + if (ranges_overlap(addr, len, 0x48, 4)) { + uint32_t v =3D pci_get_long(s->dev.config + 0x48); + pci_set_long(s->dev.config + 0x48, (v & 0xff80UL) | 1); + } + if (range_covers_byte(addr, len, 0x41)) { + pm_io_space_update(s); + } if (ranges_overlap(addr, len, 0x90, 4)) { uint32_t v =3D pci_get_long(s->dev.config + 0x90); pci_set_long(s->dev.config + 0x90, (v & 0xfff0UL) | 1); @@ -156,17 +160,15 @@ static void vt82c686b_pm_reset(DeviceState *d) /* SMBus IO base */ pci_set_long(s->dev.config + 0x90, 1); =20 + pm_io_space_update(s); smb_io_space_update(s); } =20 static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp) { VT686PMState *s =3D VT82C686B_PM(dev); - uint8_t *pci_conf; =20 - pci_conf =3D s->dev.config; - pci_set_word(pci_conf + PCI_COMMAND, 0); - pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_FAST_BACK | + pci_set_word(dev->config + PCI_STATUS, PCI_STATUS_FAST_BACK | PCI_STATUS_DEVSEL_MEDIUM); =20 pm_smbus_init(DEVICE(s), &s->smb, false); --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 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=1613918251; cv=none; d=zohomail.com; s=zohoarc; b=cMSxGp7xO8lnAmlJLcoO5jogXr84UEczYJaXNTzuIp6vBJTf5iInPko6bymiq3SCHTqdjZXXBZjsvhcTzXDs/cKR9RiKKczkRJQCD9fpBq7RTH4h7qgtMXKr0ILd8Crpoj3TW2+7xUqb6QxCbabD1kk47KOIQiyFugu5kllacpk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918251; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XZ96T+Noa5J6qlu675dFiF2mpPu/6XZRwEOlj0cy+uk=; b=Q0vLjXphL1oVZkdE/ks00OY7I8yW+54zmiNahbY41U3xQ0IDNVC2uBz2O5GNhDL0D0rC8gn4UNszJRHVzF4Z0wpcJ6ja0lPwcSrE0EujNniBdgTdHgIWlULqoHBpAPxP/oOr6kNjLrkghysZcIb/omRH8/qmRvyVufryUsF+dv4= 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 1613918250718649.7215486871377; Sun, 21 Feb 2021 06:37:30 -0800 (PST) Received: by mail-wr1-f41.google.com with SMTP id v1so16336176wrd.6 for ; Sun, 21 Feb 2021 06:37:30 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id x13sm7698856wrt.21.2021.02.21.06.37.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:37:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XZ96T+Noa5J6qlu675dFiF2mpPu/6XZRwEOlj0cy+uk=; b=S4XF+ZNAlY/xwyJmFzRKPFAq5wLFPi5Q8aQbi6j8rNR1+K7Xzx91WxdUW2i7yznzvd JYhPBj4DdBNYFrwmaHV+MqefHFx4R44L3WfcQ0Bb0tqqEt+9xl07hAxba0pHyu8LWrzg 5+hx77f+ugDkIW+n4yq3d+xX5/g/n8CmNdwKmJAJOMg1keEWDkeZsLyBh5Xc+3dDTul6 pX4z9qqCwVinsrDaTNLfdAFqw1kk7Cu2+b1kgUMK2xEW0BChLEytE2Mwk76iWvHCIhC5 ghmNd4gj1sSobB8q/7Gu5Jz7QOLw4rN1M23FP5E2PE/ZNyhj6rc89BJGcLkUkztAOiwH 8vMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=XZ96T+Noa5J6qlu675dFiF2mpPu/6XZRwEOlj0cy+uk=; b=I2HbFe3q3rnVvZiigmi26YcW9MLid1Luqo66I6NvFaT4/v3Otr5Lyu2WPVLr3fx3f6 WddOnUI28lijfTqm8K0E76LE6WaZxeYhXU2G6MGKG8MxheHfReVP3lKT4Fs4ttrB6EHQ VCxKnS6jqAEqqPF4et0SnK0s1LBKpm1MczH87Fp5z38qDQU84PtLHlhepyAUBNPBD4kG sJ2vffM3JVfsh8p7u0OjdLJUf6fki0ClcY/B7JBd/4biWkPxfwZ/0DNrYxma30sjtCcg CQE+aOj8yYZFD3W3CYSwaJNRW+Jp41ssyKRaNteR0IlHbopxbhyzB5rJz0JFGq79XVMp MY4Q== X-Gm-Message-State: AOAM533gBlAR2Axp11qOKuKpd2a2qNWtD+aX1dsGLPAp8oNPi5cRFR2E q/KC4k2JrRmZ5N8TBs4Mi6g= X-Google-Smtp-Source: ABdhPJzQlqf7/dSEboR4pSnZfSHjrNtR7jQDIUp1V58Dk8vKMUHnopUHQCdzcTGVt6F+Izm/6Esmww== X-Received: by 2002:a5d:6392:: with SMTP id p18mr4863196wru.426.1613918249005; Sun, 21 Feb 2021 06:37:29 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 35/43] vt82c686: Set user_creatable=false for VT82C686B_PM Date: Sun, 21 Feb 2021 15:34:24 +0100 Message-Id: <20210221143432.2468220-36-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: BALATON Zoltan This device is part of the multifunction VIA superio/south bridge chip so not useful in itself. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Jiaxun Yang Message-Id: Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index cb2f7142607..5e2bf6d16c3 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -200,8 +200,9 @@ static void via_pm_class_init(ObjectClass *klass, void = *data) k->revision =3D 0x40; dc->reset =3D vt82c686b_pm_reset; dc->desc =3D "PM"; + /* Reason: part of VIA south bridge, does not exist stand alone */ + dc->user_creatable =3D false; dc->vmsd =3D &vmstate_acpi; - set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); } =20 static const TypeInfo via_pm_info =3D { --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918256; cv=none; d=zohomail.com; s=zohoarc; b=jbUQ+97JJy0A2XYaNA3pbXCjzE26HECChVbmIgOQb/hSDwkqn5gwO0RvzHvNoF8uV7gdPXpMUOFe3hvX24yy0C3G5R9e6KOD47QhiGdeBVCjHV9ZAkQHlTsPWqCHpcczjvZiXkp+s5oHM13+sJkXB+n1LsDbz3Og4cZDlDiPMFE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918256; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MnTZ/TustYEbBKJFReUwns6tIkh8Sbj+jG6SPisGBxc=; b=aMPycns8vhb0k/lX3Qr89N15aLCT6/Ep/dL0n0g0FdxfG+1GQ339xzcKLG86E2eCKkY4rtaMIv7huMXrF3Sblh2h7MkH/szusfAR6v9XLXA92G7luSgRGo9J4NVQNpzXw4dmOZbyAWpDhkXO201R0e0aQxDP7oYmXVsaBOjgzX0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1613918255667996.9991245905211; Sun, 21 Feb 2021 06:37:35 -0800 (PST) Received: by mail-wr1-f47.google.com with SMTP id 7so16364638wrz.0 for ; Sun, 21 Feb 2021 06:37:35 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id q25sm17099061wmq.15.2021.02.21.06.37.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:37:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MnTZ/TustYEbBKJFReUwns6tIkh8Sbj+jG6SPisGBxc=; b=NDBAnlrIS3aWn63oG7pD0Rm5yLVGHvCNp67W2CEBzjaBesiHuwBTlztCJEG3OzcWD/ gVhortgw1Yd8hLEywT1IC1t/JvxmkW1yDz1ikTkf8NCRrRD6xOJOqLZ8Ny0yYWgsPGAh ujOxe5pM5jBN87bfCIg7KhSqjuPY6gDBuPNOqYxIQ+2LrZLp7weXkWSHkMARi9B6u42o uAlMdzT+8mCsZWDjxP+u4HM8445GPKdxTieZ3/EECt3fZNddNGkEz5VtOlX1OmepH0dQ afm01osZllXKHs7s3G26hp3h9FaihiVJwusyLBGwBTJYLudT8yAAAGXJaE+b2CRLk65b 9p6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=MnTZ/TustYEbBKJFReUwns6tIkh8Sbj+jG6SPisGBxc=; b=bUYfRO9iUFk8ZvSrgE5N0+Fyfi7nY/q3RCVQJ4dNtVViBq9YGOp4LGLMo0X82h8odv 7t4j6/5V8swKiUqkW8lI2s2MlmLTd8bg/JGdh5HZkMUnVLs2QJpp8ydsNEeBEqInTdWP 9wMMCkggseaL6OZ2IrKPotlxKPF3KUhrfF7y5mBGnq1wQG4z7z1J5cQ04X9RC0cEfviF nZYNh31mCUzIiocQx+Sv9QyQaLF7JdIXANtnef37hThSL85RIxqeY6PL0ffjFZxMK98h obS8pC+1RU68QhWaNW4MaTdfgLB1PT1G1QbPzumkYT2mQTu91ir3CiR+JeJNzF3EqHp0 17/g== X-Gm-Message-State: AOAM532dA8M1abYYsqpA9xkAAU8Q7ms+c3q2QCugMf9zleTLwJtaPR6y LoQ7ElyPzwnak7R/K5NFAzupcQ2wwFI= X-Google-Smtp-Source: ABdhPJzbtn4Gv0j7y6GLFBasD0J59BjTQB3DwX3XhF3r007cXvjRxmEBPjNsHLvZB3aiRL1IsUxN2A== X-Received: by 2002:a05:6000:107:: with SMTP id o7mr17433134wrx.87.1613918253898; Sun, 21 Feb 2021 06:37:33 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 36/43] vt82c686: Make vt82c686b-pm an abstract base class and add vt8231-pm based on it Date: Sun, 21 Feb 2021 15:34:25 +0100 Message-Id: <20210221143432.2468220-37-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: BALATON Zoltan The vt82c686b-pm model can be shared between VT82C686B and VT8231. The only difference between the two is the device id in what we emulate so make an abstract via-pm model by renaming appropriately and add types for vt82c686b-pm and vt8231-pm based on it. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <34969fc7be984fa070479bfb9f748993a0aef31b.1610223397.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/isa/vt82c686.h | 1 + include/hw/pci/pci_ids.h | 3 +- hw/isa/vt82c686.c | 84 ++++++++++++++++++++++++++------------- 3 files changed, 59 insertions(+), 29 deletions(-) diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h index 5b0a1ffe725..9b6d610e838 100644 --- a/include/hw/isa/vt82c686.h +++ b/include/hw/isa/vt82c686.h @@ -4,6 +4,7 @@ #define TYPE_VT82C686B_ISA "vt82c686b-isa" #define TYPE_VT82C686B_SUPERIO "vt82c686b-superio" #define TYPE_VT82C686B_PM "vt82c686b-pm" +#define TYPE_VT8231_PM "vt8231-pm" #define TYPE_VIA_AC97 "via-ac97" #define TYPE_VIA_MC97 "via-mc97" =20 diff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h index bd0c17dc789..ea28dcc850b 100644 --- a/include/hw/pci/pci_ids.h +++ b/include/hw/pci/pci_ids.h @@ -207,9 +207,10 @@ #define PCI_DEVICE_ID_VIA_ISA_BRIDGE 0x0686 #define PCI_DEVICE_ID_VIA_IDE 0x0571 #define PCI_DEVICE_ID_VIA_UHCI 0x3038 -#define PCI_DEVICE_ID_VIA_ACPI 0x3057 +#define PCI_DEVICE_ID_VIA_82C686B_PM 0x3057 #define PCI_DEVICE_ID_VIA_AC97 0x3058 #define PCI_DEVICE_ID_VIA_MC97 0x3068 +#define PCI_DEVICE_ID_VIA_8231_PM 0x8235 =20 #define PCI_VENDOR_ID_MARVELL 0x11ab =20 diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 5e2bf6d16c3..0e812c49241 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -27,9 +27,10 @@ #include "exec/address-spaces.h" #include "trace.h" =20 -OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM) +#define TYPE_VIA_PM "via-pm" +OBJECT_DECLARE_SIMPLE_TYPE(ViaPMState, VIA_PM) =20 -struct VT686PMState { +struct ViaPMState { PCIDevice dev; MemoryRegion io; ACPIREGS ar; @@ -37,7 +38,7 @@ struct VT686PMState { PMSMBus smb; }; =20 -static void pm_io_space_update(VT686PMState *s) +static void pm_io_space_update(ViaPMState *s) { uint32_t pmbase =3D pci_get_long(s->dev.config + 0x48) & 0xff80UL; =20 @@ -47,7 +48,7 @@ static void pm_io_space_update(VT686PMState *s) memory_region_transaction_commit(); } =20 -static void smb_io_space_update(VT686PMState *s) +static void smb_io_space_update(ViaPMState *s) { uint32_t smbase =3D pci_get_long(s->dev.config + 0x90) & 0xfff0UL; =20 @@ -59,7 +60,7 @@ static void smb_io_space_update(VT686PMState *s) =20 static int vmstate_acpi_post_load(void *opaque, int version_id) { - VT686PMState *s =3D opaque; + ViaPMState *s =3D opaque; =20 pm_io_space_update(s); smb_io_space_update(s); @@ -72,20 +73,20 @@ static const VMStateDescription vmstate_acpi =3D { .minimum_version_id =3D 1, .post_load =3D vmstate_acpi_post_load, .fields =3D (VMStateField[]) { - VMSTATE_PCI_DEVICE(dev, VT686PMState), - VMSTATE_UINT16(ar.pm1.evt.sts, VT686PMState), - VMSTATE_UINT16(ar.pm1.evt.en, VT686PMState), - VMSTATE_UINT16(ar.pm1.cnt.cnt, VT686PMState), - VMSTATE_STRUCT(apm, VT686PMState, 0, vmstate_apm, APMState), - VMSTATE_TIMER_PTR(ar.tmr.timer, VT686PMState), - VMSTATE_INT64(ar.tmr.overflow_time, VT686PMState), + VMSTATE_PCI_DEVICE(dev, ViaPMState), + VMSTATE_UINT16(ar.pm1.evt.sts, ViaPMState), + VMSTATE_UINT16(ar.pm1.evt.en, ViaPMState), + VMSTATE_UINT16(ar.pm1.cnt.cnt, ViaPMState), + VMSTATE_STRUCT(apm, ViaPMState, 0, vmstate_apm, APMState), + VMSTATE_TIMER_PTR(ar.tmr.timer, ViaPMState), + VMSTATE_INT64(ar.tmr.overflow_time, ViaPMState), VMSTATE_END_OF_LIST() } }; =20 static void pm_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int= len) { - VT686PMState *s =3D VT82C686B_PM(d); + ViaPMState *s =3D VIA_PM(d); =20 trace_via_pm_write(addr, val, len); pci_default_write_config(d, addr, val, len); @@ -127,7 +128,7 @@ static const MemoryRegionOps pm_io_ops =3D { }, }; =20 -static void pm_update_sci(VT686PMState *s) +static void pm_update_sci(ViaPMState *s) { int sci_level, pmsts; =20 @@ -145,13 +146,13 @@ static void pm_update_sci(VT686PMState *s) =20 static void pm_tmr_timer(ACPIREGS *ar) { - VT686PMState *s =3D container_of(ar, VT686PMState, ar); + ViaPMState *s =3D container_of(ar, ViaPMState, ar); pm_update_sci(s); } =20 -static void vt82c686b_pm_reset(DeviceState *d) +static void via_pm_reset(DeviceState *d) { - VT686PMState *s =3D VT82C686B_PM(d); + ViaPMState *s =3D VIA_PM(d); =20 memset(s->dev.config + PCI_CONFIG_HEADER_SIZE, 0, PCI_CONFIG_SPACE_SIZE - PCI_CONFIG_HEADER_SIZE); @@ -164,9 +165,9 @@ static void vt82c686b_pm_reset(DeviceState *d) smb_io_space_update(s); } =20 -static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp) +static void via_pm_realize(PCIDevice *dev, Error **errp) { - VT686PMState *s =3D VT82C686B_PM(dev); + ViaPMState *s =3D VIA_PM(dev); =20 pci_set_word(dev->config + PCI_STATUS, PCI_STATUS_FAST_BACK | PCI_STATUS_DEVSEL_MEDIUM); @@ -177,8 +178,7 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error = **errp) =20 apm_init(dev, &s->apm, NULL, s); =20 - memory_region_init_io(&s->io, OBJECT(dev), &pm_io_ops, s, - "vt82c686-pm", 128); + memory_region_init_io(&s->io, OBJECT(dev), &pm_io_ops, s, "via-pm", 12= 8); memory_region_add_subregion(pci_address_space_io(dev), 0, &s->io); memory_region_set_enabled(&s->io, false); =20 @@ -187,35 +187,61 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Erro= r **errp) acpi_pm1_cnt_init(&s->ar, &s->io, false, false, 2); } =20 +typedef struct via_pm_init_info { + uint16_t device_id; +} ViaPMInitInfo; + static void via_pm_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); + ViaPMInitInfo *info =3D data; =20 - k->realize =3D vt82c686b_pm_realize; + k->realize =3D via_pm_realize; k->config_write =3D pm_write_config; k->vendor_id =3D PCI_VENDOR_ID_VIA; - k->device_id =3D PCI_DEVICE_ID_VIA_ACPI; + k->device_id =3D info->device_id; k->class_id =3D PCI_CLASS_BRIDGE_OTHER; k->revision =3D 0x40; - dc->reset =3D vt82c686b_pm_reset; - dc->desc =3D "PM"; + dc->reset =3D via_pm_reset; /* Reason: part of VIA south bridge, does not exist stand alone */ dc->user_creatable =3D false; dc->vmsd =3D &vmstate_acpi; } =20 static const TypeInfo via_pm_info =3D { - .name =3D TYPE_VT82C686B_PM, + .name =3D TYPE_VIA_PM, .parent =3D TYPE_PCI_DEVICE, - .instance_size =3D sizeof(VT686PMState), - .class_init =3D via_pm_class_init, + .instance_size =3D sizeof(ViaPMState), + .abstract =3D true, .interfaces =3D (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, { }, }, }; =20 +static const ViaPMInitInfo vt82c686b_pm_init_info =3D { + .device_id =3D PCI_DEVICE_ID_VIA_82C686B_PM, +}; + +static const TypeInfo vt82c686b_pm_info =3D { + .name =3D TYPE_VT82C686B_PM, + .parent =3D TYPE_VIA_PM, + .class_init =3D via_pm_class_init, + .class_data =3D (void *)&vt82c686b_pm_init_info, +}; + +static const ViaPMInitInfo vt8231_pm_init_info =3D { + .device_id =3D PCI_DEVICE_ID_VIA_8231_PM, +}; + +static const TypeInfo vt8231_pm_info =3D { + .name =3D TYPE_VT8231_PM, + .parent =3D TYPE_VIA_PM, + .class_init =3D via_pm_class_init, + .class_data =3D (void *)&vt8231_pm_init_info, +}; + =20 typedef struct SuperIOConfig { uint8_t regs[0x100]; @@ -424,6 +450,8 @@ static const TypeInfo via_superio_info =3D { static void vt82c686b_register_types(void) { type_register_static(&via_pm_info); + type_register_static(&vt82c686b_pm_info); + type_register_static(&vt8231_pm_info); type_register_static(&via_info); type_register_static(&via_superio_info); } --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 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; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1613918261; cv=none; d=zohomail.com; s=zohoarc; b=VdRtUINKzXa4lhulp3SUsSWiXCF/Msj1HpjkWkYjUPqXpFQTnRRL2U2xhactUV56mtAiUFSk9bczaXhSOY02oA+R/YI+GMjhn4CB10m6nE5kahtPH5inBDiG4wrvmcd8VdbeFLN2mE0SJuoadvd24wB+rJQ2Ml2D5hHCiulhCnw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918261; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8x/mEIPP6SN5UeYnGwuR8cfhi2QpcZNzmhDjPXqrXro=; b=VRnTSe39IpCzhpfj6PJt8mzUn9hHRErfdB7wA1Iv9QO8kTsu7PfJ9cw7oIX1J8Eo/lAWE9aPAYh0mWrh/KXaH6lxUqHe2HqMPoPyX7tTQJVeB5HObhmgwAdUb/Evnvl62biWDIyrr0tJqLzo6Lfsn4W45ioz1oNmxSE0WgmcmQc= 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; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1613918260729154.9487697014331; Sun, 21 Feb 2021 06:37:40 -0800 (PST) Received: by mail-wm1-f45.google.com with SMTP id l13so2519508wmg.5 for ; Sun, 21 Feb 2021 06:37:40 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id t16sm6602666wrq.53.2021.02.21.06.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:37:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8x/mEIPP6SN5UeYnGwuR8cfhi2QpcZNzmhDjPXqrXro=; b=bZkAYYt4xqcWLIIuVW+YsHWKj2hfdYxNLXsk+r81R0E6i1hXpnicbKcU0sXfZG0vX1 7YKheWgosr4fS/BsacsGHhDTXrYcNWZ74XDmV3uwUjnjBu1wzibjdhMguOCiwJSBrFHw goW5Si6pRH3zC6LS7on/ZcpegeFamrGemIv4liMpdIlSsdbVzrJbX/d3yuwMKSoVZe91 ID0L9W3swP4H8fa/tiEIP4rxVQ/v0CYtoK7ashf/VBwQc28+fjaHIMMvK3MdSFQ4c8BA r97dIWyL8vi/jHy39AyXeApjQM04Ckd0n5pI8QO9srMrkRfqEVOG0z/tiLYlq/JgYwGt YMeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8x/mEIPP6SN5UeYnGwuR8cfhi2QpcZNzmhDjPXqrXro=; b=pobb9zsZVwmozAHL2RK0brHnbd21mL5n5PvmRTx2EdF98H345wMlLkQ84ebHlr285M ngiL50VQsBvh93qp7H4kX7BAwJjuTSIQN9m+aO7yCAQ5oaCZE4C4mHmvtMLB8pfY4TUe +2zmq+sZJXuoOob9Z+pICvhempQmPKd5b9zKvR4UCFI7twKD3nLKD9PnaMzxRE3BBUU8 atJQW+vF4mLnK76Arkr+qJeFIVEf1J0qk+6N0fHwBMRbsCgTCBxLjvovhnJCf/jKjdFI 2tZhELT1cQdFaBre2ExjbOId6AcXjZbxXOrnFKLs1IprJ2zK/a1mwgk5tKGct7aWpLAz 7Gxg== X-Gm-Message-State: AOAM533CIeeAz6ibtbmZNn7eQYHuogLsBmRfWQfX4Hzzksg/47rqxwAH 8biey/r3raf+2Rwnz4R+PsQ= X-Google-Smtp-Source: ABdhPJz7r0EjONDtIdNO3SwDc7gDDUKvSpmp5VJqc3SRZvP2vrDB7NyZNgMQfX15UKumEU90unIjvA== X-Received: by 2002:a1c:4683:: with SMTP id t125mr16240100wma.75.1613918259015; Sun, 21 Feb 2021 06:37:39 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 37/43] vt82c686: Simplify vt82c686b_realize() Date: Sun, 21 Feb 2021 15:34:26 +0100 Message-Id: <20210221143432.2468220-38-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: BALATON Zoltan Remove unneeded variables and setting value to 0 on zero initialised data and replace check for error with error_fatal. Rationalise loop that sets PCI config header fields read only. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 0e812c49241..7e5fa060f5f 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -363,24 +363,16 @@ static void vt82c686b_isa_reset(DeviceState *dev) static void vt82c686b_realize(PCIDevice *d, Error **errp) { VT82C686BISAState *s =3D VT82C686B_ISA(d); - uint8_t *pci_conf; + DeviceState *dev =3D DEVICE(d); ISABus *isa_bus; - uint8_t *wmask; int i; =20 - isa_bus =3D isa_bus_new(DEVICE(d), get_system_memory(), - pci_address_space_io(d), errp); - if (!isa_bus) { - return; - } + isa_bus =3D isa_bus_new(dev, get_system_memory(), pci_address_space_io= (d), + &error_fatal); =20 - pci_conf =3D d->config; - pci_config_set_prog_interface(pci_conf, 0x0); - - wmask =3D d->wmask; - for (i =3D 0x00; i < 0xff; i++) { - if (i <=3D 0x03 || (i >=3D 0x08 && i <=3D 0x3f)) { - wmask[i] =3D 0x00; + 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 --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918266; cv=none; d=zohomail.com; s=zohoarc; b=b47ZKX+BtoruvWd0U5DzqivFzJD8s5sVeHyfH1uZ8aLFeZbEH61Qu1/U3S1uJ0jcoTdQ+4ZU622XjPxA0AsGUHo71363ldzgoBOMh4vszOcVBtVO/wrsJ3vxE4TTLpw9bcBlB3x/V2NeawJvzIpMixJyjRVYl716UpCP0ERH0gE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918266; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2T+hpNRPaClY3K4hATCoC3PY+rExU+CseU3tyEMImpE=; b=MnGRhXEGE5zNMph9DvzLelJqG+MhfD104HgorsdMPksuMH2I9SsErPnKXloYKoWn84+c4dF4990brkorXDQnZI5I/rZymkImFW4BXBnCn3ruFUphhxVeuIAvyuO9dD6PtuaqaM94fvnEGdioVe8Lx1AEPPlVBksDuvDVNPxdmxg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1613918265911564.8117326763402; Sun, 21 Feb 2021 06:37:45 -0800 (PST) Received: by mail-wm1-f43.google.com with SMTP id p3so1050029wmc.2 for ; Sun, 21 Feb 2021 06:37:45 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id h20sm6417404wmb.1.2021.02.21.06.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:37:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2T+hpNRPaClY3K4hATCoC3PY+rExU+CseU3tyEMImpE=; b=j1uJHVkTSe8Tc+cQRNwemTeiBzyCt2LrhAk1s1+mSRGdWUxhPzxBMixOaJ8A6JTUzI +z0GQWmqs+nMC8lDJbd9usU8L789UMb7OmKNAxRZ4JwKMLsyr15j3hGHgviZ6DZBNE3P JlLMVBmE+4DWXdSCcV4N4GY00UlB/1sHtjPabCuH9cL3PiJMBKZMctpODvlkNl0D6AQk 6rZ4+F7xOfyc3ajSFXq4kdulKY5JMUt9fKfzmAqaJN3h5rLYPGlONO87MQ7dBab7Fj74 9bqL2VzfFFHCmBENaifz9QEw62Cv/th7VkHlOVqWlsdzzfl3VqhCNz+gA2jwM5jxYMwi iEWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2T+hpNRPaClY3K4hATCoC3PY+rExU+CseU3tyEMImpE=; b=Iv5n+500BXV9fEwlTQVW4PboBM7EDM08TiViGx208UwliLSyJqiTnyNI0ck9HAc9jY qnb9LBnBn6/ZJ1e8KCbjdJXoQaYMCu/OTRJbEzv5h70H6ClCa4Q353O+jm/axIaTd5Cf PHXdxZCr7jB5sBjWrd18mv1s7binOFg55LVaSuQigojP0evPSA46oD1r5BJ8yiaoHeY7 xSMScRtFS4QSc/tQTWDeMIVtCeLNQHOpE1DwzP0KH++MDudgjh5oFfhUY43RIgkLVJhb yrZInYujFlgJJ9GJdrQWxS6noVuhLnMFeJD2jEAu4W9z+9s2JfPEG8rKRmzS2XFRp6FD MeFQ== X-Gm-Message-State: AOAM5338xaJwVlMTVccvupZPlJbWaO+nTTdysd/rDO5r0ULBOCHDRDtw if8BIfeMMrYm+poknZW/qwg= X-Google-Smtp-Source: ABdhPJxTk07QfGnDVXIHuy1MPreAarCrDoQQJQ7hxQO+eqp64EwGoBhFQt/G+YZgA0kvmrExPBmShg== X-Received: by 2002:a1c:a791:: with SMTP id q139mr16144950wme.20.1613918264173; Sun, 21 Feb 2021 06:37:44 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 38/43] vt82c686: Move creation of ISA devices to the ISA bridge Date: Sun, 21 Feb 2021 15:34:27 +0100 Message-Id: <20210221143432.2468220-39-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: BALATON Zoltan Currently the ISA devices that are part of the VIA south bridge, superio chip are wired up by board code. Move creation of these ISA devices to the VIA ISA bridge model so that board code does not need to access ISA bus. This also allows vt82c686b-superio to be made internal to vt82c686 which allows implementing its configuration via registers in subseqent commits. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 20 ++++++++++++++++++++ hw/mips/fuloong2e.c | 29 +++++------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 7e5fa060f5f..a37f1931ce0 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -16,6 +16,11 @@ #include "hw/qdev-properties.h" #include "hw/isa/isa.h" #include "hw/isa/superio.h" +#include "hw/intc/i8259.h" +#include "hw/irq.h" +#include "hw/dma/i8257.h" +#include "hw/timer/i8254.h" +#include "hw/rtc/mc146818rtc.h" #include "migration/vmstate.h" #include "hw/isa/apm.h" #include "hw/acpi/acpi.h" @@ -307,9 +312,16 @@ OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686= B_ISA) =20 struct VT82C686BISAState { PCIDevice dev; + qemu_irq cpu_intr; SuperIOConfig superio_cfg; }; =20 +static void via_isa_request_i8259_irq(void *opaque, int irq, int level) +{ + VT82C686BISAState *s =3D opaque; + qemu_set_irq(s->cpu_intr, level); +} + static void vt82c686b_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int len) { @@ -365,10 +377,18 @@ static void vt82c686b_realize(PCIDevice *d, Error **e= rrp) VT82C686BISAState *s =3D VT82C686B_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); + isa_create_simple(isa_bus, TYPE_VT82C686B_SUPERIO); + mc146818_rtc_init(isa_bus, 2000, NULL); =20 for (i =3D 0; i < PCI_CONFIG_HEADER_SIZE; i++) { if (i < PCI_COMMAND || i >=3D PCI_REVISION_ID) { diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 94f4718147f..4f61f2c873b 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -25,9 +25,6 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/clock.h" -#include "hw/intc/i8259.h" -#include "hw/dma/i8257.h" -#include "hw/isa/superio.h" #include "net/net.h" #include "hw/boards.h" #include "hw/i2c/smbus_eeprom.h" @@ -39,13 +36,13 @@ #include "qemu/log.h" #include "hw/loader.h" #include "hw/ide/pci.h" +#include "hw/qdev-properties.h" #include "elf.h" #include "hw/isa/vt82c686.h" -#include "hw/rtc/mc146818rtc.h" -#include "hw/timer/i8254.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" #include "sysemu/reset.h" +#include "sysemu/sysemu.h" #include "qemu/error-report.h" =20 #define ENVP_PADDR 0x2000 @@ -203,26 +200,13 @@ static void main_cpu_reset(void *opaque) } =20 static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq= intc, - I2CBus **i2c_bus, ISABus **p_isa_bu= s) + I2CBus **i2c_bus) { - qemu_irq *i8259; - ISABus *isa_bus; PCIDevice *dev; =20 dev =3D pci_create_simple_multifunction(pci_bus, PCI_DEVFN(slot, 0), t= rue, TYPE_VT82C686B_ISA); - isa_bus =3D ISA_BUS(qdev_get_child_bus(DEVICE(dev), "isa.0")); - assert(isa_bus); - *p_isa_bus =3D isa_bus; - /* Interrupt controller */ - /* The 8259 -> IP5 */ - i8259 =3D i8259_init(isa_bus, intc); - isa_bus_irqs(isa_bus, i8259); - /* init other devices */ - i8254_pit_init(isa_bus, 0x40, 0, NULL); - i8257_dma_init(isa_bus, 0); - /* Super I/O */ - isa_create_simple(isa_bus, TYPE_VT82C686B_SUPERIO); + qdev_connect_gpio_out(DEVICE(dev), 0, intc); =20 dev =3D pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), "via-ide"); pci_ide_create_devs(dev); @@ -269,7 +253,6 @@ static void mips_fuloong2e_init(MachineState *machine) uint64_t kernel_entry; PCIDevice *pci_dev; PCIBus *pci_bus; - ISABus *isa_bus; I2CBus *smbus; Clock *cpuclk; MIPSCPU *cpu; @@ -336,7 +319,7 @@ static void mips_fuloong2e_init(MachineState *machine) =20 /* South bridge -> IP5 */ vt82c686b_southbridge_init(pci_bus, FULOONG2E_VIA_SLOT, env->irq[5], - &smbus, &isa_bus); + &smbus); =20 /* GPU */ if (vga_interface_type !=3D VGA_NONE) { @@ -351,8 +334,6 @@ static void mips_fuloong2e_init(MachineState *machine) spd_data =3D spd_data_generate(DDR, machine->ram_size); smbus_eeprom_init_one(smbus, 0x50, spd_data); =20 - mc146818_rtc_init(isa_bus, 2000, NULL); - /* Network card: RTL8139D */ network_init(pci_bus); } --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918271; cv=none; d=zohomail.com; s=zohoarc; b=CHxgQvnGnu6oNKv+jsgDipWKUnhQcsGtxTeP3/eps8Mgjt4WIykXsPD6F2bWz+5fIPC1duF/KOtTbVGOLRiUBsyaL/GTxNcMON32QsToheSRvwXSfKkHwx8nLLaTXATBM7b/misEdUb6YfKVVLzbs5nw71cBDWy6zCDD4RvIEL4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918271; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=muqL6retzxZvpcBpGa23dxnp9efbxFOJm+AoenlNu0M=; b=CXXAwHYWdtrpMbI4KnHkCQTbARR9yLR1NpVT4DeTdDMvzXg2oyuetU+w1OwIkx6hzmN4mY3HsFXOR9HR9uPht8FkQ1Wkfkmv/yR8P/UPENnb/V5DwG3fTchW+tX3btopC06KMOUjBcOkDdu9FpV8Vo/2MItCgYfzxmr4Hl+ebjk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1613918270748240.00757732999602; Sun, 21 Feb 2021 06:37:50 -0800 (PST) Received: by mail-wr1-f46.google.com with SMTP id v1so16336769wrd.6 for ; Sun, 21 Feb 2021 06:37:50 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id y2sm3090434wrp.39.2021.02.21.06.37.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:37:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=muqL6retzxZvpcBpGa23dxnp9efbxFOJm+AoenlNu0M=; b=kQPKDk8c78UF26cl4IxAxihMz2IMrzGSWXYDo8bBPkQ/ettyPyHvsBySLoaizMS1n2 4X3JzSWOUvzUp6WPR+4/sDX2wy8++PfWa2rja0OzDTXNMBAoDF3VVxF+Ni+Koh8KamoD zQBT89kp8MJW9jNKd7QWnpff2I4v1pGLHGxAlIAwRrs8REhX0KZvix2fD+UuKzb4EFms vVpwfpT7S0I/4wRepKMxezSdQdfTIMfEKKuli6RSKu7xG/FMGDF8UUirJYMmOHfffy3E QDtvz62ybvwtBA2zIAvP7Z0ragY+c7PiZuWnoHGcKAnhPJWloHP2VXKbrcxVDZJTa9Bp DODQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=muqL6retzxZvpcBpGa23dxnp9efbxFOJm+AoenlNu0M=; b=Qyi+Vnq4xfDLW9OesNOPQVDlJ3Kd7UUDULjzJG7rwxV4tYBm1aRObg31M/KyFx5pif TC5+LKyua6OOauJ7nW/Y/fv0pEtV6hbOLOEHDU0ISY+GWR5q7J1Xk7LXjQkCyqn2S3++ y8sUqW1eIQW2WqA/p5XYWteOKWhE7eTdCB38j31PBNnNPy5D/PMatNSOf29K+ZTB3H5X ZBtcPzmTYiivMlCh4ddZL4gv3lJXZljYl2ZIHJrz1e3A6Tk9asjd17mQ9SBk4ospE7y6 zPcy3w0U2TdZgNzdH0jVeH7YlMWKN4T28eQiX6uOSojLpeVpRhICnGL2yqbiERPvIfNs +IjQ== X-Gm-Message-State: AOAM5318NAxJk4RGmV7u3CPgE1dWUMx9TMVtVNI64IEDuGylkF45TxvV yngDWi2aziqCWFGvyTBy6LQ= X-Google-Smtp-Source: ABdhPJzpKhADvmvuoNPN+zHAUkHZ+lnicDplja+cWeo4lrpEQchpGJHMeqwcHu36Ha98GWOznMxlAg== X-Received: by 2002:a5d:4c82:: with SMTP id z2mr17589401wrs.220.1613918269077; Sun, 21 Feb 2021 06:37:49 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 39/43] vt82c686: Remove index field of SuperIOConfig Date: Sun, 21 Feb 2021 15:34:28 +0100 Message-Id: <20210221143432.2468220-40-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: BALATON Zoltan Remove the separate index value from SuperIOConfig and store the index at reg 0 which is reserved and returns 0 on read. This simplifies the object state. Signed-off-by: BALATON Zoltan Message-Id: <15b2968fd300a12d06b42368d084f6f80d3c3be5.1610223397.git.balato= n@eik.bme.hu> [PMD: Split original patch in 5, this is part 1/5] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index a37f1931ce0..eebaa0d444c 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -250,7 +250,6 @@ static const TypeInfo vt8231_pm_info =3D { =20 typedef struct SuperIOConfig { uint8_t regs[0x100]; - uint8_t index; MemoryRegion io; } SuperIOConfig; =20 @@ -258,14 +257,15 @@ static void superio_cfg_write(void *opaque, hwaddr ad= dr, uint64_t data, unsigned size) { SuperIOConfig *sc =3D opaque; + uint8_t idx =3D sc->regs[0]; =20 if (addr =3D=3D 0x3f0) { /* config index register */ - sc->index =3D data & 0xff; + idx =3D data & 0xff; } else { bool can_write =3D true; /* 0x3f1, config data register */ - trace_via_superio_write(sc->index, data & 0xff); - switch (sc->index) { + trace_via_superio_write(idx, data & 0xff); + switch (idx) { case 0x00 ... 0xdf: case 0xe4: case 0xe5: @@ -283,7 +283,7 @@ static void superio_cfg_write(void *opaque, hwaddr addr= , uint64_t data, =20 } if (can_write) { - sc->regs[sc->index] =3D data & 0xff; + sc->regs[idx] =3D data & 0xff; } } } @@ -291,9 +291,16 @@ static void superio_cfg_write(void *opaque, hwaddr add= r, uint64_t data, static uint64_t superio_cfg_read(void *opaque, hwaddr addr, unsigned size) { SuperIOConfig *sc =3D opaque; - uint8_t val =3D sc->regs[sc->index]; + uint8_t idx =3D sc->regs[0]; + uint8_t val =3D sc->regs[idx]; =20 - trace_via_superio_read(sc->index, val); + if (addr =3D=3D 0) { + return idx; + } + if (addr =3D=3D 1 && idx =3D=3D 0) { + val =3D 0; /* reading reg 0 where we store index value */ + } + trace_via_superio_read(idx, val); return val; } =20 --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 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; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1613918278; cv=none; d=zohomail.com; s=zohoarc; b=N9CFzbFIjEGzIQp/kg37ypEPGa35hyL9Bu6IO3/KgF8WdpErXlU0Q17dVcJXinLBgyI5gHbJocLm6DsdwnUDmOzM3uQJaIbVnxrZuPe60eh0xLao7t3Vqj0kWZoVqScJw1SS9L+WZCayXA8cGqXzkWSlLRmelISvmTRyE6e/W6Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918278; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8uDjfWQ/sIxX8kRNXJ8euWqWigOjj7dJz0jCt5kTchs=; b=G2chTNTpoYM/mdKNrOc79xkPEinLD0qSRizZLJ+k+94UxgzHXCueGIShWUrL2nr1iuLYGn+NFlaToXOn/mMHey+DHI6C153Nl4PvWViq3Z6XXHuULIoAfuCYnPob4YYCTjwm/pj0iLGixrdoDIzuIoKrEvMXU3G/8iTQQSOMTBg= 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; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1613918277840224.95414549212; Sun, 21 Feb 2021 06:37:57 -0800 (PST) Received: by mail-wr1-f45.google.com with SMTP id v14so16335067wro.7 for ; Sun, 21 Feb 2021 06:37:55 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id k15sm22512939wrn.0.2021.02.21.06.37.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:37:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8uDjfWQ/sIxX8kRNXJ8euWqWigOjj7dJz0jCt5kTchs=; b=p+pRljfKwjNP3bu+/xPFoCAtSM7PjIZHzBxwnCdsqY3abCuzVYPJPy3vsuf2dgZ/Wo hNSMZh+hlfljzvd2dNcRMh6sQLAHmZp9TeK9ZyixqBXwz/GcBFRTXYeWMq9/otYEEzA7 RYt1k/Td36/KeWih9I43NP0NuNXB7ssCC/ashlvjUugMHSbC4Mxzjg5iTZZ+IgSadrfw 5FQPtGAND3mOEqIFDJY6sM9hFekuMUe2rf+xDrmSuyGkc5aZWhqh9E8H18pdMgDFSpg/ uvQhp87H5tgT8U/dZ2ZlGvbli3URS4XncphfuT3fXIsCYVMsm0Es2BXh+uoH85KXW6Wz dGlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8uDjfWQ/sIxX8kRNXJ8euWqWigOjj7dJz0jCt5kTchs=; b=Sv0RD5QfemRqF7HHGXqxwzby7MvE4sretr1SjjYiae3dAF0i8Gxj6BGN60J6r06ctY 0KkXm25Qsr9p9tn53JO/d6kCp+Q7uWAndlh1ZH/zfC4jW4m1uymRWWW/+meVGXpUlTsO Q/ddV3/wV44K96bS4vHSKK1FA5iZQx7RbixaBLfTaa54QdFBbvrXce0CBfonc+bCcRn8 wijk7lyn1foFVrbjZkH53/b5moUobesDaTU1fxS+Q2OJrNQfPdziFXLDI7hPkOYzr4HS 44heqJLBmBwHexKkieDTu+pMarPfgHgBatjJbcIRpqAp85wxUrGLlBZwvuyIDEgbli7o mK0g== X-Gm-Message-State: AOAM5325tXQ7tA56R9M4fUnAuehNbgD+H13EU6zpcXa07L/g9RUq8Jg6 yTOnI81hsAcxRm2z1+ko5p4= X-Google-Smtp-Source: ABdhPJwBnXMnOdM7BvaxmiRmkk4kGQ6WG4QlB3WoFoOpytBGhALFzaKm+Dq4Yu581qVCIZS2/aBwXw== X-Received: by 2002:a5d:4e10:: with SMTP id p16mr17614678wrt.360.1613918274100; Sun, 21 Feb 2021 06:37:54 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 40/43] vt82c686: Reduce indentation by returning early Date: Sun, 21 Feb 2021 15:34:29 +0100 Message-Id: <20210221143432.2468220-41-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: BALATON Zoltan Signed-off-by: BALATON Zoltan Message-Id: <15b2968fd300a12d06b42368d084f6f80d3c3be5.1610223397.git.balato= n@eik.bme.hu> Reviewed-by: Philippe Mathieu-Daud=C3=A9 [PMD: Split patch original in 5, this is part 2/5] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index eebaa0d444c..2f69b4d531f 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -258,33 +258,32 @@ static void superio_cfg_write(void *opaque, hwaddr ad= dr, uint64_t data, { SuperIOConfig *sc =3D opaque; uint8_t idx =3D sc->regs[0]; + bool can_write =3D true; =20 if (addr =3D=3D 0x3f0) { /* config index register */ idx =3D data & 0xff; - } else { - bool can_write =3D true; - /* 0x3f1, config data register */ - trace_via_superio_write(idx, data & 0xff); - switch (idx) { - case 0x00 ... 0xdf: - case 0xe4: - case 0xe5: - case 0xe9 ... 0xed: - case 0xf3: - case 0xf5: - case 0xf7: - case 0xf9 ... 0xfb: - case 0xfd ... 0xff: - can_write =3D false; - break; - /* case 0xe6 ... 0xe8: Should set base port of parallel and serial= */ - default: - break; - - } - if (can_write) { - sc->regs[idx] =3D data & 0xff; - } + return; + } + /* 0x3f1, config data register */ + trace_via_superio_write(idx, data & 0xff); + switch (idx) { + case 0x00 ... 0xdf: + case 0xe4: + case 0xe5: + case 0xe9 ... 0xed: + case 0xf3: + case 0xf5: + case 0xf7: + case 0xf9 ... 0xfb: + case 0xfd ... 0xff: + can_write =3D false; + break; + /* case 0xe6 ... 0xe8: Should set base port of parallel and serial */ + default: + break; + } + if (can_write) { + sc->regs[idx] =3D data & 0xff; } } =20 --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918281; cv=none; d=zohomail.com; s=zohoarc; b=KA2jfSA2bPTTItTdGIpuR+B21nnbsn2r4l8YoL0Ch4ju5AFPGmknOraVni8UqKJ13qGzcBxxwK7PGQArbbTQopELnd7LIzFpRXcMrfpsJA18PIuHD6znQ1MRVoC8SYTyCZLEcQ0vIvap2OZeaW6D0AUWdpPVtHDa8aH2RhpV8SA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918281; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iKgI0jrs5rTnvBXYFkU8zRUhc3j4MNSCivde0C/yDfw=; b=Avu8Nt5VbKR0Cd5AxTVRVTHhmlQ0+qDmDD4k7hr1vY1M/my3XMAVTBuN2reh45bFhsFpF+iIx79uXZ3xl9CIpNhbiAsA/krDW2okDhnPhcqVFcx3ZllOGgNZrzZoL+VGBl4ashwOb+lEPw3h5bpP5hhd3Vee8bZ5JmicP4kNymw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1613918280682434.5860664146088; Sun, 21 Feb 2021 06:38:00 -0800 (PST) Received: by mail-wr1-f47.google.com with SMTP id l12so16352554wry.2 for ; Sun, 21 Feb 2021 06:38:00 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id c9sm22540169wmb.33.2021.02.21.06.37.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:37:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iKgI0jrs5rTnvBXYFkU8zRUhc3j4MNSCivde0C/yDfw=; b=AcdSuFuox/lRILb4b6y6yy2dVM8X3tuDetVz07i8Z3IsjxB4nHtN55gJWPpVPfDU5X x2ETz2+zWCxzf1mP6YbhOGtJ9fjdPQm0fyDkf3YtI/yGnY+GYbytPH+6asajSVyI8ipP gzF5zn65+8z3W6i9PXIXe17yiRAMpX2YLl3xBT8R1PKyBtzHYCKteOnXaBuJSCMcwhe8 wpYhAhdWfQSp2kUUO1FNfntJEBiPrbrj+G+w0mcw5N++72Z+ymwBqWy7jPbsz1amTdbo DB9sKazAPNA1+/1xvv3rjZEjtJb1JSQRvlveFv5FqPIOmgKV8vQfNYZ7FgSorLHJCn2I ICMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=iKgI0jrs5rTnvBXYFkU8zRUhc3j4MNSCivde0C/yDfw=; b=H+amQjX72XcTaxY2h9AtC1bIlUf6xrVpGouLVXONFgEwHizLMaxE8ydjz2+pFGUSdq 4ZJoFqmCHImGuYrD+KkLHjr4C/p8c36lCBAPy8c92SB0cCVLmYocqevL7Z5HLLrpIvte GgHqjLMWZdOn8VT3GrxowH9Bxtw/pMoP7FOLvAtaH9Qfee2plO6sPL8ljJlsI83Y2FHX L+dis+mreW7ysJtNlu7X/g/1Q5LH6xke65EUUde9CcYv2BUhoVifx4+etuHsKIPH5Ilm x0tvSwdI3xfyUkvXNLRGS+YR841tfvmmEEZoNAz1R0Y5bbe6MG8YvGIaCi0PmpIbElQR EZHg== X-Gm-Message-State: AOAM530C4ZbUyAibcjPRMcac/BStPWLcW6OJXy2s7HIhry9actSX+hzQ kBAlshHUQXJb/eCZW0jRgHk= X-Google-Smtp-Source: ABdhPJzlTlvNKnoZICXBF49A1R9AiN7EasKTAo4qalhMlmiRCoCIUyE6hliog5xcLgEwCFwwEbnRjA== X-Received: by 2002:adf:a4d1:: with SMTP id h17mr15824718wrb.57.1613918278935; Sun, 21 Feb 2021 06:37:58 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 41/43] vt82c686: Simplify by returning earlier Date: Sun, 21 Feb 2021 15:34:30 +0100 Message-Id: <20210221143432.2468220-42-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: BALATON Zoltan By returning earlier we can remove the 'can_write' boolean variable. Signed-off-by: BALATON Zoltan Message-Id: <15b2968fd300a12d06b42368d084f6f80d3c3be5.1610223397.git.balato= n@eik.bme.hu> Reviewed-by: Philippe Mathieu-Daud=C3=A9 [PMD: Split original patch in 5, this is part 3/5] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 2f69b4d531f..2bd10d91013 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -258,7 +258,6 @@ static void superio_cfg_write(void *opaque, hwaddr addr= , uint64_t data, { SuperIOConfig *sc =3D opaque; uint8_t idx =3D sc->regs[0]; - bool can_write =3D true; =20 if (addr =3D=3D 0x3f0) { /* config index register */ idx =3D data & 0xff; @@ -276,15 +275,13 @@ static void superio_cfg_write(void *opaque, hwaddr ad= dr, uint64_t data, case 0xf7: case 0xf9 ... 0xfb: case 0xfd ... 0xff: - can_write =3D false; - break; + /* ignore write to read only registers */ + return; /* case 0xe6 ... 0xe8: Should set base port of parallel and serial */ default: break; } - if (can_write) { - sc->regs[idx] =3D data & 0xff; - } + sc->regs[idx] =3D data & 0xff; } =20 static uint64_t superio_cfg_read(void *opaque, hwaddr addr, unsigned size) --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 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=1613918285; cv=none; d=zohomail.com; s=zohoarc; b=lDhBz5NW1oXGuOegk4u4WRDC5a6hZOILr/px786fGhQCGnrzTrtf3xZ3+oqaAjXcAvuE9fL1kxqCVZTafXicUKEQ80mys7cWnZezEnCkgzZ3hilOBYjvYKgfhy/71xP+HZpnfTCxCVlPbs+HiA9D2Q5/lGFtGJIriT0eB0N40ag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918285; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sPGBK2Ez9fB1ht+wPhXTOH6TvXvQPmXNorVWD5i/OwQ=; b=lbUGftojUedVm2FSKJieKWsCRCUZu/wvUiAktW9lwCV+ulNJH5yHMdGnfINpiWuzPvhRNksYGwssO2K3Ah+bmU2mjahLe7y28BNJno4gCMiQ1M0ZnOFtJe2pRpoLdDxgeEbW8Ej5aZR1mGhUUrxr2CUVsjyHzrrk9LHEIim1VfQ= 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 1613918285587891.7970305241159; Sun, 21 Feb 2021 06:38:05 -0800 (PST) Received: by mail-wm1-f42.google.com with SMTP id m1so12071739wml.2 for ; Sun, 21 Feb 2021 06:38:05 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id c18sm76371238wmk.0.2021.02.21.06.38.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:38:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sPGBK2Ez9fB1ht+wPhXTOH6TvXvQPmXNorVWD5i/OwQ=; b=f30QLnFJWosTRNZiXmCtIOCKic6mcVqqpJLZ4oSBi4S31H6uzVobn3/tLyyxnXhlHz swWZN65hejGsAjhImpHedtREBxhcTxc3MqQdp6IenKE7m5N5fJEnIXNHxF+WDuFQcL+5 PUOxDRI1F9dlW7+A/ZXxjZeNG6Q2SDvkQIQzfYCx4xX1hitRjqg8po4wJztNQ4z34Z1/ iftDupnP9BaROeQPq8DUpGiuWdBJrHct1GKFvuvX198UvmwJFdlLon8pJvpW5+T6/Id9 sTwCOWmvlZBLeG92bjqYsf7UBTxYKkyC+M4sP9sjKOJekJONDZfAvouOLAZxzqrXK8kR ZHtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=sPGBK2Ez9fB1ht+wPhXTOH6TvXvQPmXNorVWD5i/OwQ=; b=KqKx8UujolvsT35/Moc3GmJV5QHTKr8n800RVO8TsVgqGV+B7xyfvmpFlAuR1EZHnX 8EbEBahI3gkP41WAz6JpY7woNiX7ylw1/kYiayjJQ/scmw3WHstGNqcyHtGyE1F+uKaB ykHN/m1r1GZV9C4tApmFQCDgx+By4GxvUrf5KYR1yoXCr9vRlKVhD/WP/fm73758gRe6 wxCvjONhkE/2OkRyjFdIbZfisfVm8QAUjD/6GKLEDW5J04fVSE7dlrw2xlaRgfbwMZic LXELxGn/b10XHuo7z9ena4ZFWWfKvr6/lq0sijngoDyhobRLXVEbAuWqxZ1/z3lx0pCO uLxA== X-Gm-Message-State: AOAM533/Gzu7vNAiuC2r4yUEwPZkKx35psqJSu8RMwYIyut0ox4LnCE+ p1eRn4M9YOEYBxJaHfNYEgw= X-Google-Smtp-Source: ABdhPJxzawfWYjTFPO+q8UmS53/kZER4aD19JXKzYOPoYp+AAsFLtlnC9nOSXDIYBF9SjZNufwVzFA== X-Received: by 2002:a7b:c1c4:: with SMTP id a4mr5977951wmj.123.1613918283895; Sun, 21 Feb 2021 06:38:03 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 42/43] vt82c686: Log superio_cfg unimplemented accesses Date: Sun, 21 Feb 2021 15:34:31 +0100 Message-Id: <20210221143432.2468220-43-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: BALATON Zoltan Signed-off-by: BALATON Zoltan Message-Id: <15b2968fd300a12d06b42368d084f6f80d3c3be5.1610223397.git.balato= n@eik.bme.hu> Reviewed-by: Philippe Mathieu-Daud=C3=A9 [PMD: Split original patch in 5, this is part 4/5] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 2bd10d91013..766584cabd0 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -26,6 +26,7 @@ #include "hw/acpi/acpi.h" #include "hw/i2c/pm_smbus.h" #include "qapi/error.h" +#include "qemu/log.h" #include "qemu/module.h" #include "qemu/range.h" #include "qemu/timer.h" @@ -279,6 +280,8 @@ static void superio_cfg_write(void *opaque, hwaddr addr= , uint64_t data, return; /* case 0xe6 ... 0xe8: Should set base port of parallel and serial */ default: + qemu_log_mask(LOG_UNIMP, + "via_superio_cfg: unimplemented register 0x%x\n", id= x); break; } sc->regs[idx] =3D data & 0xff; --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918291; cv=none; d=zohomail.com; s=zohoarc; b=mb0VkyvjDgHENIgpuIrXA98qdJx+bPm2WbmTomzR4OcrkAZ5GPoQAktrS0IXgGHy4wDB0qHCrEwlqByQvILP+OJ3Q4IAZ3LJF3b0uqs1s0se4VHZEbsM9u2OdyxTg9eoPi8RYO6hB5kDaGajBbK8rXPSUOj7T6wVp5jti1xz6iU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918291; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zw4iTXqwCfmL83vCtQL4WiNjLhPBYSVn760ReNY3gcU=; b=Ms+sA14/Pa+tLr23OrewK84yCF5q4E+LNKg6nm09SgPQw6ePD3xULLqKDLwR3ND3kbWxKbq8V4isbt3bn5yTYfpv1mKpWnwIlqEV+gK7VH6WrMR4+TckN6K6AfEu/FG5ymFsfl1ZY+06M9qOGL0AmThtrfT/8EULDXKt2wlZf44= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1613918290643158.17460707050168; Sun, 21 Feb 2021 06:38:10 -0800 (PST) Received: by mail-wr1-f52.google.com with SMTP id a4so14117962wro.8 for ; Sun, 21 Feb 2021 06:38:10 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id z5sm25577308wrn.8.2021.02.21.06.38.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:38:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zw4iTXqwCfmL83vCtQL4WiNjLhPBYSVn760ReNY3gcU=; b=KfzZeD4dTJh9SvhGBrddSTUkMr9pLjmbd6mWrRnFp+W8JyYJVqcK9EG+w45hkZaIQZ yfvsAp/VaWQUdGZg2BMzvpQFZKsBhbgFbVqthuFGeQLxzUIhaAIm9Lwrv4JH6BSgetJn gDEacxYtvEg3yo+MHnP6MVzQ0Wt/GfLi6yEoRlAm1CJP1gdHeuFIuzLoGaDaQWmRkTOm mx8gPNGd8qgxMLBKXdV2xe8vJ+XiUQx5M6rbuAZZcsre8IhJx+d4eaU/h+RHXt3iAf7b KKRlBLl+PiKaqLNDPi88GvzdN1GIrE9NkaIp9lSJCR0PMumnIzNdsHyexE/43EoaycC8 ZtUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zw4iTXqwCfmL83vCtQL4WiNjLhPBYSVn760ReNY3gcU=; b=rJJSwcDDobrGFJqC426ihKsff8RBXcyzokHIYtEoNaM4klJva4frqBWz6J5FfUAYtj 4SoaBT1WZP911PJe0AsrIMixyXHkw/slt3ej1Wofn5Qp1O4baxx7unSxLBZSwGFFos+k sk2FBn5yu3jFk0WBbXnNEbTOBDmcHLfxUY3JYEF5t1fk2u1iXBrP6jSiS0ROYlzT5LN4 cjWFx8gydJbceJnbg5Dr/wZa15hF0qyKZTj1ut4X7If1WZO0t9BCiDlDOG9DUVWMEaX2 +XXBW6tRxpiJvnsNkoGiUZVN452p6z3BPXlSIHtyUdl3pPDxTLHbCLKdHBQsQoelYxNv c6Mw== X-Gm-Message-State: AOAM53362gm3tZ869iLvaj5yBWO6oVpFR5n2heLNPqpwo7xlANPAPj8f AHvaHKa7krKz4+5/adjXi8Q= X-Google-Smtp-Source: ABdhPJzo4kuxSgDrnorUsaeLvfyCIQFxVqaqeyXZKzLkz6MISUhVuRiCU56M5fh7uMAbpksTIHiZlw== X-Received: by 2002:adf:fe09:: with SMTP id n9mr6659141wrr.104.1613918288998; Sun, 21 Feb 2021 06:38:08 -0800 (PST) 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 , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 43/43] vt82c686: Fix superio_cfg_{read,write}() functions Date: Sun, 21 Feb 2021 15:34:32 +0100 Message-Id: <20210221143432.2468220-44-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-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) From: BALATON Zoltan These functions are memory region callbacks so we have to check against relative address not the mapped address. Signed-off-by: BALATON Zoltan Message-Id: <15b2968fd300a12d06b42368d084f6f80d3c3be5.1610223397.git.balato= n@eik.bme.hu> [PMD: Split original patch in 5, this is part 5/5] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 766584cabd0..5db9b1706c8 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -260,12 +260,13 @@ static void superio_cfg_write(void *opaque, hwaddr ad= dr, uint64_t data, SuperIOConfig *sc =3D opaque; uint8_t idx =3D sc->regs[0]; =20 - if (addr =3D=3D 0x3f0) { /* config index register */ - idx =3D data & 0xff; + if (addr =3D=3D 0) { /* config index register */ + sc->regs[0] =3D data; return; } - /* 0x3f1, config data register */ - trace_via_superio_write(idx, data & 0xff); + + /* config data register */ + trace_via_superio_write(idx, data); switch (idx) { case 0x00 ... 0xdf: case 0xe4: @@ -284,7 +285,7 @@ static void superio_cfg_write(void *opaque, hwaddr addr= , uint64_t data, "via_superio_cfg: unimplemented register 0x%x\n", id= x); break; } - sc->regs[idx] =3D data & 0xff; + sc->regs[idx] =3D data; } =20 static uint64_t superio_cfg_read(void *opaque, hwaddr addr, unsigned size) --=20 2.26.2