qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gavin Shan <gshan@redhat.com>
To: qemu-arm@nongnu.org
Cc: qemu-devel@nongnu.org, qemu-riscv@nongnu.org,
	qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, philmd@linaro.org,
	clg@kaod.org, imammedo@redhat.com, imp@bsdimp.com,
	kevans@freebsd.org, richard.henderson@linaro.org,
	pbonzini@redhat.com, peter.maydell@linaro.org,
	b.galvani@gmail.com, strahinja.p.jankovic@gmail.com,
	sundeep.lkml@gmail.com, kfting@nuvoton.com, wuhaotsh@google.com,
	nieklinnenbank@gmail.com, rad@semihalf.com,
	quic_llindhol@quicinc.com, marcin.juszkiewicz@linaro.org,
	eduardo@habkost.net, marcel.apfelbaum@gmail.com,
	wangyanan55@huawei.com, laurent@vivier.eu, vijai@behindbytes.com,
	palmer@dabbelt.com, alistair.francis@wdc.com,
	bin.meng@windriver.com, liweiwei@iscas.ac.cn,
	dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com,
	mrolnik@gmail.com, edgar.iglesias@gmail.com, bcain@quicinc.com,
	gaosong@loongson.cn, aurelien@aurel32.net,
	jiaxun.yang@flygoat.com, aleksandar.rikalo@syrmia.com,
	chenhuacai@kernel.org, crwulff@gmail.com, marex@denx.de,
	shorne@gmail.com, npiggin@gmail.com, ysato@users.sourceforge.jp,
	david@redhat.com, thuth@redhat.com, iii@linux.ibm.com,
	kbastian@mail.uni-paderborn.de, jcmvbkbc@gmail.com,
	shan.gavin@gmail.com
Subject: [PATCH v4 00/33] Unified CPU type check
Date: Thu,  2 Nov 2023 10:24:27 +1000	[thread overview]
Message-ID: <20231102002500.1750692-1-gshan@redhat.com> (raw)

There are two places where the user specified CPU type is checked to see
if it's supported or allowed by the board: machine_run_board_init() and
mc->init(). We don't have to maintain two duplicate sets of logic. This
series intends to move the check to machine_run_board_init() so that we
have unified CPU type check.

Note that the term "the registered CPU type name" used in this series
corresponds to the names of non-abstract CPU classes, regitered by
individual target.

PATCH[01-03] Come from Philippe Mathieu-Daudé. cpu_class_by_name()
             is consolidated to ensure that the returned object
             class isn't abstract and a child object class of
             CPU_RESOLVING_TYPE
PATCH[04]    Adds a generic helper cpu_model_from_type() to extract
             the CPU model name from the CPU type name
PATCH[05-20] Uses cpu_model_from_type() in the individual target
PATCH[21-24] Implements cpu_list() for the missed targets
PATCH[25-33] Validates the CPU type in machine_run_board_init() for
             the individual board

v1: https://lists.nongnu.org/archive/html/qemu-arm/2023-07/msg00302.html
v2: https://lists.nongnu.org/archive/html/qemu-arm/2023-07/msg00528.html
v3: https://lists.nongnu.org/archive/html/qemu-arm/2023-09/msg00157.html

Testing
=======

With the following command lines, the output messages are varied before
and after the series is applied.

  ./build/qemu-system-aarch64            \
  -accel tcg -machine virt,gic-version=3 \
  -cpu cortex-a8 -smp maxcpus=2,cpus=1

Before the series is applied:

  qemu-system-aarch64: mach-virt: CPU type cortex-a8-arm-cpu not supported

After the series is applied:

  qemu-system-aarch64: Invalid CPU type: cortex-a8-arm-cpu
  The valid models are: cortex-a7, cortex-a15, cortex-a35, cortex-a55,
                        cortex-a72, cortex-a76, a64fx, neoverse-n1,
                        neoverse-v1, cortex-a53, cortex-a57, max

Changelog
=========
v4:
  * Rebase to latest v8.1.2                                     (Gavin)
  * Integrate Philippe's patches where cpu_class_by_name()
    is consolidated and my duplicate code is dropped            (Philippe)
  * Simplified changelog and improvements                       (Thomas)
  * g_assert() on the return value from cpu_model_from_type()
    in is_cpu_type_supported()                                  (Philippe)
  * Collected r-bs from Philippe Mathieu-Daudé, Leif Lindholm,
    Bastian Koppelmann, Daniel Henrique Barboza, Cédric Le Goater,
    Gavin Shan                                                  (Gavin)
