From patchwork Tue Apr 10 23:16:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Moger, Babu" X-Patchwork-Id: 10334513 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8F0286053C for ; Tue, 10 Apr 2018 23:16:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A09028565 for ; Tue, 10 Apr 2018 23:16:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7EC9B2856D; Tue, 10 Apr 2018 23:16:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D38E128565 for ; Tue, 10 Apr 2018 23:16:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753680AbeDJXQs (ORCPT ); Tue, 10 Apr 2018 19:16:48 -0400 Received: from mail-by2nam01on0081.outbound.protection.outlook.com ([104.47.34.81]:40576 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755131AbeDJXQa (ORCPT ); Tue, 10 Apr 2018 19:16:30 -0400 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=NLSFkDsiMWYpIHjMULVVtqlangIptJJPGcc23iGydsg=; b=pylUDsR28q68I5sNODtGIKyhYvLs6vVrUrOMiC9C34R+u1Sasi9OO5BFOxzxNDitJqS6WOiXeOVTUHmitL5DdGS8qEqY2NzjIl+6Yo0gOKoAkPan755He59qNq78PR9JEfh+NZdyBFpLAPnm44ZvA2oGTEfPpA/bIyZovdaOmsY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; Received: from linux-pyp0.amd.com (165.204.77.1) by CY4PR12MB1767.namprd12.prod.outlook.com (2603:10b6:903:122::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.653.12; Tue, 10 Apr 2018 23:16:26 +0000 From: Babu Moger To: mst@redhat.com, marcel@redhat.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, mtosatti@redhat.com Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, kash@tripleback.net, geoff@hostfission.com, babu.moger@amd.com Subject: [PATCH v6 6/9] i386: Populate AMD Processor Cache Information for cpuid 0x8000001D Date: Tue, 10 Apr 2018 19:16:06 -0400 Message-Id: <1523402169-113351-7-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1523402169-113351-1-git-send-email-babu.moger@amd.com> References: <1523402169-113351-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR2201CA0048.namprd22.prod.outlook.com (2603:10b6:301:16::22) To CY4PR12MB1767.namprd12.prod.outlook.com (2603:10b6:903:122::9) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603328)(7153060)(7193020); SRVR:CY4PR12MB1767; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1767; 3:7jskUDI6LDSOaVBiHwAnnIRs6vgTwAunNbuXh0cC6PgL3aogPZz1idOZBbsK+ElXqoCV5Lk71AHEFhzOZpIJRCewtMbdtso0VqHtLf8DpiDlwA092GOa0VOXfBh8Fao06nzWXnKrB2EI4sp6d22lvAJQntPTX18XYKh1IsGpAdOWuhNBiYaP+HfDWYKwlQzgodRNhD76AujHS4E6MROWXgNdug0j4oNKDCAM0nBebHOtJqgiQOXlEd+GluEO27s3; 25:/CjTCTRKOQAuaZsWamFYPv+8HB04CyIiJ6A02S0Ql2KbOeFaGcO8m54k5MoCbXv5JzdY5kHIi611fdM4hNuyLm5NBwltZQkRJ7J/e+tk7WrMpyTufZWMvMc+pAPub1RqMiZiAavTzTHL/GuTmvaqzIx2gw+WgNsRA2QBORLwKJ6OWIdS/Wl+qOSujhKnX/p9LBpvhvMGjEY65KAxILnXdobTxwhCrabN2IMNVbkFT09SmAvQM9wyLo0RYvVMDEkZ78V8QnSrSid//S7GXK2cyjHOChP0WFlifxRQ6yd//zOmnk59bUp8T6hMjqx6zQa3CRfkT/n7JVlB9Gcb/WHfUg==; 31:HDrEN7nwP8WOiu4q3kLMIDMYOGKNnOciD11zDq6AudW5yinqGjAbRK6oPzXOGd39FJDO+OlLj39/0kzY5zcvk3artjr+fC5g4g+138l5oogA/33Hw7V42WpGcs6+cpRrY8i15kWUrDBqMCZkZP7nhjvHOFdHBrjYPl62oUVPxBzbMvU34SKBgnDTsYw4Joq54Am2f6z89fkAvoBDE6olE31p6a4Q4uPGP8Z0bccs+sM= X-MS-TrafficTypeDiagnostic: CY4PR12MB1767: X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1767; 20:1cC7arYuX9O8VGsGIxVJ9qLqXRZ6JVisNLbTKfpDiza8Mz8tvNUYVz0WkxGoN/V3dItCmIYKnHAuXGg4bfhzTbH3dEIf/S+vZ3b4ajYSi431yTkNfvE5qOxGVoT8WIuLazM15Pn5u2PRFi+TCrWLpgaScRQ04Sm8TOVvcfRtwmBl62tFgNO1DRs+TryyHcM/jOfYtMEHO11CSKvjl0o5CFILazijhBrA80M1MZEHi/oxCRyvKwoFfddr2SlpsW44TvEXEhnmpPMCUFIKsHvnFjyMhyHbbGIGOsuHXHyDEhpjN3tTTPik5hQuqNV6MvusL7OTpElbpNsZIs83aJIylL5FKfVx+ACKFkARcz61h7YCLFqmkVOdbcXBqzA7+d9K+ypsZ/4L+wy+dDehnFfbJKoKVpclG41zoEbdcVh8Fe6qO7dXaOzuAg6U9Z/4erRtljvBzQo4OEobt4V8mYx8VU2/a9+cW+5rFaxp6Q6Tczg3UtXdgLgRPChRzgP3290W; 4:O7vsG70iBSAcTcH4MzrAMtnBvMTuGUQUqNl3bUirUcLo0dVqv9nz8etxWQVyXCJfpAGlob0SOnE7DMa15VvNJvNu5jl4hBOK2uzxgxaeJVH1YDC7HKbRgVosYnAbLyVoKvxkQYqmIZiCepd22M32+Y0hM5vH06i0wtQgRK1523EGKDVI8vHs7vHGxqQYwtMOgUYOUGrR4EOeUz0PHsCDhOZ0fyoYn7JLo3ZuuMB6V2cWRkVJzpiw+9GXGm2HcL0zZIPGxSZ0TeRKstQgI8Pssx8/l5V3dnP/3O9qJb9XijG1ZCRSxD9ZIg97nJOXgo46 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)(8121501046)(5005006)(93006095)(93001095)(3231221)(944501327)(52105095)(3002001)(10201501046)(6055026)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:CY4PR12MB1767; BCL:0; PCL:0; RULEID:; SRVR:CY4PR12MB1767; X-Forefront-PRVS: 0638FD5066 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(39860400002)(39380400002)(396003)(199004)(189003)(476003)(2906002)(52116002)(26005)(86362001)(50466002)(50226002)(305945005)(5660300001)(186003)(48376002)(7736002)(16526019)(6666003)(25786009)(6116002)(446003)(11346002)(105586002)(4720700003)(2616005)(6486002)(4326008)(956004)(3846002)(66066001)(53416004)(8936002)(386003)(72206003)(478600001)(316002)(16586007)(8676002)(81156014)(81166006)(97736004)(36756003)(47776003)(76176011)(106356001)(7416002)(7696005)(51416003)(68736007)(53936002)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1767; H:linux-pyp0.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR12MB1767; 23:l3wGHQHt1Geb6ssCTdc99WshZKQuE+22/tlNjdOqK?= =?us-ascii?Q?nfUJJ1YxF/ktEB9hwbxYvEMug5V3tgdwGAQ30isL07P5anspVv0upAt3/yVQ?= =?us-ascii?Q?caU+AeKJ4ZGVAc42z3CXa7sXYS9DHDMM/FwbN1XXhkVeJTKvIGegVsV+cUi9?= =?us-ascii?Q?XPIKdL6pYHgYH3SM5IFZw2amOVtYHfQ4ZCRbVY7G/s9NbC17+Pg6rJb5ntzH?= =?us-ascii?Q?Yp15lnkKnxFdDjj4ggjdJj2bFTCPC2d5JKvyuMsMAF6aNl2Zt29Nnt1LEMf4?= =?us-ascii?Q?R2J/iJdbDgNhkAkJkaSNgsQDsmrurnOCdIcSsvgXOzYuu4wKS7en//5qTg1r?= =?us-ascii?Q?ONGjLgvtQs1g5MoXbr7XiR2AWsuDZANAjbfo4+pjaG02CKN5VLBDbHatRo17?= =?us-ascii?Q?ermG4+khmZPvH20evvkb87/zezBLl2n/SsVqyfu8EMTHYSR/XCdKz/yy/yM4?= =?us-ascii?Q?T8lpqQ6F3yPnYfl775RFyxhqEZF/gD2IfGAgwk7daqSm/b+GaznSzuSDoEhC?= =?us-ascii?Q?eXSOVsKM3Rv435XnhQM5YTShSYSgwJ/Mp9LsM5fzkUb+MlNPoSRvvBiWzvQ4?= =?us-ascii?Q?K/CNn989KecADHCLAymEbpLEH5SoGGdAokOShNcHSl7TaI62cGmd7EhQFY4l?= =?us-ascii?Q?1FMqkIT7BLkHH/Ue5OD7NjVyGt/fgqFCerBd7i8uJWOJC68ihFHiHtQHw+QQ?= =?us-ascii?Q?LnefGaVCzTKigT4jGay5o28HXHVu7i8sOl4XPI2FnPbTJZV294/rYC9+a+of?= =?us-ascii?Q?w1pyejDU8zZO71RtemjFCU11oZqSwooPLgZvEpxSMsVYh6AzzIZMi2S73O84?= =?us-ascii?Q?/mKSSbo1L4CYoQ0Wjj7ownZdnLlhu6G8FtypS7dXbzJmQdF71rbsSI3tX0Vy?= =?us-ascii?Q?pFMKroTnQj7CjMaEd8UTaZGa/6JW6sKDXX2Bwy/1RHZpEorj9mVi2PpXhnhZ?= =?us-ascii?Q?LPAIo8VJS8RxpIV3JWpZMpzpuoKhskktW75xI1YN6tabL2px/6lay8+Xyts+?= =?us-ascii?Q?tKkhNxLvNJ/Nd7BDStc0qJRShW9zYc81i4xmYcy3ui2qM2z6/f9/40VUckSc?= =?us-ascii?Q?+5u2MF3hCA2CzX8FZQ7WGqjHBk7mFG18Lmz5vUsk1CGbcA5Ee3B+MrkeuM7D?= =?us-ascii?Q?7tn0M/UuaIFbuRcuxXe/je9g/spSrr16MXCVQDEBbbBmDIVIK9xPpJ2rt1MF?= =?us-ascii?Q?60DJW9Cf4WFEXU/l/c+wNRZuTmXkuPs1ncJvaXDs6YdZXnEsKgtKwVjaA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Antispam-Message-Info: VtEJ6ztbFACJTnhis0/DP97WWpbAAPpedr5gMw1WayK30Wpd8biR5UP/33jv8sJr+YlgguQNpr3LyPsO1Uk17mUSiRlxo1sG/qyofZ9RxpEOhXFxmFwY1Hhdc4474VI62LFF7aUN4mZPGR7CWkXRuOxzCIDVIYz9M8D/PzaqUAN2rUaoidgGJqiDS+MXkLw4 X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1767; 6:KH6Z6v2m0tEf5/+mBjNJFd7z2pB15NBibMpMwaQ435qz78qv4GZvWlhbHa4W+8tgjjTSpWa7+GokrrjLRTdE/NFy0cv0XQHgJlOK6qB96u1+krGyirlhMG4YGBQpnvejreQeyNJc8zTIr2RwsG/d15yqPiJyhAEXXlyZYjL6mbEtftym+pPMNeNrmYCEnziFYp5Z9EoFG+LqyFwhh+x2/LChlT+26Um2yZajOz7RoYDaQo14xxtlf0zRz8ZDphpMxAYGBLWhHMMvTT2nwzJOFCKuyvEG5EdnUOA79VRPzmlXuCqU6WsmYOqYAsJgUQfqOZjGtnCQ+8Uk6z+hmBj7zOYtoROXy8MO7/XAjww4OwOpaZthM//38/wHKps5vVOtxP0NOrvDGoBAXNtl6LoFMG2jNK9JlgGRsL0ejNkmMWwPs6ozLR15NlyObhm9OpKr7zqpt4tomg3GIPMz5r4RYQ==; 5:+Ge48yekDWj/j+H8hAchnAPcaSdn/dXfz9kq9cW/if6zrV+GuTi3f/21E8+i+l+ftLiL7OlAOeeDC/eT438qn4DmTP/nzKQAU+iOubyhn3B7aU2SSlCDRLkrmoGdArsy77xurjN72ah58GzcjEXv38KaVaVs0gGdY/JB0XvoNU8=; 24:1d+HPaenn5HKjrY+LyO71eJ2zc/R+UFJWIHTY+96IPb5QCer1f/LJWHo/riWMJM5dVfNGWjk4VxXNutyxojocZsCZKjIr2i0LO5183LLvts= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1767; 7:jioAM8grULZMVQtdW46qoAVRuuuzgD9Gjy5AFooFkv7jOWFLN3K566/PoJbNyWRjq2blHkWJchPRYgSiCYrz+Y9DNEoJshJ7R34x6GJevAx739SYHDQN7TJMwLap+7DxSIUE/CGWG4W/LFkYhCuXjOc5GNIDTKSoGQGbkZM64wCZKPuIwvXBSzE7q7qL6uyZH8h9cEea18ywZJPwlq3VyeqT9s/L6fbUTZe7IzUpQMdvAib3YSkjBXvIyTLMHigD; 20:H2LBbgcrlbU/zeviYMF+Z2bpExCvX520prmfhiJM9GkGqm4vNphjRCBe1Fbhx3xoFlaMl1ilMpuTfvahKxojuhkXiAs6Uorxqtg21bmtN579dSewaeTbgcmnhdnHVVKBc18GK5mv7/WrC3Ml96fGekpQfQjnE3Au90Wg49it0zyyRpE9xbmF2uEfxSTKMQivPvlT3mTyA+VxrKevHB7vhUpbtaStOP/Fkld17oFHTIvcf/fHDhqNow5e/QqCSE3K X-MS-Office365-Filtering-Correlation-Id: d92634e9-538a-420c-290a-08d59f3915f7 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2018 23:16:26.2796 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d92634e9-538a-420c-290a-08d59f3915f7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1767 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add information for cpuid 0x8000001D leaf. Populate cache topology information for different cache types(Data Cache, Instruction Cache, L2 and L3) supported by 0x8000001D leaf. Please refer Processor Programming Reference (PPR) for AMD Family 17h Model for more details. Signed-off-by: Babu Moger Tested-by: Geoffrey McRae --- target/i386/cpu.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ target/i386/kvm.c | 29 ++++++++++++++++-- 2 files changed, 118 insertions(+), 3 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 76b3bc9..63f2d31 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -307,6 +307,14 @@ static uint32_t encode_cache_cpuid80000005(CPUCacheInfo *cache) a == ASSOC_FULL ? 0xF : \ 0 /* invalid value */) +/* Definitions used on CPUID Leaf 0x8000001D */ +/* Number of logical cores in a complex */ +#define CORES_IN_CMPLX 4 +/* Number of logical processors sharing cache */ +#define NUM_SHARING_CACHE(threads) (threads ? \ + (((CORES_IN_CMPLX - 1) * 2) + 1) : \ + (CORES_IN_CMPLX - 1)) + /* * Encode cache info for CPUID[0x80000006].ECX and CPUID[0x80000006].EDX * @l3 can be NULL. @@ -336,6 +344,41 @@ static void encode_cache_cpuid80000006(CPUCacheInfo *l2, } } +/* Encode cache info for CPUID[8000001D] */ +static void encode_cache_cpuid8000001d(CPUCacheInfo *cache, int nr_threads, + uint32_t *eax, uint32_t *ebx, + uint32_t *ecx, uint32_t *edx) +{ + assert(cache->size == cache->line_size * cache->associativity * + cache->partitions * cache->sets); + + *eax = CACHE_TYPE(cache->type) | CACHE_LEVEL(cache->level) | + (cache->self_init ? CACHE_SELF_INIT_LEVEL : 0); + + /* L3 is shared among multiple cores */ + if (cache->level == 3) { + *eax |= (NUM_SHARING_CACHE(nr_threads - 1) << 14); + } else { + *eax |= ((nr_threads - 1) << 14); + } + + assert(cache->line_size > 0); + assert(cache->partitions > 0); + assert(cache->associativity > 0); + /* We don't implement fully-associative caches */ + assert(cache->associativity < cache->sets); + *ebx = (cache->line_size - 1) | + ((cache->partitions - 1) << 12) | + ((cache->associativity - 1) << 22); + + assert(cache->sets > 0); + *ecx = cache->sets - 1; + + *edx = (cache->no_invd_sharing ? CACHE_NO_INVD_SHARING : 0) | + (cache->inclusive ? CACHE_INCLUSIVE : 0) | + (cache->complex_indexing ? CACHE_COMPLEX_IDX : 0); +} + /* Definitions of the hardcoded cache entries we expose: */ /* L1 data cache: */ @@ -4006,6 +4049,55 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, *edx = 0; } break; + case 0x8000001D: + *eax = 0; + switch (count) { + case 0: /* L1 dcache info */ + if (env->cache_info.valid && !cpu->legacy_cache) { + encode_cache_cpuid8000001d(&env->cache_info.l1d_cache, + cs->nr_threads, + eax, ebx, ecx, edx); + } else { + encode_cache_cpuid8000001d(&l1d_cache_amd, cs->nr_threads, + eax, ebx, ecx, edx); + } + break; + case 1: /* L1 icache info */ + if (env->cache_info.valid && !cpu->legacy_cache) { + encode_cache_cpuid8000001d(&env->cache_info.l1i_cache, + cs->nr_threads, + eax, ebx, ecx, edx); + } else { + encode_cache_cpuid8000001d(&l1i_cache_amd, + cs->nr_threads, + eax, ebx, ecx, edx); + } + break; + case 2: /* L2 cache info */ + if (env->cache_info.valid && !cpu->legacy_cache) { + encode_cache_cpuid8000001d(&env->cache_info.l2_cache, + cs->nr_threads, + eax, ebx, ecx, edx); + } else { + encode_cache_cpuid8000001d(&l2_cache_amd, cs->nr_threads, + eax, ebx, ecx, edx); + } + break; + case 3: /* L3 cache info */ + if (env->cache_info.valid && !cpu->legacy_cache) { + encode_cache_cpuid8000001d(&env->cache_info.l3_cache, + cs->nr_threads, + eax, ebx, ecx, edx); + } else { + encode_cache_cpuid8000001d(&l3_cache, cs->nr_threads, + eax, ebx, ecx, edx); + } + break; + default: /* end of info */ + *eax = *ebx = *ecx = *edx = 0; + break; + } + break; case 0xC0000000: *eax = env->cpuid_xlevel2; *ebx = 0; diff --git a/target/i386/kvm.c b/target/i386/kvm.c index d23fff1..d170d2a 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -937,9 +937,32 @@ int kvm_arch_init_vcpu(CPUState *cs) } c = &cpuid_data.entries[cpuid_i++]; - c->function = i; - c->flags = 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 = 0; ; j++) { + c->function = i; + c->flags = KVM_CPUID_FLAG_SIGNIFCANT_INDEX; + c->index = j; + cpu_x86_cpuid(env, i, j, &c->eax, &c->ebx, &c->ecx, &c->edx); + + if (c->eax == 0) { + break; + } + if (cpuid_i == 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 = &cpuid_data.entries[cpuid_i++]; + } + break; + default: + c->function = i; + c->flags = 0; + cpu_x86_cpuid(env, i, 0, &c->eax, &c->ebx, &c->ecx, &c->edx); + break; + } } /* Call Centaur's CPUID instructions they are supported. */