From nobody Fri May 3 04:28:49 2024 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 1520888612908188.75396418113132; Mon, 12 Mar 2018 14:03:32 -0700 (PDT) Received: from localhost ([::1]:34655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUbJ-0002oS-Uh for importer@patchew.org; Mon, 12 Mar 2018 17:03:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54421) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUZA-0001R5-DD for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:01:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evUZ8-0007Uv-3O for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:01:08 -0400 Received: from mail-co1nam03on0609.outbound.protection.outlook.com ([2a01:111:f400:fe48::609]:45310 helo=NAM03-CO1-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 1evUZ7-0007Uf-Rk for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:01:06 -0400 Received: from linux-pyp0.amd.com (165.204.77.1) by MWHPR12MB1774.namprd12.prod.outlook.com (2603:10b6:300:112::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.567.14; Mon, 12 Mar 2018 21:01:02 +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=wRQPY/E5QQmZwopui1YjgCIsyk9BoyNp0sO61CQE/OqiIgRbvBuFBatV9k4y7uaCK18afHHp6b9kNCyZmp+xS8O9x84dDCaGOrUhC6U6bF4m7O3Yz+M9ATxPvKByybl8bo0NrfCgyPZCKcM8emm1jmT4qgLVERtqy2NPrtGzhqA= 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, 12 Mar 2018 17:00:45 -0400 Message-Id: <1520888449-4352-2-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1520888449-4352-1-git-send-email-babu.moger@amd.com> References: <1520888449-4352-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR1201CA0019.namprd12.prod.outlook.com (2603:10b6:405:4c::29) To MWHPR12MB1774.namprd12.prod.outlook.com (2603:10b6:300:112::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: bc3b195f-6d36-465d-33f3-08d5885c5dfa X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:MWHPR12MB1774; X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 3:48drA7Zql/LN1HIcNqfE75t8Onp2TFz4MDPEe8d3k+o5ItZBeAMLp4Ig7ogG42oldylQuVysNaN78GNdkBy7f6RE9S62e5LxKHaKJkQKpBy4a7SnBlv9+evs/3JnGJYHGOPpXXvN9M9nRMd+fim5n72QxH+NlOKVo8sukIvd7FmnjrQ1hqy0+nhhi/58zZ2H8pN0dng6dkcxL5pHVo6h61t3pSDIDpiKWjRP3KL85CjO5WcFJ4OUYhtlr6Jfy0ah; 25:kyWM1JCkDFOpQ4EY8ZYWKmhczSvBZhRktNVOxied0Dae0udQpFusH3es5NRBj7YQq+L55v8G0Q4HfjAbevhIlJKAq9lb61N7CUC28qaN6OdSDpCKrdqdhVjc7SfhQzEOIHheUvcf5w3NHKB2uVqFOka5vijlBRkeNBB/1B0jf6oAJAYclygBmZhOfm1UZVuQNcgoTxXBH/BOdTceZnUGRkJ0hpzYYJAYZAaQR3bsAy9H/Iy3njka8SfUZomTddTOi39Rfjxk6w3cRChWEG+DgQtHa2XBJcO2mf5MqD9wuj71qz7arJx+ArXudz0zXzGUqoqPR1o3lLP3dbqKXqyHnQ==; 31:6TyIfpCrz2c9y7YmuaXJEX/PG0Uo0bgITh4R4+z2b5ov603eTDhPTGjX2vL8cPzNMzK/y7RGbEn6CbZKhkha233r09rdYQIQWTK3HChcKdR/lJQiiSuCjm1vi7L5rK/5GPAJ0zqk2IYUXtnxYfr+8e8u3464MRvZlZS/lhvs+si8erA1dt5rHwUzFGuK4bocmcfPDBX5EKef/6ijzvHwwNlYaJJuTXXAz39tbPsW7QQ= X-MS-TrafficTypeDiagnostic: MWHPR12MB1774: X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 20:Krk75UNHn05wo5h+g69zIAzF0n24MeF1q+TeSkJ3f8I7W8HSdp0fBLx4LuH/epO8aXb6GhnnCS+YQmFs2Lr8UYEh/qIBzj0dB2EkZWY2ozPvN5ZBqA0Jzy4/x4qrrN15OcjvRNg8o8/tmS5fhrSW668qmj6B6cGBkotj2FNuRocfxhBevyZXfnirfbyEBKfaBPm2UrIK4QTk1BtFAfhY5WoCLgPNnun0Oil6wIkrTDOPs2WgwercuO73gEYXFw3HRM9+k2wtfOASeXjcHj9jHCT68xxwV1JsT0UJsQg+PTWrVo7exzf1Ss800bVoE8sO1S9MLUSzndEkojgxWvJw0rQBMDxJoHImS4EXPw6PxPWIZxu0PvfeocnIU92kxtWIidZtsGDTlm9bzOiII999N8+MbN9Wug/f+Ns4PeufcLzzwbfpw15c1UITq3i5EzRO8mJMAEMunUFyfxujDEA+kAY2D5dWoRfrnQItpVe/qwjRgMLQ/kuYlg4PCgCcwXLj; 4:iyG4rmZiHSlWt/IJZIeK2qjbLXN0cWWv7x8NyKGkbZpK/8WckQFDAG/nJSDwZwrNonFX/i5DPI5PbhVxDweGu1VmZYSthEG5v+s5uyn5Eb4IpUXtzi/Q+9b1H2DNCpCipE6v7AsW4LZcYO9qSrvuOcxHj5N+Q72m2aLhjjN3sQFYDM+ggjtbfQ6X0WIrmuoIgFD752uU7Y3ddqALt7odeWKdW2G3MwJTezm7El3qXqPYPmdK+XbZBYDiNm1Ib1tEHXtfsef0c2GX8o2OUwa7O/jHnv7UxMGMeyM6xmg0FDJW8626W5vQmHbXvLXl625a X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501244)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041310)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:MWHPR12MB1774; BCL:0; PCL:0; RULEID:; SRVR:MWHPR12MB1774; X-Forefront-PRVS: 06098A2863 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39860400002)(39380400002)(346002)(199004)(189003)(6486002)(66066001)(8676002)(81156014)(76176011)(50466002)(316002)(47776003)(4720700003)(6666003)(50226002)(6116002)(8936002)(106356001)(2906002)(2950100002)(3846002)(48376002)(16586007)(25786009)(53936002)(81166006)(7696005)(4326008)(386003)(51416003)(52116002)(478600001)(72206003)(186003)(97736004)(5660300001)(68736007)(26005)(7736002)(305945005)(105586002)(16526019)(36756003)(86362001)(53416004); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR12MB1774; H:linux-pyp0.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; MWHPR12MB1774; 23:WeV3jy6shmz5KY8rq1afDjFWn5OpOxPtr2oCVviHl?= =?us-ascii?Q?PZkOs3qTpQuyTx2mk4tP+xPjMuteivCWoC9RUODFa25H7teL0JsnUlQe4Epm?= =?us-ascii?Q?yC9aVQw11+LzYd3J/HhReaS8kQvfFwsIJ99Q8bLZnkh9ZAPSEDgoNh0vTWKJ?= =?us-ascii?Q?c1TffHwFxa8fDLErFLb5UeqCrtw3KSr+JdN7L1tEG4WnGjD4uLEP6EUdLl40?= =?us-ascii?Q?IBrbYG9XJKR38gr+jCWiSFdQ0T0R+o2ZVKzGrtGATxwd1cnwyyBUkhbkdzb+?= =?us-ascii?Q?+iHZ/X4kxx8JWvpbRKMjJGz871yhdby9qanevfHlN8v2xDsNmzp6wQRTxVc7?= =?us-ascii?Q?sP47nERx8K+3N4rk3BLSSSJyke5QYZtEzuG9bwIkLY5LQ7hdPkDgjDILyAoa?= =?us-ascii?Q?YMhfJMzTxosXuR/CNyum/rbEr39AhPMTEIUdN9Zhs+G2mJ4Lq5RiSr+Lu7Rc?= =?us-ascii?Q?hL+k5wMsHDutwURg70Hj4+TLR4e8qiD6kbJV2+DKAAnCdsYxACjbWMDPHaQe?= =?us-ascii?Q?8Yr9Y69e/WI80KBYphxcZ4DvKL9x2mCKTGi3u+oX3mJ5tm1a93yixwA/4w31?= =?us-ascii?Q?Xmu8v9P5VGPfSTr4kXAFH1aPYOWz40h1+Tw5PqNoDWf8h75ejH7ZFWKMXGdv?= =?us-ascii?Q?jlgJvpwZhPvz5Mo2EOrxtuBgkYQeIZvYqJZmQLyPzAp7OXV6+8LxlDkdCQ2B?= =?us-ascii?Q?uJyZiW33mc1i1TgBUUBeJyqIjLRgVIy5q4GRnrHVhy88R1/b5gMWgKmHcnwu?= =?us-ascii?Q?betEpeStOCYYlDL8aAYh+8lEWHYdYA1oXg26Zo3nZKOTvgxG8exuOE+R29U+?= =?us-ascii?Q?wsfKEWMZU36VJ2YER8n8pWp0frRSrke0qRUoTkbzs2dp7grcx2E7Vd9SL0QE?= =?us-ascii?Q?PSt0GDuOyh0xYJQKMhnC4wa6JIgrvD23+fgI8jg3qNqlc7mRwybmvHHu+e5w?= =?us-ascii?Q?oPKwgBc+4FzkHtUh4sUYXz/VYc+FqcIjAMj2kuGtTp3hWZgxUz3gy4EhvqY1?= =?us-ascii?Q?qhb/u0zd2YlphpcPC+owneGIsHzMaQoZ5dxnk9dlCDxBCuXggIJjIBSVigFr?= =?us-ascii?Q?Af2ZZwDuC88UVSmCgrZaC7XbDHsXPjIUjaX1U2rqbeAheYLkRwswiFhl19Ns?= =?us-ascii?Q?RYTGI7mZHTJ2eiVzZD9Cn0E3fdGEhJq?= X-Microsoft-Antispam-Message-Info: A0S0Buwlrdhs7+tJx2CjbmLpEpw7jBdlVIplYgiDcWNdXGQKYluFZ8i91DZXxRWeHAyWGKVfSYGFE9uvg1pvz+oungkdqkbOekIWlMkaYfYZ/zsErcMS/3HT8xn/5OSXi8N1igOPxfAisGCjNuiba4IUDlPGpiP+jFzQnYLZXJsKPRlsHOeLi7NF9YitdmUV X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 6:x7UJLCSb2L79DyDbJtBdGzFIPJleaGD1f3HqaMCBQhnJUaK7TcIjmLYITjnrN6JDdcoC54mYMx+qi3Rkg2bOUYC9i5mKeUfl60cQW7I0tLLYL8P9gva5/9Dt+AXcDmDR7eibSBUSQieZV+Fm6txJcLHr4KKCMYXQxu40QqL6UJF6xlsfPS4ms/f4Jf5Y2oKsi6gQqpf8hyKMg9fXUqwMW9Tr3CEF789xCN5wGnyXplfPl2xj6SHYs7JEYyFv43uFh1q/eK5KZeQ8lAEjNgXNjaeTE/em432sMxfmtrdKeRQS7Gnb2Yb9zWWTSRzv6BXUAR0n+vGvoW6SlSLek4ffQ1R7omXi9NK+Z8RbCFZfZzs=; 5:GghsDZ88w3qB7Zx93rLEKoTwu6wGIHZfel3JYrVNpa8M5oF+YUhienfFcbciLqloRgRgZvqzFbuwQm0YRVeE1iy0FGHw40K1yZRjVNlzztCXQUQ9AGDaaVa8vuoDq/+qCucegfuEMwbuoxOOyfq7BrSsR/ZShqEj/LlrCUh2BvA=; 24:ZHF7RA+zJwv9sAGy3yxkz2WCUV+fftpBNkBGVchpE45Jdx300c0qrrVQZkByJF3j6rV9epK+PeMbO5hbg/sca3llW+FWkvws0d+wu1Wzm2Q=; 7:OMe2t2zcnCaCDszZF+XaQ3HKTMeQvSXJTkUmy+Tzf9nz0YYYMdXvhbVhxVt6gxRtv37itPB+qdioEmEYZ7KLRtZlbyX7YqhCjjGJQPVKYrkBRJq1ICjXB0oYoEvVnfTL2f5wkcuHdUO9EEaeg4pQjLQFtPU00JAVEZRXaeCF7gOByNULaOB2e9CZ+bGaNmFu8sbPLm2XUQmGcnOBRvl96ZfV/R/ldSuUytPadeQnV3EA90sIwBMqPOMH9SuO3hc3 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 20:zx8907uT64t+vnBBTDqFPVNmETt6FHLDAO4QksaRzHHuWT1B2FmdugKCvBkK480F5jtJQv5srElhqX7EcxdDMwxGZQ9jiLS2jNrAVt0NgOd7jiWjnRfe6wg8sNTzsQEHwj5PWEgEd7LHLEyycDMa+WvDY+7AYagR4bIzC8aLqiTdSXODrZV+80d0eI8W+I8be7MRrIJT40aax6Ix4eZMWaJ1LqEI9Txnbmi7rif+RNFLlU+ilU0xJrxTYtIDmcFW X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2018 21:01:02.0496 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bc3b195f-6d36-465d-33f3-08d5885c5dfa X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1774 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe48::609 Subject: [Qemu-devel] [PATCH v4 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, brijesh.singh@amd.com, kvm@vger.kernel.org, kash@tripleback.net, 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 Tested-by: Kash Pande --- 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 May 3 04:28:49 2024 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 1520888612910868.45170927606; Mon, 12 Mar 2018 14:03:32 -0700 (PDT) Received: from localhost ([::1]:34656 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUbN-0002sU-CW for importer@patchew.org; Mon, 12 Mar 2018 17:03:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUZE-0001VT-50 for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:01:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evUZA-0007Vi-8V for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:01:12 -0400 Received: from mail-bn3nam01on0040.outbound.protection.outlook.com ([104.47.33.40]:22240 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 1evUZA-0007VI-1R for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:01:08 -0400 Received: from linux-pyp0.amd.com (165.204.77.1) by MWHPR12MB1774.namprd12.prod.outlook.com (2603:10b6:300:112::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.567.14; Mon, 12 Mar 2018 21:01:04 +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=09ho2Eguwu0d3WQSnpvViAhA3wZCAjasBADFX7Z27Ts=; b=OV5ZWIAGGwh6T1wmh9DlJsOUsdaLYLt7OrFqa32z6Q6/60ohWVhIFfxrGlnPPyt1rvCKS01X2anTuuLY7H0oSuS0g1KSLfSbsDmlSt2jjZZAACpNV7FtRbcEjZ9SA4q5OV8MY08M4bkIPqZe2Rzr627lhQ/tmd9mPb9VAIZypJM= 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, 12 Mar 2018 17:00:46 -0400 Message-Id: <1520888449-4352-3-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1520888449-4352-1-git-send-email-babu.moger@amd.com> References: <1520888449-4352-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR1201CA0019.namprd12.prod.outlook.com (2603:10b6:405:4c::29) To MWHPR12MB1774.namprd12.prod.outlook.com (2603:10b6:300:112::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f381d8fc-7074-4092-7233-08d5885c5f3e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:MWHPR12MB1774; X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 3:yatI9cC/8qWHZraT48WdYWx/JvtwNCk8P8jr4kSbqoTv8DdOaQafi64uQKdx0SIE+SE/oaFaXu+j95BUhcr+m/NfD7NP3KT5liegLHpe2J5/nmtHCBEOm2PFBZ6SfA25b2tW5BPZP63C/8C7182II1Wjw3RwAWZXoWkhAOb8TimswqISlNkSoLMHM+5uSQ80waRpiGCHWX3ku4Dt8fKqp+hLjFng9dSZUS+HU1nnixm2jB5V66nCtJzpf6BUiPi9; 25:6IPuZdW7s+cdqY+d3xf0UxcwqKoVSZMAWf+yesjoEfT6IG7YuZ1y+l8tQ/ogJYztyCcX/l6IRmiH9GkmKLzNRmqLvjriLsxhRY2NBipZTAHn3pV1yRdqidsJtNCwV3cKPCKJ9ObZzzrV2QKdkMsQHCTgHFv/hjSMSJQ4KC+dix1zZJ6mnPNQTpx5npGCvNuF2qOd9gbjtOiIMi9BiGn2DxWrZ+hmUdi04mVmfLJXtsIHBYS7aPUzZCVYF8L69oeS2Xo0wDv22JS9Sc1cbhoMHLr2BwXvcvP8TZ4SINM158Ahg0V7VQxCHymxOllh/RPCKH2K7no06NgzbzeT5eqGbw==; 31:RFXek2KBZX8yGhpn4pdnuBro6VFsSDBcIPZGqHxgc+Na6lQpxDlSNTUnqLdUPcH81nFk858RUl54FZz0YdZcdINYLmB/e8aPcDEyqRyAo/2mohmZFDCgOMM//EUD9tZfuP8a2Mq6SAJsiNSB/8C5l1JtvP/ARydQnT49j7/OUuDdhrmnEspv8NJAIwdQNkzXk1fF13/xf4Aka2nxX9x3slnLfwthbH7WnexcmZ7xedg= X-MS-TrafficTypeDiagnostic: MWHPR12MB1774: X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 20:877gRElorbW9tW0uQzZXE5KmmA3t9+eyvMoEcAGJzbQSLEe40I7JelIlA4irhzcJD5r1G8JL+NKKosBUwjo3bGdA87prUgvVZfGUAXB9Co+Bg3JaeV/E05wvEeTl+JYFIwBhbt83a/tuN0XCkP8zcwTkT6yzvQLqwVbiVlZFXVEHUYGOl30R3JOr/8w2k4UJf1CcWGOlMKOW0DJq6SSnpLfn344pA9VKoEEOPhK9vkPj88QaDuen5TFwj5/no3bn5+zjssFcX/KSIcz7F1EGNKxDTR6tekoEwwVQ47/XqwS4dN17oofprd+BNVwGupAZdMCFKxNzBx6BxujfLEFpZaS6ENr31du5vUvS3B79OFWd/V8f2YtAx1zTU3I3skbQ6Lq/OGIX+LLImGDA0yVdcv8/izo9HvJ7ky/LKjtzbajpig7Y8qBZSAbDElGcBOfkT4sVxjHPrls1liyo7p8fcQ72wTw9Mr7loKQ86rmlAwiXLlyIDqm3F4RQXDldYAUc; 4:tEWkqh5BAMWbFZ4DubvxL4v3RBLQyMwfBSOt1TP6EddncuKtKCckX0EF2H6FON5qr/BRU8qt5wHrZ1kvZok1ZKT/tE8/p0S4kHpsxGCW+n/lkT3anSycZyNEVQL1rzQSP73NE2/CPzcOesqq5yOVmHUk7nQ2wh0IFLZ2px/exx+zKqNfWGXZ7vVN6DMG1tF3f8u8+JvFxrAd54B0uVfzaUNq5XSnhMb+xX6YRbzHRFNB8Bu1hvdrXpVcmyUVKzwR4KZr3p5PVTc1OP3gkkeIgR3aHOIa+XePOIWzJPZpojyFxHNZICoub/kO+MOTgUMU X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501244)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041310)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:MWHPR12MB1774; BCL:0; PCL:0; RULEID:; SRVR:MWHPR12MB1774; X-Forefront-PRVS: 06098A2863 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39860400002)(39380400002)(346002)(199004)(189003)(6486002)(66066001)(8676002)(81156014)(76176011)(50466002)(316002)(47776003)(4720700003)(6666003)(50226002)(6116002)(8936002)(106356001)(2906002)(2950100002)(3846002)(48376002)(16586007)(25786009)(53936002)(81166006)(7696005)(4326008)(386003)(51416003)(52116002)(478600001)(72206003)(186003)(97736004)(5660300001)(68736007)(26005)(7736002)(305945005)(105586002)(16526019)(36756003)(86362001)(53416004); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR12MB1774; H:linux-pyp0.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; MWHPR12MB1774; 23:U5CnULbE8ugB+UlZIfw4WAWk/GC2PEKbOXQCVb24u?= =?us-ascii?Q?nCEGBQfNmiegRfXCH+O8LTnnHAmIRl9skJNS8gejO4kLKaLIb5zCHgC1vwLQ?= =?us-ascii?Q?eNPG90Nlt3a2ebO8+h+3Ma0WeUU0EHWtWbEZCuVbC4xk3/JhezJ/oorZnMTP?= =?us-ascii?Q?3pkNSffho7/GJC0aSRdKxrjwAwnVBGQ8wktRapPW60B189QMkC6eEoEd4g2O?= =?us-ascii?Q?O6BedZC6Gx/ns2UgNJw1fuVjwCeCF8vo/c2F7Kp+fyd/rrj10ADEplG1WfHY?= =?us-ascii?Q?W1KhDFKjaMdpdsJvwdVoc1Efgd173JW8XYlyZE8uje1pLasPprWzfqnwD+B+?= =?us-ascii?Q?QTuCss4xTcLcEA2W3AfqcNPNcGXWD4kynJSXCqwVj210s3UG+49v5PBQmDeS?= =?us-ascii?Q?2kaV1AbKMAfe9zTcoDFb7XPciI30wLy/lkqZOBGwFOX7+GTtu3DAfbGfvtKY?= =?us-ascii?Q?bEs2agWbcHQK0sHur8HrGz5GUR/hWVlrlvWXEVe/r4dYOU7GJPDX/r/z/gl0?= =?us-ascii?Q?7fbEK5KXxNg2RB0z5R+n/GM/AhAsoSAHdqs19N1cqWd8Obg/O2Xmna0rUZMY?= =?us-ascii?Q?C5Sm8LMxs4lb1XvB2VDAIwY9KUvGrRWrGXaCmNq08T+berEJufp8SY/F9Bii?= =?us-ascii?Q?0dVVUwMZ9SpOujFmE9imx1ZW1W5jomFQflNRvYFMKcaIcx5DeY7S2dTxVnKZ?= =?us-ascii?Q?otngnnKGXAIt3YaR43DOJVZ/WdrRfXIMxJQ4zeKSc+GTLRVsutHUkbN+TeT/?= =?us-ascii?Q?cD72jVK/qg39O3lahqS70BcQShCDCFBu5RmH+p1yzsDzASG/47lv2OyuYSIV?= =?us-ascii?Q?ONxTNUuYSVsAuhmwWi9TZUFzKaywIa9DuAv4xIDSLoRzw98CODUFhTZxIxJn?= =?us-ascii?Q?y1+0XC81pCUu3Bmny1ARSAEj8f6Qp0EFiPXXTSmQOpwDXWDIETuqYAxyHvf3?= =?us-ascii?Q?1K8KS7Cxvz0khx2QvzR8RKUlUxUL8a6l1BIs8yqRfPgwbv6uC3t9yILsMSKJ?= =?us-ascii?Q?Qd1wqoyAz7Y7DhAhRRXdmUEdUX+VyMP9iXkyeRdgtJHiKlcJKI/Emck3tDXu?= =?us-ascii?Q?yHL+6FdI8HxVSANCGIPbAFn3eydI9hVoXyZyvvUBE0DqRxA+0K56adANmzvL?= =?us-ascii?Q?orEbW6Oq/Bz/2osXlgJjSuoLV6LdaqZ?= X-Microsoft-Antispam-Message-Info: 054svuWEFb8rEusBooL+BVc4ibOfL3dOj1Fd2s0IqMAgJl/zNwoj0FHszXPM4pEbNewieX8+dyEj8PD2oFCxwAnZfcvbY/kylps2THzCQj9wheZQyubGwW+b8PR2vmzvZMUmTNy5xGRlh2z07faFsVKE6ltGot18rwh25Zkwe9YYGcPTZIR3aNGFYdVpRNaX X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 6:Olli/iceGOfF1w5QTflSgkH3hElQcaqFxJ2Bjl2bcrVsEreB2FaSkLqpT5LjwYsHQtkt7PJg/reWD4oMmTOtW1PYRr4Ijbit/niHRmcGOMRpqH3LbjF12NGj3ORWF14ItaE/khcQBD8jIADQCPaiUEyOfBqquiCz+Agl3od3v2Rz3d2WSjzenE2XVio9bIsJMblPxLydil4vJM+Uh/Y860RFTg6lFktL2tq9DRUZ3UAF1RfVbHi8VNTyDoDoSTsCFXafuCXLqbO3NGx/8lbVXGF8OZXkhZo+BKtTuOhyD0TBs/2oa204Yir+Jd39kAp8clJ4A6DWfUqEqArgXMd/1p1KPjjSKkkyoTmAUnpF7CI=; 5:YQhklqHgpC+wgcVIqmmUXgII1dGalwZySqIjz+TYOpyTYjRbp9+yIPU2AKS7AeqVkG95IdFnKrhsAFLXB2tlL3bdi2Vlvm0u5Bm+jjREVqz2G0z0ULYjzXQdFsT49JnHWfIj6xvXNjom7OW6748hbyGQ5lNXMwX5ufnOTPLlF/I=; 24:suIlEGr7+dkX2PDjoik1Y3HINvjSu/JzaKMAGbkvy/vzne+29NQC4zU6c1LLN43bWUpfo8wM5I6FzcMwVOvI1qJI00KiFXSZVbEGnq//ORE=; 7:soIJy4C75NhOd15ErgJAzQUw6cfNEsO33KkJkb80tNQnZP3BMScu/MpBX/71j0yIHLt0KI0wOkUhZjCfGXNbcjWm67JbPFeo859WRaQQ/sVI/cRyaEKK0LU/x7MJAp/9yFJd+s8+qLO45SkuJkRVbCDHBoX+jq8sJG0mDUW3IF16fl5R7N9UCqc/sjuIEqTLnizU2693WUoUAaFc60olrLRJn2ZXVbuU2lQz6zDGpz5/69qcbII1lEvrbYq8onf+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 20:7TNFDCc84CQMKLiCM08VHr4vC3ZvSfibLnTXPh8XyKhv4aXwEhKLOj7Wnf5W7fDI3GnGTTEeUvPqHRb/J/TNpUe3HF591ANkvKDsw/H3K6uL/+W7FxqAz2qkOrgdc7h9B+zPZ9tthw2k7R5Qv/zpZZIjxgrrD4oUeyQ5tMvN0N5htOXKCKxIqezMye3U3tl+2BhhHU5nzcHCSRegNlXhVpXx6vJMhzV4zn4HMJ88Qv80xkl/aWzRYd8LaB0zxYnv X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2018 21:01:04.2059 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f381d8fc-7074-4092-7233-08d5885c5f3e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1774 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.40 Subject: [Qemu-devel] [PATCH v4 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, brijesh.singh@amd.com, kvm@vger.kernel.org, kash@tripleback.net, 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 Tested-by: Kash Pande --- target/i386/cpu.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ target/i386/kvm.c | 29 ++++++++++++++++++++++--- 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 42dd381..5fdbedd 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,67 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,= uint32_t count, *edx =3D 0; } break; + case 0x8000001D: /* AMD TOPOEXT cache info */ + 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; + } + 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 May 3 04:28:49 2024 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 1520888611592114.30140916447726; Mon, 12 Mar 2018 14:03:31 -0700 (PDT) Received: from localhost ([::1]:34657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUbQ-0002xl-OQ for importer@patchew.org; Mon, 12 Mar 2018 17:03:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUZG-0001Vn-EV for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:01:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evUZC-0007WV-9J for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:01:14 -0400 Received: from mail-co1nam03on0043.outbound.protection.outlook.com ([104.47.40.43]:5667 helo=NAM03-CO1-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 1evUZC-0007W6-0w for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:01:10 -0400 Received: from linux-pyp0.amd.com (165.204.77.1) by MWHPR12MB1774.namprd12.prod.outlook.com (2603:10b6:300:112::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.567.14; Mon, 12 Mar 2018 21:01:06 +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=D+JSIhs6/OIIA7S/beIsBjG0Ic+RhGZQBwI8Q9Lfs10=; b=uc3t3BpbpRQkLZH7wm01Th7DKtE8LeKAHfrbAkrI5Dws20bMDzQbErMKFTDEw3dtMiKGUNgQv5pBF8IcrQPf91F+7Xy9d52xAlKpPS1yhZzhf1BDV1Gc9WdGjEkxRBhVp63R+PG6uy/42eQKYJy6FYOI0sjhJNamj77lkXpk85Y= 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, 12 Mar 2018 17:00:47 -0400 Message-Id: <1520888449-4352-4-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1520888449-4352-1-git-send-email-babu.moger@amd.com> References: <1520888449-4352-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR1201CA0019.namprd12.prod.outlook.com (2603:10b6:405:4c::29) To MWHPR12MB1774.namprd12.prod.outlook.com (2603:10b6:300:112::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 22406f69-81b1-4cb0-12cb-08d5885c6085 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:MWHPR12MB1774; X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 3:g6iKMIJMK4/OfnUkQg6fE/XqzcQ7GWW+wN0EytfNke0CpRy8NtO3uGbLmfBr7BWrVmHiHXF72OezsplQ6LKZTNPJaT0/md+fvZ0eRaGg6Om8qOXKsUpIF/laUgFFrIssJo9Bg4XqdMTBrPgRbHWTZ2vGJcYugJVzCVDXaJv2lPxF7K8j2Iti/Ebu9tpv8iN/EWJtobUQeHNyGYwpkwEO19Hn4fabBMkg2Rn/hwgCAaeLQI1Uk4JjLeY32eNLEaBl; 25:C2Oorupmjs/mzgP1aoWOLKJaETUSMSnJxBJ7OZSG5ScsHJulA9gGkV0Uqy/MX6eNb1QSEIf12hnZG52S4hQWjC4oevbWH3H4zdN1HyUu4G6oxo5QrqlWst8ZrmpXvp01G2e/lfO0tur0kTHAw93Kgd3Dby2OQdsF0EZJPn0CjBQ3y1OVPipyVl7a9USHk6D/SJRxzr1QVFzOsIBvTBlrSHMEW1E4n1hytN8p6TfHgRWAak23RFdkkleOafVqaf2Yd2G0WCh0qP6t7QdquMS+dqRXNuC9nNtfvgRPuop694FEo/dhQu24Nr0AseQENXb7q7KyL8rYXdMx30SQGiY4GA==; 31:aMXU3WWxajb2NKlaiblX+Bz4ThT/j1nEldFwfOZL8XLb/JTkTDSSD1DsGbWZSyX8+jwchtlKWn3PK5DsxYxFrPnlevhE3A1wYNo+QndGRJ14EHiP+5LD+LmXL1JH1eam+U42NActvZZImL7LkMiyoOgLlDvY61L3kMEtgb7/TNvmHj3E9aUqRf7KZ8ZJShCp670PbmNFKgn1ZpPl7xdz06lz6THqHT7C+kJYYqcgU6M= X-MS-TrafficTypeDiagnostic: MWHPR12MB1774: X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 20:bxrTffqGmRHSMCOgogWV/Z3T+94jLH/sFF8LlWA6ywOq5WHWvdXWtN/PrD4fKSQy9M6i2e4fK9YUbitAUmF6V1iiMIfXiXG6PUQ1JJogskFABHW46snHg21qVSVYvYROZLtn1bOaD6Cm1KHSOKZYevdHdp/J8vM1s/nssT4+IMeFjGKOhPbQY/rvU20WV91/oM85TQuE1cfL/eMpRznuNDUSNO43q0TuYeF9K85iLKBzx/B47rvqwCb7iJw3iVV9pn1QvgPAHItJHoCCvdjfsmyoyR+izUITXSAgVS7jH3T7hy0BVGS/PvPRC8f7505z6VaaYgLdiz+EQmkDfm0smcWK8hMfhU4PhBuOMq4v9VB062o/WEFPTQ8EHh+h9m+qL/hOhHppvFnRN+vlDqU9aJwBv/0GwMuqlGBOwA2q8KLXnrPfyvjnS2QDKf7hZOlRo02l4bc9wqnLRQND2tH4L1OvcT6rCdivVhCxxg0Mgn0WLXYONcZq3aI67pRBzPLI; 4:IXHOuo4C77C2OCSZLV4vMv5+v5Ynazr+8gnQW4Caf5cx6zSF+MJF4K6h5hs8+nEilnL2cRyBS8fAXZesL3gdKFRAAwV5TQ/WjEV39EkL1sPSKLQMgf94GSa3DjzU0VcVUmGcKpPrx4PeNKJS5OqxuwnDP2LXnHnnPvyWR6AZ8sUkPusRjtc0O1RAfxYu/2q/MGivoKEvpMV+lTyg00Ky7XCSzAMsbhbOcuyLvnKhTwku4kGB5+OjkARxV6bc4o91KHnJ8YuzJLsw1R/PnCUwBUNOuy4UTUNrYhipxoez5TR3cySf8ZCmG5Ya/ojtb0Mu X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501244)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041310)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:MWHPR12MB1774; BCL:0; PCL:0; RULEID:; SRVR:MWHPR12MB1774; X-Forefront-PRVS: 06098A2863 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39860400002)(39380400002)(346002)(199004)(189003)(6486002)(66066001)(8676002)(81156014)(76176011)(50466002)(316002)(47776003)(4720700003)(6666003)(50226002)(6116002)(8936002)(106356001)(2906002)(2950100002)(3846002)(48376002)(16586007)(25786009)(53936002)(81166006)(7696005)(4326008)(386003)(51416003)(52116002)(478600001)(72206003)(186003)(97736004)(5660300001)(68736007)(26005)(7736002)(305945005)(105586002)(575784001)(16526019)(36756003)(86362001)(53416004); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR12MB1774; H:linux-pyp0.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; MWHPR12MB1774; 23:VFLP6ZsC5pw0RkVwlyXYKtQ+N2nUaYPhUSbFYteEG?= =?us-ascii?Q?yQ4tkog0tjhFk+o4s4amVdyEufDFptIQposahKOJ8i1Y+y4eI5Q+6JNqegD6?= =?us-ascii?Q?Zeu0SwDIdsHfgqTNY9hHvpgogMrDhazT6zntM1+vlhHDw8i5d6zs3jZNc1PX?= =?us-ascii?Q?9/YxFWcV/vYSt7TcycT7fznMRp+Xlw3HDnS2oo08c1bwSyMJWwQzdDonlE5B?= =?us-ascii?Q?tIu8Jwnbh7nm7nJB/TlDACY4c5zl5FEHut4fvR/yAXMiXPi69ipWIYUHN//y?= =?us-ascii?Q?rA8leqFIa+2ohcVGEesuTPHdNd1d/r/ZnJ6V/OGk0bgYhZV14gynK4dc/Mz0?= =?us-ascii?Q?C1CoMQKjidfDGjkE4Kj2FiPVUgQsz+TrDaz0chx0vCpGzOg7g4G6cMyhvB79?= =?us-ascii?Q?BClQ0Sx1+0zVlJKaO6MIhtdfaldtTQmr49NHqkZ3QwuMuyHATCr78Vj8L8kD?= =?us-ascii?Q?gspKZtT9f5LiorqyO8OoYnpeRlVW5RsrvcPhFRQpUCFDe/uejPsXYAp19ieM?= =?us-ascii?Q?xs0hR7qPhYiRovOjegromfpqodA8k00GEhQ38d65+TXZBSlzb/MbLiydDRaQ?= =?us-ascii?Q?EDmKqTw1NBNVc7puZo/lLXCpliebgaRVtaWRDpSt5pMyOq3TF5HZpo184Hzl?= =?us-ascii?Q?XkRhl290bau5DhFG0fk+1OQp9C7LNbPbz1G92HQBnbk2nfSvROkCqQ28SpeY?= =?us-ascii?Q?x323yNcYvVvyIatIFwpugGyhebedtrh58kppOAGWKVbVZfm+l494iV286Htr?= =?us-ascii?Q?zYD9RnoXoxD5PdUAoRcIwgnWO8qQmPKUQ8IDN9HFrax1F5WNKs8oThkaWE7r?= =?us-ascii?Q?LJQfMLOmj1pXKojMAokSZvsiFyihiaoqz/IPHTa3rLMG51xq7UBuYNEOvEop?= =?us-ascii?Q?m2FWQAWRyIBoFHPwHbcWHzLJCdmFc4gAXRHiwL2K+3LrVemRDnYjOeK+/4aX?= =?us-ascii?Q?PBXJXUXl8OYn2nJvqMXFyuhFz3RLdWcYPxtTGWLGpQ6hg2lJdhzKjxt/GMh8?= =?us-ascii?Q?3Vd7BXYG9SDe3rVG9EaautFfLEvswnW2ddBXbCMGYaNwFQJIKEFKFOKFMmH8?= =?us-ascii?Q?TcnrF4gawKM3ZBy82ywX+HihgsqlTYbw0m9xs6heGTV5MsudfWANIGLKMWKu?= =?us-ascii?Q?Z5kxi0orTvzAqZhsfpogQtz4FWbKzRcRmc5kTSyTj6UyAgiCnnrug=3D=3D?= X-Microsoft-Antispam-Message-Info: 0ojXFo7wly/jcROW2bZIjx00NU0BkC1KxqKp/g1E5Q1qirG53dvkrXhMzio/YJ+2DQFHSPZ9FgFHnjktU0lAHcJK+wIZtwbuuJ3SOtiM4FuE5vgatuhVAHxnVecpH2P4yNZAEeUGYo6NcMN6TwsJ7cW8GgKNMCOvZ6wojQWpo6qEeDHl5lzypRzB4GI1c/ml X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 6:FGTKc/jn2uYYe24Apw4r7MBLgD3QNTce7OhUV5FrawmTfA1DLbAqA60y+IS+6t8FDMuwktm4TQ6Lw8pM0Qpld28kGe4u12COljNVCWJd8gIHosn0ugQS3NQYumnCRhETAotlfo/qQVLgy9trLhs689mw/QujNDbJE4MliJJNwJli6KH2e/LnEF4zTZ3FSoUvEa51jAVMIj+Yfa5Q9zyYm+4uJje7Xx+WBW7JxBvmuf602rPH6knRkYxt+s76+s3VyMJ3nCo/4hTR5lFqD/ymgk2t8I1CwF5QZHf7rn3H1YxrAXuL5BiPNltWsqaSn15/kNLXrosRUGaRp9beg2PkQwL+vLSCM1Bvbsy2fvIdz7s=; 5:GvCG+YLIeBRtgNrXk56RNOJ9Q0mi4rUEBWwb/ef9GDTGPrZLD0rjyZPd9kfm/+WqkIxn+tppkDSMS9PCERKD4J93jOkcdoLPZz3ItqCpVgfV7Q2qPuV0JDvBaQIsBx1kocv3Fyp4XMRbXTf+BXi/Iogky3pRvAmCTxaVCVpyvEM=; 24:Wegy7P7gHwDKtvlWLOFL/CWjboAOTHTsI/AAkj0ZWjIcjVK+6unvTiEebu3ac9w3Ad5j8xD/anUm7VwXgGmWK8I31mOzAV3ZupRygAwp334=; 7:7mDPsRmBZc/5Hu494T0pQeoJDEbkI9F2e+Jtah+8DT9xAPdzjMdcYRseIvhturzKPUYHyt8EE88fheZlchndB7RVKV0kVKsCG4InnZXL6OvtFZu0Ld+xQ1rdC9+RZ9bzCfUw3cN9r2vh8aq9NOttBWv408HRTdTs494U13mdnHMcU9Fw9k2FIEsbfiPPqSPiwA5poEDt5hZcKG+mb8TxPYlfSGsTzKgQ1lUvKQf7vpsA1Hev0ESz2zPRqzHNjWzo SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 20:zeWzz1Ar3th2nbE3JhDOPVHVn3VMbiLj0ailncEHf0+mVIa3xrqWPTi33sCdP731nfMpTfPu9l55UNMyMImJDrx9vBV2sOBxv6ESLgKkug1o6u4k9lOJXS4vVlIVd5P/jQBHgMwZeGchQ3JegK7DGvny/Kq2fJLxyygidfPzujROyTXPVrMQ0Pdva72Va3bsQPNh9TbD7c1Sw5+8EtlUGOIq3LX8INTltBacDIvKxfE/tqrpSwxpUs6fuOcWvdFo X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2018 21:01:06.3464 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 22406f69-81b1-4cb0-12cb-08d5885c6085 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1774 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.43 Subject: [Qemu-devel] [PATCH v4 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, brijesh.singh@amd.com, kvm@vger.kernel.org, kash@tripleback.net, 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 Tested-by: Kash Pande --- target/i386/cpu.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 5fdbedd..ba63d0c 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3655,6 +3655,13 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,= uint32_t count, break; } break; + case 0x8000001E: + 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 May 3 04:28:49 2024 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 1520888743103919.0184668707145; Mon, 12 Mar 2018 14:05:43 -0700 (PDT) Received: from localhost ([::1]:34667 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUda-00058w-2i for importer@patchew.org; Mon, 12 Mar 2018 17:05:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUZI-0001Xx-A6 for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:01:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evUZE-0007X9-8I for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:01:16 -0400 Received: from mail-bn3nam01on0051.outbound.protection.outlook.com ([104.47.33.51]:26992 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 1evUZE-0007X0-1Q for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:01:12 -0400 Received: from linux-pyp0.amd.com (165.204.77.1) by MWHPR12MB1774.namprd12.prod.outlook.com (2603:10b6:300:112::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.567.14; Mon, 12 Mar 2018 21:01:08 +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=LAVkOy+6qSw9XWJCwdeteEQ3yhicYO+GQHZlgrwDEog=; b=y/E3kjegHyR3Mezpinv08BZZffAetbLdspoRP59q0pWCTYnBab3WfaPiI9lUKU0knL+wX3tSnYy+yIouYxUAsVgGUT7jxALizz2mYXwINzpsJfNTHc4Y3soEzwuaFIECxw4hAKgDbHOCdrPB+lUoorXhE9oRsHhBJWYIaDQhgzU= 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, 12 Mar 2018 17:00:48 -0400 Message-Id: <1520888449-4352-5-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1520888449-4352-1-git-send-email-babu.moger@amd.com> References: <1520888449-4352-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR1201CA0019.namprd12.prod.outlook.com (2603:10b6:405:4c::29) To MWHPR12MB1774.namprd12.prod.outlook.com (2603:10b6:300:112::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 37e5cf74-e526-489c-2a02-08d5885c61c2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:MWHPR12MB1774; X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 3:WqiD+M/t/41rr3A9YnMZuULNhSfI1Y4eItD7pMPUcDVp8liytqQEp9El9xq1e6KI7EqMO9rxGzaet6mMb/vA2MbRGI5i55+QYMJTW9RkRCGXnuKuy3mcEwlxD93de4Q/SGdr1vmD1sTPdT4TlQfdoSXhtZgyVrdlAu8DGeETSCC/ya126a4W1GS2rTOMwd2sswyXmBSKKL+eipRQhDrR4os6qf/hz8F/+56Ra5pd7UHnmEKLj9Bft9QBgVIJJeST; 25:1Sg3VFA92rUakm1luiyLuOV0y0Tij3lYUe+cgMBwVZKbSRJGHoLjVgo7gvZNedK+gf5R/jDYzk/unMvHIotkc6ncVvH4r0MUVleQcQ69CqNKoc+wUZydywZV7ukurClpAWB6A01bEZjrPfDS9/hivdoy6cyx9qNnzLg66BcTboiA0Z4iAwnERRsi+Gw1tMEP94oYukKiFrhY1f395f+A6mUpg53vsw0eTyHvAPNgQkCgcMhcpvyo+ruSr3d110cS423ffSjOATf7fG9RFkfsNc6X0CUGhfmeKFipzoG4i84MqVT9vCU7p2rP12SyK/k2OIgxuUA4G2cWiEwFQuN3og==; 31:BUHaoRtgEU6pHpaHf3+BfZrr5w7RQ+Lj6DR8pIai0PrS6NZqkDaCnq/lzEhs5hXCk2BMak0xEU3TBUPaU9CazbZw8MWGLkAXADFUEDpc/g5TgH0zyuZ8O2M7G3+FOXf7Fxoc/RNU0qloSHgN+rPQupBh3afZ1q+cVPOKXWr2RPIPcaD5lIFlkGWzH4z7R+4T1MW7GKSumIoC0HnPE+agl7kdM8MNLfMybmTbOUQ7F/c= X-MS-TrafficTypeDiagnostic: MWHPR12MB1774: X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 20:OkKd3NYCE9Bo2p2L3rtov3A5lWzGMGLZOWINLoZpettwQjcuNrjQURFtQCNoUKPZAa42QR5wX5+/lFf3Zk4GWgMbEmUhHAaSobNskcmUyYcOtXAB993EpQAwYqjcoZm/ztumoQOFLGZj/OTwyRRFTSoUUB+Uha037DK4YtuGAJX1N6oNUzpzs7JQE+PjFz5msYi1qJ6g6d0P3gYMXjFnXzWfCMlMi7v1t1ing2fEoLwx5quaWhy3Q6Y1i8DXn3xjprhq0mE92PnFkwX64w49TA1n+GlNf9yCjC3epgT2UqBaaHNmgxe7BVB6fnBWR+6IXvODzTEi8a7Uko+Se8IYkhWzqzQ1pRNdFklrReuQcjWTCpfEMTLRE+dKpY00TZr/oxRkwOCvI1UBgHJUKtCMPqT8xOu36XD/h7qrLtPoqu2zSTBraybyFb5yUUCI9A4XvWlMuHLluFOGzfWJINKPohy2bhgq8Sx9rSeI6Y6sRlw3/Yh+4heqUzu0rldJfRt6; 4:lOqemKhRoG5cvhDJ01BsEY4uiTED33mpWdGv2Ogz8MQaiE0BHo6bQyJ8A//5T+WI2UwqUg7/NwE/BuVpMJHaxO8kvMWd3A64skcRxf4/IUZv0CnKEeHzp1TuTUsY9JpgoibRLF/ykAp3gZ/l3eChP/OK2UXB/ZdAXjxNC552kQvmb3rDBbKHPa/+bhFh7LVE9svzKtFRklpfUvrEJcl7zFjwZB9XVNZMUKbXGqSatItlqX/Sjboq+NSEJ+4McYyN79MylyOGWt9KJgOfCqOF/wRWr/D9YCVckthwZMxIEAozmKSY5QepYrficSot1kS4 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501244)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041310)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:MWHPR12MB1774; BCL:0; PCL:0; RULEID:; SRVR:MWHPR12MB1774; X-Forefront-PRVS: 06098A2863 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39860400002)(39380400002)(346002)(199004)(189003)(6486002)(66066001)(8676002)(81156014)(59450400001)(76176011)(50466002)(316002)(47776003)(4720700003)(6666003)(50226002)(6116002)(8936002)(106356001)(2906002)(2950100002)(3846002)(48376002)(16586007)(25786009)(53936002)(81166006)(7696005)(4326008)(386003)(51416003)(52116002)(478600001)(72206003)(186003)(97736004)(5660300001)(68736007)(26005)(7736002)(305945005)(105586002)(575784001)(16526019)(36756003)(86362001)(53416004)(217873001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR12MB1774; H:linux-pyp0.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; MWHPR12MB1774; 23:fi6TgoWkPBhWvB3NR58aL4HyZ9eqAV5BJc38ra6hI?= =?us-ascii?Q?kSZw4AnwVBzEVjQpM23E4gIc3xS7kBa7vYY5Q5852IJf3DHLuqiwZnZt5+ko?= =?us-ascii?Q?Ndnt5TM5bh+dqafF9qf0tmS0fF6H3pZiWVYwkkmjZuheLR44pfjLGcXDPNCW?= =?us-ascii?Q?w38IcL29yccAYh5HnWuwQ8MfbSDsl6EavuN1PDvvrR88MQorGbnaY8gPlPAI?= =?us-ascii?Q?UesotgIH4pRJER95ZDyCuybi6NWDCpO0tggBdTSVDfZtn79heO/6TzL48eai?= =?us-ascii?Q?QjuQ5uT9/dWNxIAQBDvwRkHs8R2d2B3cyr8NQ5HmN6H5C/jAlMmY3DBeQtts?= =?us-ascii?Q?GgnPYMHwv5AlVl9TOLlpY/T6IOWdaiMcdWYjcBiLI8BjKYZRqcGFKtuiKSui?= =?us-ascii?Q?kCyB8VaoJnTFuKPqZbJYslGa6/58DuyL8inMTFbyMEjJhpgfV55dK9NihkUA?= =?us-ascii?Q?tZpuJJ2fGIP6BOspHwiPgWvvqxH/OZUqi0KZ79LlqDrSb8nmySIAe9fQiG/X?= =?us-ascii?Q?/lWDnfUYj4G0btrrFIkyZgMc+z0rI5olUWWMHkFPhfh7/uenh7/ESuy1hl6i?= =?us-ascii?Q?/clY/o5PoqD0F0JCsVgKxtUA/TRudfkyaTEY3GV5gmrsi0QL7QavTAjFqQ1y?= =?us-ascii?Q?jREpiBWcvTaO2wm83l9QllMRO4X5yflgPXX/+hGOr3Ff3ZdTygwVUK7r7iLt?= =?us-ascii?Q?6hVm3Gwc0PU+VuX6iHzI6mL8gfUqCkVd6RqQFlDGcbN8VhStiiwwExE79Yku?= =?us-ascii?Q?bH6fDGKZvJnNrYAnqTPiBddoflM7VDqdvCGXoSkT743CbI26RBoUWuCHZ0Kr?= =?us-ascii?Q?/MTbx1PeKgm8XV9YrWlLI09H4glpMWK9Mak7CKXDlNCcLHDtcMHxslEx+/Kr?= =?us-ascii?Q?m2sbckEJA+K8xcXIIrVGAeIrZGYk0giTZOrPTaIpz16JlgiF82nS2TGzFieV?= =?us-ascii?Q?MaNbHd6iT9sPeKwGu2nmLVudQFVXkQ2A4lBXgdXSHuJkpHGneOKy6jhDxbd0?= =?us-ascii?Q?5xFH0Jq5e2CDU2o56uErdo+zi5fHFlzJajBo1BqM+6WAIXZmqFsrCEh4A9Bl?= =?us-ascii?Q?GFYDyHgEdWTmGWRinliXw/+loNfcW5RrIPF0iL7j5UTEtCZmg4oOeMkGNgmM?= =?us-ascii?Q?98egXAisP5gfYVcZtIrJCEZRHJ2kscq9IhCtRzF0MIux1OfxIrVVxz9ibRXT?= =?us-ascii?Q?wHUVVqg26/WGIVqbZOfBhGPJ4MVSHTmH/DN?= X-Microsoft-Antispam-Message-Info: 6j5o/0IUO1aiNcgwX2gaOoQBEAOJLSyxNc2idDdSIAY91MSOKYIc/d9NqfSJvp3iamZiiKQMe84YfQm4Qq7HG+QVpCecA0RqLEjLGw533dg34JWcwh7US3HpqnM5O1Fhim8jVJuuKkj296AEvEqWEb7x/MjZDaO1Y2QqL6Gl6NUxQ6cjxFJx1ywoRsfebOwv X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 6:6aTsrx1t3JfBf4kqXHInY8hKf0bREDSQQERUIRasWKM/NwGXRE8Fb49PeStZ5wRu1z8AXvQBqIQoF2VjgN2zfJczynIZ5KLeYrc6BRCAtKbNmE674rPv95fcPq69gF4cUOgdsE3yedoQFBNE+ePS+vY/N4hnQzOiBP4aBxsQSC1yRb7Se9/8OeF5pMdBD6x/qExXyls7WGl9cqzG7Mohf+aw33zNRFtaBNzobdVGdcaywtVf5BxxtFOGMhyW3xDKcXf0RpKe44detvE13tV6ziO8Kp2SozIfQs45fd+5lYS2RP3vxNnp32fkQpfuFyeGjVoqTXfL1iQ/sEih+U9wUG2XuhbIHU98OZ+j5YY9EQ4=; 5:awL29hQUriNScaXp7kGuOi8Oljs7Ur0eckCVEyR6HTScE+PEjvI/Nqh3KATK+vorzAz20hXFV3II2ldkNAT6RpPjAdY7pQjdDHBOLI8w5iDzGTDUWOdKp/H31H5rHhw57S9p8KwBGv97swX/Lx4e/ytq6lhAgZ787msLIMx+5n8=; 24:EauLLc1jAowYk2+bkdwn1v67EnhpGNWYlVlLW7Sz9ZOkgLeaDA3CdSbXmhbHuUVp7fkFwtCHZ6Y+M8ViQUx0i7jut7jPsx/vizkm734EZ18=; 7:WjEd045na978LnT+2w9cnDWRxJFz3WZrEobQDO14SUW/njmjgArYNlne11YqH1JBwINs6mu6sCQLfB58kBdHLmxAyw6v0B6kzWdtjrVXzF5X0okBa3D52+7jBAl5eL/vB8nBbWZSfCCcHfAydzbJub7yM0giY5UNxwGvw0zWxeuzZQ+DqvbZyecsrhB4ZZTa0K+QOtADQPUPUwMEa7Y8c2zZSvTuiXSFVLGG3NkGbIIlweX2jEr9twGeORYGLsFn SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 20:Wg4rCIivVZzSFMDBv99+fAb727YRN0l7aoihvTFLiv4UBuFlImzgiOzzprbO4nxHwOMqFJ8kl0m3nPTuAeEzLHGWpR7/lzQN+XQR+8d2AlwtTAhz/T4p37ul+2ymRtcC2PbYc1WPRSP2v7mXmzmI8ZSAkI8aY1PQc7TeRICEG02XYDYeSAl0zvmm/UB7af5eOEwtlm38EC5UfEr2r7SzWcW+P5exsZKTnNPIY6EweSLg1ttDQjgPEIfkX8vdsLaS X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2018 21:01:08.4245 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 37e5cf74-e526-489c-2a02-08d5885c61c2 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1774 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.51 Subject: [Qemu-devel] [PATCH v4 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, brijesh.singh@amd.com, kvm@vger.kernel.org, kash@tripleback.net, 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 Tested-by: Kash Pande --- target/i386/cpu.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index ba63d0c..ade272e 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= | @@ -1999,7 +2000,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_8000_0008_EBX] =3D CPUID_8000_0008_EBX_IBPB, .features[FEAT_7_0_EBX] =3D @@ -4113,6 +4115,11 @@ static void x86_cpu_expand_features(X86CPU *cpu, Err= or **errp) if (env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_SVM) { x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000000A); } + + /* TOPOEXT feature requires 0x8000001E */ + if (env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_TOPOEXT) { + x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000001E); + } } =20 /* Set cpuid_*level* based on cpuid_min_*level, if not explicitly set = */ --=20 1.8.3.1 From nobody Fri May 3 04:28:49 2024 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 1520888839762291.0885349949017; Mon, 12 Mar 2018 14:07:19 -0700 (PDT) Received: from localhost ([::1]:34680 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUf8-0006RI-WD for importer@patchew.org; Mon, 12 Mar 2018 17:07:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUZK-0001Zv-H3 for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:01:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evUZG-0007Xp-Fv for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:01:18 -0400 Received: from mail-bn3nam01on0051.outbound.protection.outlook.com ([104.47.33.51]:1953 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 1evUZG-0007XX-9V for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:01:14 -0400 Received: from linux-pyp0.amd.com (165.204.77.1) by MWHPR12MB1774.namprd12.prod.outlook.com (2603:10b6:300:112::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.567.14; Mon, 12 Mar 2018 21:01:10 +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=nvleo03ywej05xBBAwO0LHWvnbWedetm8CKsg/q4VIA=; b=DvYs2pmGfALfwR78IZkuZHzqp937YyLMma7ygGZ2x+jzwyVZyQXH6Z0HhhfU+Xkfe/32WHQxJfydUuRHkqileLG9clOn/2nVY6cbEsHpdlwGGYvUVfhaDYk9ezN5OnTUi3rgcsSsOQGAdkDcy+4H9pUVja4BqcEiEBQaxS4ecO8= 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, 12 Mar 2018 17:00:49 -0400 Message-Id: <1520888449-4352-6-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1520888449-4352-1-git-send-email-babu.moger@amd.com> References: <1520888449-4352-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR1201CA0019.namprd12.prod.outlook.com (2603:10b6:405:4c::29) To MWHPR12MB1774.namprd12.prod.outlook.com (2603:10b6:300:112::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 71e1e592-e441-452b-53f2-08d5885c6312 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:MWHPR12MB1774; X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 3:3gtucyEtbjDv+8VXVLzPw1OPQpvLls4Qeowoju5y7YkjzQRZcXx97HDHQ3bYYae3qULlLNUvMwdLsHHhT5kMQHUqvIP4WjeBjZC023Jwa02awLxscTrPh5D79xwPrasLJFlaO5eBff2i+VoBQa6x3A9FRQg2/yRFu7SWCt1G/0qK2OnwDsKT88P3iKUyEbjpAMvqLEo7kClU138N3llNPCCE0gH54Y3qLh6XCwxoYFZhTF0h/PkgvnhQXiv5Ea9k; 25:+5SuGFeMmwvMMD7kiutwC+YTULnTXu1K9RhTi6/0b1eKLQhtSGUtyrGDly5j3krjbx/RWa7e+v4WY4/Wmjr2gQ0X6BISEpvHBG2kwyVCZmeZH0F2cLGtNv2Vosx9X+Ov1x8lDgx7S4tKn1QNeiqB9bNFnT5WFC0kRpX/RPV+ZsPJUeY2CrtQD9m7HTmQi2w1AqmKsiTe2n03iD+XvRDsifU/w3LCJflAv4YUQHfJe5YPllKaRdDHvlWcGrLWagGijt8lw6P5F77Bb/ev5TiGGFJENUgsus1p6DiSsplLjk2KY9rEcTAicB6H6dYvMwyBuXg/iJYcgQj27X/QBYdpXw==; 31:DeWH5GghLJyFu5ZS1kZXA7xr0+HnK6qqGtvUNj1fMWZLXcJFLm/fR4t9vpUXvNGoTNjYycsS9ILc4NDYHHZYeLAzXyMtNMUHG5wkqKmLZe4xAqqY6OJ2IKDLwJraOUKDNmDNy1MG/KAJGcJKKcHnZWWAdRAmvaN2LK0k6U7t2zPtWu0zj8Bi9xkuh9n087wiJ9XsCI4+qB1LBXavyt92X28hyo8yO65NQdBM5YsKhUg= X-MS-TrafficTypeDiagnostic: MWHPR12MB1774: X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 20:ITH14cyDBm6CDV+fP+ChS/yB+s5ZV5w+N8N87/lhT9d/zVdKXbdAWutg/GDr+NC0z7Bn9BmjQpQNnz34XFoBQlNDxnwDtzFF1BdvFntX+daYYxdJzVKzGd89EFJ7sAru7SioiMSpY6A2+LCxMLwhNO8VTkx7nCCB1QmmOCMy2yVMCTL5WE763uKE55xI+566KjoW/X4kHrDA4MY86zG1TiFHOEocYWu36LSXAhUfYClD8m1PtQJTfh78V2/bi/Ox0fDW/mLIZNqzyRftybtcLBAIQxAKkaMnEKvzTbywh1gxj4Gh/kKyPXNFTbUgQ2MkdF86iuAgg2hbCW9yZ3nQENsUWmTAqkE7BGjyshXv4zafUGRjSwKoar88vEKky+bXWUp040q4ndv7ExTEBJo0mKrVQvJJ8KDJ/N6TuWHIXUOyrYAtNyzVlSCfkr1sc2Nof52xB2qL3ekVS5W/5+sNFvASnlfW0DLa5cncUAoH9/DJB9QdPcL77zRKaloK+dPH; 4:ZlEIilUTLAIRQPxlhOxIYrbU4JaduoS2fPfDE4rrqGeQxKWMi07Smud/GtKbXI+lknD0A30HoL76F/VVUBADzVghobVuHtPh102oEU8KAsiLvJJjCoktcgJpJDBbCfF8cxaaMzM41Etw6/WOxRsjQWbNgJPzF1VpV3D+hUuSX2H7lSYtIEP+32qHsW/3SWze5JhLePpgQOPcEtLgDRi0WRnrgUyVDxD8gyYP5uTeSS18DfrrqACf2vBmeMvxSE4YF6uWQptUR+7TkCYANvX8fDENv3bQv944vchi8kOalwn916wmFCxwqqqia5Y3ffer X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501244)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041310)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:MWHPR12MB1774; BCL:0; PCL:0; RULEID:; SRVR:MWHPR12MB1774; X-Forefront-PRVS: 06098A2863 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39860400002)(39380400002)(346002)(199004)(189003)(6486002)(66066001)(8676002)(81156014)(59450400001)(76176011)(50466002)(316002)(47776003)(4720700003)(6666003)(50226002)(6116002)(8936002)(106356001)(2906002)(2950100002)(3846002)(48376002)(16586007)(25786009)(53936002)(81166006)(7696005)(4326008)(386003)(51416003)(52116002)(478600001)(72206003)(186003)(97736004)(5660300001)(68736007)(26005)(7736002)(305945005)(105586002)(16526019)(36756003)(86362001)(53416004)(41533002); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR12MB1774; H:linux-pyp0.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; MWHPR12MB1774; 23:sVEg59Ebi1Z06WQgZ4TreiJQd6ndgRS2VI4lr15FE?= =?us-ascii?Q?nuetn1S/SzO1Ju+nN2YbfbJ19ukXnrJ/Ww9NdFd8Y38nnu7X/SO1eQmliKm1?= =?us-ascii?Q?PttOHv0YYH2RzJXjdoumje65koFNUGMvbqe08jPKI1mv/oyld8Fn2RmDI4Le?= =?us-ascii?Q?OOrUu8RYmns4uPjJaOEUlqmcqayIIeXysgR8mzjhnt+igDoRYoxGqHvs94Co?= =?us-ascii?Q?xvoiKuPjT/e5IejZ25ckNYU+9F7T4y88aabSvUDyQOHyrq8UgVf7D9Duk7vy?= =?us-ascii?Q?lN+X2KyGS1WOLKGSkP0E1aUhD57Su8A8ZNWqfdOY9v0A7OoloEBL1apHKgIB?= =?us-ascii?Q?DsV+ub301Fgej3pxtYAxx8IzrpWQ82CCsXD8/zPa+3nFELBsyPOPQzvax+rG?= =?us-ascii?Q?o5ywrfYmMGKYyIVAereDlSqWYKrMqSL+9mqysHJR2763B3+yVqG505kNAdZF?= =?us-ascii?Q?vAxri3MoS78jpt245XJGqdmHZD6m67DtkGRpUfp0wpHN2mmihZGqwpMe1M9S?= =?us-ascii?Q?PLqJ3iNRAoIikRofCrpacIDGJza63VMACZjeTg0mveZ00icfTrMIfjOV2L5C?= =?us-ascii?Q?9FZJcAS6PCb7IA9v2AUbMCV7LK6CZtnUk1mnvDeA3ikuH6QMfIlNai6Pxc76?= =?us-ascii?Q?0EsOpn581/szOuFHaxSrz+yOHxVrdnszmeAkuNJ+U1ADfbfD075YiF3olL+5?= =?us-ascii?Q?1BGkHxOQc/NXgXayzJQOf26DgfGVUIRFvtZcC0/Eif/Z5zl7aL+mjP4WdRNg?= =?us-ascii?Q?j5DYtFJnHsnPDQaO1C9qwiAY9iZ58pdzg7Hmm0KRzedkd9tDwg4RFMJlS6YY?= =?us-ascii?Q?DdPOUQsu5MXZS7fl62DjaYx63peyy9DzGWwcpJBuIpxzj3TKx34e7ZOt3FfC?= =?us-ascii?Q?RPeowGH01JEHFUbn0oA5GF6IuJBH5hX25APKBxUgg/ePD7C8fvjZUYMLGMBd?= =?us-ascii?Q?90zt2uakZc7LwYM4fxbBhdlUc+Gt+uxaw4yApMR/vw5t3yzOa9Qvf270Guw3?= =?us-ascii?Q?k6fG4Ki33cofqgguoJn93J3FkbZq1ARdCG7do81rItiQMWCzd7WIq5gz993u?= =?us-ascii?Q?ZJxIlo/QhiNJI3oJO/P+KjCCfejObiO3CJiI3FtXeuelYHYTmmaGdqOI7jCI?= =?us-ascii?Q?yWdUhqEAoSwDR1oiWNmA6LAZ1E6B/nCRI+a/cAypXy2c42aArpzTPi/VMeLL?= =?us-ascii?Q?afxxUifZ3wOSAg=3D?= X-Microsoft-Antispam-Message-Info: Z0QcHSOmW8cXGyxu7jvZ0FxQFEiWiamFVgRg50LS08NeT3RxsCHT5C8vr1xI3M6SYC3J3Cpv06v0PCUVPNdCV4l7KLlFaGk2LDdAdx0Nn7t1whzh8PWuGg4TkuUuJIQItQ+oIC36UM0IT8hNOf+FnRzCsg/RkBjKsyChFSlFLTV1DIq4wWjBKxpJnpBBrVTX X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 6:BX+CGzInSy+1uFMsFl6U5vgJxC/DpY3eBvd4S5x3odzeJsAEgZaGGOxEd+pgVt/wB2wwnRAsxldN9Erfsp8fS9y3QsF7gGIS6B2k51WD1WjIafepVWvRXp0YaCJULX7y8ytxPuR1CRxpo/RkC17PgSKaUSQQeIEsv7bqgfNPcPJnNU5ooH5S+KQpoH/e75pffMcKNCJGs6IuZxLpkAQssMWvNTpT90cxlMbGbyMs2sukpTD8+c83RaO82wAodTuJnzQieuHGO60Vc8pj3+SoxxPqSkjcCo1rFAr/wo5YN2v5yDBaoKIIvVtqauKkDbck8PWVnKGpFvJHKd3YeTEV4/vMavYTkajnoMaBLLrSxqY=; 5:lKcp5gWkuTHJaFUJhl/OV+n8c829D3DY0mP7ClgPgnlzuSLGmDrCOt5to4nAFnmO5/QjMyiDb34u/gtHgRetPfptXzy3kXucWG2Hmc3dauQo229s0jNXZF3yMjkmxN4FtLf9sY2oiwQaKEgllEhUserNtgPHredNI2SNYPJd4wc=; 24:RNhJByU1i8s6jG9mfceop1Hj0ScaPOHJccgvquwVse5a9m+aT888Xrh67pdB2q/0GSbXKjEV2kSHTwilhp+nQsC0rlgVowMP2Soz5xtBn5w=; 7:3QdKobigaZlbhdbj2SuJbgWW8vt14fo29OmkWM0k3iVcfelAG3C8Q+tEJP1gkvetKvzs9MQeqyXj7Hg1ZDc24yCtHkgoeunieglK8iGY4pcE8YFD0kVDCqxdRQ7KhCOmqsXAjtuhTdDwccvKQyI+C7L9SI3ip4HSpXQZyga2wFtcgHIzYDOx0xupRRj1QXGkNOE5YHb7/Ht2g3ajDQWd1RJVqxNNOHcOVCgXfH13lonGfCVjHQZ80sUKJFlE8mwA SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1774; 20:xRHV8lHk//0vE8uYSSKF2wCLEwLmB15DgtMFnfwZz9CpZumGQxBww+C0FLWujJdqEANvLVhQeB1ug9uOYrhWrFoJlJPYsNa7DL0H9So9w179IG9CHGdNf6nVXSVTiAY+rwp4YOsuu0/yLM+1UEWkEx/K/9ZbfBQs8oboVEpm9B5YWGAe0iXUXBjLZAsz3pWSJdrMLp3wAtOEqNyfcERvmXfkfN7iBDwX6fDE6QTDpkYLZjmvvpnY/bxANsC7xu6l X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2018 21:01:10.6276 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 71e1e592-e441-452b-53f2-08d5885c6312 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1774 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.51 Subject: [Qemu-devel] [PATCH v4 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, brijesh.singh@amd.com, kvm@vger.kernel.org, kash@tripleback.net, 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 Tested-by: Kash Pande --- 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 ade272e..10970b7 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4330,17 +4330,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