Commit 6a9fe1ad authored by Wei Wang's avatar Wei Wang Committed by Borislav Petkov (AMD)
Browse files

x86/cpu/topology: Consolidate AMD and Hygon cases in parse_topology() 



Merge the two separate switch cases for AMD and Hygon as they share the
common cpu_parse_topology_amd().

Also drop the IS_ENABLED(CONFIG_CPU_SUP_AMD/HYGON) guards, because
1) they are dead code: when a vendor's CONFIG_CPU_SUP_* is disabled, its
   vendor detection code (in amd.c / hygon.c) is not compiled, so
   x86_vendor will never be set to X86_VENDOR_AMD / X86_VENDOR_HYGON,
   instead it will default to X86_VENDOR_UNKNOWN and those switch cases
   are unreachable.
2) topology_amd.o is always built (obj-y), so cpu_parse_topology_amd() is
   always available regardless of CPU_SUP_* configuration.

Signed-off-by: default avatarWei Wang <wei.w.wang@hotmail.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Tested-by: default avatarYongwei Xu <xuyongwei@open-hieco.net>
Link: https://patch.msgid.link/SI2PR01MB4393D6B7E17AB05612AEE925DC4BA@SI2PR01MB4393.apcprd01.prod.exchangelabs.com
parent 2219ec23

arch/x86/kernel/cpu/topology_common.c

+2 −6
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static void parse_topology(struct topo_scan *tscan, bool early) 


	switch (c->x86_vendor) {

	case X86_VENDOR_AMD:

		if (IS_ENABLED(CONFIG_CPU_SUP_AMD))

	case X86_VENDOR_HYGON:

		cpu_parse_topology_amd(tscan);

		break;

	case X86_VENDOR_CENTAUR:
@@ -170,10 +170,6 @@ static void parse_topology(struct topo_scan *tscan, bool early) 
		if (c->cpuid_level >= 0x1a)

			c->topo.cpu_type = cpuid_eax(0x1a);

		break;

	case X86_VENDOR_HYGON:

		if (IS_ENABLED(CONFIG_CPU_SUP_HYGON))

			cpu_parse_topology_amd(tscan);

		break;

	}

}