From patchwork Tue Apr 26 10:04:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12826778 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7BB3EC433EF for ; Tue, 26 Apr 2022 10:05:04 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.313636.531283 (Exim 4.92) (envelope-from ) id 1njI3w-0000Ns-Mx; Tue, 26 Apr 2022 10:04:52 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 313636.531283; Tue, 26 Apr 2022 10:04:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1njI3w-0000Nl-HA; Tue, 26 Apr 2022 10:04:52 +0000 Received: by outflank-mailman (input) for mailman id 313636; Tue, 26 Apr 2022 10:04:51 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1njI3v-0000NY-Mo for xen-devel@lists.xenproject.org; Tue, 26 Apr 2022 10:04:51 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 4f45fbac-c548-11ec-8fc2-03012f2f19d4; Tue, 26 Apr 2022 12:04:50 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2054.outbound.protection.outlook.com [104.47.14.54]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-25-x_HgQ9plPkSOtXWqm449xA-1; Tue, 26 Apr 2022 12:04:48 +0200 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) by VE1PR04MB7358.eurprd04.prod.outlook.com (2603:10a6:800:1a5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.21; Tue, 26 Apr 2022 10:04:47 +0000 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::5cb0:5195:4203:7c2f]) by DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::5cb0:5195:4203:7c2f%9]) with mapi id 15.20.5186.021; Tue, 26 Apr 2022 10:04:47 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 4f45fbac-c548-11ec-8fc2-03012f2f19d4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1650967490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nfvkLKxgZzpvNh45ZE00gKlfe5dLJE1wRsQWU7S2WTw=; b=dmBEL6ci7IJVafYDD8mRxnxqUBaa7QccA2bOj4TtcMcqnOP5rj11yVDfRW+pngA0FuO3Mi 4GRdrAEO0Qn9N15M4aGHaoXmHJ0bNrQ1dI/as5FVkju1kBXA0wbogre+wCZ4gh1ZVNkFI9 aaCvXyz1BXdGWke+Sa+tzb8lFqr1EFE= X-MC-Unique: x_HgQ9plPkSOtXWqm449xA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PAz+FdWzrIJ+uQarPrKlgDZRWGEO24nSTJhhJgbW39Y/91X7auGdApdW4WBvsgJi3v70L+bJdi8VUnNHxKQNcEiTU7XgmqT7y8mfRuudtzDUQyTMxGMA83rAMY0fvBc61aSBXpV0qH0euqAqGcle3A0aW2NIhySlmWRnh4xugEXvFjxgUZ8BnXqoocK8xM/HSUzaC1VXYZsiHotdCxA6CiXXbq2SzH9P7WU+QpP/bOr1xaBGbfYqElPVkrHFEwlRYST9QtfCGHi79fHm+jIE+nLq2sCUOQ5qIwzM+BA3Oq58tus32XBpmEEL3vWiih74OBEslIV9URtuSNbDy9qKCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nfvkLKxgZzpvNh45ZE00gKlfe5dLJE1wRsQWU7S2WTw=; b=J0rwVSM9JCqGuJm04XFmAE8avLQbMgghsc47M2yGUpI15jCV1KPZQGUcBC40XE2KRrPa7D3ci67UGk+J90M4pf+9iBjX8NuXyaA7+OYq8rQAQxWU1T4QFfllLuw5AofQlkHDd8zbPywIhu3q0cRVKFoTMGQ+h3FRgE7Eyyb2ckxoZgOfc6ga/3YLw+rYC92ItXnoFwwmYRBghjmGFw3E0OIIJgP7mOjntvtWgjIErDuunj3/Xsm40BZnAgTX5S12U0Xl8XAGMCKMx/eLFAKvkcXDc0K9nVTnoUmyGEgb4LKDm2FwWX5aDp0JtLHgSM/u7XzVijJNBsY+hZuDw4lhaQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <974cdc87-cae1-2c5a-4c3a-98c5d98a5425@suse.com> Date: Tue, 26 Apr 2022 12:04:45 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Subject: [PATCH 1/4] x86/mwait-idle: switch to asm/intel-family.h naming Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <4eae5ab3-361c-4eac-619c-160147220be4@suse.com> In-Reply-To: <4eae5ab3-361c-4eac-619c-160147220be4@suse.com> X-ClientProxiedBy: FRYP281CA0007.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10::17) To DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 28725fb3-0321-465d-df02-08da276c31ae X-MS-TrafficTypeDiagnostic: VE1PR04MB7358:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UWde5jewysNqQP9v9Q008uj2g2kEB78DSO7jKcQmU3teBs/zPCVHBJcjwstdzPh+ECiWR9P/CYJ/yt+MlFwE3sks0+zj/bO7wZpOxUl2JtZOvwyi05Jsr0RA+tb4SSmfHNfiFRT1YhTdMZhHDpJ7Cfy8xqlPlvvokZv1gdsc9/rR20UnXzsEtlIsa+7tOZzRVZu31JnhzFXoCJbblDEM+SB+iIHeZofRu3DOnfkhFzu64eocjCfsFj4znkf5Dn0NePnT9tVY0Cs+KzjbcgeeB3ose5UzO6+rnbdJK3zmyzS7CWIyQeHhtrYcgM25Ub5WGqmyEnxzZsKQOsk8rZRqml07h8rytQuqr1u7ggvBS8zm2Xjmtch4lUC/GbcT9v9ikO5dU+W4IIyyQ+5okmeNxpiDj2vuVMhv3PxGP65DcLyJbK4TAOeGLfVNWYtOokTczv+471rRG6I59zG3pidnNEWjNuqaZhDFYF1weRAgx1TzBaDnxGG2PKboP5CDhiApOHV7OYk8KUsNvn6y2VRWUBZqBDWWdrkheULbMA8Z18sCezG4TdvU9UfztPHbA+PsuTxMu50u4Tb2NTiWNbb63D4sbiEKOeORvqOe1DY3/iQftF8Edb5j9CwziDX/jrGNLyj4hcNGzFfswKS9nrYOvWw25wEO/zkQT2ZD3Cdahl0W83VhY46oQR44O16zWb/OCS7VrjpIyOI/Tw2gZbav4PkuR2mAH3fzx0hOtIVMEgzXEFetywFS7CG/j/eWEKiT X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8616.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(36756003)(2616005)(8676002)(5660300002)(186003)(2906002)(31686004)(83380400001)(316002)(54906003)(6916009)(6506007)(66946007)(66556008)(66476007)(26005)(6512007)(8936002)(6486002)(31696002)(38100700002)(508600001)(86362001)(4326008)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?bYZvbIdFIBURL5RVPfyYK/jSPVRh?= =?utf-8?q?/0oLqoEIV3n5OrqQtc70M+bYSWd6jc8cxTLY0Xpb2w5mTzV9IRHdcq64USyNBp6tk?= =?utf-8?q?M1BQ0JbRwMvTt6q0Zts65+7k0pXRoshqPaTikpJ3DKPWE4pdlJZi5+Wh4AEe3dZwl?= =?utf-8?q?njWqjw6+XavhK7ttXFbOBBXcHNF2tSd9pGTb+Qlrl7XLtsGy8CVd8IU/oOJMd+9JD?= =?utf-8?q?5P+4GrcdDmNuOKMLuSkWkJK6FqRutpqSP6EBFdZdIu1cGkiYcFty/gktWCnZnDp2M?= =?utf-8?q?oeYmkcHfiTdp6ykHGmQ1SIoi85M+AFC521Ra1sUEv6gPxVBRAhxENj3K7z3aiphoc?= =?utf-8?q?yz8/CdE52TKM/7vOkRfJi1tnvhcVnxXBhllFqPxyf4iD69AhizwBk1rKYvPGEsDVC?= =?utf-8?q?/XAvtoNdsLMUie1fxtOM9JnY1+Xm3Vbat4+zKaMxfNE2Y1WXKrxtKQ+gEs8y7mQVR?= =?utf-8?q?ejsNW2xf7R65u4TndW7fQzMNUYl2aHYQUe7HdHC7JQXV1ZPKy5DTCDxN41SANTQfJ?= =?utf-8?q?pk/pN+EXIC2PLYD0U7ZD1Xb5IZv67rN+aEYzOBAI6MGayzRq/1U+A8xseuw8KA5wk?= =?utf-8?q?gtSdYFWzmDhbmtr0cJeuh9zD9aJ3sN5CtCEsFENYm8P1bFB7jwnw9Nhh5/sw+9ljn?= =?utf-8?q?Kfjd1wwlC4NLTwNAT0H5nd8GXv8ySApg3KQxoMzmLeiorM7Qt/eqYkEVA29rVF2eu?= =?utf-8?q?WikL4sukVWoknIJSgq9y6CDQTZqwNfrbVwwNM0tz4zpIrAptKe3saAte87ZkRD5he?= =?utf-8?q?DnQibIs5K5Kn+TqUPKFJHrCZ/e4sn26I5BfwdA6EKyjXpovv4OHkpDmkl0ixApJaj?= =?utf-8?q?tasytuk/z1t9Gq6TRF3/tvv0F3Rr4SSF36ErTQ5Ar/VBsWyi+NhUDmuOlk1iqXhK7?= =?utf-8?q?/s71GfUPAl2DSTNIo/i/xaQ6QbHEE18+noQmIdqn4xyvEXIFXisHdP7rFJ5RE4g5L?= =?utf-8?q?RWBcIb1vomsHD8cx+KJg/xXmp+RlwjqwH3m5QF2rRmNP95KHJTKQSKr1/Si2WlrUB?= =?utf-8?q?uU1Lvf3DpkkSyXdxwGzMEAihj3mwqsYhkiyjRZdy3pa/JnvlAKBE18jnNc9NDvTrH?= =?utf-8?q?xb7TlQfR31SNccWPCw/0/w07YW5J0+arwNBOK5dXOA31cknEIrnGzQfykLYCANtl3?= =?utf-8?q?JaxvNDPuw7d2BfiFqTPq+Pur7o8m7v1jJgnf+iS8AZZU4JK9abqjg7ACwBE/9QJvJ?= =?utf-8?q?3C+iPDBbGcYx5PkjBwVhMZQ6/8SQEgpruwwoDOGUqXDf9h2rRJFrPBaHQYZOQu0dD?= =?utf-8?q?XgQ/+KdSMWIVHYzXBuEmoE5m0wTzrkaQIDIHx0JJ8EjPVeHVPtLCv4aHzOa5aCrw5?= =?utf-8?q?GktFdCvWEi3vJoWz+xmeJNB0pfBI81hP6u+c8cjJQiBmyWlEz+g8o2zzOxMFvzyUg?= =?utf-8?q?Exngdr0yvx+YSH+2QC5Pt4B+ivLjbRVYV+S6ONDOwlQouwKA1DCJvlAKxK3B5L07a?= =?utf-8?q?B55rS0JDaos+3k18xdleU4Qv8d2iSpVoLJzDyKFC+2o4eCVxZvH4mioYC4/RDTIS3?= =?utf-8?q?lqB9VFtteG9VAz0mlA4Mnl58RHzgUnbkiqrDdnRvr7RbTE049j8mlTDS9jCsq+NuT?= =?utf-8?q?/EGvXyL34Qye+ueZKbZJeaTvOHuYG0MjZgLeuIejE6Aguj5buE7SccAi0wcOsNUjB?= =?utf-8?q?039Lm8wq6RoWhXb45TmuSm0NxK89NEaA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28725fb3-0321-465d-df02-08da276c31ae X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8616.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2022 10:04:47.1560 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hBV+t2uBUdzGowcA+Z6ueNeVzwUYz/5zASu7Fj9AZqOkiLBZZLoeHEMvqgizAM+skfSwoRlHCeF3YaU9J3WdNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7358 This brings us (back) closer to the original Linux source. While touching mwait_idle_state_table_update() also drop a stray leading blank. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -996,48 +997,49 @@ static const struct idle_cpu idle_cpu_sn }; #define ICPU(model, cpu) \ - { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ALWAYS, &idle_cpu_##cpu} + { X86_VENDOR_INTEL, 6, INTEL_FAM6_ ## model, X86_FEATURE_ALWAYS, \ + &idle_cpu_ ## cpu} static const struct x86_cpu_id intel_idle_ids[] __initconstrel = { - ICPU(0x1a, nehalem), - ICPU(0x1e, nehalem), - ICPU(0x1f, nehalem), - ICPU(0x25, nehalem), - ICPU(0x2c, nehalem), - ICPU(0x2e, nehalem), - ICPU(0x2f, nehalem), - ICPU(0x1c, atom), - ICPU(0x26, lincroft), - ICPU(0x2a, snb), - ICPU(0x2d, snb), - ICPU(0x36, atom), - ICPU(0x37, byt), - ICPU(0x4a, tangier), - ICPU(0x4c, cht), - ICPU(0x3a, ivb), - ICPU(0x3e, ivt), - ICPU(0x3c, hsw), - ICPU(0x3f, hsw), - ICPU(0x45, hsw), - ICPU(0x46, hsw), - ICPU(0x4d, avn), - ICPU(0x3d, bdw), - ICPU(0x47, bdw), - ICPU(0x4f, bdw), - ICPU(0x56, bdw), - ICPU(0x4e, skl), - ICPU(0x5e, skl), - ICPU(0x8e, skl), - ICPU(0x9e, skl), - ICPU(0x55, skx), - ICPU(0x6a, icx), - ICPU(0x6c, icx), - ICPU(0x57, knl), - ICPU(0x85, knl), - ICPU(0x5c, bxt), - ICPU(0x7a, bxt), - ICPU(0x5f, dnv), - ICPU(0x86, snr), + ICPU(NEHALEM_EP, nehalem), + ICPU(NEHALEM, nehalem), + ICPU(NEHALEM_G, nehalem), + ICPU(WESTMERE, nehalem), + ICPU(WESTMERE_EP, nehalem), + ICPU(NEHALEM_EX, nehalem), + ICPU(WESTMERE_EX, nehalem), + ICPU(ATOM_BONNELL, atom), + ICPU(ATOM_BONNELL_MID, lincroft), + ICPU(SANDYBRIDGE, snb), + ICPU(SANDYBRIDGE_X, snb), + ICPU(ATOM_SALTWELL, atom), + ICPU(ATOM_SILVERMONT, byt), + ICPU(ATOM_SILVERMONT_MID, tangier), + ICPU(ATOM_AIRMONT, cht), + ICPU(IVYBRIDGE, ivb), + ICPU(IVYBRIDGE_X, ivt), + ICPU(HASWELL, hsw), + ICPU(HASWELL_X, hsw), + ICPU(HASWELL_L, hsw), + ICPU(HASWELL_G, hsw), + ICPU(ATOM_SILVERMONT_D, avn), + ICPU(BROADWELL, bdw), + ICPU(BROADWELL_G, bdw), + ICPU(BROADWELL_X, bdw), + ICPU(BROADWELL_D, bdw), + ICPU(SKYLAKE_L, skl), + ICPU(SKYLAKE, skl), + ICPU(KABYLAKE_L, skl), + ICPU(KABYLAKE, skl), + ICPU(SKYLAKE_X, skx), + ICPU(ICELAKE_X, icx), + ICPU(ICELAKE_D, icx), + ICPU(XEON_PHI_KNL, knl), + ICPU(XEON_PHI_KNM, knl), + ICPU(ATOM_GOLDMONT, bxt), + ICPU(ATOM_GOLDMONT_PLUS, bxt), + ICPU(ATOM_GOLDMONT_D, dnv), + ICPU(ATOM_TREMONT_D, snr), {} }; @@ -1208,20 +1210,20 @@ static void __init skx_idle_state_table_ static void __init mwait_idle_state_table_update(void) { switch (boot_cpu_data.x86_model) { - case 0x3e: /* IVT */ + case INTEL_FAM6_IVYBRIDGE_X: ivt_idle_state_table_update(); break; - case 0x5c: /* BXT */ - case 0x7a: + case INTEL_FAM6_ATOM_GOLDMONT: + case INTEL_FAM6_ATOM_GOLDMONT_PLUS: bxt_idle_state_table_update(); break; - case 0x5e: /* SKL-H */ + case INTEL_FAM6_SKYLAKE: sklh_idle_state_table_update(); break; - case 0x55: /* SKL-X */ + case INTEL_FAM6_SKYLAKE_X: skx_idle_state_table_update(); break; - } + } } static int __init mwait_idle_probe(void)