On 30/07/2018 18:43, Pu Wen wrote:
> On 2018-07-29 07:42, Paolo Bonzini wrote:
>> On 23/07/2018 15:20, Pu Wen wrote:
>>> scrubval = scrubrates[i].scrubval;
>>>
>>> - if (pvt->fam == 0x17) {
>>> + if (pvt->fam == 0x17 || pvt->fam == 0x18) {
>>> __f17h_set_scrubval(pvt, scrubval);
>>> } else if (pvt->fam == 0x15 && pvt->model == 0x60) {
>>> f15h_select_dct(pvt, 0);
>>
>> This, and many other occurrences in this file, should in my opinion
>> avoid testing family 18h without also checking for Hygon as a vendor.
>> You probably need to add a vendor field to struct amd64_pvt and
>> initialize it in per_family_init.
>
> Thanks for the suggestion.
>
> As AMD and Hygon will negotiate the usage of CPU family number
> to make sure the unique of family numbers in both company's processors.
> As Hygon will use family 18h for Dhyana, AMD will not use family 18h
> and jump to family 19h for new product. So if family number if 18h,
> processor should be Hygon Dhyana. Based on this assumption, we created
> this patch set.
But if that's the case, it doesn't make sense to have a new vendor! If
AMD's 17h and Hygon's 18h ever diverge, you could always choose the
right behavior based on the family, without checking the vendor.
However, if the x86 maintainers prefer to have a new X86_VENDOR_*
constant, I'd just ignore the fact that AMD will skip family 18h, and
introduce vendor checks along the lines below. This has the advantage
that it's not an issue if AMD ends up _not_ skipping family 18h.
> If the vendor field is added to amd64_pvt, and check the vendor in 0x18
> codes, then the codes may like:
> - if (pvt->fam == 0x17) {
> + if (pvt->fam == 0x17 || pvt->vendor == X86_VENDOR_HYGON) {
>
> switch cases will be modified similar to:
> + case 0x18:
> + if(pvt->vendor == X86_VENDOR_HYGON) {
> + fam_type = &family_types[HYGON_F18_CPUS];
> + pvt->ops = &family_types[HYGON_F18_CPUS].ops;
> + break;
> + }
> +
Either that, or
if (pvt->vendor == X86_VENDOR_AMD) {
...
} else {
fam_type = &family_types[HYGON_F18_CPUS];
pvt->ops = &family_types[HYGON_F18_CPUS].ops;
break;
}
Paolo
