On 8/28/20 12:27 PM, Eduardo Habkost wrote:
> On Fri, Aug 21, 2020 at 05:13:03PM -0500, Babu Moger wrote:
>> Remove the EPYC specific apicid decoding and use the generic
>> default decoding.
>>
>> This reverts commit 7568b205555a6405042f62c64af3268f4330aed5.
>>
>> Signed-off-by: Babu Moger <babu.mo...@amd.com>
>> ---
> [...]
>> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
>> index 19198e3e7f..b29686220e 100644
>> --- a/target/i386/cpu.c
>> +++ b/target/i386/cpu.c
>> @@ -388,7 +388,7 @@ static void encode_topo_cpuid8000001e(X86CPUTopoInfo
>> *topo_info, X86CPU *cpu,
>> unsigned long dies = topo_info->dies_per_pkg;
>> int shift;
>>
>> - x86_topo_ids_from_apicid_epyc(cpu->apic_id, topo_info, &topo_ids);
>> + x86_topo_ids_from_apicid(cpu->apic_id, topo_info, &topo_ids);
>
> This was not part of commit 7568b205555a6405042f62c64af3268f4330aed5.
> I suggest doing this change as a separate patch, to make review easier.
>
> That line was addd by commit dd08ef0318e2
> ("target/i386: Cleanup and use the EPYC mode topology functions").
> Wouldn't it be simpler to revert that commit? If there are parts
> of commit dd08ef0318e2 we want to keep, they can be re-added
> in a separate patch.
>
Sure. Will take care of it in next revision. Thanks.
