Re: [PATCH v5 01/15] x86/cpu: Create Hygon Dhyana architecture support file

From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Pu Wen <puwen@hygon.cn>, xen-devel@lists.xenproject.org
Cc: "Stefano Stabellini" <sstabellini@kernel.org>,
	"Wei Liu" <wei.liu2@citrix.com>,
	"Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>,
	"George Dunlap" <George.Dunlap@eu.citrix.com>,
	"Tim Deegan" <tim@xen.org>,
	"Ian Jackson" <ian.jackson@eu.citrix.com>,
	"Julien Grall" <julien.grall@arm.com>,
	"Jan Beulich" <jbeulich@suse.com>,
	"Roger Pau Monné" <roger.pau@citrix.com>
Subject: Re: [PATCH v5 01/15] x86/cpu: Create Hygon Dhyana architecture support file
Date: Thu, 4 Apr 2019 15:02:00 +0100	[thread overview]
Message-ID: <614b4eab-065a-c911-7759-2663ab6a9657@citrix.com> (raw)
In-Reply-To: <0d6839a65753c60f4fd1738560a551ca7df7b1e8.1554382869.git.puwen@hygon.cn>

On 04/04/2019 14:45, Pu Wen wrote:
> index 774ceac..75fefcf 100644
> --- a/xen/include/asm-x86/x86-vendors.h
> +++ b/xen/include/asm-x86/x86-vendors.h
> @@ -30,6 +30,11 @@
>  #define X86_VENDOR_SHANGHAI_ECX 0x20206961U
>  #define X86_VENDOR_SHANGHAI_EDX 0x68676e61U
>  
> -#define X86_VENDOR_NUM 5
> +#define X86_VENDOR_HYGON 5
> +#define X86_VENDOR_HYGON_EBX 0x6f677948 /* "HygonGenuine" */
> +#define X86_VENDOR_HYGON_ECX 0x656e6975
> +#define X86_VENDOR_HYGON_EDX 0x6e65476e
> +
> +#define X86_VENDOR_NUM 6
>  
>  #endif	/* __XEN_X86_VENDORS_H__ */
> diff --git a/xen/lib/x86/cpuid.c b/xen/lib/x86/cpuid.c
> index 311d19e..d0b3ff7 100644
> --- a/xen/lib/x86/cpuid.c
> +++ b/xen/lib/x86/cpuid.c
> @@ -29,6 +29,12 @@ unsigned int x86_cpuid_lookup_vendor(uint32_t ebx, uint32_t ecx, uint32_t edx)
>               edx == X86_VENDOR_SHANGHAI_EDX )
>              return X86_VENDOR_SHANGHAI;
>          break;
> +
> +    case X86_VENDOR_HYGON_EBX:
> +        if ( ecx == X86_VENDOR_HYGON_ECX &&
> +             edx == X86_VENDOR_HYGON_EDX )
> +            return X86_VENDOR_HYGON;
> +        break;
>      }
>  
>      return X86_VENDOR_UNKNOWN;

This needs the following hunk folding in

diff --git a/tools/tests/cpu-policy/test-cpu-policy.c
b/tools/tests/cpu-policy/test-cpu-policy.c
index beced5e..88f5121 100644
--- a/tools/tests/cpu-policy/test-cpu-policy.c
+++ b/tools/tests/cpu-policy/test-cpu-policy.c
@@ -35,6 +35,7 @@ static void test_vendor_identification(void)
         { { "AuthenticAMD" }, X86_VENDOR_AMD },
         { { "CentaurHauls" }, X86_VENDOR_CENTAUR },
         { { "  Shanghai  " }, X86_VENDOR_SHANGHAI },
+        { { "HygonGenuine" }, X86_VENDOR_HYGON },
 
         { { ""             }, X86_VENDOR_UNKNOWN },
         { { "            " }, X86_VENDOR_UNKNOWN },

which can be done on commit to avoid sending yet another version.

~Andrew

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
