From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BCFBC433DB for ; Fri, 12 Mar 2021 14:46:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D337C64FDD for ; Fri, 12 Mar 2021 14:46:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D337C64FDD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKj3E-0004CP-MH for qemu-devel@archiver.kernel.org; Fri, 12 Mar 2021 09:46:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKiWk-00060p-Ub for qemu-devel@nongnu.org; Fri, 12 Mar 2021 09:12:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:32771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKiWg-0005D1-Lp for qemu-devel@nongnu.org; Fri, 12 Mar 2021 09:12:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615558345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C5gxy7fH9Xgf2OfVqQnB5fvwF7VQSLrBMlHRFUsnjsI=; b=BJDDnbGbQQS32X/7ATDyjtZoc3w1kucXPB8O+eVKTCwUiOqyedTwpGhz0+avFp12e4LkHD oZuNhS0f1TOPHPs/dcwGrCGTjGUHXOqx42bdLfwCg2/YGZS/0ev0GeGLnWwPhG+zQzUicg ZyVYrE3mo2rC8uBL2Cshop+YdSIl6Fc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-40-K368lLcLMS2GTGc9dn4RMQ-1; Fri, 12 Mar 2021 09:12:23 -0500 X-MC-Unique: K368lLcLMS2GTGc9dn4RMQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 33FA518460E3; Fri, 12 Mar 2021 14:12:22 +0000 (UTC) Received: from [10.36.114.197] (ovpn-114-197.ams2.redhat.com [10.36.114.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id C7806190F0; Fri, 12 Mar 2021 14:12:20 +0000 (UTC) Subject: Re: [PATCH] s390x/cpu_model: use official name for 8562 To: Cornelia Huck , Christian Borntraeger References: <20210311132746.1777754-1-cohuck@redhat.com> <2dd31caa-0263-191d-f7ed-8471282403b2@de.ibm.com> <20210312145516.6d7a9a63.cohuck@redhat.com> From: David Hildenbrand Organization: Red Hat GmbH Message-ID: <0990f757-1aaa-790b-641c-698aa9859657@redhat.com> Date: Fri, 12 Mar 2021 15:12:20 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <20210312145516.6d7a9a63.cohuck@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Halil Pasic , Thomas Huth , Richard Henderson , qemu-s390x@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 12.03.21 14:55, Cornelia Huck wrote: > On Fri, 12 Mar 2021 14:48:17 +0100 > Christian Borntraeger wrote: > >> On 11.03.21 14:27, Cornelia Huck wrote: >>> The single-frame z15 is called "z15 T02". >>> >>> Signed-off-by: Cornelia Huck >> >> Acked-by: Christian Borntraeger >>> --- >>> target/s390x/cpu_models.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c >>> index dd474c5e9ad1..b59ed4135615 100644 >>> --- a/target/s390x/cpu_models.c >>> +++ b/target/s390x/cpu_models.c >>> @@ -87,7 +87,7 @@ static S390CPUDef s390_cpu_defs[] = { >>> CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"), >>> CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"), >>> CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM z15 GA1"), >> >> you could also change that formn "z15" to "z15 T01" >>> - CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"), >>> + CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM z15 T02 GA1"), >>> }; >>> >>> #define QEMU_MAX_CPU_TYPE 0x2964 >>> >> > > I now have: > > Author: Cornelia Huck > Date: Thu Mar 11 14:27:46 2021 +0100 > > s390x/cpu_model: use official name for 8562 > > The single-frame z15 is called "z15 T02" (and the multi-frame z15 > "z15 T01"). > > Signed-off-by: Cornelia Huck > Reviewed-by: David Hildenbrand > Acked-by: Christian Borntraeger > Message-Id: <20210311132746.1777754-1-cohuck@redhat.com> > > diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c > index dd474c5e9ad1..050dcf2d42d2 100644 > --- a/target/s390x/cpu_models.c > +++ b/target/s390x/cpu_models.c > @@ -86,8 +86,8 @@ static S390CPUDef s390_cpu_defs[] = { > CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"), > CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"), > CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"), > - CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM z15 GA1"), > - CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"), > + CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM z15 T01 GA1"), > + CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM z15 T02 GA1"), > }; > > #define QEMU_MAX_CPU_TYPE 0x2964 > LGTM -- Thanks, David / dhildenb