From nobody Thu Apr 25 08:00:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1575268573; cv=none; d=zohomail.com; s=zohoarc; b=L63ZRgSqO5SmjlfXZXrStlikkBszSoJ5THQk9y55ABJj7zonsD4/HAAtxzpreP/AfK0a1cu/ep550ZdmNbVzwlSHYb76MhYdwh7KZZaooxfGDpreM+x/KMGRQkAhu7oES2esdgtyprbneDKk5Rnbi2mmc4YtaYMT7QRvXBE/iF4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575268573; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=owZici0XsgcJUgC7Y112LfjRPZJ6+F4m2l/GxOzvA2w=; b=bmLYtlDBV4mOj3a7HX5aqyAQb4+sOIm/iXfUg2bva8H9qtzvOVp6LurUHvol8S8dp7POFdoaa3vF9aLpi/DrmrX2RdmNRtE+aLJ+GIjKYSp5IS6YA8XAOhUuRh2kkow3zzohHA71TzQqBzZigB7ciZvcBoDo8y36XmYlUfqLdb8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575268573252454.69461530616184; Sun, 1 Dec 2019 22:36:13 -0800 (PST) Received: from localhost ([::1]:59572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibfJc-0003Pq-3R for importer@patchew.org; Mon, 02 Dec 2019 01:36:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60185) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibfGE-0006gF-T5 for qemu-devel@nongnu.org; Mon, 02 Dec 2019 01:32:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibfGD-000157-V4 for qemu-devel@nongnu.org; Mon, 02 Dec 2019 01:32:42 -0500 Received: from mga07.intel.com ([134.134.136.100]:13270) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ibfGD-00014b-Np for qemu-devel@nongnu.org; Mon, 02 Dec 2019 01:32:41 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Dec 2019 22:32:41 -0800 Received: from tao-optiplex-7060.sh.intel.com ([10.239.159.36]) by orsmga001.jf.intel.com with ESMTP; 01 Dec 2019 22:32:39 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,268,1571727600"; d="scan'208";a="293301493" From: Tao Xu To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Subject: [PATCH RESEND 1/4] target/i386: Add Denverton-v2 (no MPX) CPU model Date: Mon, 2 Dec 2019 14:32:30 +0800 Message-Id: <20191202063233.28523-2-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191202063233.28523-1-tao3.xu@intel.com> References: <20191202063233.28523-1-tao3.xu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.100 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: tao3.xu@intel.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Because MPX is being removed from the linux kernel, remove MPX feature from Denverton. Signed-off-by: Tao Xu --- target/i386/cpu.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 69f518a21a..06a3077f95 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3482,6 +3482,18 @@ static X86CPUDefinition builtin_x86_defs[] =3D { .features[FEAT_VMX_VMFUNC] =3D MSR_VMX_VMFUNC_EPT_SWITCHING, .xlevel =3D 0x80000008, .model_id =3D "Intel Atom Processor (Denverton)", + .versions =3D (X86CPUVersionDefinition[]) { + { .version =3D 1 }, + { + .version =3D 2, + .props =3D (PropValue[]) { + { "monitor", "off" }, + { "mpx", "off" }, + { /* end of list */ }, + }, + }, + { /* end of list */ }, + }, }, { .name =3D "Snowridge", --=20 2.20.1 From nobody Thu Apr 25 08:00:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1575268636; cv=none; d=zohomail.com; s=zohoarc; b=fjJOymvbnrENSajM2FheUM85qIoGgGyFd1+OACT93T652BE307P2hUVcnV7GYableNS8NFD1d1J943Q4jmsppsu0AwkbM4tvl2olw+s7gl6+QWYW8NmmFTrn5LJL9wtp1tThF6ZSjk5GN9Lk580rtaORrDKxUgKNDXJcWL2CDHo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575268636; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uJO1xUf1o1HhVWLHs7sEf6swEL2WBqL590ssBk9Jx14=; b=EhdGejOrdiSxhkJ7vX3KpYsM7sd3NLDna5qZXvPhZokP7U0lI6l0mw4C1quLDjYyJXTqUGn7rhMsVN920qazJewUQ7RgCUtn2DMzO3vncjVOlhp+SKldujENmKwOWfi7yKpB58duCzLj71pXwt5DvCGLQPXLKh+HEUqahyfcS6U= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157526863692062.06792256899644; Sun, 1 Dec 2019 22:37:16 -0800 (PST) Received: from localhost ([::1]:59582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibfKd-0004Hy-RN for importer@patchew.org; Mon, 02 Dec 2019 01:37:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60204) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibfGG-0006iq-SA for qemu-devel@nongnu.org; Mon, 02 Dec 2019 01:32:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibfGF-00015y-O4 for qemu-devel@nongnu.org; Mon, 02 Dec 2019 01:32:44 -0500 Received: from mga07.intel.com ([134.134.136.100]:13274) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ibfGF-00015V-Fa for qemu-devel@nongnu.org; Mon, 02 Dec 2019 01:32:43 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Dec 2019 22:32:42 -0800 Received: from tao-optiplex-7060.sh.intel.com ([10.239.159.36]) by orsmga001.jf.intel.com with ESMTP; 01 Dec 2019 22:32:41 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,268,1571727600"; d="scan'208";a="293301502" From: Tao Xu To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Subject: [PATCH RESEND 2/4] target/i386: Remove monitor from some CPU models Date: Mon, 2 Dec 2019 14:32:31 +0800 Message-Id: <20191202063233.28523-3-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191202063233.28523-1-tao3.xu@intel.com> References: <20191202063233.28523-1-tao3.xu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.100 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: tao3.xu@intel.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add new version of Snowridge, Denverton, Opteron_G3, EPYC, and Dhyana CPU model to remove MONITOR/MWAIT feature. After QEMU/KVM use "-overcommit cpu-pm=3Don" to expose MONITOR/MWAIT (commit id 6f131f13e68d648a8e4f083c667ab1acd88ce4cd), the MONITOR/MWAIT feature in these CPU model is unused. Signed-off-by: Tao Xu --- target/i386/cpu.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 06a3077f95..b09ac38409 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3621,6 +3621,14 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { /* end of list */ }, }, }, + { + .version =3D 3, + .props =3D (PropValue[]) { + /* mpx was already removed by -v2 above */ + { "monitor", "off" }, + { /* end of list */ }, + }, + }, { /* end of list */ }, }, }, @@ -3732,6 +3740,17 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_EXT3_ABM | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM, .xlevel =3D 0x80000008, .model_id =3D "AMD Opteron 23xx (Gen 3 Class Opteron)", + .versions =3D (X86CPUVersionDefinition[]) { + { .version =3D 1 }, + { + .version =3D 2, + .props =3D (PropValue[]) { + { "monitor", "off" }, + { /* end of list */ }, + }, + }, + { /* end of list */ }, + }, }, { .name =3D "Opteron_G4", @@ -3856,6 +3875,14 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { /* end of list */ } } }, + { + .version =3D 3, + .props =3D (PropValue[]) { + /* ibpb was already enabled by -v2 above */ + { "monitor", "off" }, + { /* end of list */ }, + }, + }, { /* end of list */ } } }, @@ -3908,6 +3935,17 @@ static X86CPUDefinition builtin_x86_defs[] =3D { .xlevel =3D 0x8000001E, .model_id =3D "Hygon Dhyana Processor", .cache_info =3D &epyc_cache_info, + .versions =3D (X86CPUVersionDefinition[]) { + { .version =3D 1 }, + { + .version =3D 2, + .props =3D (PropValue[]) { + { "monitor", "off" }, + { /* end of list */ }, + }, + }, + { /* end of list */ }, + }, }, }; =20 --=20 2.20.1 From nobody Thu Apr 25 08:00:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1575268525; cv=none; d=zohomail.com; s=zohoarc; b=gCGT8GZVBqD5c0Yg95pqhgnHcB5ASOGw1S29Zpy0nJ36yqbvwlSd30r3cRQB32JekfPik7kIu65NRQuVZI4c8pnWslW3VkL0/pMY+407agWXHyFx8Ku9++kNalHGsZu8sRzDx27hZZ2oNIpv0Cfi3vKiDSMEC7d6XS2E95sQjpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575268525; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bqBdgrScBGc55+TaGV80aa2rqo71V+/g0R8ZB4Lw15Y=; b=NfKeayo+mb2+krrq6fS6OkkR+8zbSsvjsEa1CXgJIZZXiJqxPNUekMDwAMQs0f1phWexQT+Ndbb68uB3g++4a3ANemA1URuyOSx0oiNuyFa8BNL1yTb/dwLOjXBaMbp2xb+nUg4SqW2KsKbvc73+bu+uFJPeeuMm/7YuH/HYEMo= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575268525501564.4285408767623; Sun, 1 Dec 2019 22:35:25 -0800 (PST) Received: from localhost ([::1]:59546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibfIq-0002CP-FL for importer@patchew.org; Mon, 02 Dec 2019 01:35:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60210) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibfGH-0006jn-GW for qemu-devel@nongnu.org; Mon, 02 Dec 2019 01:32:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibfGG-00016d-Ew for qemu-devel@nongnu.org; Mon, 02 Dec 2019 01:32:45 -0500 Received: from mga07.intel.com ([134.134.136.100]:13274) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ibfGG-00015V-6V for qemu-devel@nongnu.org; Mon, 02 Dec 2019 01:32:44 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Dec 2019 22:32:43 -0800 Received: from tao-optiplex-7060.sh.intel.com ([10.239.159.36]) by orsmga001.jf.intel.com with ESMTP; 01 Dec 2019 22:32:42 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,268,1571727600"; d="scan'208";a="293301517" From: Tao Xu To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Subject: [PATCH RESEND 3/4] target/i386: Add new property note to versioned CPU models Date: Mon, 2 Dec 2019 14:32:32 +0800 Message-Id: <20191202063233.28523-4-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191202063233.28523-1-tao3.xu@intel.com> References: <20191202063233.28523-1-tao3.xu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.100 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: tao3.xu@intel.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add additional information for -cpu help to indicate the changes in this version of CPU model. Suggested-by: Eduardo Habkost Signed-off-by: Tao Xu --- target/i386/cpu.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index b09ac38409..7b3bd6d4db 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1693,6 +1693,7 @@ typedef struct PropValue { typedef struct X86CPUVersionDefinition { X86CPUVersion version; const char *alias; + const char *note; PropValue *props; } X86CPUVersionDefinition; =20 @@ -1723,6 +1724,7 @@ struct X86CPUModel { X86CPUDefinition *cpudef; /* CPU model version */ X86CPUVersion version; + const char *note; /* * If true, this is an alias CPU model. * This matters only for "-cpu help" and query-cpu-definitions @@ -4788,6 +4790,7 @@ static void x86_cpu_list_entry(gpointer data, gpointe= r user_data) char *name =3D x86_cpu_class_get_model_name(cc); char *desc =3D g_strdup(cc->model_description); char *alias_of =3D x86_cpu_class_get_alias_of(cc); + char *model_id =3D x86_cpu_class_get_model_id(cc); =20 if (!desc && alias_of) { if (cc->model && cc->model->version =3D=3D CPU_VERSION_AUTO) { @@ -4796,14 +4799,18 @@ static void x86_cpu_list_entry(gpointer data, gpoin= ter user_data) desc =3D g_strdup_printf("(alias of %s)", alias_of); } } + if (!desc && cc->model && cc->model->note) { + desc =3D g_strdup_printf("%s [%s]", model_id, cc->model->note); + } if (!desc) { - desc =3D x86_cpu_class_get_model_id(cc); + desc =3D g_strdup_printf("%s", model_id); } =20 - qemu_printf("x86 %-20s %-48s\n", name, desc); + qemu_printf("x86 %-20s %-58s\n", name, desc); g_free(name); g_free(desc); g_free(alias_of); + g_free(model_id); } =20 /* list available CPU models and flags */ @@ -5280,6 +5287,7 @@ static void x86_register_cpudef_types(X86CPUDefinitio= n *def) X86CPUModel *m =3D g_new0(X86CPUModel, 1); m->cpudef =3D def; m->version =3D vdef->version; + m->note =3D vdef->note; name =3D x86_cpu_versioned_model_name(def, vdef->version); x86_register_cpu_model_type(name, m); g_free(name); --=20 2.20.1 From nobody Thu Apr 25 08:00:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1575268442; cv=none; d=zohomail.com; s=zohoarc; b=gz/g+AXJkELYDVJkx/pQy6wWNEqbUWVBjMPYcIQG6LxZoxwV8wzKQr/F0JiKQdyGhDCY6uAlNzwzrcVOh49ofSxs2nPMQWaDtz6qHGSafUHqxZ8OY/57EqQilRFrAmbd1zHCIBJCQ3sfQlsUIHyqDBGSCFq3mnPxJYypYTjNdnc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575268442; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2RQT44RQGgCutoHjVHa1/CbsBMoe8JN2rBGhf/Ka1ms=; b=jUdp3ItWbn1bwVNn9QmAH7dx2h6V/XY5purN3jo5EnFvmBo5kzya+8s/J76+G0YVbHH1WImIDiBThLa7MopplUiHI/ACoctn3ubkTlDk8Yt0iYycLHTeKAY6bMWHsV8SxwvjAYFh5QS84qFtLAZO0u+eJ+J3/9HOnjUkfuuiNyk= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575268442779269.05303239018895; Sun, 1 Dec 2019 22:34:02 -0800 (PST) Received: from localhost ([::1]:59528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibfHV-00081T-ET for importer@patchew.org; Mon, 02 Dec 2019 01:34:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60229) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibfGJ-0006mJ-La for qemu-devel@nongnu.org; Mon, 02 Dec 2019 01:32:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibfGI-00017V-7f for qemu-devel@nongnu.org; Mon, 02 Dec 2019 01:32:47 -0500 Received: from mga07.intel.com ([134.134.136.100]:13274) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ibfGH-00015V-So for qemu-devel@nongnu.org; Mon, 02 Dec 2019 01:32:46 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Dec 2019 22:32:45 -0800 Received: from tao-optiplex-7060.sh.intel.com ([10.239.159.36]) by orsmga001.jf.intel.com with ESMTP; 01 Dec 2019 22:32:44 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,268,1571727600"; d="scan'208";a="293301529" From: Tao Xu To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Subject: [PATCH RESEND 4/4] target/i386: Add notes for versioned CPU models Date: Mon, 2 Dec 2019 14:32:33 +0800 Message-Id: <20191202063233.28523-5-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191202063233.28523-1-tao3.xu@intel.com> References: <20191202063233.28523-1-tao3.xu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.100 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: tao3.xu@intel.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add which features are added or removed in this version. Remove the changed model-id in versioned CPU models. Signed-off-by: Tao Xu --- target/i386/cpu.c | 50 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 7b3bd6d4db..c82fbfd02e 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -2281,10 +2281,9 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 2, .alias =3D "Nehalem-IBRS", + .note =3D "IBRS", .props =3D (PropValue[]) { { "spec-ctrl", "on" }, - { "model-id", - "Intel Core i7 9xx (Nehalem Core i7, IBRS update)" }, { /* end of list */ } } }, @@ -2362,10 +2361,9 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 2, .alias =3D "Westmere-IBRS", + .note =3D "IBRS", .props =3D (PropValue[]) { { "spec-ctrl", "on" }, - { "model-id", - "Westmere E56xx/L56xx/X56xx (IBRS update)" }, { /* end of list */ } } }, @@ -2448,10 +2446,9 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 2, .alias =3D "SandyBridge-IBRS", + .note =3D "IBRS", .props =3D (PropValue[]) { { "spec-ctrl", "on" }, - { "model-id", - "Intel Xeon E312xx (Sandy Bridge, IBRS update)" }, { /* end of list */ } } }, @@ -2540,10 +2537,9 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 2, .alias =3D "IvyBridge-IBRS", + .note =3D "IBRS", .props =3D (PropValue[]) { { "spec-ctrl", "on" }, - { "model-id", - "Intel Xeon E3-12xx v2 (Ivy Bridge, IBRS)" }, { /* end of list */ } } }, @@ -2637,17 +2633,18 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 2, .alias =3D "Haswell-noTSX", + .note =3D "no TSX", .props =3D (PropValue[]) { { "hle", "off" }, { "rtm", "off" }, { "stepping", "1" }, - { "model-id", "Intel Core Processor (Haswell, no TSX)"= , }, { /* end of list */ } }, }, { .version =3D 3, .alias =3D "Haswell-IBRS", + .note =3D "IBRS", .props =3D (PropValue[]) { /* Restore TSX features removed by -v2 above */ { "hle", "on" }, @@ -2658,21 +2655,18 @@ static X86CPUDefinition builtin_x86_defs[] =3D { */ { "stepping", "4" }, { "spec-ctrl", "on" }, - { "model-id", - "Intel Core Processor (Haswell, IBRS)" }, { /* end of list */ } } }, { .version =3D 4, .alias =3D "Haswell-noTSX-IBRS", + .note =3D "no TSX, IBRS", .props =3D (PropValue[]) { { "hle", "off" }, { "rtm", "off" }, /* spec-ctrl was already enabled by -v3 above */ { "stepping", "1" }, - { "model-id", - "Intel Core Processor (Haswell, no TSX, IBRS)" }, { /* end of list */ } } }, @@ -2768,35 +2762,33 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 2, .alias =3D "Broadwell-noTSX", + .note =3D "no TSX", .props =3D (PropValue[]) { { "hle", "off" }, { "rtm", "off" }, - { "model-id", "Intel Core Processor (Broadwell, no TSX= )", }, { /* end of list */ } }, }, { .version =3D 3, .alias =3D "Broadwell-IBRS", + .note =3D "IBRS", .props =3D (PropValue[]) { /* Restore TSX features removed by -v2 above */ { "hle", "on" }, { "rtm", "on" }, { "spec-ctrl", "on" }, - { "model-id", - "Intel Core Processor (Broadwell, IBRS)" }, { /* end of list */ } } }, { .version =3D 4, .alias =3D "Broadwell-noTSX-IBRS", + .note =3D "no TSX, IBRS", .props =3D (PropValue[]) { { "hle", "off" }, { "rtm", "off" }, /* spec-ctrl was already enabled by -v3 above */ - { "model-id", - "Intel Core Processor (Broadwell, no TSX, IBRS)" }, { /* end of list */ } } }, @@ -2896,17 +2888,17 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 1 }, { .version =3D 2, + .note =3D "IBRS", .alias =3D "Skylake-Client-IBRS", .props =3D (PropValue[]) { { "spec-ctrl", "on" }, - { "model-id", - "Intel Core Processor (Skylake, IBRS)" }, { /* end of list */ } } }, { .version =3D 3, .alias =3D "Skylake-Client-noTSX-IBRS", + .note =3D "no TSX, IBRS", .props =3D (PropValue[]) { { "hle", "off" }, { "rtm", "off" }, @@ -3017,19 +3009,19 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 2, .alias =3D "Skylake-Server-IBRS", + .note =3D "IBRS", .props =3D (PropValue[]) { /* clflushopt was not added to Skylake-Server-IBRS */ /* TODO: add -v3 including clflushopt */ { "clflushopt", "off" }, { "spec-ctrl", "on" }, - { "model-id", - "Intel Xeon Processor (Skylake, IBRS)" }, { /* end of list */ } } }, { .version =3D 3, .alias =3D "Skylake-Server-noTSX-IBRS", + .note =3D "no TSX, IBRS", .props =3D (PropValue[]) { { "hle", "off" }, { "rtm", "off" }, @@ -3141,6 +3133,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { .versions =3D (X86CPUVersionDefinition[]) { { .version =3D 1 }, { .version =3D 2, + .note =3D "ARCH_CAPABILITIES", .props =3D (PropValue[]) { { "arch-capabilities", "on" }, { "rdctl-no", "on" }, @@ -3152,6 +3145,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { }, { .version =3D 3, .alias =3D "Cascadelake-Server-noTSX", + .note =3D "no TSX", .props =3D (PropValue[]) { { "hle", "off" }, { "rtm", "off" }, @@ -3264,6 +3258,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 1 }, { .version =3D 2, + .note =3D "no TSX", .alias =3D "Icelake-Client-noTSX", .props =3D (PropValue[]) { { "hle", "off" }, @@ -3381,6 +3376,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 1 }, { .version =3D 2, + .note =3D "no TSX", .alias =3D "Icelake-Server-noTSX", .props =3D (PropValue[]) { { "hle", "off" }, @@ -3488,6 +3484,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 1 }, { .version =3D 2, + .note =3D "no MPX, no MONITOR", .props =3D (PropValue[]) { { "monitor", "off" }, { "mpx", "off" }, @@ -3617,14 +3614,15 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 1 }, { .version =3D 2, + .note =3D "no MPX", .props =3D (PropValue[]) { { "mpx", "off" }, - { "model-id", "Intel Atom Processor (Snowridge, no MPX= )" }, { /* end of list */ }, }, }, { .version =3D 3, + .note =3D "no MPX, no MONITOR", .props =3D (PropValue[]) { /* mpx was already removed by -v2 above */ { "monitor", "off" }, @@ -3746,6 +3744,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 1 }, { .version =3D 2, + .note =3D "no MONITOR", .props =3D (PropValue[]) { { "monitor", "off" }, { /* end of list */ }, @@ -3870,15 +3869,15 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 2, .alias =3D "EPYC-IBPB", + .note =3D "IBPB", .props =3D (PropValue[]) { { "ibpb", "on" }, - { "model-id", - "AMD EPYC Processor (with IBPB)" }, { /* end of list */ } } }, { .version =3D 3, + .note =3D "IBPB, no MONITOR", .props =3D (PropValue[]) { /* ibpb was already enabled by -v2 above */ { "monitor", "off" }, @@ -3941,6 +3940,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { { .version =3D 1 }, { .version =3D 2, + .note =3D "no MONITOR", .props =3D (PropValue[]) { { "monitor", "off" }, { /* end of list */ }, --=20 2.20.1