[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v19 04/21] s390x/sclp: reporting the maximum nested topology entr
From: |
Pierre Morel |
Subject: |
[PATCH v19 04/21] s390x/sclp: reporting the maximum nested topology entries |
Date: |
Mon, 3 Apr 2023 18:28:48 +0200 |
The maximum nested topology entries is used by the guest to
know how many nested topology are available on the machine.
Let change the MNEST value from 2 to 4 in the SCLP READ INFO
structure now that we support books and drawers.
Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
Reviewed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
include/hw/s390x/sclp.h | 5 +++--
hw/s390x/sclp.c | 5 +++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h
index 712fd68123..902252b319 100644
--- a/include/hw/s390x/sclp.h
+++ b/include/hw/s390x/sclp.h
@@ -112,12 +112,13 @@ typedef struct CPUEntry {
} QEMU_PACKED CPUEntry;
#define SCLP_READ_SCP_INFO_FIXED_CPU_OFFSET 128
-#define SCLP_READ_SCP_INFO_MNEST 2
+#define SCLP_READ_SCP_INFO_MNEST 4
typedef struct ReadInfo {
SCCBHeader h;
uint16_t rnmax;
uint8_t rnsize;
- uint8_t _reserved1[16 - 11]; /* 11-15 */
+ uint8_t _reserved1[15 - 11]; /* 11-14 */
+ uint8_t stsi_parm; /* 15-15 */
uint16_t entries_cpu; /* 16-17 */
uint16_t offset_cpu; /* 18-19 */
uint8_t _reserved2[24 - 20]; /* 20-23 */
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index eff74479f4..d339cbb7e4 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -20,6 +20,7 @@
#include "hw/s390x/event-facility.h"
#include "hw/s390x/s390-pci-bus.h"
#include "hw/s390x/ipl.h"
+#include "hw/s390x/cpu-topology.h"
static inline SCLPDevice *get_sclp_device(void)
{
@@ -123,6 +124,10 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb)
return;
}
+ if (s390_has_topology()) {
+ read_info->stsi_parm = SCLP_READ_SCP_INFO_MNEST;
+ }
+
/* CPU information */
prepare_cpu_entries(machine, entries_start, &cpu_count);
read_info->entries_cpu = cpu_to_be16(cpu_count);
--
2.31.1
- Re: [PATCH v19 02/21] s390x/cpu topology: add topology entries on CPU hotplug, (continued)
- Re: [PATCH v19 02/21] s390x/cpu topology: add topology entries on CPU hotplug, Nina Schoetterl-Glausch, 2023/04/20
- Re: [PATCH v19 02/21] s390x/cpu topology: add topology entries on CPU hotplug, Pierre Morel, 2023/04/21
- Re: [PATCH v19 02/21] s390x/cpu topology: add topology entries on CPU hotplug, Nina Schoetterl-Glausch, 2023/04/24
- Re: [PATCH v19 02/21] s390x/cpu topology: add topology entries on CPU hotplug, Pierre Morel, 2023/04/25
- Re: [PATCH v19 02/21] s390x/cpu topology: add topology entries on CPU hotplug, Nina Schoetterl-Glausch, 2023/04/25
- Re: [PATCH v19 02/21] s390x/cpu topology: add topology entries on CPU hotplug, Pierre Morel, 2023/04/25
[PATCH v19 07/21] target/s390x/cpu topology: activate CPU topology, Pierre Morel, 2023/04/03
[PATCH v19 08/21] qapi/s390x/cpu topology: set-cpu-topology qmp command, Pierre Morel, 2023/04/03
[PATCH v19 03/21] target/s390x/cpu topology: handle STSI(15) and build the SYSIB, Pierre Morel, 2023/04/03
[PATCH v19 10/21] machine: adding s390 topology to info hotpluggable-cpus, Pierre Morel, 2023/04/03
[PATCH v19 04/21] s390x/sclp: reporting the maximum nested topology entries,
Pierre Morel <=
[PATCH v19 06/21] s390x/cpu topology: interception of PTF instruction, Pierre Morel, 2023/04/03
[PATCH v19 11/21] qapi/s390x/cpu topology: CPU_POLARIZATION_CHANGE qapi event, Pierre Morel, 2023/04/03
[PATCH v19 09/21] machine: adding s390 topology to query-cpu-fast, Pierre Morel, 2023/04/03
[PATCH v19 12/21] qapi/s390x/cpu topology: query-cpu-polarization qmp command, Pierre Morel, 2023/04/03
[PATCH v19 13/21] docs/s390x/cpu topology: document s390x cpu topology, Pierre Morel, 2023/04/03
[PATCH v19 16/21] tests/avocado: s390x cpu topology entitlement tests, Pierre Morel, 2023/04/03