{"id":1850796,"url":"http://patchwork.ozlabs.org/api/patches/1850796/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20231018130716.286638-6-thuth@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20231018130716.286638-6-thuth@redhat.com>","list_archive_url":null,"date":"2023-10-18T13:06:56","name":"[PULL,05/25] s390x/sclp: reporting the maximum nested topology entries","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"25fbb1c17848f431b65b5c3adec51d77926b840f","submitter":{"id":66152,"url":"http://patchwork.ozlabs.org/api/people/66152/?format=json","name":"Thomas Huth","email":"thuth@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20231018130716.286638-6-thuth@redhat.com/mbox/","series":[{"id":378180,"url":"http://patchwork.ozlabs.org/api/series/378180/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=378180","date":"2023-10-18T13:06:52","name":"[PULL,01/25] qapi: machine.json: change docs regarding CPU topology","version":1,"mbox":"http://patchwork.ozlabs.org/series/378180/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1850796/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1850796/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=KuoZfB8+;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4S9WNn1Rs4z20Zj\n\tfor ; Thu, 19 Oct 2023 00:07:53 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1qt6Gr-0003z5-2a; Wed, 18 Oct 2023 09:07:33 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1qt6Gp-0003wb-A8\n for qemu-devel@nongnu.org; Wed, 18 Oct 2023 09:07:31 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.133.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1qt6Gn-0007sm-NW\n for qemu-devel@nongnu.org; Wed, 18 Oct 2023 09:07:31 -0400","from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])\n by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-108-mLiM7n1INNSWOlt8qXUYRA-1; Wed, 18 Oct 2023 09:07:27 -0400","from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com\n [10.11.54.4])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 42D653C1CC43;\n Wed, 18 Oct 2023 13:07:27 +0000 (UTC)","from thuth-p1g4.redhat.com (unknown [10.39.192.109])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 0AB6120268C8;\n Wed, 18 Oct 2023 13:07:25 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1697634449;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=CInx0c9QuSXUH5cjyT7bh+hkIZbzXa+9xz4TvL4gEg4=;\n b=KuoZfB8+jKPEfyYQF0xIdzz6/A4PZI4jschXw6MWR3QgBFWajK+GbxqlemCPe6ta0ImJo9\n CqY+rsdLtZSb38tIHyLfpB9xVXsdpg65UCBseeR0tsO6EpHaibMHKrRz/4GrOx7ukhTtRT\n 76/OTQhLbpV/avjHLNZtXCYZAjzGFVs=","X-MC-Unique":"mLiM7n1INNSWOlt8qXUYRA-1","From":"Thomas Huth ","To":"qemu-devel@nongnu.org","Cc":"Stefan Hajnoczi , qemu-s390x@nongnu.org,\n Nina Schoetterl-Glausch ","Subject":"[PULL 05/25] s390x/sclp: reporting the maximum nested topology\n entries","Date":"Wed, 18 Oct 2023 15:06:56 +0200","Message-ID":"<20231018130716.286638-6-thuth@redhat.com>","In-Reply-To":"<20231018130716.286638-1-thuth@redhat.com>","References":"<20231018130716.286638-1-thuth@redhat.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.4.1 on 10.11.54.4","Received-SPF":"pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001,\n SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"From: Pierre Morel \n\nThe maximum nested topology entries is used by the guest to\nknow how many nested topology are available on the machine.\n\nLet change the MNEST value from 2 to 4 in the SCLP READ INFO\nstructure now that we support books and drawers.\n\nSigned-off-by: Pierre Morel \nReviewed-by: Nina Schoetterl-Glausch \nReviewed-by: Thomas Huth \nMessage-ID: <20231016183925.2384704-6-nsg@linux.ibm.com>\nSigned-off-by: Thomas Huth \n---\n include/hw/s390x/sclp.h | 5 +++--\n hw/s390x/sclp.c | 5 +++++\n 2 files changed, 8 insertions(+), 2 deletions(-)","diff":"diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h\nindex c49051e17e..9aef6d9370 100644\n--- a/include/hw/s390x/sclp.h\n+++ b/include/hw/s390x/sclp.h\n@@ -112,12 +112,13 @@ typedef struct CPUEntry {\n } QEMU_PACKED CPUEntry;\n \n #define SCLP_READ_SCP_INFO_FIXED_CPU_OFFSET 128\n-#define SCLP_READ_SCP_INFO_MNEST 2\n+#define SCLP_READ_SCP_INFO_MNEST 4\n typedef struct ReadInfo {\n SCCBHeader h;\n uint16_t rnmax;\n uint8_t rnsize;\n- uint8_t _reserved1[16 - 11]; /* 11-15 */\n+ uint8_t _reserved1[15 - 11]; /* 11-14 */\n+ uint8_t stsi_parm; /* 15-15 */\n uint16_t entries_cpu; /* 16-17 */\n uint16_t offset_cpu; /* 18-19 */\n uint8_t _reserved2[24 - 20]; /* 20-23 */\ndiff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c\nindex eff74479f4..d339cbb7e4 100644\n--- a/hw/s390x/sclp.c\n+++ b/hw/s390x/sclp.c\n@@ -20,6 +20,7 @@\n #include \"hw/s390x/event-facility.h\"\n #include \"hw/s390x/s390-pci-bus.h\"\n #include \"hw/s390x/ipl.h\"\n+#include \"hw/s390x/cpu-topology.h\"\n \n static inline SCLPDevice *get_sclp_device(void)\n {\n@@ -123,6 +124,10 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb)\n return;\n }\n \n+ if (s390_has_topology()) {\n+ read_info->stsi_parm = SCLP_READ_SCP_INFO_MNEST;\n+ }\n+\n /* CPU information */\n prepare_cpu_entries(machine, entries_start, &cpu_count);\n read_info->entries_cpu = cpu_to_be16(cpu_count);\n","prefixes":["PULL","05/25"]}