From patchwork Fri Jan 26 21:39:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Babu Moger X-Patchwork-Id: 10187091 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 2FFF260211 for ; Fri, 26 Jan 2018 21:40:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21C83293D3 for ; Fri, 26 Jan 2018 21:40:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 15EFB2A84A; Fri, 26 Jan 2018 21:40:08 +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 4F771293D3 for ; Fri, 26 Jan 2018 21:40:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752148AbeAZVkE (ORCPT ); Fri, 26 Jan 2018 16:40:04 -0500 Received: from mail-by2nam01on0070.outbound.protection.outlook.com ([104.47.34.70]:19812 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751992AbeAZVkA (ORCPT ); Fri, 26 Jan 2018 16:40:00 -0500 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=TxRIP0sXxJjZ6MblCSLRzff5gr3dMKa3D0BFpMCm/Yg=; b=txi+B13TtICaQP2zKyUAj/bcw6vnU1jDiqhpCCyqpqQo3DgXvKMlIPWtQFvVdo7h+FVu0hRj1aHB9rk7zzI+0jtzHdQ1BTfm5bS3YOAEb8FXx+G4nVneQszmb7LGwNJkAISRsfbIEfJdWqu/WCyj4EsdHxqhgA4nQaP9DrNJr/Q= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; Received: from linux-pyp0.amd.com (165.204.77.1) by DM5PR12MB1769.namprd12.prod.outlook.com (10.175.89.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Fri, 26 Jan 2018 21:39:58 +0000 From: Babu Moger To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, pixo@polepetko.eu Cc: mtosatti@redhat.com, babu.moger@amd.com, qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [PATCH 1/5] target/i386: Fix instruction cache associativity for AMD Date: Fri, 26 Jan 2018 16:39:40 -0500 Message-Id: <20180126213944.7594-2-babu.moger@amd.com> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180126213944.7594-1-babu.moger@amd.com> References: <20180126213944.7594-1-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CY4PR04CA0064.namprd04.prod.outlook.com (10.171.243.157) To DM5PR12MB1769.namprd12.prod.outlook.com (10.175.89.150) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: fca6acc0-583c-4fde-fc21-08d56505593a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DM5PR12MB1769; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1769; 3:yw3Qh3haDKVpdSPHM0y4DzFlW8wpqyBLlQUniGvxVgsM4vM4KfJCINqXWVHxVPzF1ao3QDdi3jg4YTExVtdXN5A2lvtx4ENyABsShkis8lvPK/roCktwh/qNZ/rTTU0GvGYjXDRjH9E2O93ngGQ7lskwytrbqAKveTq7KxoJyRY50aXIDZQHO0VhCO1zuLTuU9mOvbVF32ZMzrCBrCqw03AUYKd6wPwfjaTjfveQ1MeXmLb9lX9fZ8hnxTSE5u2P; 25:XIpn7cKvvvuF8lpG9076xbaccoQ3EZmRmEnMh4FGYyNp6BXU2d/JbemqwyjH0NbCfL2aa6SqftYBCKWuqkxAyijORrdodvlrOglzSlqxIjDOKcCpSNW76Kiba3J+FKyhndkpNScNP5TeYdCfldveD/QrlUpMztCROtuIoy151K3ydT0Se0FLp6G2tIBspKvVeqzD0VjR40QiuVzjjghw8Y/OmaicWwPYtXHhLgzTWykQKe7+OrqkiS33Zel3eTH8OWDr1GqY9LMxhfSVNk8Xen/B8jsSVESra2Djkq08JSzhE0wJZxOXbdg+9TNG66JFaRpHkueD0HFRxA9VQij5MQ==; 31:CVLDQ3ShRGA9VsgusweYPoSRPuJKWQnmk9ylZ14/gtufSG+B1HXaapN+JeoXXa20ynamALc6mocMxbM/0QfPbJKY6vPAVDlLUBQuSlbWNLTMZ3Z6O8+LGDsUnEkx8lTnCr7uTg8wmEz5TAvpV8t1qJXoZwb1aNzuS3y5yLtCpDejNQmEdVAvjvwKgCSxe9r2xY2RwxioB4zYSLSk5ebRNajVEMUub82oDaPKvC0cyP4= X-MS-TrafficTypeDiagnostic: DM5PR12MB1769: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1769; 20:9bIp28Mht+yLtLgD3SW4dZKrjDHg1+iX1pGRTen6uSTDrC92Wcbx8k1w51MMh0cm8tXMTp3jjbWEeS/riJE9jE/cN49UKmwMnlBOwSKMpzECcQbKMyCIpcY8ufYvKTzgBT2U5iyuW53tN9J7oGU89egTCLQxlGb9244Nrr+iTWr8YD+Ipb2ZUWmfgYZPpL/RU/gpsSnFScYmoWur3zSBzRZ3ONYVFeFGHuOnkPbsmH6AZeeAbqlaFkJCPLZGGnwzbVJO1Q6AyPQYt2UqOHyCZ/gHvgvwLl0tX4YWxgEJsBMRLJZT644++0gmCRDrscJ8mn/l1jQeahtaBZ3+El1ziSXGzLM0j4AsaMvmtVJIglyCNtYGXFLUt/Vm4BZM0EsDW09s1Mql/95YiZcmW7iD1GrCUKod370Jlvyb6pqOFDud0AqKis5ShRXZRXB4AIgfXARyL0rQLhidyvduLK8UduVHtb3uxEB/fXk/Jf09PPJOzGMYePymJZlbphp6YrGv; 4:vdZS8iNCVczNF15V/hLVN2+xWvwVI2ZzRO45KhRP+ZhcbxxKHDYRWh2d29lNprJ/y6nm2bRugbx8xLfcMrKAmvJjEmvLvTwLr+qRx5DxdN3W4FBW3kX76/m1E4qAmqyYqcoK81F/85erFIQjZXkb+sifU06pRXrjHp9RUnZykvCn6PP+rLswUTJ3PWKRYeOpwkrE4VuUNyQhoA+J7Emxtl5YZX/SqORMCpgKmsKgoD9rC96hB0aJr5kH3Kd7yKf0NY6So7wN4+Q+IbPXrDy48FwF+MzG0eElZIMYT6KhDt3v58rut1WIDHjozrCRAL+9 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(3231077)(2400081)(944501161)(10201501046)(93006095)(93001095)(3002001)(6055026)(6041288)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR12MB1769; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB1769; X-Forefront-PRVS: 05641FD966 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(39380400002)(346002)(396003)(376002)(366004)(189003)(199004)(5660300001)(106356001)(51416003)(7696005)(52116002)(59450400001)(53416004)(8936002)(68736007)(386003)(105586002)(8676002)(81156014)(81166006)(50226002)(76176011)(53936002)(6666003)(2950100002)(6486002)(4326008)(16526019)(72206003)(36756003)(86362001)(1076002)(186003)(3846002)(305945005)(2906002)(66066001)(6116002)(47776003)(50466002)(48376002)(16586007)(97736004)(7736002)(478600001)(26005)(25786009)(316002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB1769; H:linux-pyp0.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR12MB1769; 23:6kKebop41Vs5XYoD6kzTLYqdzRhhX7HOzGjwS/HcX?= =?us-ascii?Q?4PMhd4i+ajSBewc+i5qHp1eaMgL8BQkW9QBW7DADvHnhyWTIt7vGSY1t/OoO?= =?us-ascii?Q?bcYy2ZNfhYA9G3qZFnd4Y0tQQ55N+CSsaF01RJJNW/xp7r1IIyI1pHs/Dryt?= =?us-ascii?Q?W1EfdXrclmWw66T3DjkvmkHgqZWT1DOedb+RfD6PRp445VSvG2P6X/lOvzvd?= =?us-ascii?Q?4u9z5L4bT6CGDkjamXKipA7aQWZ6VAg4xgtCDmV3gw0vrOlzz+5vUTuqqEQ9?= =?us-ascii?Q?uM4RXPwr0+pFzqdtzkZPqFkwTNOcVxwOQbV7QzXyyDc5SvVEkGZWWa6UgaWU?= =?us-ascii?Q?bCzIad92E1LcdcieWIB5nRHzallfg/Cw++yJVh3QdrcM5+7TYnWlGF2w2BPY?= =?us-ascii?Q?E7Lyr0xluAjQxXNvnNU3qn4vrF0LdIK8CUB0uvzO4Z9WbIuwJay0Rn5FCJng?= =?us-ascii?Q?JmcITLrc9DtSynfMAQUSBHCAXVEu854jPgtNO1e0vh1lPChp+sRXNCMlNguX?= =?us-ascii?Q?uTx5gt0+WKKpgTWx0GmjKP7SQ2648dOxa0E0YFBVM2+CXOGPqIaSizvWO2Hu?= =?us-ascii?Q?gc4glCm6/Q3OTxR/0Y2rVRjGiTKQ8Ird7ob9bFugdTOtETuLaGSGW15TBWy/?= =?us-ascii?Q?02SRhE2800ID9P6ztc0iPzkOHEjZtK2ZjVZwJFmbsA8ucnNioA9X1A3A+eNa?= =?us-ascii?Q?xdYS2nR74H9bQLzZwazO44VbXUlbmNnPma1V6hmQuEWdJJ171GKehZX2Gh1g?= =?us-ascii?Q?hQAwbD2fUM1K92ZXPd7Qzghw9MBR2EDj6wW89KM6TRrEVNieQksUalzatYea?= =?us-ascii?Q?sO5d6+l3VOVUp7PMkz5RHHrwMGzh1YyzzObEtPJ/hUtVEbRZgyG4RsJLbaUH?= =?us-ascii?Q?YT78VZ/v4MGmwjZV0GL5lUoF4dQOjJFXma8/3//hyK6wSxxyQS8ZTuGT3VQQ?= =?us-ascii?Q?jVoXo/NsG9b6OL3q/A3I+sYU0SOL8TLcWaiL5r/+7hWwVQ0ERdxFVE4FolL1?= =?us-ascii?Q?OrWhoyvJLW3t7sDMSmXbVQcbdOG4n32i7+anUg5Knu37M1GQK6/ovPCaCkva?= =?us-ascii?Q?wCQEiLiFZQnl0EJDsI5ejlI+DmMzOTRvAPzu371LT/g8rj3XvoUblApZpUXw?= =?us-ascii?Q?IP2uoOuE4P98G2luySU9jGZcI25rQa0?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1769; 6:3+PJMLlXRsa6L4ihtttKY/vLO0FEvI2tnTybCsNw1v1LAaKdpFXULelGsxWS0u8s0Ha8Ro74VlNeftmviSi46BgCPGcDulF55frKzynRHX1XsEZyGt0IEH9TeYG/uyQSi4yFyUgEzbCvmSABtvwA2sj3PrwQ3Hl65eGZErffufFEnL0PJFkAcg7JDI1hCKJ5M6IvDxw4jQ66xAn4Wi5wLeKR5dGNB44Qyy6q66bVuHmSswpNgGHGSUjgcGqp+WiYM2h2frXHfKXSQ8BqdKeDAWyMbyxCTYAZdQNezEF6BRjIAfgZqi1rhtroZJbvG29ejzM+rpQmiXqOkfjvXxl2UYKJawYxNVwiERV44UxXsRE=; 5:4fV2hCi4/HJRbFZTiJKjmAkP1IqtF6WwBu/7XvhTNfj8swmjDngEzNSUK5ihV27NcfN5kOd2nIqxqFa+I8QWoWaGFOzNBosDzit9zIl7EqLCxubRJWQ0AOCefRTPw2BWJO14XPls+k/xIgb1n9sID1Y4ckT/41Bp+iDw1w5n+aA=; 24:SMn1+2NCWZbEAok7TG4HNItroLssgDJzWQ9gWnJQKfdxoX+yuvz7bDmRctP2SUZfkafyzKyXFdlWmmoud98t9WmBAL9T1B6WUQBaNqeRJs0=; 7:bDWuIm8ZBXeX3HGxFjf0QQJjSI1IfuGxYv1nE+bylSYtyv4QVPeU9es6oHHr0uefVE/waTWAIlB1IpZP9nUrxUquKyYMBADoUoPxv7fxQKb8ubvTevx+qhbgNqdl1bJfiY5pyf534VdX7ZPrxUol4PhUPG8IozMqjMnLWfpwy1Z2SuoG2CQblZhUPLOGLs1lY4269QDW5rDPBIqtS9CgVprJLhRNGm+mH9kCDgbFqoBolXYGtMVc1Gqc1qgcZebN SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1769; 20:mDR/ujbozvzaZ0B63EVU7lKXcPo9ieOpRwTK/XzpJKOZICscXCB/gvOVKHYA8G+dP+7et25c43iVPNrzo9rKFDmFhjEkEUauEzGo20C2FwmSWlvVOrDAWgMrdkjbu8wZz3dvUHoApenag9rh0SWinDQ9Q4z2Yasiw5aB8wv/vOlSpvlH1rmGNrtZedIbj9gWn7pYXO6iS5aiFXFycvJ3bB9l94vSdAATfsDrD1yhBZi8h6vGVByAhhPLujJsW0k/ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2018 21:39:58.2510 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fca6acc0-583c-4fde-fc21-08d56505593a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1769 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Per Processor Programming Reference, CPUID_Fn80000005_EDX should report L1 instruction cache associativity as 4(way) instead of 2(way). Signed-off-by: Babu Moger --- target/i386/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 3818d72831..cb055f5940 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -123,7 +123,7 @@ /*FIXME: CPUID leaf 0x80000005 is inconsistent with leaves 2 & 4 */ #define L1I_LINES_PER_TAG 1 #define L1I_SIZE_KB_AMD 64 -#define L1I_ASSOCIATIVITY_AMD 2 +#define L1I_ASSOCIATIVITY_AMD 4 /* Level 2 unified cache: */ #define L2_LINE_SIZE 64