v3:
  * Generic helper cpu_model_from_type()                        (Igor)
  * Apply cpu_model_from_type() to the individual targets       (Igor)
  * Implement cpu_list() for the missed targets                 (Gavin)
  * Remove mc->valid_cpu_models                                 (Richard)
  * Separate patch to constify mc->validate_cpu_types           (Gavin)
v2:
  * Constify mc->valid_cpu_types                                (Richard)
  * Print the supported CPU models, instead of typenames        (Peter)
  * Misc improvements for the hleper to do the check            (Igor)
  * More patches to move the check                              (Marcin)

Gavin Shan (30):
  cpu: Add helper cpu_model_from_type()
  target/alpha: Use generic helper to show CPU model names
  target/arm: Use generic helper to show CPU model names
  target/avr: Use generic helper to show CPU model names
  target/cris: Use generic helper to show CPU model names
  target/hexagon: Use generic helper to show CPU model names
  target/i386: Use generic helper to show CPU model names
  target/loongarch: Use generic helper to show CPU model names
  target/m68k: Use generic helper to show CPU model names
  target/mips: Use generic helper to show CPU model names
  target/openrisc: Use generic helper to show CPU model names
  target/ppc: Use generic helper to show CPU model names
  target/riscv: Use generic helper to show CPU model names
  target/rx: Use generic helper to show CPU model names
  target/s390x: Use generic helper to show CPU model names
  target/sh4: Use generic helper to show CPU model names
  target/tricore: Use generic helper to show CPU model names
  target/hppa: Implement hppa_cpu_list()
  target/microblaze: Implement microblaze_cpu_list()
  target/nios2: Implement nios2_cpu_list()
  cpu: Mark cpu_list() supported on all targets
  machine: Constify MachineClass::valid_cpu_types[i]
  machine: Use error handling when CPU type is checked
  machine: Introduce helper is_cpu_type_supported()
  machine: Print CPU model name instead of CPU type name
  hw/arm/virt: Check CPU type in machine_run_board_init()
  hw/arm/virt: Hide host CPU model for tcg
  hw/arm/sbsa-ref: Check CPU type in machine_run_board_init()
  hw/arm: Check CPU type in machine_run_board_init()
  hw/riscv/shakti_c: Check CPU type in machine_run_board_init()

Philippe Mathieu-Daudé (3):
  target/alpha: Tidy up alpha_cpu_class_by_name()
  hw/cpu: Call object_class_is_abstract() once in cpu_class_by_name()
  cpu: Call object_class_dynamic_cast() once in cpu_class_by_name()

 bsd-user/main.c                       |  3 -
 cpu-target.c                          | 34 +++++++++-
 hw/arm/bananapi_m2u.c                 | 12 ++--
 hw/arm/cubieboard.c                   | 12 ++--
 hw/arm/mps2-tz.c                      | 20 ++++--
 hw/arm/mps2.c                         | 25 +++++--
 hw/arm/msf2-som.c                     | 12 ++--
 hw/arm/musca.c                        | 13 ++--
 hw/arm/npcm7xx_boards.c               | 13 ++--
 hw/arm/orangepi.c                     | 12 ++--
 hw/arm/sbsa-ref.c                     | 21 +-----
 hw/arm/virt.c                         | 23 ++-----
 hw/core/cpu-common.c                  |  8 ---
 hw/core/machine.c                     | 93 ++++++++++++++++-----------
 hw/m68k/q800.c                        |  2 +-
 hw/riscv/shakti_c.c                   | 11 ++--
 include/hw/boards.h                   |  2 +-
 include/hw/core/cpu.h                 | 19 +++++-
 target/alpha/cpu.c                    | 15 ++---
 target/arm/arm-qmp-cmds.c             |  6 +-
 target/arm/cpu.c                      |  5 +-
 target/arm/helper.c                   | 12 ++--
 target/avr/cpu.c                      | 17 +++--
 target/cris/cpu.c                     | 12 ++--
 target/hexagon/cpu.c                  | 17 ++---
 target/hppa/cpu.c                     | 19 ++++++
 target/hppa/cpu.h                     |  3 +
 target/i386/cpu.c                     |  7 +-
 target/loongarch/cpu.c                | 14 ++--
 target/loongarch/loongarch-qmp-cmds.c |  3 +-
 target/m68k/cpu.c                     |  5 +-
 target/m68k/helper.c                  | 14 ++--
 target/microblaze/cpu.c               | 20 ++++++
 target/microblaze/cpu.h               |  3 +
 target/mips/cpu-defs.c.inc            |  9 ---
 target/mips/cpu.c                     | 18 ++++++
 target/mips/sysemu/mips-qmp-cmds.c    |  3 +-
 target/nios2/cpu.c                    | 20 ++++++
 target/nios2/cpu.h                    |  3 +
 target/openrisc/cpu.c                 | 19 ++----
 target/ppc/cpu_init.c                 | 12 ++--
 target/riscv/cpu.c                    | 19 +++---
 target/riscv/riscv-qmp-cmds.c         |  3 +-
 target/rx/cpu.c                       | 11 ++--
 target/s390x/cpu_models.c             | 12 ++--
 target/s390x/cpu_models_sysemu.c      |  9 ++-
 target/sh4/cpu.c                      | 26 ++++----
 target/tricore/cpu.c                  |  5 +-
 target/tricore/helper.c               | 13 ++--
 target/xtensa/cpu.c                   |  5 +-
 50 files changed, 384 insertions(+), 310 deletions(-)

