From nobody Fri Oct 24 21:54:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520281440967639.6569368468621; Mon, 5 Mar 2018 12:24:00 -0800 (PST) Received: from localhost ([::1]:51387 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1esweI-0000NC-H7 for importer@patchew.org; Mon, 05 Mar 2018 15:23:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34880) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eswZK-00053h-NQ for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:18:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eswZH-00010v-Kt for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:18:46 -0500 Received: from mail-bn3nam01on0063.outbound.protection.outlook.com ([104.47.33.63]:48284 helo=NAM01-BN3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eswZH-00010I-G7 for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:18:43 -0500 Received: from linux-pyp0.amd.com (165.204.77.1) by BN6PR12MB1763.namprd12.prod.outlook.com (10.175.101.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Mon, 5 Mar 2018 20:18:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Yk0C7447rjAZe0OqXl/HwJzvbNoYOapE3J+QPurlSYQ=; b=kfAkaspAi/OPoJmbGxRVqz5G5HtlTgMzL0vq94h+lQrFY/fzVN0222qbPaAnhr89J1H+U5kKO+oXzXEe0DthK/Ofe1XAmOACesE74+/wZyCJCfJjviOHcHqu2ZClUI+bbW8L1LFzInkUJFCNYEVHoNNrlYbWWsQGz8jBBr9JDN4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; From: Babu Moger To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, rkrcmar@redhat.com Date: Mon, 5 Mar 2018 15:18:23 -0500 Message-Id: <1520281107-5115-2-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1520281107-5115-1-git-send-email-babu.moger@amd.com> References: <1520281107-5115-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CY4PR1801CA0014.namprd18.prod.outlook.com (10.171.252.27) To BN6PR12MB1763.namprd12.prod.outlook.com (10.175.101.136) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ccab2049-0bf8-44cd-17aa-08d582d648f8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:BN6PR12MB1763; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 3:5eVoVEtdskL3sbzYCkMhz78Afbpf4c0bZ4SEDgO+tfqnVywr/HxPGzFPLWFKm+V8al0/chSG4yBl27vYkRLL52Cw1+ddqEMoA3rezqODjGYoxhLfE2xfH5H+7qBsBNRAXaZAo0ZoPGT1jPi4YtwBplJP1BCCow/sJs7nlA+4ouckOHnpmF4bhIfB9vsRviqOxDovoLtmWy2PyACZnD6F+8aOjVsrmRRfwLRf/dkHFyWr5NOcygBjXTEqUw4MPlAv; 25:fNjpq+4K5PzKudAcYeu0xplRE2u98n+adBWkXG5HsWdkPfUW9Y9lspsnCcpPm8q55YWXOL0HIYxOxM6/4kUBDdj2I18jGMbbZB+yll0BW1Qe6TN7KN5uISoQbn8l98escKUE0Jqln4+CDGcUSiVqDN+3iQkOPfWCVFF2MPYL++k9pgNIfaYc6HCDWHVHjCD3VRAADC/WRTuYIHquzQyJHZuFJe1G+rzQpUvrooa/ZXkfvSQFbEIB9Oxt+FXJXB0L5peBvOeEopvkJIBPKZAbCij0atUfEPm4ZmrpdPyOe7FK4veYYu3m8MdzpPevemQUr4WHnd7Asnoo1Wa2KWO15g==; 31:lBEofXUGI669M83OQdiPtzFTXuieXG/8ApOpo2A6BClXUFjMdeE/TrVEvGqhOsGlApSE83anx7V0IXtDBjPUeGS7n2b+ThP/wmXCf005xr1X0574CDrs46meMbshVxZp4V9VUpwmkfGI5snOIj3PeBD4/srFEamwWW+pI2qNMyGM2OR53YIgtrxfT8xc/OjmDATPuYi/4tqXKGqMXZ1mIVw2olwKQTOBJrmxn+GJkl8= X-MS-TrafficTypeDiagnostic: BN6PR12MB1763: X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 20:dxUA4XAZwz/MS7TAo/hB9XpXsQkp3O10KTXB+3ip5jC49LBH5725TzoF9Dk52gml55xTaLhnT3FN2cmJxp938jPNLfRIdyOVt9a0w9BsXgIWmoZ846jWXZ+hX0ENepn5KExTNN0Gsv9ZBRYzxkYZlkPcQUQEamrYflJYI7t5E2hgnUEVDkbGxhjJRANJl0s0dPONjI6EJdR4+KSjOJLJCJ5WaQn5JWKZp+P+wi4hjnAUvm4rqh7Z+ReEnZx+6su4Az1EGPIpYqyymxqhosgoBNUqHzU45gP61EO2FaO3FTenMCKwHT1uvM53SstJaw970AQWlHn7ODMQBeCNoIFjKHbcDi1IaTYGNHnG+Z0UgwqCgH4cgPXq+GuCoeKLsjqesWH33XCNVXwSYTHGPAL4gcluE+V+0INhgih4cWq+m9PWOYx+U5UztUrcfrJYHJBe+cGvlarTEUisex44zqaTpK2fM8bb18SE6yyBhG+Rha6A62Hy1sR/pLbWPeQkWEM9; 4:jSSL2vUzj47baZRSnc8JzzFbmDu0aS1Dqeg5Oakz5emOhpNOelBDDoQ3jD3mYbTLKHlyr4YanHyvtup41i5OmTwfLhHzhMMbi/ag2gFkBsaLc+WiSFta0sQ0IIbe4C6jA9hhNP4+eZyMStnhNdVO1ty3kL5owseADTdCsiugaheM09Mh01V8YLoiLhJiq2mJR4q5E4MPUdnGJ3gtuFDm0aHOYGo7D2JmjVl0FwupVAg1Nn09YAPJ0IIqIZhGelItvS/+pO5VKIq77sihJEYV/398SF/04kGxVfvwE+4SsO49cMPI6Ps7BpwrS5ebHUYH X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(5005006)(8121501046)(10201501046)(3231220)(944501244)(52105095)(3002001)(93006095)(93001095)(6055026)(6041288)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011); SRVR:BN6PR12MB1763; BCL:0; PCL:0; RULEID:; SRVR:BN6PR12MB1763; X-Forefront-PRVS: 06022AA85F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(39380400002)(396003)(366004)(376002)(346002)(189003)(199004)(2950100002)(4720700003)(2906002)(106356001)(66066001)(6666003)(97736004)(25786009)(36756003)(5660300001)(478600001)(48376002)(81166006)(81156014)(8676002)(72206003)(47776003)(8936002)(50226002)(4326008)(105586002)(50466002)(26005)(6486002)(305945005)(16586007)(186003)(16526019)(316002)(52116002)(53936002)(7696005)(68736007)(53416004)(3846002)(6116002)(386003)(51416003)(7736002)(76176011)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1763; H:linux-pyp0.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR12MB1763; 23:iKoFNoOoDTMjJ9EXQFe+TOoqATCPt08EXK1iV/gzw?= =?us-ascii?Q?poCCIpbmWvhwZ/uKVkt2XYqSAmyx+0bMmdL4aEEIn8rQqaSDxlYCSXI1HWYs?= =?us-ascii?Q?oYa97uMsbrVhXwuzHcf6FYM/zNe0PfBhXff3Qn4TfR/rQXc3tmEgtOO0f8ey?= =?us-ascii?Q?CbFAAaePeux5tvDbe9FMV97ONvXA9wa5dxnW18NUd42weKpZiPmG/DMLs52z?= =?us-ascii?Q?qZk/sjGQZf6ToFX0uDzo0Gaz8uKoDl+9RHjMIP/VQuRy9w86jz3giGaGceXh?= =?us-ascii?Q?dj8K0aLi56Uczu/n9W0qiMQ3StY//l7cW6B8Bkb2FV+A6+g0yJiy7HWyqGyF?= =?us-ascii?Q?q9M+vWws/JUlvklDSG26VloIJ8Q5Va7x2soihEsTSc8W6X6Asi+YjZNiL0bI?= =?us-ascii?Q?WfW4W1rhKa+fFWdE+LyYUI3SdeB4lAZbN6nv8wJTBKZ629cv3zKWW03V1TCi?= =?us-ascii?Q?Lo71jEvBU8/kEntuQs4OXkUUHryx2pWVurudNRX7LiaLZ00FBbk6Wj00AvMs?= =?us-ascii?Q?eFpv6yJv7gcIaDC/g81lUqRbUitu3+I941qu5a/KllHGRTapzdIB3RiDtj/i?= =?us-ascii?Q?9ZlWxorTYJ/Wbb6MsmR7rD43ummh+8OvylTltKrPCl6soEU2Gxhb0evbkDgl?= =?us-ascii?Q?9JFrTgeONn5utUO/WB9a8k2kX6Pv/S0erPPjdqq32bxOKnYfTrN5FE8bmkkb?= =?us-ascii?Q?hpyL4jap7VBgqt4BCkBNi/MSfqHN989AZrciBRLGkibWSerKXdZ8tO8vWZos?= =?us-ascii?Q?LIWj+I+b/ynw7AwJjeF7spn11L5U8lLQmup4DtXKepVRtS32KI235m659R6n?= =?us-ascii?Q?XXaA0/19PBCcMQBDdy8J/1CDi7LTbpYgrtexhAZepRteTIUuCobvDYSsmUHx?= =?us-ascii?Q?nUYKv6VpKfyI0qjBkq3DI7CI4AIE3VlMo7+6gPJ02eX1ql4+bO77Cb3EqlVP?= =?us-ascii?Q?yRd6tG05gvIHtGph55t+cGqZRpIbriTIUptZaFIVYh25sYJAvxMwhrU5Mtci?= =?us-ascii?Q?ypIciFyKCU+rS6S/m+EKKCblrZT3YDx7R6f7Eb69tX1Z17TcUigfuuPgtWY9?= =?us-ascii?Q?gD129emkfpr/H7+6J6Wuw6njjAcnGKpCnEAjxUW1QObsfNmkvHJYA9t3MT7A?= =?us-ascii?Q?D+Nu2ucCS899hxavUIcofW320NHdKFa?= X-Microsoft-Antispam-Message-Info: tp98g34feYlcLrLgDybcTEr7Rb6seTc7mp1wlX+3Y0i78rzqGk/fe+xIewCHn8pYK82QycXza4Lw4iwfaGVTI0dUz7futzmtcAEJF5RqJdh36nzWSwfszo0hcOJ75hvc23Yt7F8ET1sWWGCPkywdEnmb05sYobKa9gCqIFZOrys/tbKZV4ei9cHNCKxXc7CP X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 6:ndJfQWJQ/jY30Mnhaowpf5SS8tB2ImL4iuA0bKWZXe2W1MhOrhYB7OXQp5dvWYwwEk89+vhRPQwXICRKaQbanMbi01oREsz7pTszfapDfPq6691EpHjbKHDMLuKaCci2J+0+2bvKPQo5GOY+jO/HGw2wMiTHHl7T7mH5BamRGKmEIzX3oJXCLKOCQaaAmPNIWMO+peKQN6aYHt1IoX1VhEUVeZYVPa0GLQKQMOC23HjQ5KUZnhwx4bpAGE2hzEEpd+wRSPMAoOe8LJ6pkwriOOTP5O5KxVYK1+bbEx5c46ixTkb6hshxAZFz2cyxuytmOdv4C1e+I6VjBh0VoRTrNezhio/MuqToZiZPRp2nRKY=; 5:hkQBs22RDdwqxTZ83VfCcq6XinI+3fOaFyjpIs5bCFpg1ubGOxK1yLq1DipwV9v7AA2gn/tOQH3Lam+aNTVYggzIY+rZ5zslRyRJRWfBSCeSdGjI4cMFo8MtumTgzPKyCl56VPww4fj4ZmImaS3GU4YNpnY4Cj9jzUtnB/HsQj8=; 24:8fudp8SpUi7eQIZ2kGZ7LGzlSB7qLR32oUPc6EUA1ejVqKnmM+3DO7oCemSXCq36DOzxozt921FH3Hk3n9ohaTzpzF4wgkVIeu1Ip48dwh4=; 7:8kEyVYjn1vmmd0cRPt7cyvLOT3lv+3BuOn27BtsYZIqK3zcY3OeksK9WtNknY9vWfi7md9WdcXwj3FLp1qgK5H9QkBAcGjZyduwq0IWP0W5bw84ySnx3RIdmT+w7vRZHUdlWHUoaUgBu00shwIWqtcNRDCQJCnicUda1qX2M6ElOrx48ExKDp87rz1kQLchZLyTqv4xnXfVteXM5+GmXL6d/UhdCfiqjIaanw2YNjgFj7pg9qjFFHE47ZV+8oZPd SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 20:jz+87sUH6VP64dbfwPlHUm5Lp7INXn4+Hzt6sZjvwtwSDJ461RHc2bqjCR2Brq5A/wkwImHfMJ+m/Ka8P1qmdixKa6sKCtxDKnRfl5Lrw+4ijA7faKhLrvZ5HjTZguM+s/vRwaa2l8E5AbWPsdGWKK0l5LLVKoLCZwkA0yIJZ3QxIb1edSLHZFvwVVdz5FaznsZ6aO98y0kFkjF/eYifjaNK/tPExigHjb8G1oVezEqHw/2EjE3Ib4JMEleC4UEP X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2018 20:18:39.0842 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ccab2049-0bf8-44cd-17aa-08d582d648f8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1763 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.63 Subject: [Qemu-devel] [PATCH v3 1/5] target/i386: Generalize some of the macro definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, kvm@vger.kernel.org, mtosatti@redhat.com, Gary.Hook@amd.com, qemu-devel@nongnu.org, babu.moger@amd.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Generalize some of the macro definitions which are generic cache properties that are common between CPUID 4 and CPUID 0x8000001D in preparation for adding support for 0x8000001D. Signed-off-by: Babu Moger --- target/i386/cpu.c | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index b5e431e..42dd381 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -66,22 +66,22 @@ #define CPUID_2_L3_16MB_16WAY_64B 0x4d =20 =20 -/* CPUID Leaf 4 constants: */ +/* Cache specific constants: */ =20 /* EAX: */ -#define CPUID_4_TYPE_DCACHE 1 -#define CPUID_4_TYPE_ICACHE 2 -#define CPUID_4_TYPE_UNIFIED 3 +#define TYPE_DCACHE 1 +#define TYPE_ICACHE 2 +#define TYPE_UNIFIED 3 =20 -#define CPUID_4_LEVEL(l) ((l) << 5) +#define CACHE_LEVEL(l) ((l) << 5) =20 -#define CPUID_4_SELF_INIT_LEVEL (1 << 8) -#define CPUID_4_FULLY_ASSOC (1 << 9) +#define CACHE_SELF_INIT_LEVEL (1 << 8) +#define CACHE_FULLY_ASSOC (1 << 9) =20 /* EDX: */ -#define CPUID_4_NO_INVD_SHARING (1 << 0) -#define CPUID_4_INCLUSIVE (1 << 1) -#define CPUID_4_COMPLEX_IDX (1 << 2) +#define CACHE_NO_INVD_SHARING (1 << 0) +#define CACHE_INCLUSIVE (1 << 1) +#define CACHE_COMPLEX_IDX (1 << 2) =20 #define ASSOC_FULL 0xFF =20 @@ -3273,29 +3273,29 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index= , uint32_t count, *eax =3D 0; switch (count) { case 0: /* L1 dcache info */ - *eax |=3D CPUID_4_TYPE_DCACHE | \ - CPUID_4_LEVEL(1) | \ - CPUID_4_SELF_INIT_LEVEL; + *eax |=3D TYPE_DCACHE | \ + CACHE_LEVEL(1) | \ + CACHE_SELF_INIT_LEVEL; *ebx =3D (L1D_LINE_SIZE - 1) | \ ((L1D_PARTITIONS - 1) << 12) | \ ((L1D_ASSOCIATIVITY - 1) << 22); *ecx =3D L1D_SETS - 1; - *edx =3D CPUID_4_NO_INVD_SHARING; + *edx =3D CACHE_NO_INVD_SHARING; break; case 1: /* L1 icache info */ - *eax |=3D CPUID_4_TYPE_ICACHE | \ - CPUID_4_LEVEL(1) | \ - CPUID_4_SELF_INIT_LEVEL; + *eax |=3D TYPE_ICACHE | \ + CACHE_LEVEL(1) | \ + CACHE_SELF_INIT_LEVEL; *ebx =3D (L1I_LINE_SIZE - 1) | \ ((L1I_PARTITIONS - 1) << 12) | \ ((L1I_ASSOCIATIVITY - 1) << 22); *ecx =3D L1I_SETS - 1; - *edx =3D CPUID_4_NO_INVD_SHARING; + *edx =3D CACHE_NO_INVD_SHARING; break; case 2: /* L2 cache info */ - *eax |=3D CPUID_4_TYPE_UNIFIED | \ - CPUID_4_LEVEL(2) | \ - CPUID_4_SELF_INIT_LEVEL; + *eax |=3D TYPE_UNIFIED | \ + CACHE_LEVEL(2) | \ + CACHE_SELF_INIT_LEVEL; if (cs->nr_threads > 1) { *eax |=3D (cs->nr_threads - 1) << 14; } @@ -3303,7 +3303,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, = uint32_t count, ((L2_PARTITIONS - 1) << 12) | \ ((L2_ASSOCIATIVITY - 1) << 22); *ecx =3D L2_SETS - 1; - *edx =3D CPUID_4_NO_INVD_SHARING; + *edx =3D CACHE_NO_INVD_SHARING; break; case 3: /* L3 cache info */ if (!cpu->enable_l3_cache) { @@ -3313,16 +3313,16 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index= , uint32_t count, *edx =3D 0; break; } - *eax |=3D CPUID_4_TYPE_UNIFIED | \ - CPUID_4_LEVEL(3) | \ - CPUID_4_SELF_INIT_LEVEL; + *eax |=3D TYPE_UNIFIED | \ + CACHE_LEVEL(3) | \ + CACHE_SELF_INIT_LEVEL; pkg_offset =3D apicid_pkg_offset(cs->nr_cores, cs->nr_thre= ads); *eax |=3D ((1 << pkg_offset) - 1) << 14; *ebx =3D (L3_N_LINE_SIZE - 1) | \ ((L3_N_PARTITIONS - 1) << 12) | \ ((L3_N_ASSOCIATIVITY - 1) << 22); *ecx =3D L3_N_SETS - 1; - *edx =3D CPUID_4_INCLUSIVE | CPUID_4_COMPLEX_IDX; + *edx =3D CACHE_INCLUSIVE | CACHE_COMPLEX_IDX; break; default: /* end of info */ *eax =3D 0; --=20 1.8.3.1 From nobody Fri Oct 24 21:54:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152028158580060.29588579896938; Mon, 5 Mar 2018 12:26:25 -0800 (PST) Received: from localhost ([::1]:51399 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eswgf-0001kU-EF for importer@patchew.org; Mon, 05 Mar 2018 15:26:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eswZM-00054A-2T for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:18:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eswZI-000116-Ae for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:18:48 -0500 Received: from mail-bn3nam01on0088.outbound.protection.outlook.com ([104.47.33.88]:45611 helo=NAM01-BN3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eswZI-00010z-4d for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:18:44 -0500 Received: from linux-pyp0.amd.com (165.204.77.1) by BN6PR12MB1763.namprd12.prod.outlook.com (10.175.101.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Mon, 5 Mar 2018 20:18:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=45xGr1ZN+d4cisceS2s/SdZHTZUbDpZ/jUt8eRR6b9o=; b=tGLnQ13rJSD9NgpDubsgVHVT5dYMqOgzLLmrG36dXnHNndW1MAH0QZrk51qDi/R/RUAAAhb/TMIicALw99xoCGZrIRuGDtugSEnthEHXhCCqgRJX8y265gtG1D7NgrepJV4WjjR6JZX9RUGvbg8p32ubDGrKjAOc4M7O/q+XXJg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; From: Babu Moger To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, rkrcmar@redhat.com Date: Mon, 5 Mar 2018 15:18:24 -0500 Message-Id: <1520281107-5115-3-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1520281107-5115-1-git-send-email-babu.moger@amd.com> References: <1520281107-5115-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CY4PR1801CA0014.namprd18.prod.outlook.com (10.171.252.27) To BN6PR12MB1763.namprd12.prod.outlook.com (10.175.101.136) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: cc7daacc-c2ca-4c33-0cbe-08d582d649f0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:BN6PR12MB1763; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 3:njjX5EZRpV4NMix2YkoFahmAhV9H4Kv7jVjS9rX/F+fQOMMiBYP0pnHLqWbcb/1BsQ1gzRCpJTA0KzYAJty2wlv9ia4zLTB9+2qnbBnZ+AH8JbhezFHFt3LcTQ11++Iy2dEVWMe6ecvm08gaaJ8kp5O5cuZrFQ9U/qpVP9QnU/87zJESLRVsEZTqWayv7Aw8P0rQlxnh51kcccBBpbYCOrlr/e4lGVzivw9gy1f+Bbigh2FvcFsE6yiHrjpfPT8M; 25:pK86A3WnHw5GRjH8hYIQj1MPcb1GOFpvijJdrL6Ahk77YCCRcrLoZa2Zzqh4huz/fkexFZZYMI2f1ft7ezITIfNRgHa+NEpPr35FaOPBtH8gK6vbvaxiTJVue0MamRKe4L6a9wRqPCu8HmJ+wZtPVwXwJ3yvNWL/W46mWc9CKRlrPSoICApQ4sRlVfQ3vwfTkR8IRox2Tp5XIbiF8lGMfDAI+LE8XAI2DoPTFot//O331cBDlyG5rMUkAblugjsSMcu7sz6fjg3Xl+L70TL20hq9Yr5ZxGKImqND6mlboG+ywnafPeKKBgMy/+5xWR0I5DT3zp5cd8CK9jTLCiLs1Q==; 31:fGHy81ZtC3PDb39MsMi0d6IoRWMO/Crm2b1XwJ0FQup7fuE65HGSK/8PCeok9v6X366IiSJzezEJf1e/w6zFVMoW0JEtiVR3+zKehP1lI5rqXhl8uHme/ATEkupguXbm08QimqS82CXL3ZoeH8067u/Nj16PGj0XNqrGJ2MFqxJ/iwSLchebS3iqRKMgX0y3aVfJzjtdZO8rU152FZdqrGw0Fz7bWjOSByqT853/FLA= X-MS-TrafficTypeDiagnostic: BN6PR12MB1763: X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 20:lWYggM0YFYq5hxTpUDR0C4f440JPEBD5uCZHHARYR6vJ/o1eo7IoeVewUTS47zjcCavavv8GE8K4irVdMYV2C1yWQ5GDKs8QUxmZ1a+XsxYoyEIO90qMmZJEFxszJGRxLSTRX8QEe7i/nl4b10QdHzLF1ZKdsXIUh4jCA3wxgUbNNNTBtnVrZeFxHN7+5iQCf4zxPBaB6UKGxpmDz79bOgwgJQ8ZP0SojuhMessH2vrFrtAbRNyBvrtXUDz+w/5+yJfbXA+M5F7XuI5Et15V36rGRShh0E1QEeLl7VJBLeG8LilHsMeqEpLhyUtrdjcQ7uwFJjDeeLaUfZKjDhcw7H6Y4546rnOKTJ7YOQfGvAkP5GnwnvS3sO2k7+Kls7M8lI4Oi0al3OeQvGtapgN7R8VCqCP2KvXVP5ViZghBS/3ELQzgaPbDREPx5yq+QH7qaVxUIX8+nMV4MRwfLVyG+yXMiikG0aQxpktULYw15Y6k86msdZ81wQ/kCYU20hpk; 4:YoSr4g/VpgR6/MNaM497z6DtvI1xHfifDHhYbI+qc6CnbAo04eRosUzMcJ/527a1sszUB2pbxDk+5GIM1xZOfYNsXqLz8Pjg940XANI2YtPD88qjzQJkN3yX1S6SIbs+WDXKNLtoLZm6yLVMbmN37eBA4v0QyQpNAS1+AUjtCPw6I4C5uvgwI3JX7Uy8UsPGus+iQvIV+s/fuVvUfekPl5sYqsFNgApKEM5xh9t2yGAARQcSE4q1fCWtEnVAzNlxmwU/IwSvB4XE06w/c3b5qcLa8PHVOF467oLsslKPO+GI441AUHurTF1ReFBWdr6V X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(5005006)(8121501046)(10201501046)(3231220)(944501244)(52105095)(3002001)(93006095)(93001095)(6055026)(6041288)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011); SRVR:BN6PR12MB1763; BCL:0; PCL:0; RULEID:; SRVR:BN6PR12MB1763; X-Forefront-PRVS: 06022AA85F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(39380400002)(396003)(366004)(376002)(346002)(189003)(199004)(2950100002)(4720700003)(2906002)(106356001)(66066001)(6666003)(97736004)(25786009)(36756003)(5660300001)(478600001)(48376002)(81166006)(81156014)(8676002)(72206003)(47776003)(8936002)(50226002)(4326008)(105586002)(50466002)(26005)(6486002)(305945005)(16586007)(186003)(16526019)(316002)(52116002)(53936002)(7696005)(68736007)(53416004)(3846002)(6116002)(386003)(51416003)(7736002)(76176011)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1763; H:linux-pyp0.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR12MB1763; 23:yaVQ1zqSi1j00NmBytmBhFCFx1P+55dE+6U8KQMTp?= =?us-ascii?Q?Nrq89woOIO+7ET6/wm9L7qCRgZrIJMos6Uj5NtkCZuoaMxcs4VbP/VKlCx6k?= =?us-ascii?Q?zBnvmrP8ytCZJM5WKpqZyhvJFovfJco9kA4Cja6uhu5fGa5iL4X+Ya3st6mL?= =?us-ascii?Q?AzDK1mpPZu5pAayXBA6Iq8pC1wLpEOgS7TKUbWVUiWufiHXK0lXBD/A4mPfH?= =?us-ascii?Q?uqmy4NdwnpTbNaESShZQFowWRdCOMd+0XufepOCoN8NLbOzw25OzJZMrmDb+?= =?us-ascii?Q?kK1vlx2o3b3CCt3Kje/SkSJA9dRh0DSNOq1hvj+3sDuiESyWRCPGyMAqimAw?= =?us-ascii?Q?FSPMXACRtHXxRrpawkSXM46irRt6IxifFKzIwb/qKJ9o1SM74touVOzrXSw2?= =?us-ascii?Q?7jmdOIt5wkGoc2ftwyt9+nMyd9ojZVhQTMgaBJwGErz35hYC9guvju2tFu9X?= =?us-ascii?Q?ea5BRqy/7gwW/+Gy8hHhosPMZo0vGbQo45noDQqafJZcg+OhT5DThg3lOPpB?= =?us-ascii?Q?Q4IsLPjy8DyKDu+Axkyv83lzEs/L9r86eusVPhqbyZM/+rK+8TDuM4KZW6HS?= =?us-ascii?Q?ggAoFaHP+oCwe0laIe9m3XlB5LGLORA2d58Oi37c4CpUdEayLPywS1Z6PKQw?= =?us-ascii?Q?K3n9uwqbdaL1ohdRwTxEWeertzlSMgltM3zM3FJm39HBREwtCgJclsOX6ne9?= =?us-ascii?Q?1M9G3fEeKrUjxljU5Qb50gOioD01EVDZ42ciaEXF4Zx3XAepEzhcF9unxMUX?= =?us-ascii?Q?cS92u70dPeJ449afSe0xNKW59l3f068HAnn/8ffDKbeZbjchWK3cU7Iszrz9?= =?us-ascii?Q?TXyKUMplqQaLMRCedjmeOaIhonkQsHrZYR1BSMKCufJRo0FLXYGHGr+kJWt8?= =?us-ascii?Q?aOKtxohx+enTzSBogj0QRYYaLkVCxAmy0Uil/Cy7hvNT+fLhVga6/XnB45SI?= =?us-ascii?Q?2g0nv4hRdFkBEYP5bawnrtU9k7/iD2gxTP9I5LFzp+eeaDZJABrzt3q2yYff?= =?us-ascii?Q?oTRmv/Ru5y3elYY7OWDHFauWmPjvM2+IdKPpeDIDIJqCM8ESpE+qOrd5dDb2?= =?us-ascii?Q?NP4Hp1lFoNr9jgNTl/2v3sLUKL8yGMCHXFFl7eoP/4WXleQeVahiSAx3brII?= =?us-ascii?Q?9jipyfixMX69+IpWSuGNzG/bbK1JfZy?= X-Microsoft-Antispam-Message-Info: tl5orkDLU3MeSr43doX+1BKxm9S0HttcnqB7vxu+fTRIP381N7lCQAEh5VE1vyX1QWQ4GQrwO5JUllknx2EV3tiDUBY3tdYGJsSYw0r81hkFdHjA3FvtWSDIQNxGXg34sIovOAzrg/wBdSXKDV7pXH8EaJYzcL9CJlEmTBOW++8fQr5Qb/vstYwDrSrYqRPQ X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 6:smGFcYR+vu6JD64i1KzqQZKPfL1uV3SV6U61dTBMtjGwcXpdNALn1DjcAwmRTYyHNEV5eXghjYg7zZNgUrco7ezuVoypD4TEPsTSyn+JHji8Sjd1zQFUciUorv+3b1H2Qt5V4IDYgbA4BZIv/nIWxDkZLN+SPW596AyWMG5W74aDwpDN9HCyUCjf2eoCGWgWHYA4Ls10lvQ+eZ8SlV+RgJyAxE0w3iXxuqOkUO52y//YQcJwYd3mKTQUHFMdfGM6joM4zeEUaIiL1FElYk3KsMl4H5jo6KbRc/Mr3vONM09vblLbX7ePDQETgdyxKZDnqnVhEx6F66RfVagomSYlCisQ0dI0Ap/cnRd26EBstHw=; 5:nF8l6UaPkPm2E4DP/ay9sN8bMAc9gNgOKZnXLIAyv1LeN/MfUO9YxAOc4HhpOg9iD4MVP/wgyqS6i+adWVFyaYFSITAZN6iktVpf9a2qW9RTaqUmdQjXGiZf8Y0sUYmHtm19fE1adtJ860gGVLmkCzeyXW+GWljHaSNFAkDWDkQ=; 24:OYghSmyABNb7guiLJii8qC7q9cWxRq5MMzsz9KAo2U55W8n5mwdLGAdNAO0gXtxKXMZ9EbHA5X+B4Q3i1KrITtesssGZE8T/4aL/Jwl1dFk=; 7:Jxtu/rIzFBUOHGgXs4hsiVseWMeodAd8fEsbJo6omVlcPLIAdw5w/U3yLC7yzsQMxGm8GCmghH6pOqCGquDEpNsIdjZkaZYGQdpwDVBBOXd6JpP/8WvYaL9499Pj+mT+FlhQsKlmG9TxdQliJkuECSiKAp8gJ+5yvX33RGTWSiCt4izogSBmelVqgdsp+/XDPdtofK+SAzD1//ouPzcSA+O18TxNKbTKgVEjna6CHahUmzN6DDnDl05VA9JBZ2Fs SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 20:ekq7b7fDHgcz8SR8UoJsdjNn8ivM5OHDTmgHUDtzkvmaxly4gJu9GDdsDtwsNdFwo438fGmeW383L6aS3/FFOhm7SWV/ccpmlvi580+yLG4j7OD91w1V7DSm/I/2uLfE9+i5mt1HKSid2k2pXWhbCuXtEdPuc9lMp92c0rYzfwC2H0uDcelRiyxQghdRZFZUXBAOXIzj9B6jRdnLnZMZDG9O0fnlJja1Uq3S5Bzz9dQXhO7Wa2tBWiBldc8YTWFX X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2018 20:18:40.7092 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cc7daacc-c2ca-4c33-0cbe-08d582d649f0 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1763 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.88 Subject: [Qemu-devel] [PATCH v3 2/5] target/i386: Populate AMD Processor Cache Information X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, kvm@vger.kernel.org, mtosatti@redhat.com, Gary.Hook@amd.com, qemu-devel@nongnu.org, babu.moger@amd.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Stanislav Lanci Add information for cpuid 0x8000001D leaf. Populate cache topology informat= ion for different cache types(Data Cache, Instruction Cache, L2 and L3) support= ed by 0x8000001D leaf. Please refer Processor Programming Reference (PPR) for = AMD Family 17h Model for more details. Signed-off-by: Stanislav Lanci Signed-off-by: Babu Moger --- target/i386/cpu.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ target/i386/kvm.c | 29 ++++++++++++++++++--- 2 files changed, 102 insertions(+), 3 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 42dd381..1485175 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -118,6 +118,7 @@ #define L1I_LINE_SIZE 64 #define L1I_ASSOCIATIVITY 8 #define L1I_SETS 64 +#define L1I_SETS_AMD 256 #define L1I_PARTITIONS 1 /* Size =3D LINE_SIZE*ASSOCIATIVITY*SETS*PARTITIONS =3D 32KiB */ #define L1I_DESCRIPTOR CPUID_2_L1I_32KB_8WAY_64B @@ -129,7 +130,9 @@ /* Level 2 unified cache: */ #define L2_LINE_SIZE 64 #define L2_ASSOCIATIVITY 16 +#define L2_ASSOCIATIVITY_AMD 8 #define L2_SETS 4096 +#define L2_SETS_AMD 1024 #define L2_PARTITIONS 1 /* Size =3D LINE_SIZE*ASSOCIATIVITY*SETS*PARTITIONS =3D 4MiB */ /*FIXME: CPUID leaf 2 descriptor is inconsistent with CPUID leaf 4 */ @@ -146,6 +149,7 @@ #define L3_N_LINE_SIZE 64 #define L3_N_ASSOCIATIVITY 16 #define L3_N_SETS 16384 +#define L3_N_SETS_AMD 8192 #define L3_N_PARTITIONS 1 #define L3_N_DESCRIPTOR CPUID_2_L3_16MB_16WAY_64B #define L3_N_LINES_PER_TAG 1 @@ -3590,6 +3594,78 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,= uint32_t count, *edx =3D 0; } break; + case 0x8000001D: /* AMD TOPOEXT cache info */ + if (cpu->cache_info_passthrough) { + host_cpuid(index, count, eax, ebx, ecx, edx); + break; + } else if (env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_TOPOEXT)= { + *eax =3D 0; + switch (count) { + case 0: /* L1 dcache info */ + *eax |=3D TYPE_DCACHE | \ + CACHE_LEVEL(1) | \ + CACHE_SELF_INIT_LEVEL | \ + ((cs->nr_threads - 1) << 14); + *ebx =3D (L1D_LINE_SIZE - 1) | \ + ((L1D_PARTITIONS - 1) << 12) | \ + ((L1D_ASSOCIATIVITY - 1) << 22); + *ecx =3D L1D_SETS - 1; + *edx =3D 0; + break; + case 1: /* L1 icache info */ + *eax |=3D TYPE_ICACHE | \ + CACHE_LEVEL(1) | \ + CACHE_SELF_INIT_LEVEL | \ + ((cs->nr_threads - 1) << 14); + *ebx =3D (L1I_LINE_SIZE - 1) | \ + ((L1I_PARTITIONS - 1) << 12) | \ + ((L1I_ASSOCIATIVITY_AMD - 1) << 22); + *ecx =3D L1I_SETS_AMD - 1; + *edx =3D 0; + break; + case 2: /* L2 cache info */ + *eax |=3D TYPE_UNIFIED | \ + CACHE_LEVEL(2) | \ + CACHE_SELF_INIT_LEVEL | \ + ((cs->nr_threads - 1) << 14); + *ebx =3D (L2_LINE_SIZE - 1) | \ + ((L2_PARTITIONS - 1) << 12) | \ + ((L2_ASSOCIATIVITY_AMD - 1) << 22); + *ecx =3D L2_SETS_AMD - 1; + *edx =3D CACHE_INCLUSIVE; + break; + case 3: /* L3 cache info */ + if (cpu->enable_l3_cache) { + *eax |=3D TYPE_UNIFIED | \ + CACHE_LEVEL(3) | \ + CACHE_SELF_INIT_LEVEL | \ + ((cs->nr_cores * cs->nr_threads - 1) << 14); + *ebx =3D (L3_N_LINE_SIZE - 1) | \ + ((L3_N_PARTITIONS - 1) << 12) | \ + ((L3_N_ASSOCIATIVITY - 1) << 22); + *ecx =3D L3_N_SETS_AMD - 1; + *edx =3D CACHE_NO_INVD_SHARING; + } else { + *eax =3D 0; + *ebx =3D 0; + *ecx =3D 0; + *edx =3D 0; + } + break; + default: /* end of info */ + *eax =3D 0; + *ebx =3D 0; + *ecx =3D 0; + *edx =3D 0; + break; + } + } else { + *eax =3D 0; + *ebx =3D 0; + *ecx =3D 0; + *edx =3D 0; + } + break; case 0xC0000000: *eax =3D env->cpuid_xlevel2; *ebx =3D 0; diff --git a/target/i386/kvm.c b/target/i386/kvm.c index ad4b159..0eb39b52 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -909,9 +909,32 @@ int kvm_arch_init_vcpu(CPUState *cs) } c =3D &cpuid_data.entries[cpuid_i++]; =20 - c->function =3D i; - c->flags =3D 0; - cpu_x86_cpuid(env, i, 0, &c->eax, &c->ebx, &c->ecx, &c->edx); + switch (i) { + case 0x8000001d: + /* Query for all AMD cache information leaves */ + for (j =3D 0; ; j++) { + c->function =3D i; + c->flags =3D KVM_CPUID_FLAG_SIGNIFCANT_INDEX; + c->index =3D j; + cpu_x86_cpuid(env, i, j, &c->eax, &c->ebx, &c->ecx, &c->ed= x); + + if (c->eax =3D=3D 0) { + break; + } + if (cpuid_i =3D=3D KVM_MAX_CPUID_ENTRIES) { + fprintf(stderr, "cpuid_data is full, no space for " + "cpuid(eax:0x%x,ecx:0x%x)\n", i, j); + abort(); + } + c =3D &cpuid_data.entries[cpuid_i++]; + } + break; + default: + c->function =3D i; + c->flags =3D 0; + cpu_x86_cpuid(env, i, 0, &c->eax, &c->ebx, &c->ecx, &c->edx); + break; + } } =20 /* Call Centaur's CPUID instructions they are supported. */ --=20 1.8.3.1 From nobody Fri Oct 24 21:54:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152028136573954.64675754774066; Mon, 5 Mar 2018 12:22:45 -0800 (PST) Received: from localhost ([::1]:51381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eswd8-00080V-Cq for importer@patchew.org; Mon, 05 Mar 2018 15:22:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eswZN-00057n-Q6 for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:18:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eswZK-00011h-G6 for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:18:49 -0500 Received: from mail-cys01nam02on0074.outbound.protection.outlook.com ([104.47.37.74]:61218 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eswZK-00011K-6D for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:18:46 -0500 Received: from linux-pyp0.amd.com (165.204.77.1) by BN6PR12MB1763.namprd12.prod.outlook.com (10.175.101.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Mon, 5 Mar 2018 20:18:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=rKQd5lfvVIQuVFSDa5JddZlfELn2nsS8h1EjV9b97gc=; b=H/suiqauzB6T0urDykCULE3dZbm4A96v3KC09+bmEBQEnOFWu1Ewpbc55EPoBcLSLkaj8UMq+POyoM5IzrqWU05JdEyFffyFDkuQUxMnj3x66RxrcTkVwZCP0dkLxXXIIxLkmOKf+D/FT/LfWvPDNGFPP6eYN5yNO/6FPpxEl4I= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; From: Babu Moger To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, rkrcmar@redhat.com Date: Mon, 5 Mar 2018 15:18:25 -0500 Message-Id: <1520281107-5115-4-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1520281107-5115-1-git-send-email-babu.moger@amd.com> References: <1520281107-5115-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CY4PR1801CA0014.namprd18.prod.outlook.com (10.171.252.27) To BN6PR12MB1763.namprd12.prod.outlook.com (10.175.101.136) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f767dd64-75c4-41fc-7864-08d582d64ade X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:BN6PR12MB1763; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 3:32vNcJ5zI4LsImLfqTqE/fB3N3ANrgH10hWB0XflL+aEVp4kmIT5RdTnqFze19CpdH0ZdGGWRwG3DrT0jLEtA5u7XnbOon8/ARFZSdBHps0r2wC8vKnhVDMRcZmXjd+Mz4j+i5+PJryB6pP6JwOfkjMQ5oCMRr9y+uORp0Q7UHSOfmcylWA1nfvsvIHcNSurLLV39AEYYRCZnyer13nOZ/KTrbWHWRJjS3nBnqx8SSBSHu5GhBempTZhjqVtmFn5; 25:mIC0uIJLEFxnMziFyLBIQ3sgFg1UXTx9WQnuS/1u0IO2h6OjXKN1D6fV4QtA0yNF2YJAG2OJzgWk7YIoeeepfMOeDUZRFWnwKrzxGhrutxhgh1WheVc1kntqXI5BOxeKBeOd4NLe5mGMMvXVtNW4UGz9MsUeS4lzN/apyDI59HCWh4nGc5SLN3U5gf3yIcuco3gA+Orhy8acJLeG07XZ/3otiAJiPIO4asSw4hS7Yy4wdhk6wznal5GNuk11HWT96Ua2lgeFSLHaM+RpZhCJc+XmQ2HAyU7RhFAazfKlUqJ/OjFUz7oG+nOLAgWgVmy/cVQ4rTSGaSjg3VR6z3dDvA==; 31:VM6H6p6l0YvDWmu2Su04TwlcCgL9NZxQWphRoekQbzPs098TFiVIZMcgD2wv0w8H6Qqwh9mXoQPj367cBT+3zW/q/RfGj6nQdcYq2J3921FYySy1TNNdgNpS+arh2YTWsuq6kkJs3m73DaejbrsFcj+ByFi+3o9fhm6N4pQ02pmMVliQOz/Ld1AQ33kZZXzNWEhfOWimqZfjwIRZ1iuNYyw4ydKk3c4NOQt8mDanSSM= X-MS-TrafficTypeDiagnostic: BN6PR12MB1763: X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 20:3KuSWXPBHNQ/Q/tHjL3P/jLhYiqyvCr3slltJ6db2/mKlv9pmFnLq1wWudO3MUJfNQcC3IWI7kqVjgEuFSM0gxtiDcX/tWI/Vy+cfYEt2pl95Tb+Xldp+PcVA/Ee2tBNWa64N9tapgVyz885VC+H+EmVgbR9HLGF/vFXjTG4M2fvwY2TAHXFzfQ7UBkNcZ6SItYZhyEs7dNI3vOKyAsVpwy/mlT752Sx1kVN978sTiJgOxCclNTyKNRN+tXHwCrty5nHGLcRuNPMoL8uhF4KM1ho0HChb9c/+VHUG9LvSjEFvdy+ZaCVLQ3Gxq/eD1sq1OnEnrHR2WwWkPZL28GYwe8Ulh50Ovt23cGXtjvhf/9JtwAYj2KoFOHFvtk7YS6VGZniTpw5VP3ohMeLZ7icIcUY641bYirdWwzZKmWkJ1RUIhn6fFjmZU0t3jxynpPt6zK7V1qLzeRJc6lUAzvwQc6O/Zuj5YIy65/1+t9BpNl6AJghsvcN989OyNzKnjc5; 4:ULRXxG+k/fBiA6Rtx3iSupvH0Agvng6R2gHVmMw0tw+7RnLhqFF6Q+OsUUSZc62J6k4+Qba4/1NW2wJD3guipcHEa3ByDL6a4FBM/fa5AJI1bFtgZBDDISSVdwNW1Y4/26CmUytjOjTLhsZv67ZqlGVDifmzfabYxVBVH8xNC5VklQvAid5ewkZTuPqWsHdqtRhqifXEerTijoqK83Yaz6AngLLuCsdLVqsPR3/oU2Nx3W95wDdUNGQxbhgHYzpf7zwAZdV08ucuNyeFBVRiaEiJ69NuVw6rgnwUqGAJAA/6aAskCR600HlWIZow9b1m X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(5005006)(8121501046)(10201501046)(3231220)(944501244)(52105095)(3002001)(93006095)(93001095)(6055026)(6041288)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011); SRVR:BN6PR12MB1763; BCL:0; PCL:0; RULEID:; SRVR:BN6PR12MB1763; X-Forefront-PRVS: 06022AA85F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(39380400002)(396003)(366004)(376002)(346002)(189003)(199004)(2950100002)(4720700003)(2906002)(106356001)(66066001)(6666003)(97736004)(25786009)(36756003)(5660300001)(478600001)(48376002)(81166006)(81156014)(8676002)(72206003)(47776003)(8936002)(50226002)(4326008)(105586002)(50466002)(26005)(6486002)(305945005)(16586007)(186003)(16526019)(316002)(52116002)(53936002)(7696005)(68736007)(53416004)(3846002)(6116002)(386003)(51416003)(7736002)(76176011)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1763; H:linux-pyp0.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR12MB1763; 23:LVII81jfCGxdDwVBMmpXzwlqE5vNUaeFyNeZ/M/Sc?= =?us-ascii?Q?K2Ngu6A+X41FLSKBHhtpktNXh1aGVWm4mP8fl4H1z/7W8bL5Xnwj8/uSQpzg?= =?us-ascii?Q?c9oatXuvdJgKu+iGv5FaSTYF/BGr1ioq8E22s01JZKlxHMZrOrKFeNhC8Ohw?= =?us-ascii?Q?bvy7S34S7VOR8OqA77cX4pPcroHBetjMAHVLsSVrDqVoO7TSE9fsk+2GrMKx?= =?us-ascii?Q?8Zczs8QEtbNBZGEId+nn1c7s+h5j393uOi/yfwMXFq7zh/UoN/eX+nliLRi+?= =?us-ascii?Q?BmAEeVhBkCMD3sjlnsqpw18+VVtN8wj/6UTFI5KbS5sQUdh3Scm+GXMxrjnc?= =?us-ascii?Q?a5bm2c4BtwniGaPiQVx0XJkRsm7u64BPF7HjVPY3NDqHyAYx+vtm6y7OcVfM?= =?us-ascii?Q?dUlTvLH/uSdAjIq5m/Hiw0CWtPoiYOHCNcGtw8gCZTGEtFIsTUAtHJzEEsLt?= =?us-ascii?Q?+Cn75gSQ5sKq2CeZauRABCbrF5E2m/5o5YUf/WW/e6ZbgsedFNLLA7nVw6cY?= =?us-ascii?Q?qjVHxam3JZzm9RqSev+JykuHvpAQ/zLjOQ7C88mYmWw96d5Htw+DExuXXEuH?= =?us-ascii?Q?gn375Nk3GK4UonzSTvRnm0fxjiJ/2sDIruQ3z/lYzBpLgWpbKz2yp7yQNmW/?= =?us-ascii?Q?Jx5jol7q5KLfhuDEvRIuEQDzL4dv3JQDSA/ZM/048mli+ppzhgHz/X7O+R6+?= =?us-ascii?Q?gfwfYwS0eA/P17WvYpK4AIGUNICqHd3y0M2qZj9BmZ8FQgtZ1JG6u4dYad+K?= =?us-ascii?Q?lxJXgEE6o+Cea3PcWR8SRjIOdUeh+LQy1/9xV5Q5Pqpd8WTg48H0HG1iZUkc?= =?us-ascii?Q?fbiANfhm4XE2AJ8XszYsT8ZrI50X1X3DxFq94wQt92ZwaeU9+0OdNbwsNUgP?= =?us-ascii?Q?JQGpC440Ctv53pvqS5MtyQMAQ0kXz8Jb9F1xFQBiw50LfhPgHnLTHMDjKmMO?= =?us-ascii?Q?LVWh+KmSHd+3dhawxGo88+3q/fwJthPeaREtKhAULD37OptPvs25SxqklWph?= =?us-ascii?Q?PxkFLoZ303UJm9mq64+2afGBsT7uESgsIm/EhjSI8u1iliiS75NED2eZJF98?= =?us-ascii?Q?QY+p19x4SA8nnL0vEBbMWcpwLIukYtdd4+Ty9eCV9t7X0HHlnWXRDCGpu2jn?= =?us-ascii?Q?ior69MTwqDVs8p0LtSfB/0BQK3dd+C3?= X-Microsoft-Antispam-Message-Info: 1lLI6GBGF8z3lcpO6f++c5Yf/ynU3dXNX83kttLQrVQzh28UN/9l8Zp0O539jJgT6b2afG5bt17NZeGgQJO9IgtCSILya6wcg8ZQ+cKqp2A8stppvTmh4mHldfGWwrVHeDnu+9t+Ua8mzQpsqAZ5EmtRe3UNqHzlxVsP1LMM63EDrJr/TSiSGtIKRayyl1wS X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 6:onQtC7mi2nnjY9KwzU0/sh2nGd/Nk7zdsFV5NSy04s4X9sKjpDM/XK/LsY1xOtV5ZMc6DnyNUFzxhcPI5Nj7CV7V69cfrE8mmLlFFAEsOf6d6qIjMtL5BJKJuggS8/rSNDCy39XDJZudD6IXQCMlLQKqgowbeOoGl57uX1SfqCxzgsnH0Xoa5BNXg4ux6XgcibkfdJ/PIdapewQt8DssZsqM5WcZY6xIrLUvHT6KdRyZGyxcDKsV3EdMVN1euMUS7IkzzSqp1jO3ZEXIgnn0sK63yKOengIAlWyw//5P+EO25ZTgOREFghMp83jfxx1DDpEbUDi0IUTRRE96vVIXoB4UvK/sic+jx5R1peuB3EU=; 5:0XCRYs1MWBIUwO373Oc+HauAMf2f55bQXz9ZG8iU9g6hiS1uNLuEV++q8jZX2lVgk/kckOMe0B0T0YUL1HDpImmbT8ePXW1TfQsvTqRR5Zt9oL4Wv5IWwoWST6ME1GRcfpQkxQ79bi1PybT1ZY2o/+Vb9ObMfglvt9V40h5nP8I=; 24:W0vmr+GK9QpJ1TNkOclLJNO34eR51tjyUZkczG/P3rG1asVlJLweBOJAxiEBkSPVDECvNrmR8rg1XVJSLcLC+z/SMO1XMsEmObrlU46hq+w=; 7:NohmMRiQzsrt5PQPXJJZFoUx61pBSgXbANsY6BUoYn+GE9K8OFIi7euW2nwpVLj48inVWtMxzluI3Oa0dyO2I60sSIXbdKw9pmNC/91xKJtLc8PBWRw+ttqyEw7NiXyWeio6oZ5bYFpY6e4A5iJOzm7az+qmz/Yqc9r3MA9BEorK/7RVc/eD72V4fx2BFocVJyVPdV6K5+Q6xV/RZe4EARhmJSWsdeys6bw+pTMxuFW1akt6Ff7BudRVM5FCUUDq SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 20:yt3szwBti0ferHhfBTSNYChLT0TO50kd/Y6iv5PeiXPZuPa6qWHM6mlaF+tW4SrNCBtl0Mp2SzLRuH+vnHQei/Yb2zxrwlLJeBRQOWAnqeEUPQso8DXKxdkikrJCrqbDVKip9JGwQJCTcaBIGoEt46yejKX5UdI/CUEHViDJJJZ89nCH6PxjugRCZLgFk686a2Eq7ruul1yMjcGrSD9BEycPszPU7UP8QvdnfOICjKt5ZV13BJbP+kJldUy5M45Y X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2018 20:18:42.2717 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f767dd64-75c4-41fc-7864-08d582d64ade X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1763 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.74 Subject: [Qemu-devel] [PATCH v3 3/5] target/i386: Add support for CPUID_8000_001E for AMD X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, kvm@vger.kernel.org, mtosatti@redhat.com, Gary.Hook@amd.com, qemu-devel@nongnu.org, babu.moger@amd.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Stanislav Lanci Populate threads/core_id/apic_ids/socket_id when CPUID_EXT3_TOPOEXT feature is supported. This is required to support hyperthreading feature on AMD CPUs. This is supported via CPUID_8000_001E extended functions. Signed-off-by: Stanislav Lanci Signed-off-by: Babu Moger --- target/i386/cpu.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 1485175..555ab83 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3666,6 +3666,15 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,= uint32_t count, *edx =3D 0; } break; + case 0x8000001E: + if (env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_TOPOEXT) { + assert(cpu->core_id <=3D 255); + *eax =3D cpu->apic_id; + *ebx =3D (cs->nr_threads - 1) << 8 | cpu->core_id; + *ecx =3D cpu->socket_id; + *edx =3D 0; + } + break; case 0xC0000000: *eax =3D env->cpuid_xlevel2; *ebx =3D 0; --=20 1.8.3.1 From nobody Fri Oct 24 21:54:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520281243911768.7754207798728; Mon, 5 Mar 2018 12:20:43 -0800 (PST) Received: from localhost ([::1]:51368 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eswbC-0006D3-Tl for importer@patchew.org; Mon, 05 Mar 2018 15:20:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eswZP-00059k-Af for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:18:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eswZM-00012U-5N for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:18:51 -0500 Received: from mail-cys01nam02on0080.outbound.protection.outlook.com ([104.47.37.80]:10256 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eswZL-000122-Sb for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:18:48 -0500 Received: from linux-pyp0.amd.com (165.204.77.1) by BN6PR12MB1763.namprd12.prod.outlook.com (10.175.101.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Mon, 5 Mar 2018 20:18:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=dX6d9WQs4hcOC2DzDVkih86855Hl3DqY4D3//QOZ6X8=; b=OSTIWrNSFUE5yIkhkU8EpafF0+6otrMfiLu7cQhFjOT5+7y6s5rBspiPxZp/K3ocdBHCx3C+Nc80EmuwWNsT1fBANDpr7uOdW0VTxkaJvGI7k+hE9L6G4G626SnJV5+jhjWkbcrVP5CTxPdOEVHsHToGS0wXg82fVxtp5CKoRsc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; From: Babu Moger To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, rkrcmar@redhat.com Date: Mon, 5 Mar 2018 15:18:26 -0500 Message-Id: <1520281107-5115-5-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1520281107-5115-1-git-send-email-babu.moger@amd.com> References: <1520281107-5115-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CY4PR1801CA0014.namprd18.prod.outlook.com (10.171.252.27) To BN6PR12MB1763.namprd12.prod.outlook.com (10.175.101.136) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: bb3c53ab-a9d3-4d7a-4666-08d582d64bcf X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:BN6PR12MB1763; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 3:oVxmpKcU+dENJjTrClIl6d5pC7Ck5pbcISExIpF3+WHXvxlhzDdKzR6LlWgCFjQXHCWRqYbhgPEX+GHzjgU8/rhN9WIvcHE80nLWWGsTenmWrDUiSEE4F4TZRQ4RBD3HHOAJiJN1/JiQuS9fzhAuMcbSSIqXPAoGleJjOIwpKogZYzaUvjmaZnOQxr69KwIdCyUSgYKHaDAsqgBqfexw50S6iEa/sEolJVbxZH9gsxwLXvG66rM0p+XFI7GSVqj/; 25:/7RodsTCq8EhxgnQz0obEGLQTU/7clrQJiObqbsCovpFfYn6e3X8BCBjJmIHg7sMH8vhclFEJVQdxDC3xZPUWvsLZ/Wb80FIYW/Qh30HGOQKYP7UuFWoVww5kZ4qhftlWKewN9udEPY1H0cvPb62kv4IVWfN0Rp2B6n6eKc07HsAsO4OyrN+eaOC2qc1GaVdZWrCMMQwLsf0WgPGJ/XDpYwOxW9JjvYPA0RHGdhLqrdEKjgRX5typz+BUK7Da64BwVlMfg91FozNXEHNanFnMQf489rEUJG31g3j2zfwHUOyioMMFoWP67j26Iq+P5HWHCspRqoS9exwGWnVRFPOdw==; 31:znxfIl4vvm56Q+sh25GfL8hjMlOtWscgqaZ6QeAPM+Av6KlnSBtw0Oxgs/7H/0Mkofdmb5UFQD+1VPpsivc1mJ4hKQwousRA59/9rJqG1QReZqDP3klcG8NkbRJsAJUyFDJhg+3KzAsu3eiQVzpGr1Cx67rdFg6cn21Fv6y6qDvovtJ/i3MZQtNioT12SI1TVc2GNrKiapvmeRcUiLjOkIrCA/HQjCNI/5anSf8897k= X-MS-TrafficTypeDiagnostic: BN6PR12MB1763: X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 20:CTaKuIIx+OdC/f2jgs8Iq49hnGkenX3MURDhYUBdQ2ZonDFtmUsg3XciIfDIoBKo06RtSUt1xmmZWI5yshoCT0nVSNe/EGp7L0c/gElkxwCw7NKppZxp2FDwkqtTpZ3wENbOaD9GwKGxb8/J5lLjmfIGKnVHbNQkf381kDMV38TE84/i10ye40hU98hSDyl4S9RVYM3Dc5bS5XyDyDyMyiNtN7YjxHgVJ5Wd+Bkj3YDKIMQ5Xw3xf8BuE3mWvktbDTQOaSEAPgyQQLmghm4GTcah0HwjXpFy5UiFDfxfSed1WdbUcdh7mEvRHcyLYO8XY+wrLRx9OoHVjfakEfUviUbV0wjspfiMQOPGAKUj9m95du0tHKDsgPOiOCu80syFb5JvNK9DvsPqojNlY4T5UjMgAtf0kiLdgCQaT2MgRoh1iv4LV+FtrYfSTrgC7Aie/JxJE6lbET1O4ngea8fcDGMCiqJJmDu0LbMXrMiBQQqffcxUKebw7dCIbp9LdNNJ; 4:5sGf2Lizu6/8/5uqP+qQG5dWBXSjuPL2hISyQ3ubCfXDerzgufsUsxxpVsTRRQrRTCBJcmazX/eV/E84EMipSjSthDcQqZuWa9NdVhYaVXJj+2swKZ8UJcBA0S3Q+C8BTU3ByuD1ysmZ5jqCD13VffNoev0d03BXTXzLNdeMD2IW5sJWyZvSfOp38CEWeAt1FQ8SRg+mZPwBZkLjrF7xg4B4mxIGEr8m2bBzXlmWC5I8w9KL3ierFQ2IS5wUzkmh/QdJICbs5tFYSX9byV+MTSQtUbA1dM6zV8FaBPxTn0eQtLoxkTrUN8q6Iz0BaCwe X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(5005006)(8121501046)(10201501046)(3231220)(944501244)(52105095)(3002001)(93006095)(93001095)(6055026)(6041288)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011); SRVR:BN6PR12MB1763; BCL:0; PCL:0; RULEID:; SRVR:BN6PR12MB1763; X-Forefront-PRVS: 06022AA85F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(39380400002)(396003)(366004)(376002)(346002)(189003)(199004)(2950100002)(4720700003)(2906002)(106356001)(66066001)(6666003)(97736004)(25786009)(36756003)(5660300001)(478600001)(48376002)(81166006)(81156014)(8676002)(72206003)(47776003)(8936002)(50226002)(4326008)(105586002)(50466002)(26005)(6486002)(305945005)(16586007)(186003)(16526019)(316002)(52116002)(53936002)(7696005)(68736007)(53416004)(3846002)(6116002)(386003)(51416003)(7736002)(76176011)(86362001)(217873001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1763; H:linux-pyp0.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR12MB1763; 23:TVKV9dUH6N545lughhVxtbHTmrbpWU2oSJlr9MLiU?= =?us-ascii?Q?SYPwHWqpW2qyOLBHXrWuACQCWL7oZUEi7Kmx7OSQCR0iNzm9+ix0UnIXlTE4?= =?us-ascii?Q?TNmtHI7xJP2n6ZHW/qePJBv5IobIxQbI5jHtJ/NSEqm/NQuKgJ40ZzpjZU6R?= =?us-ascii?Q?49/0IyltntkrpVg4NwLzcy/p21p1X5FPLHNt8ofo+ErigDHWdWYxeWEIkbPp?= =?us-ascii?Q?cDrsS4e/6MDsAaFvRZoM7llIHgG3Y897Irj9/ngC+QkSXT2rRBv7TXuFXpav?= =?us-ascii?Q?7INhrRNggClQIrqhRoDEdRKoC/eY4nD0MDfc2syNHtmBpty4bURspvUuyEQr?= =?us-ascii?Q?3DLkIzJz/jxig4BgtQlLpoAHBqRTsuc/RqTVRMX73wjC/I09tbNPt41uvE4p?= =?us-ascii?Q?gbBnenTHE7R1YngaW8eGn9UzfCJlKTGSysxgcR00MsAz45+UKvo5TMGmwJsQ?= =?us-ascii?Q?vnoYvvER0cCzY4R596Qyy66UpDIvDHIkEyAQqe3YIIVITvyqpOPsbqWTyzTX?= =?us-ascii?Q?ms8CeMN9/Y4X/IVVMU6QvEcN4r3mPxFOspuz/9kUxFUp5iYW38shwN4HJk3D?= =?us-ascii?Q?RaSFMdV15jX9iFBC7ruxJTY5a+323Qfk63XFis5zCzBZuSWNOcrXJfuyje0L?= =?us-ascii?Q?hhYyPXJES83LzWgBziTBx5BELIoVqqu//yi17i4g3sZkWJfqAVdqU/VNKl67?= =?us-ascii?Q?dFerLcG4DbT8siPsVotRMV5ndk72DoSGyfzWK2s0LKBkbxBKOM5yT1A/oqbI?= =?us-ascii?Q?zUXjLdKolO5JiwVuktVaFKIq5hW7hnVuB3rgA54ka5ENMdwa1G+espvjQasx?= =?us-ascii?Q?8++XbkLWE1SLjmDrNRvMwsafBqR27hD5h2Ueov/PYS70cAptAoZd+4ggDxwy?= =?us-ascii?Q?YY0o/QnfyqJd543BezWVH9wKD0uQhIhdpUqzAqOmmtBcxMW7Je/ZRf1jy4Gl?= =?us-ascii?Q?HcjMGO8EM2Ayh1+eJwqyxV4WJ9pXId1klcJq1Lj9+mIHcZMPlLre8R9PD8t0?= =?us-ascii?Q?c1MP+RNyiR7L4LW+Ek9ar6/csujUTJ9/ZY9qsDgvFmt54S81tyIFunR8uVXJ?= =?us-ascii?Q?Jmum+CawBsY0Zdurm77EsmX2bNqs47KPpoXi7uxhy4/+gEr3gWILZuqM5rWk?= =?us-ascii?Q?91X6hG8q1rKtHrAFij8jcxlhQX/Otp3PpdtbfTVZlZrCkrdiXVsTQ=3D=3D?= X-Microsoft-Antispam-Message-Info: mtkywBuqMA9GG2d8HKTySAmlslawafpXlTMZmlnjxmh7WGoDnKQfFxKJvWTfZ+rbjGDAsvKkJjwNshw3H3+WKrlG1OhsREr/TxbZrVylXLK9VTk44xpQWFd1zRJ9c8ytOZo0j8GcqkeRoxkRDE3M2//WtOt0BJ/y3q6jeAAGbN5zmoRT9+lj18wQpGOxEvtH X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 6:Ae125hxS9IQe5hN5p2gFAPQCTeFPEod1pITJQ4E3moOW8zFii0N5PtG/2aFZv52bDmy7wJ2PEG3oEZ2E78c8ffubXZtHpfgUalUlhzRncPJi8QkIcTi+cZRLOzzhpiusYYbJBf9xmA9dZ4WxwJxQZgoCISm8KQ6jKDlGRGocm2oEBq0NZpfeAMeWm9VoQPKMGjR45/Xu38p2v1OjYAsXX7/2OjB4gmMY7acXPkVuD9lKOAynlJVIJ+B5eErO2NH9KE/T0RsZDSUpli8pEVNTJyUUF7YOnpxqizTyEWzshuxF1M1qR5bnzYmfFinakjCCZAG5PrY8vR/BctfrB6WNQCvdNu9SHYbhW0Hkjgo4Xzc=; 5:e+H4qQawJbk8Tcda3RM1svoi2LII7K9+sXYnzrfw3KQewS/XkYxZ9uuzJHdTB3BQcxAfbTDV2eDzPBlEXDrn+1BOwLgugeR40wYOQ64pauT7Oy9u2Evb8AuONKJ2wRJ+QP61Cg+qnd+vH8y/iB2HjfnstPb8/q8z87hRlO2bfwY=; 24:EQ7B3AP1aA4H1noOdLNptq0jz//xlnX0dsOgNKs6aLo9kpPrjUX9RYb/Xlp6yaF/aTcdUo84GBlnlIiNU1UWcUrLJSZOmowa2wySbeyCQrQ=; 7:Wsi7cA1QqvDfQhCs3mLd355m1joSCFglnXhSntB9YW6u7j5tUdBMY4UmznpmHfqKo91YpBQRs/VhuOU/CdQTkHc2Z/lt8VO6gXYsLGVhc2pfbBSvGQehw9E9ohLg01OPwCK07AQcjpBWr6pY8U+QIIln5C7u0JDvcVKKqSn0fDwA/hGj4g0kKrdBaCZz5XMm9YiY/iuSVileKgptcr/dJpwVkhqZ6WwmmR2jKIzbSqWEVChUVW72xi4Nu5Jz8+BO SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 20:NL7L8MPNZASzV0fvKGvMTtNm68n+VKV2rf0immDE8Nq2i+ZzJQDiWeHc9lRLchRrdMtyhoKvW8rla/ALcVslM5zheS+jYi9x9QkB/F2ngkg2aV2OiJi/UrhIywm0ycPfTLCw5+CU4vb8WiK8KYBrr/6ml28k4IEQMWyVL1CbBfTS3bIv/Ih2/qjD3ZAmg78dXUamWgHPVuVlsMCIDHqSRHDqS2VoJk3xFCeqOeJea0b5hUB47H7PlQ2B/8v8SWcs X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2018 20:18:43.8499 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bb3c53ab-a9d3-4d7a-4666-08d582d64bcf X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1763 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.80 Subject: [Qemu-devel] [PATCH v3 4/5] target/i386: Enable TOPOEXT feature on AMD EPYC CPU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, kvm@vger.kernel.org, mtosatti@redhat.com, Gary.Hook@amd.com, qemu-devel@nongnu.org, babu.moger@amd.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Enable TOPOEXT feature on EPYC CPU. This is required to support hyperthreading on VM guests. Also extend xlevel to 0x8000001E. Signed-off-by: Babu Moger --- target/i386/cpu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 555ab83..88941d9 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1955,7 +1955,8 @@ static X86CPUDefinition builtin_x86_defs[] =3D { .features[FEAT_8000_0001_ECX] =3D CPUID_EXT3_OSVW | CPUID_EXT3_3DNOWPREFETCH | CPUID_EXT3_MISALIGNSSE | CPUID_EXT3_SSE4A | CPUID_EXT3_ABM | - CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM, + CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM | + CPUID_EXT3_TOPOEXT, .features[FEAT_7_0_EBX] =3D CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 | CPUID_7_0_EBX_AV= X2 | CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_RDSEED= | @@ -1970,7 +1971,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_XSAVE_XGETBV1, .features[FEAT_6_EAX] =3D CPUID_6_EAX_ARAT, - .xlevel =3D 0x8000000A, + .xlevel =3D 0x8000001E, .model_id =3D "AMD EPYC Processor", }, { --=20 1.8.3.1 From nobody Fri Oct 24 21:54:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520281249734202.01056193418867; Mon, 5 Mar 2018 12:20:49 -0800 (PST) Received: from localhost ([::1]:51369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eswbI-0006IL-Qq for importer@patchew.org; Mon, 05 Mar 2018 15:20:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eswZR-00059v-Ss for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:18:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eswZO-000134-Ey for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:18:53 -0500 Received: from mail-cys01nam02on0041.outbound.protection.outlook.com ([104.47.37.41]:7093 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eswZO-00012n-5i for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:18:50 -0500 Received: from linux-pyp0.amd.com (165.204.77.1) by BN6PR12MB1763.namprd12.prod.outlook.com (10.175.101.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Mon, 5 Mar 2018 20:18:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=XNROgMkOlvUyPvw2KXtxVEs7heufm7Hmk3S/hs27810=; b=S6JAvMa/JB6fBs8ISaENqjUtsG1WtNOqhemXUQL8tz4CcTSzAPiPEoxZ65QKoaLloaR4GATGwmNmBGs0YryH+6YFvC72dWs9y2jU71zQUIWqyBv0WQ1D3BcMBAfaX6arq0ytnhXIe353JS13lNkwPYj7fwFDZlSJ+8sPf7cyUnA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; From: Babu Moger To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, rkrcmar@redhat.com Date: Mon, 5 Mar 2018 15:18:27 -0500 Message-Id: <1520281107-5115-6-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1520281107-5115-1-git-send-email-babu.moger@amd.com> References: <1520281107-5115-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CY4PR1801CA0014.namprd18.prod.outlook.com (10.171.252.27) To BN6PR12MB1763.namprd12.prod.outlook.com (10.175.101.136) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 08721938-4a54-4631-6290-08d582d64cce X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:BN6PR12MB1763; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 3:9UoI6O+EO9fzXT4ZeZTNPO+MqtPAvXSWbXVJAPUkCfAlpemu24+m7DH0ZD8NL6ylVzo9JZ0VPlZbwN6c7HbQLBLKzDLZlPyp/GDpFXFc3PU6G2XL90B3n1/AAm/luPSml9zxkOkPqBZJ6e8MpKBqIq0pwSyorWEtptKSFNLMxtJpTbUrOjO3t5YQW7hGDWALDS3RtV7jf1GHhOXcT3S5ToP3GUzPEAdkF8vlLXSDb9+KS1DbK5fSDKUT4YtkCRzL; 25:/KxcyxvDC9r9crUO8I35Yg65uIACO5HfwIxMj8vN6IPWDyqjnWCQP2I/K44e1tUoTFBUBgYh/7rK0MWzCwsK6xLqFHhuVPDsk9tUqMvbwuBeB4TG7X2LJIFf7Z4UEAN3DbgdCL76Ms3hFPgQq1KDOJQPTMJ7GlLKPAJEQAgCOH/CYkuk24Xf96+o6dfp1/LKIB1McuqSytFL84hvVG1n/1NlFqn8tqWUGdbeR40NaZGlp6ZTM2LNp4N3mmz8NYJDhXSZPMYniJ+R/BbOkDbyM8xvL2gSiMIH4o+UQ27a0UsCUh0C4hwkey/qHb3C7jnA1EB3PYnCTXXj9ITsm+YvjA==; 31:JRwQ2vzPa+nl4G+8UpYsW7qcr81EGXh+RL52zddjkDIIMCw9fYyyr2LJcRXMq/pRe3jLXUWa5jS263rNVijj2iNa+lz0E8xOKRblTuS5N1OSSevjqHOT5mD7vsvyv6PYTKLmDCHoTVfIhUv0Tecxf5CJql0U4WM8hx6BM7dCkClgbD1QnYSRiPGkCqtuXnMVDNJLysMD0refXstNnqRmWYaisZHdVg0FEkvjdJtP8SY= X-MS-TrafficTypeDiagnostic: BN6PR12MB1763: X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 20:iBneHBLURtxUIxNLvHa1K5UTWAiT2P1+pO8tKfLZomTnBiOp2RzUGePEtJEEw5SF4K+jhSgDDPwvGywF2rD1NrTtanJwSGQ5JmE3RVU3T+YIzQwdVCPPDzNz5TXs+mlkdwZ15ncSukIuT3BKa1/y8ewXpvhABheJnlx/ax2g+LrgEx/R8d5Y5I4hnORHzGY4c7spacdlswLRxhF5zy/HSmxqL7gVaQE7A8GUPZY9ZHORoK2lO0ZBlgGG9092UBomf8XUzgVt7qxnyBr14XJLvd01BINDa0oQwS2yPtGjxdtzLZwzSV2l25NKQY//+6AnRaPLjx89/u36oXzfNznXHlhfTiOR65zdWKXGwU6BKG6wxNg0Yd9cd5cKvtiv+e+A0AJlENg4BqOIwYn9eo62Cc09nD/3tIS9TW2F3gwJtccjn/7MfmXm4/4DzH31SYdOdsoWmuXf+bDMmZBE47z2zyhwfMTkigtQy/A/Y3Yow+6EKGUUY+dXLcmmORzZEYir; 4:L0WzhBfEQATgtWVyQKpirwB51FO4w+gy+KBQjiOnyctjcn8mfZ0c93L+9Ss+Z3oVZXtMHSnciFC9FwANajMlpouTZgIxTE9Eh1BISR+sE5nN552b0hU7wc5EGE/XtFhfix97qAR+WsC6QpIktJ1HHqIJK/9WFu9g1+s2T6Vj0reTCm2bQldGAPlU8RNFnhGQqmpw08PAqWpC45lnam2nJZ59eRWzh5xlcMlFV87dgqHWDH+RoUjdp4Dazz71td33l3YD9xtlx4wklUD1cqcCqFiSCjc+2VhjKIbSsa46u125lge49h80D9EBoQlxEq8L X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(5005006)(8121501046)(10201501046)(3231220)(944501244)(52105095)(3002001)(93006095)(93001095)(6055026)(6041288)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011); SRVR:BN6PR12MB1763; BCL:0; PCL:0; RULEID:; SRVR:BN6PR12MB1763; X-Forefront-PRVS: 06022AA85F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(39380400002)(396003)(366004)(376002)(346002)(189003)(199004)(2950100002)(4720700003)(2906002)(106356001)(66066001)(6666003)(97736004)(25786009)(36756003)(5660300001)(478600001)(48376002)(81166006)(81156014)(8676002)(72206003)(47776003)(8936002)(50226002)(4326008)(59450400001)(105586002)(50466002)(26005)(6486002)(305945005)(16586007)(186003)(16526019)(316002)(52116002)(53936002)(7696005)(68736007)(53416004)(3846002)(6116002)(386003)(51416003)(7736002)(76176011)(86362001)(41533002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1763; H:linux-pyp0.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR12MB1763; 23:itaTrcCODj64isrrJuUaP1OncaARnjTpV0kh00nj0?= =?us-ascii?Q?Pk6wY6zCpRNdTjcLXZQTe+bjPY62neVdC8RxrH6GqMF9ZQMHM7BPwnzxxiI8?= =?us-ascii?Q?dyzIpBTCglzfhNwWH1uMTRaKFG4mZcaxh/5r50rXeXIlxqeZPZw+UVr/Bstu?= =?us-ascii?Q?kAmiKpMN8cpomn58NkhCtBbxZcHeagyGMAIkIhMPlUiRNzFmkm7hvayAVc5x?= =?us-ascii?Q?azojZiu6lwYTtBd+/XOIQLtdZIO8xsuyYUb9VaU49cL2fPBkKFnr9EsCfE8A?= =?us-ascii?Q?4Rc3MnBI8B6vhXyoDwUGpB61bIzbf/VEV8vyALk72UX/qRIKU1EnQkyM2/3s?= =?us-ascii?Q?iC3zgc+uUWugKo4E+/7vYUiS0KEtqijwHzlyDDTvZejM3suFecaNdvGvFqH/?= =?us-ascii?Q?ozLwYN5Tu0nda67kK+jZYtbkzltWxu4IkJm2RbS1/rG6wvggd4eiMJKaMo38?= =?us-ascii?Q?1YGDdM0VfTLJzWBZLnu1GcbE/pOsUdER5lxjhgoS0bplBpSOGX/MBAZPbo55?= =?us-ascii?Q?w58OBacHQb25eudugwI51QOArHqLlFLx2QVXxl7I+UAf1rmOntjV/f0+fPyv?= =?us-ascii?Q?NXx067s4q24jk/8RafEuDwGTu28C8/UuT/Yckrhv6P+chiqhI1b6wTZmy36e?= =?us-ascii?Q?XIvmUZrKMdvYXk4PMsbyeZlnzlUaMryuKJNJInLZdlxMITcCd0ndOtReyoDp?= =?us-ascii?Q?Fhb5O7dAI0DUoCbLI+PFqmVKSFE6oOZUqKt1rnVTGk1U8sHr3yCWlo066orM?= =?us-ascii?Q?2oAmPxJzPR5sldZiA7LzJetxoQn7jve7Iy3WxYQx+9RETRXHFxt/ywPc17te?= =?us-ascii?Q?HHKwrcOwSe6rXfVeFmup2AULqYKTILCuAAh7S8Xfo8wptavPFeq7tkHT8A0+?= =?us-ascii?Q?XNIoPj+IAOEDV4IvB40veIqk8NbCH7AxI6Bhz8VLGsiqnXcllIbG8aBDhPb2?= =?us-ascii?Q?r/IAYGgUSUM4gGobiMD9h15dUI7OMcI/+8u3WoTs4BoZLOluzUrcc/1OlmJq?= =?us-ascii?Q?kBY1VoH316fUNwwSgRYxbb8w0x7EaAGrMOKOZ3TCA/C3J9srhyjkNRENuI6M?= =?us-ascii?Q?psPqnbOAKfVCNjkSZUMv0b/Pj5MIqWUwuWOPuie6DzAHT4r2PDQIoi76MgqW?= =?us-ascii?Q?rsxOo0qE64HyYyWDC7tbM4uAflrAjXwK/2p9nzzk54amGdpZgT8pEteisgND?= =?us-ascii?Q?4v1Q/sPs/aCPNs=3D?= X-Microsoft-Antispam-Message-Info: zCKNHfx4zPjQfC2Zg4xco2xv+UpNiQR+dT8+nSLqN7trnTYusUWpfvI8Xno/5rZnqq1JfFPzw5J2OStCDOne3f1S1QPFyd0DuD4bplSF/NXMls2gQJalOlHIJbLrBRNOyL51Rn4oWTigoa1muEmm2jPHs2n9t3nTYECLUV/isdnj2px4kCfELkTkZx3ptIud X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 6:MuJxD5o5+DXNPVU7IJ48pGlxES4AeWCY/XJ+AfEQFD6jSnrhtGwaPM/oCM98RpraDH4ENJ2RCU+uWUUNrLXBSRfsr3Xsvs1mnPtjlU7ow2XwMTbNLUElNvQ9/0b3P2OShp6ZtXFJn8x4SnMp8N3OJnN4TaX2S5bi3zBdUTuGWqFnvqhBJu/H0CmYTEKbOc0XoL7Imy8saztU2DLvZhmdQcTmJo8xqFbx5NXgLrr5yeWTDU8C/Ri+3wdNbvao/TeuS+aKNTXvf0seJh01FZJYRzB4lLi74AU5YUuKzNYgBL60euGwsFw1mtrhoXJaT0RGw1R/lnsG6qCE224MG8dz06Ke+CN09GZBxSTTGNKrmRw=; 5:/pMqS1sZqExb7hBnNjSKtR4MN1CknYfagiGJZgxi56qayOeEVqG040fuxppS6+gw8PhLjaTzzmdVcBfjHCNgbqwD5olnKFO86Xw9AKlQUYgMsx4Af9t2Ic4RHBnQKwjzhOt1dGArmAUjJYqNAWMNsvkHR7LwkStgIS1SpHc9lcY=; 24:RcNG5opD87xQFXDTvoRwh+E3zUGlAk6a3QcRd0n2mrF4GJZ7Bp5j2OaZRJLaXRnpPYhifBufq+dTx7PpGdlVmv067kGS2zFpbkfdUH3Et+A=; 7:7l36YfI0JyiF5Eb3JE+TgVjfsrSrtNNdPWnm8v7hd9Eyw6hWqmDefFDBkspVyZY4WCWCi+PYm2Z/Inh7MeQb2cuzvU2A4zZJTk2WRzzgdzLQiVigsJk2ML2vqtAV2IbjWvSIurFXLWer1icrwtIFCRikz07U6P+OvKx7YJE9NF7rXn3WjgxZljuJ7CPhOaz6pT2AzlzkFIULjvV43ECz+YM0uhRMM9y9Die2kaNWTGBb5SGzHHC5i96gp7CZSj6Z SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1763; 20:0sNEiXesZ8Q1YS9ur9aD7nYrydlMifeVQoRi2H1Fz2Cwilzorp2Y5mK2pcTZKL9AJUyDSi9GUD6MSBI1U8rsORqbp7yK9A6SYiNY6HGVjNzb12T2Ojep2JWFVC/bB+b2LOnfKF3CUOh4FF2VnMTLCT/S34SGjArtEOkdtiK4xrr5k/rrM3cFD9TDQnNg+sMGfQEmSi+KWetLpmXWJQuWrIm8vCOApb5dZbYzCJUMq9NUsukIQk3EHYy8T9xf0TYa X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2018 20:18:45.4749 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 08721938-4a54-4631-6290-08d582d64cce X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1763 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.41 Subject: [Qemu-devel] [PATCH v3 5/5] target/i386: Remove generic SMT thread check X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, kvm@vger.kernel.org, mtosatti@redhat.com, Gary.Hook@amd.com, qemu-devel@nongnu.org, babu.moger@amd.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove generic non-intel check while validating hyperthreading support. Certain AMD CPUs can support hyperthreading now. CPU family with TOPOEXT feature can support hyperthreading now. Signed-off-by: Babu Moger --- target/i386/cpu.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 88941d9..0eb319d 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4337,17 +4337,20 @@ static void x86_cpu_realizefn(DeviceState *dev, Err= or **errp) =20 qemu_init_vcpu(cs); =20 - /* Only Intel CPUs support hyperthreading. Even though QEMU fixes this - * issue by adjusting CPUID_0000_0001_EBX and CPUID_8000_0008_ECX - * based on inputs (sockets,cores,threads), it is still better to gives + /* Most Intel and certain AMD CPUs support hyperthreading. Even though= QEMU + * fixes this issue by adjusting CPUID_0000_0001_EBX and CPUID_8000_00= 08_ECX + * based on inputs (sockets,cores,threads), it is still better to give * users a warning. * * NOTE: the following code has to follow qemu_init_vcpu(). Otherwise * cs->nr_threads hasn't be populated yet and the checking is incorrec= t. */ - if (!IS_INTEL_CPU(env) && cs->nr_threads > 1 && !ht_warned) { - error_report("AMD CPU doesn't support hyperthreading. Please confi= gure" - " -smp options properly."); + if (IS_AMD_CPU(env) && + !(env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_TOPOEXT) && + cs->nr_threads > 1 && !ht_warned) { + error_report("This family of AMD CPU doesn't support " + "hyperthreading. Please configure -smp " + "options properly."); ht_warned =3D true; } =20 --=20 1.8.3.1