From patchwork Tue Mar 27 21:31:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Babu Moger X-Patchwork-Id: 10311717 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 2E9E86037D for ; Tue, 27 Mar 2018 21:31:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F9E929B42 for ; Tue, 27 Mar 2018 21:31:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 13D5C29B54; Tue, 27 Mar 2018 21:31:41 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 7C2EE29B42 for ; Tue, 27 Mar 2018 21:31:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752128AbeC0Vbi (ORCPT ); Tue, 27 Mar 2018 17:31:38 -0400 Received: from mail-sn1nam02on0076.outbound.protection.outlook.com ([104.47.36.76]:53483 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752055AbeC0Vba (ORCPT ); Tue, 27 Mar 2018 17:31: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=dBiKjRAvB28DbgoXx9acldG14zQ3qHaSEOZZj9u3JzQ=; b=GqBt7/Rbc7BQuiI+qtRhhZkrUvgYOE5txirpnmSMm364npX5oR72bAzMiY5emMOsoOiKq5znJvmKetDBWJ6bDybntu/7XFl5p38jg3flXm/w+btYdNu/pCWF+9oild9MmzLPfI9ylCav9RuX6oFw2WD5Vci18GbXb2dQCbwgep4= Received: from linux-pyp0.amd.com (165.204.77.1) by DM5PR12MB1771.namprd12.prod.outlook.com (2603:10b6:3:113::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Tue, 27 Mar 2018 21:31:24 +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, babu.moger@amd.com Subject: [PATCH v5 5/9] i386: Use the statically loaded cache definitions Date: Tue, 27 Mar 2018 17:31:07 -0400 Message-Id: <1522186271-27743-6-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1522186271-27743-1-git-send-email-babu.moger@amd.com> References: <1522186271-27743-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CY4PR04CA0039.namprd04.prod.outlook.com (2603:10b6:903:c6::25) To DM5PR12MB1771.namprd12.prod.outlook.com (2603:10b6:3:113::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d3df61cd-105a-4dae-103c-08d5942a17ba X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM5PR12MB1771; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1771; 3:jjG0aeWGihB+H8vPZ9o7QBjmd4WUwE+v/U/2ZhRpWaeuds18kGhc5OSHrZecRGfjXNBQrQeXdAyPlQMkIkEN6J8fM3dgyHtiv4biCXxhfTY1XoySaN+E5g+mOXZ9MrZ/yKTn8tcBOcfAOCgM7Z9gb33pE52NDDDLt7FkZowAAacRDp8mXOb0mkMD1j26bSno4fuhLPu/Elf/nK2WzPo/bTXLm3DTlnaePwGaNBVt5W6oZPX3Ym6n+U1hY2DdKa/I; 25:pGIyOiZ8E1WUM1Qw+36O4RToN8E6WlrBuLQIQihtAt/MLQXixldeiL3EgL7qy/YW4wQeQMpg+UbEiYgx2h5oscRxDNNKKdZ09gxiNYMQGWOKVZXbaFmcTF6i7DbBBJyod/OlvOke1XWGi4sLjh3EpsAVjSTGJ1rHq78xpRL/Wf0LSN4JaqvB7gSNM6kRIjxA8XX+2YcRCL7hV+l2LLS+F+m12aOIEInQUjzLEJWfg9aGEDTEcBkGe1PKrceHljE+qDJPyTL/j7As35vH4pogFBVytEBqdAqUenWP8FRkSRf+XugM4H2CU797aSIBUrIwH6hFfLLzBKNYj9pzF98AzA==; 31:u9k8QAEA62JFhh03qyRnb3Q9XjKM31WJXEkPmoGig9TTIAU8SU+OqaK9XOSx3+sCcgAFycNBf/iH9NdwsXEhtxxl0dnpi+pArSdQEYPmgjCfqjvwnzPMluiSeF04wqbpR0EoNMGikwlaPLscOa7vLwOAiSmq3lSuJ+VSFcXz5i8+FuJaL2TqNt75W2V6IdgrwE2k9iIliTj/ZYeO5gVMoLDfEqPAcgVzMBKWu4IMleg= X-MS-TrafficTypeDiagnostic: DM5PR12MB1771: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1771; 20:0W/60dlcc+4yG89Y5jleGL6zZBmSXLXQvyA+3EAYG68KZEiVbVStw+2o9QAXYDSYn8KYm/qWB0bdIQ62bfzCE8dEw3J4VZVodOrw6xio5zcreypIXTNVurwC71BCpXpmqGw/qPUNAxVOrP+ONkUHBuSa69Y7/XOjm+ZaGVfJwjqqKvflyI9Px0GLz534wj52IdDsDyMHo35I161dK+u4Eou3daTYx40E7RBpFG+mXUR7iQ+RVeKzBqBZQIZVXZLML1nq50enUNVokYQ6ZFrDAIpW+xuIJieTDP3ee6NqRdbBFDb0A/7p0XwFaTuiFJwPIUxGiRKFFuq6PAIgA6ZNVdkAPE49CpHBVY+007T9o78q5JhdC1NH/yJkzCXz+PZFI6WDVDyZdXBEqcYf6SG6g3bP33odserxp+zSiVsveW+wfS71ins0HZ4bWgFQRs1LJLcH/7/Rv2ya1Ij4fpdTGmWRSZvPyZSmQVbtNGcpzc1NS0gOoQ3RIp9a8x7WMVO1; 4:zadyyTYiKbDkVFYx/Afu1qCrDszPWKsc43BP6IMGlf5+x/Y3RtdLsWk/9HQqsfG3JF7A4h+TXZkithTbINRBzleOOPCDHsJ4xUYaHt5Uw+7krlbUFaQtGkiVlJpIvHy+TCEHmUbXujNishhO52GFMijfoA/nARES3MilDS9bqLoddiDsMuY6TAGlcbnKbwCdU9JqgP9eoyuMzFrqXljm4tWR+nXvy4cQaGENjiNinXpfjYHiKKOH6HLsYxTwqd7Sjc2mzM/FQKxbwwo4QXt5kxCX/bfAobbLScEwVBjlPihUuqIvIxQ4wWFH/Kcg/XOa 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)(3231221)(944501327)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR12MB1771; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB1771; X-Forefront-PRVS: 0624A2429E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(366004)(346002)(39380400002)(376002)(39860400002)(199004)(189003)(36756003)(6666003)(105586002)(47776003)(76176011)(25786009)(66066001)(53416004)(97736004)(7696005)(51416003)(386003)(486005)(486005)(2906002)(72206003)(4720700003)(6486002)(52116002)(4326008)(11346002)(5660300001)(7736002)(305945005)(53936002)(81156014)(50466002)(8676002)(6346003)(81166006)(16526019)(106356001)(68736007)(50226002)(8936002)(3846002)(476003)(478600001)(26005)(2616005)(186003)(446003)(316002)(6116002)(956004)(86362001)(16586007)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB1771; H:linux-pyp0.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR12MB1771; 23:IlvqzPaOz3bbPHEdO0MI4+ruB6Q2UVQ+WsVcsvdzA?= =?us-ascii?Q?GklMNtNKTpJA6qvpaT/WAj+D/Pl+0szDmeV1Qp5zd9TMGzlOROCktiHePa0U?= =?us-ascii?Q?8hXhjSWRyMowCkVYt7x4QImJCCQiEHUH9EDNMJG7LLQtVqqlR4mSLWSkGjU+?= =?us-ascii?Q?Savikq9fCpLrrx9R3aK9Q1UFdkhDXAIcRrS5zdV4nOnLyFuA1C05pYseA1WW?= =?us-ascii?Q?OWfut0Z0HwCftqMqC4vMbOO4l400A2aCLLK61a9rFwNKdDwE5QKRO5Lz/oXa?= =?us-ascii?Q?w6poWr+iy0Zjqnes5evraEgNDbzijiVgoe5bgyHYfTsDZmd0/zvVX5RGCQ4E?= =?us-ascii?Q?QPaVDBZ0gkMNPDQnS6+7mRcyooQH7bwfqLy6sYQ12YzQpZSBe297V+umWGmu?= =?us-ascii?Q?h5zKTV4w5gOjOBVd7AbDG1ZSB9o53JVnu0lsgxeixnxpqch4vTyU+RZxE/sX?= =?us-ascii?Q?rWYDYDB5dSeonWLbvBTCSIAhPdLisC7OT4didP05dbh0I1Tnpo5nu0qQjr+T?= =?us-ascii?Q?Jq4/n4AZlf0UDrQ7MSvqiLNqTs7IpVmHmMpqhV/AJmp149im+spW44FyptCR?= =?us-ascii?Q?2SG80w1+yWSFiiFy7DgLWC+oVT0VrpcSilnf5ScHfvi+wqy+fAc+yuFmzPzI?= =?us-ascii?Q?cgLZAPgpuhCBgAec5sCzSpNAP2NwtMNz37NxoPc3uJ1RCHukmrdGmJwuO6Q3?= =?us-ascii?Q?6hu3y0uw0N7ljBASnAeI3ewBvbZq6GAOTq1G7F92QJaTU0fPZc4ZcGFp0p4a?= =?us-ascii?Q?gGHCgXesM/tUvHEs1gr8dh3GSltzRhaAhVat/vDhloMwvPLbQvrSEyEeGXdf?= =?us-ascii?Q?0cUY0Tn5yXoShpn66xoFswSSadG2KLt16TbdEM0TrYWb72SwqHF2DIEfuznM?= =?us-ascii?Q?7mxHCTWueXf1e1VhmFDaLVJafaz3nA81EvzhUSp2dVeNR/tJMbQ1eKh1r+YY?= =?us-ascii?Q?ivgb2CIKOi8j4YvR267gdYxQG9I9KAX6lIBhxN+OnmCiGxNyVynP2H7rhDfL?= =?us-ascii?Q?xLElAY6kFqJAd+TFtHmKs1pj+jaV44LIEBFGtWn8ecvKAj1VTl2736utp9h4?= =?us-ascii?Q?qBVWBcViSSLNg2Aul0KpKAqdsPtiTOFzew61QjPgYiFLNdhGeHfG/uqLmN0M?= =?us-ascii?Q?hjd8qeaWI3+mobZyCC4DhgkktBDf3QT4iUkofLj2oZKosyRltMoOULwkmzic?= =?us-ascii?Q?Syk1XAE8grE3CXFXJMKgwgmfLAvQPAL7Xgy8+hAuHgH+vGpaXZ1FP+9XB6aS?= =?us-ascii?Q?EZQjmqx/Juf16dDjDY=3D?= X-Microsoft-Antispam-Message-Info: m5qNfIgq6tdhmHsGdlXwF+fZRzzAJZxVb8RZNwnpX4UhfS6YY9nsKDonfj7cU4vaMSAKUNdO6q4xqvl4rb7BLXQiMakQ3NoRA/VqTKGeLdtqMby8x1Xsnc98PNlqtGMwvKxp09Py0EtL4N2wGDM0E1YSsiH/FgngRZYXhD6F++qwRV6JQb5AqeScMkVebSFs X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1771; 6:E+cDcwooASS0Ebd+mAGY23bRibnn40dlycbKx4A6s/CZkNvkp6cCh1sqQ+820wFVo2/uvNmuv5JFdlrD+ghF3ynpfq8fVTBNxvQIuAhGzW4iceydRsxCg7dq0YCzReWZTl4l2MFqZI0ZFrgHbVLqPkbJxi5kWZadGcYhrk4xs/ex9XRWuBsVwsvy0wJbYNBp19HStOyHG/anl75rxKPle+LJ3W8rI88nb3IpH6oqcNG5KLYvm1VV3jyNOLT0FeHMJBg+MC8G7Xq1VOy6Pzjys5uwW4HIUdmKXhESnk/K9zpZ1vtXI3pv9t5KQ2wx5ftXG3a+RaBt56Ocr3z/fNO2O8A1+lopb7kWSXfR7/E3p/m3uK0FdbgggY7Zo+m5Qrxa00+JCaW471jaXkqTJ+VDjQlJR1pPAkgAIQjCs2+hifTt9OXuhwUme1VySoWnB/YSXK8FkDGTMbJ7vRCXZyjnIA==; 5:gTkqJFThuHdvKuFaKcmKODTwTIZqDucLWW0U3fkI0Uqd3zsS0kP9TBOE6ubgqVdp3q3RVEgdy2ijBtQs2JVO9r2NFKx0WBJXh/hkb8IR75LBE0159c11Wm1/+g1iQa5Y6hMHNJuYzHlKKZKyaiMaqOluCfafASIzOE62ym9yjtQ=; 24:TKOVb9afWFzZ+/BLsj79pIlYoELWXlW+QeBGLN23S/DomtgbaP9UWMiXgyaFxIAiRoKXuhdYYSkXn+dlqyZTtaZl20ivPnKckHuo/QD4pjI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1771; 7:xN3DH6nPSdqHfkVXZKQ4R/556syltG3bMUuIbr1EqLYVe2d9D2Z+f3/PqevmU59h4YludFCB6UUoZqrNJM4zQKLJBu1XRnSsev2OnpfN7ZslleXzvBsPr/vNjjmCLQ+XbH9FT03m5KPmwAI1+lyafGL4wnYTbohDaQ+b6EVSSQes2YpCuxIKiGNaDwjL04WfEnXGqLtPBLlT2GiOmS7zAQ+dS0TDpz3NXLv6jvVzLkygk+B6M7Nqr+vLCS64g/nO; 20:nvsvkS7kQeZeQ6CD26YJIYW9J/mQ2GEVzHdezN9TwrplDt5fpIaB2iqoQX162/6+XlVxZ67DsTu5H9o+7QZspV/UVgjqHMWx7W+LNDGGbtfXFwCqOdbBgEvOuPXhEIm3k8DmWKKPZjhwhTsqCO3NBg4ATrUkvrBN+cbcp5nvjEOq91wdzBPnKtEDF5BVLY0bogcCf47uVqJV+rQFOyTNxIamocNULuVByXdierlffeFeDNqLpaZDQ366kCVYL/vN X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2018 21:31:24.3837 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d3df61cd-105a-4dae-103c-08d5942a17ba X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1771 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use the statically loaded cache definitions if available and legacy-cache parameter is not set. Signed-off-by: Babu Moger --- target/i386/cpu.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index f4fbe3a..738927d 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3938,8 +3938,13 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, (L1_ITLB_2M_ASSOC << 8) | (L1_ITLB_2M_ENTRIES); *ebx = (L1_DTLB_4K_ASSOC << 24) | (L1_DTLB_4K_ENTRIES << 16) | \ (L1_ITLB_4K_ASSOC << 8) | (L1_ITLB_4K_ENTRIES); - *ecx = encode_cache_cpuid80000005(&l1d_cache_amd); - *edx = encode_cache_cpuid80000005(&l1i_cache_amd); + if (env->cache_info.valid && !cpu->legacy_cache) { + *ecx = encode_cache_cpuid80000005(&env->cache_info.l1d_cache); + *edx = encode_cache_cpuid80000005(&env->cache_info.l1i_cache); + } else { + *ecx = encode_cache_cpuid80000005(&l1d_cache_amd); + *edx = encode_cache_cpuid80000005(&l1i_cache_amd); + } break; case 0x80000006: /* cache info (L2 cache) */ @@ -3955,9 +3960,16 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, (L2_DTLB_4K_ENTRIES << 16) | \ (AMD_ENC_ASSOC(L2_ITLB_4K_ASSOC) << 12) | \ (L2_ITLB_4K_ENTRIES); - encode_cache_cpuid80000006(&l2_cache_amd, - cpu->enable_l3_cache ? &l3_cache : NULL, - ecx, edx); + if (env->cache_info.valid && !cpu->legacy_cache) { + encode_cache_cpuid80000006(&env->cache_info.l2_cache, + cpu->enable_l3_cache ? + &env->cache_info.l3_cache : NULL, + ecx, edx); + } else { + encode_cache_cpuid80000006(&l2_cache_amd, + cpu->enable_l3_cache ? &l3_cache : NULL, + ecx, edx); + } break; case 0x80000007: *eax = 0;