-- 
2.41.0



             reply	other threads:[~2023-11-02  0:27 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-02  0:24 Gavin Shan [this message]
2023-11-02  0:24 ` [PATCH v4 01/33] target/alpha: Tidy up alpha_cpu_class_by_name() Gavin Shan
2023-11-06 14:22   ` Igor Mammedov
2023-11-13 23:23     ` Gavin Shan
2023-11-02  0:24 ` [PATCH v4 02/33] hw/cpu: Call object_class_is_abstract() once in cpu_class_by_name() Gavin Shan
2023-11-06 14:40   ` Igor Mammedov
2023-11-13 23:46     ` Gavin Shan
2023-11-02  0:24 ` [PATCH v4 03/33] cpu: Call object_class_dynamic_cast() " Gavin Shan
2023-11-06 14:48   ` Igor Mammedov
2023-11-02  0:24 ` [PATCH v4 04/33] cpu: Add helper cpu_model_from_type() Gavin Shan
2023-11-02  0:24 ` [PATCH v4 05/33] target/alpha: Use generic helper to show CPU model names Gavin Shan
2023-11-02  0:24 ` [PATCH v4 06/33] target/arm: " Gavin Shan
2023-11-02  0:24 ` [PATCH v4 07/33] target/avr: " Gavin Shan
2023-11-02  0:24 ` [PATCH v4 08/33] target/cris: " Gavin Shan
2023-11-02  0:24 ` [PATCH v4 09/33] target/hexagon: " Gavin Shan
2023-11-02  0:24 ` [PATCH v4 10/33] target/i386: " Gavin Shan
2023-11-02  0:24 ` [PATCH v4 11/33] target/loongarch: " Gavin Shan
2023-11-02  0:24 ` [PATCH v4 12/33] target/m68k: " Gavin Shan
2023-11-02  0:24 ` [PATCH v4 13/33] target/mips: " Gavin Shan
2023-11-02  0:24 ` [PATCH v4 14/33] target/openrisc: " Gavin Shan
2023-11-02  0:24 ` [PATCH v4 15/33] target/ppc: " Gavin Shan
2023-11-02  0:24 ` [PATCH v4 16/33] target/riscv: " Gavin Shan
2023-11-02  0:24 ` [PATCH v4 17/33] target/rx: " Gavin Shan
2023-11-02  0:24 ` [PATCH v4 18/33] target/s390x: " Gavin Shan
2023-11-02  0:24 ` [PATCH v4 19/33] target/sh4: " Gavin Shan
2023-11-02  0:24 ` [PATCH v4 20/33] target/tricore: " Gavin Shan
2023-11-02  0:24 ` [PATCH v4 21/33] target/hppa: Implement hppa_cpu_list() Gavin Shan
2023-11-02  0:24 ` [PATCH v4 22/33] target/microblaze: Implement microblaze_cpu_list() Gavin Shan
2023-11-02  0:24 ` [PATCH v4 23/33] target/nios2: Implement nios2_cpu_list() Gavin Shan
2023-11-02  0:24 ` [PATCH v4 24/33] cpu: Mark cpu_list() supported on all targets Gavin Shan
2023-11-02  0:24 ` [PATCH v4 25/33] machine: Constify MachineClass::valid_cpu_types[i] Gavin Shan
2023-11-02  4:14   ` Richard Henderson
2023-11-02  0:24 ` [PATCH v4 26/33] machine: Use error handling when CPU type is checked Gavin Shan
2023-11-02  4:57   ` Richard Henderson
2023-11-02  0:24 ` [PATCH v4 27/33] machine: Introduce helper is_cpu_type_supported() Gavin Shan
2023-11-02  5:02   ` Richard Henderson
2023-11-02  0:24 ` [PATCH v4 28/33] machine: Print CPU model name instead of CPU type name Gavin Shan
2023-11-02  5:06   ` Richard Henderson
2023-11-02  0:24 ` [PATCH v4 29/33] hw/arm/virt: Check CPU type in machine_run_board_init() Gavin Shan
2023-11-02  5:09   ` Richard Henderson
2023-11-02  0:24 ` [PATCH v4 30/33] hw/arm/virt: Hide host CPU model for tcg Gavin Shan
2023-11-02  5:10   ` Richard Henderson
2023-11-02  0:24 ` [PATCH v4 31/33] hw/arm/sbsa-ref: Check CPU type in machine_run_board_init() Gavin Shan
2023-11-02  5:15   ` Richard Henderson
2023-11-02  0:24 ` [PATCH v4 32/33] hw/arm: " Gavin Shan
2023-11-02  5:17   ` Richard Henderson
2023-11-02  0:25 ` [PATCH v4 33/33] hw/riscv/shakti_c: " Gavin Shan
2023-11-02  5:19   ` Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231102002500.1750692-1-gshan@redhat.com \
    --to=gshan@redhat.com \
    --cc=aleksandar.rikalo@syrmia.com \
    --cc=alistair.francis@wdc.com \
    --cc=aurelien@aurel32.net \
    --cc=b.galvani@gmail.com \
    --cc=bcain@quicinc.com \
    --cc=bin.meng@windriver.com \
    --cc=chenhuacai@kernel.org \
    --cc=clg@kaod.org \
    --cc=crwulff@gmail.com \
    --cc=david@redhat.com \
    --cc=dbarboza@ventanamicro.com \
    --cc=edgar.iglesias@gmail.com \
    --cc=eduardo@habkost.net \
    --cc=gaosong@loongson.cn \
    --cc=iii@linux.ibm.com \
    --cc=imammedo@redhat.com \
    --cc=imp@bsdimp.com \
    --cc=jcmvbkbc@gmail.com \
    --cc=jiaxun.yang@flygoat.com \
    --cc=kbastian@mail.uni-paderborn.de \
    --cc=kevans@freebsd.org \
    --cc=kfting@nuvoton.com \
    --cc=laurent@vivier.eu \
    --cc=liweiwei@iscas.ac.cn \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=marcin.juszkiewicz@linaro.org \
    --cc=marex@denx.de \
    --cc=mrolnik@gmail.com \
    --cc=nieklinnenbank@gmail.com \
    --cc=npiggin@gmail.com \
    --cc=palmer@dabbelt.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=qemu-riscv@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=quic_llindhol@quicinc.com \
    --cc=rad@semihalf.com \
    --cc=richard.henderson@linaro.org \
    --cc=shan.gavin@gmail.com \
    --cc=shorne@gmail.com \
    --cc=strahinja.p.jankovic@gmail.com \
    --cc=sundeep.lkml@gmail.com \
    --cc=thuth@redhat.com \
    --cc=vijai@behindbytes.com \
    --cc=wangyanan55@huawei.com \
    --cc=wuhaotsh@google.com \
    --cc=ysato@users.sourceforge.jp \
    --cc=zhiwei_liu@linux.alibaba.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).