mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 09:43:56 -06:00
Misc HW patch queue
- Deprecate a pair of untested microblaze big-endian machines (Philippe) - Arch-agnostic CPU topology checks at machine level (Zhao) - Cleanups on PPC E500 (Bernhard) - Various conversions to DEFINE_TYPES() macro (Bernhard) - Fix RISC-V _pext_u64() name clashing (Pierrick) -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmcqqycACgkQ4+MsLN6t wN7TfhAAkAjpWxFGptNw28LPpnZY/NTGKyXQrIEHu3XnJsZ28c/KZeCAYUUC6/q7 tAnBMb5GIn2VTyt+ElORseFtHStThoR8WMrcQSlGvCZei9lRNKCW0pVIEUgLZEtT u8lChpaVAn8gXb885xlaCBBP4SuFHEpASSfWy0mYDIqZL3oRhr9AQ/KwzHFqenbK Uva4BCWRVnYju6MhfA/pmVP011SUTdCu/fsBTIJT3Xn7Sp7fRNShIzt+1rbmPnR2 hhRl5bMKUgDUjX5GxeP0LOj/XdX9svlqL42imNQT5FFUMIR6qbrwj4U841mt0uuI FcthAoILvA2XUJoTESq0iXUoN4FQLtc01onY6k06EoZAnn8WRZRp2dNdu8fYmHMX y3pcXBK6wEhBVZ2DcGVf1txmieUc4TZohOridU1Xfckp+XVl6J3LtTKJIE56Eh68 S9OJW1Sz2Io/8FJFvKStX0bhV0nBUyUXmi5PjV4vurS6Gy1aVodiiq3ls6baX05z /Y8DJGpPByA+GI2prdwq9oTIhEIU2bJDDz32NkwHM99SE25h+iyh21Ap5Ojkegm7 1squIskxX3QLtEMxBCe+XIKzEZ51kzNZxmLXvCFW5YetypNdhyULqH/UDWt7hIDN BSh2w1g/lSw9n6DtEN3rURYAR/uV7/7IMEP8Td2wvcDX4o95Fkw= =q0cF -----END PGP SIGNATURE----- Merge tag 'hw-misc-20241105' of https://github.com/philmd/qemu into staging Misc HW patch queue - Deprecate a pair of untested microblaze big-endian machines (Philippe) - Arch-agnostic CPU topology checks at machine level (Zhao) - Cleanups on PPC E500 (Bernhard) - Various conversions to DEFINE_TYPES() macro (Bernhard) - Fix RISC-V _pext_u64() name clashing (Pierrick) # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmcqqycACgkQ4+MsLN6t # wN7TfhAAkAjpWxFGptNw28LPpnZY/NTGKyXQrIEHu3XnJsZ28c/KZeCAYUUC6/q7 # tAnBMb5GIn2VTyt+ElORseFtHStThoR8WMrcQSlGvCZei9lRNKCW0pVIEUgLZEtT # u8lChpaVAn8gXb885xlaCBBP4SuFHEpASSfWy0mYDIqZL3oRhr9AQ/KwzHFqenbK # Uva4BCWRVnYju6MhfA/pmVP011SUTdCu/fsBTIJT3Xn7Sp7fRNShIzt+1rbmPnR2 # hhRl5bMKUgDUjX5GxeP0LOj/XdX9svlqL42imNQT5FFUMIR6qbrwj4U841mt0uuI # FcthAoILvA2XUJoTESq0iXUoN4FQLtc01onY6k06EoZAnn8WRZRp2dNdu8fYmHMX # y3pcXBK6wEhBVZ2DcGVf1txmieUc4TZohOridU1Xfckp+XVl6J3LtTKJIE56Eh68 # S9OJW1Sz2Io/8FJFvKStX0bhV0nBUyUXmi5PjV4vurS6Gy1aVodiiq3ls6baX05z # /Y8DJGpPByA+GI2prdwq9oTIhEIU2bJDDz32NkwHM99SE25h+iyh21Ap5Ojkegm7 # 1squIskxX3QLtEMxBCe+XIKzEZ51kzNZxmLXvCFW5YetypNdhyULqH/UDWt7hIDN # BSh2w1g/lSw9n6DtEN3rURYAR/uV7/7IMEP8Td2wvcDX4o95Fkw= # =q0cF # -----END PGP SIGNATURE----- # gpg: Signature made Tue 05 Nov 2024 23:32:55 GMT # gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full] # Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE * tag 'hw-misc-20241105' of https://github.com/philmd/qemu: (29 commits) hw/riscv/iommu: fix build error with clang hw/usb/hcd-ehci-sysbus: Prefer DEFINE_TYPES() macro hw/rtc/ds1338: Prefer DEFINE_TYPES() macro hw/i2c/smbus_eeprom: Prefer DEFINE_TYPES() macro hw/block/pflash_cfi01: Prefer DEFINE_TYPES() macro hw/sd/sdhci: Prefer DEFINE_TYPES() macro hw/ppc/mpc8544_guts: Prefer DEFINE_TYPES() macro hw/gpio/mpc8xxx: Prefer DEFINE_TYPES() macro hw/net/fsl_etsec/etsec: Prefer DEFINE_TYPES() macro hw/net/fsl_etsec/miim: Reuse MII constants hw/pci-host/ppce500: Prefer DEFINE_TYPES() macro hw/pci-host/ppce500: Reuse TYPE_PPC_E500_PCI_BRIDGE define hw/i2c/mpc_i2c: Prefer DEFINE_TYPES() macro hw/i2c/mpc_i2c: Convert DPRINTF to trace events for register access hw/ppc/mpc8544_guts: Populate POR PLL ratio status register hw/ppc/e500: Add missing device tree properties to i2c controller node hw/ppc/e500: Remove unused "irqs" parameter hw/ppc/e500: Prefer QOM cast hw/core: Add a helper to check the cache topology level hw/core: Check smp cache topology support for machine ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
63dc369443
29 changed files with 625 additions and 347 deletions
|
@ -5,7 +5,7 @@
|
|||
# See the COPYING file in the top-level directory.
|
||||
|
||||
##
|
||||
# = Machines S390 data types
|
||||
# = Common machine types
|
||||
##
|
||||
|
||||
##
|
||||
|
@ -18,3 +18,95 @@
|
|||
##
|
||||
{ 'enum': 'S390CpuEntitlement',
|
||||
'data': [ 'auto', 'low', 'medium', 'high' ] }
|
||||
|
||||
##
|
||||
# @CpuTopologyLevel:
|
||||
#
|
||||
# An enumeration of CPU topology levels.
|
||||
#
|
||||
# @thread: thread level, which would also be called SMT level or
|
||||
# logical processor level. The @threads option in
|
||||
# SMPConfiguration is used to configure the topology of this
|
||||
# level.
|
||||
#
|
||||
# @core: core level. The @cores option in SMPConfiguration is used
|
||||
# to configure the topology of this level.
|
||||
#
|
||||
# @module: module level. The @modules option in SMPConfiguration is
|
||||
# used to configure the topology of this level.
|
||||
#
|
||||
# @cluster: cluster level. The @clusters option in SMPConfiguration
|
||||
# is used to configure the topology of this level.
|
||||
#
|
||||
# @die: die level. The @dies option in SMPConfiguration is used to
|
||||
# configure the topology of this level.
|
||||
#
|
||||
# @socket: socket level, which would also be called package level.
|
||||
# The @sockets option in SMPConfiguration is used to configure
|
||||
# the topology of this level.
|
||||
#
|
||||
# @book: book level. The @books option in SMPConfiguration is used
|
||||
# to configure the topology of this level.
|
||||
#
|
||||
# @drawer: drawer level. The @drawers option in SMPConfiguration is
|
||||
# used to configure the topology of this level.
|
||||
#
|
||||
# @default: default level. Some architectures will have default
|
||||
# topology settings (e.g., cache topology), and this special
|
||||
# level means following the architecture-specific settings.
|
||||
#
|
||||
# Since: 9.2
|
||||
##
|
||||
{ 'enum': 'CpuTopologyLevel',
|
||||
'data': [ 'thread', 'core', 'module', 'cluster', 'die',
|
||||
'socket', 'book', 'drawer', 'default' ] }
|
||||
|
||||
##
|
||||
# @CacheLevelAndType:
|
||||
#
|
||||
# Caches a system may have. The enumeration value here is the
|
||||
# combination of cache level and cache type.
|
||||
#
|
||||
# @l1d: L1 data cache.
|
||||
#
|
||||
# @l1i: L1 instruction cache.
|
||||
#
|
||||
# @l2: L2 (unified) cache.
|
||||
#
|
||||
# @l3: L3 (unified) cache
|
||||
#
|
||||
# Since: 9.2
|
||||
##
|
||||
{ 'enum': 'CacheLevelAndType',
|
||||
'data': [ 'l1d', 'l1i', 'l2', 'l3' ] }
|
||||
|
||||
##
|
||||
# @SmpCacheProperties:
|
||||
#
|
||||
# Cache information for SMP system.
|
||||
#
|
||||
# @cache: Cache name, which is the combination of cache level
|
||||
# and cache type.
|
||||
#
|
||||
# @topology: Cache topology level. It accepts the CPU topology
|
||||
# enumeration as the parameter, i.e., CPUs in the same
|
||||
# topology container share the same cache.
|
||||
#
|
||||
# Since: 9.2
|
||||
##
|
||||
{ 'struct': 'SmpCacheProperties',
|
||||
'data': {
|
||||
'cache': 'CacheLevelAndType',
|
||||
'topology': 'CpuTopologyLevel' } }
|
||||
|
||||
##
|
||||
# @SmpCachePropertiesWrapper:
|
||||
#
|
||||
# List wrapper of SmpCacheProperties.
|
||||
#
|
||||
# @caches: the list of SmpCacheProperties.
|
||||
#
|
||||
# Since 9.2
|
||||
##
|
||||
{ 'struct': 'SmpCachePropertiesWrapper',
|
||||
'data': { 'caches': ['SmpCacheProperties'] } }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue