[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 2/3] x86/cpuid: replace more cpufeat_word() uses


  • To: Jan Beulich <jbeulich@xxxxxxxx>, "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Andrew Cooper <Andrew.Cooper3@xxxxxxxxxx>
  • Date: Wed, 23 Feb 2022 10:57:09 +0000
  • Accept-language: en-GB, en-US
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
  • 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=EUi43xVVzgsLCdi1JHTfT24uDri7YIzDb2sJiSnh0Lo=; b=BtmtnUKQUCcXPVRJMEWZH/hNfY2uVWtd0LA1G3EAPhLNquATKa/l621PCvFG/oSvU4SvarKYc2AMugB4H73xCancJKw8YiIGlMop7srWh172v/D0Kky3E3RhqraXow9oWumjFgyp04x0KzR0wHgAIjTfR4PRdQ48X4Rmh1q4tRn5GYI8zlcYoyyoA5Fb+2NjCeZW12eLf9vGxMuE2OPtBlpYPzue7+XxVDznRtzqfnPZ4OJHSwnWB0pNooiZ/+ffu1WsN7GMIlZA6sBA8i3BO9yOFx0vAEy7AwAN4PYj/7fTAxGOTYPkMtwYqDaKhNk94f7p3dINNXHrTDIYoXA9wg==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fe1aa+nW1gwCYzxmjDVEe+HuFlLMnDEsoDJLXDOk6gnr/+h8Sj1swPSYZztIx7H4xS2486AGO9mc+sa+KHHWOD+o3gPpktwy6cb+X3/YUQSzk94btFdXriU5eWZgEwU+DK6vI8rbfDER1jXIJntzfyD7Xr6q1Ptdp3rsilO6efDNuulo69n/oaDqAmSbZPGMfOVI7H8a3BlwgUOG9rgS5/PonjIIL5tiwwf00DkujNB/CxW1FtLcyIHr7XNXSOBYJ7iz0pQAqaZlk7Ij/RT4vYY8huQnf/n5/CWD34eP/KyAdlcUM7+iyQYWbH5BVb85WKqgDv7npznFsVr0R0m7XQ==
  • Authentication-results: esa4.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com
  • Cc: Wei Liu <wl@xxxxxxx>, Roger Pau Monne <roger.pau@xxxxxxxxxx>
  • Delivery-date: Wed, 23 Feb 2022 10:57:19 +0000
  • Ironport-data: A9a23:xql2R6+WlxEVg1SJJV4UDrUDkn6TJUtcMsCJ2f8bNWPcYEJGY0x3z mcbWmjVb/nZamXwfdF0a4nio0hQvZaDyNBnTAZqr388E34SpcT7XtnIdU2Y0wF+jyHgoOCLy +1EN7Es+ehtFie0Si+Fa+Sn9T8mvU2xbuKU5NTsY0idfic5Dndx4f5fs7Rh2NQw24LiW1rlV e7a+KUzBnf0g1aYDUpMg06zgEsHUCPa4W5wUvQWPJinjXeG/5UnJMt3yZKZdhMUdrJ8DO+iL 9sv+Znilo/vE7XBPfv++lrzWhVirrc/pmFigFIOM0SpqkAqSiDfTs/XnRfTAKtao2zhojx/9 DlCnazpFUQ7Bvbpor8ADDZoMSNXMY9i5IaSdBBTseTLp6HHW37lwvEoB0AqJ4wIvO1wBAmi9 9RBdmpLNErawbvrnvTrEYGAhex6RCXvFKoZtmtt0nfyCvE+TIqYa67L+cVZzHE7gcUm8fP2O ZVBNGY3Mk6ojxtnNn07MI0Tp/qR3kbtaSZUhGmQvKsl2j2GpOB2+Oe0a4eEEjCQfu1Kmm6Iq 2SA+H72ajkKOdraxTeb/3aEgu7UgTi9SI8UDKe/9PNhnBuU3GN7IB8cWEa/oPK5olWjQN8ZI EsRkhfCtoBrqhbtFIOkGUTl/jjU5XbwRua8DcUKsV3O2JKPxjzCGzcrfhxDQdAEkNMPEGlCO kCyo/vlAjlmsbuwQH2b96uJoT7aBRX5PVPudgdfE1JbvoCLTJUby0uWE409SPLdYsjdRGmoq w1muhTSkFn6YSQj86ygtW7KjDu3znQiZl5kv16HNo5JA+4QWWJEW2BKwQWDhRqjBNzAJrVkg JTis5LChAzpJcvQ/BFhuM1XQNmUCw+taVUwe2JHEZg77CiK8HW+Z41W6zwWDB43bptZJGGxM BWP5lM5CHpv0J2CN/Mfj2WZUZlC8EQdPY69CqC8giRmOPCdizNrDAkxPBXNjggBYWAnkL0lO IfzTCpfJS1yNEiT9xLvH711+eZynkgWnDqPLbimn0XP+efPPxa9FOZaWGZim8hktctoVi2Oq I0BXyZLoj0CONDDjt7/q9BLdglSdSBhbX00wuQOHtO+zsNdMDhJI9fawK87epwjmKJQl+zS+ Wq6VFMew1367UAr4y3TApy/QNsDhapCkE8=
  • Ironport-hdrordr: A9a23:IbXMr6CLc2Jp55DlHegCsceALOsnbusQ8zAXPh9KJiC9I/b1qy nxppkmPEfP+UsssHFJo6HkBEEZKUmsuqKdkrNhQYtKOzOW9ldATbsSobcKpgePJ8SQzJ8l6U 4NSdkcNDS0NykBsS+Y2nj4Lz9D+qj+zEnAv463pB0NLT2CKZsQlDuRYjzrSXGeLzM2YabRYa DsgPav0ADQHkj/AP7LZEUtbqzmnZnmhZjmaRkJC1oM8w+Vlw6l77b8Dlyxwgoeeykn+8ZjzU H11yjCoomzufCyzRHRk0XJ6Y5NpdfnwtxfQOSRl8kuLCn2gArAXvUjZ1TChkF2nAic0idvrD D+mWZmAy210QKWQoiBm2qp5+An6kd215at8y7BvZKpm72HeNtzMbs+uWseSGqC16NohqAN7E oAtVjpxqZ/HFfOmj/w6MPPUAwvnk2ooWA6mepWlHBHV5ACAYUh5rD30XklWavoJhiKoLzP0d MeeP309bJTaxeXfnrZtm5gzJilWWkyBA6PRgwHttaO2zZbkXhlxw9ArfZv00so5dY4Ud1J9u 7EOqNnmPVHSdIXd7t0AKMETdGsAmLATBrQOCaZIEjhFqsAJ3XRwqSHqokd9aWvYtgF3ZEykJ POXBdRsnMzYVvnDYmU0JhC4nn2MROAtPTWu7ZjDrRCy8/BreDQQF6+oXgV4r6dn8k=
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
  • Thread-index: AQHYKJ3yxw44MvRAME+HWfLX8yy7K6yg9viA
  • Thread-topic: [PATCH 2/3] x86/cpuid: replace more cpufeat_word() uses

On 23/02/2022 10:12, Jan Beulich wrote:
> --- a/xen/arch/x86/cpu/common.c
> +++ b/xen/arch/x86/cpu/common.c
> @@ -332,23 +332,22 @@ void __init early_cpu_init(void)
>       cpuid(0x00000001, &eax, &ebx, &ecx, &edx);
>       c->x86 = get_cpu_family(eax, &c->x86_model, &c->x86_mask);
>  
> -     edx &= ~cleared_caps[cpufeat_word(X86_FEATURE_FPU)];
> -     ecx &= ~cleared_caps[cpufeat_word(X86_FEATURE_SSE3)];
> +     edx &= ~cleared_caps[FEATURESET_1d];
> +     ecx &= ~cleared_caps[FEATURESET_1c];
>       if (edx & cpufeat_mask(X86_FEATURE_CLFLUSH))
>               c->x86_cache_alignment = ((ebx >> 8) & 0xff) * 8;
>       /* Leaf 0x1 capabilities filled in early for Xen. */
> -     c->x86_capability[cpufeat_word(X86_FEATURE_FPU)] = edx;
> -     c->x86_capability[cpufeat_word(X86_FEATURE_SSE3)] = ecx;
> +     c->x86_capability[FEATURESET_1d] = edx;
> +     c->x86_capability[FEATURESET_1c] = ecx;
>  
>       printk(XENLOG_INFO
>              "CPU Vendor: %s, Family %u (%#x), Model %u (%#x), Stepping %u 
> (raw %08x)\n",
>              x86_cpuid_vendor_to_str(c->x86_vendor), c->x86, c->x86,
>              c->x86_model, c->x86_model, c->x86_mask, eax);
>  
> -     if (c->cpuid_level >= 7) {
> -             cpuid_count(7, 0, &eax, &ebx, &ecx, &edx);
> -             c->x86_capability[cpufeat_word(X86_FEATURE_CET_SS)] = ecx;
> -     }
> +     if (c->cpuid_level >= 7)
> +             cpuid_count(7, 0, &eax, &ebx,
> +                            &c->x86_capability[FEATURESET_7c0], &edx);

Spaces vs tabs here.  This hunk interacts with the CET-IBT series (which
collects edx too), but the rebase either way around is easy.

Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.