From 803a0624794ab6cea86fba3b9af34322b321e0d9 Mon Sep 17 00:00:00 2001 From: Xorg Date: Sun, 12 Mar 2017 09:32:28 +0100 Subject: [PATCH] Doesn't specify l2_cache value for Llano CPUs and newer --- libcpuid/recog_amd.c | 65 ++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/libcpuid/recog_amd.c b/libcpuid/recog_amd.c index d75d394..cb95066 100644 --- a/libcpuid/recog_amd.c +++ b/libcpuid/recog_amd.c @@ -213,49 +213,48 @@ const struct match_entry_t cpudb_amd[] = { { 15, 5, -1, 16, 5, 3, 512, -1, ATHLON_64_X3 , 0, "Athlon II X3 (Rana)" }, { 15, 5, -1, 16, 5, 4, 512, -1, ATHLON_64_X4 , 0, "Athlon II X4 (Propus)" }, /* Llano APUs (2011): */ - { 15, 1, -1, 18, 1, 2, 512, -1, FUSION_EA , 0, "Llano X2" }, - { 15, 1, -1, 18, 1, 2, 1024, -1, FUSION_EA , 0, "Llano X2" }, - { 15, 1, -1, 18, 1, 3, 1024, -1, FUSION_EA , 0, "Llano X3" }, - { 15, 1, -1, 18, 1, 4, 1024, -1, FUSION_EA , 0, "Llano X4" }, + { 15, 1, -1, 18, 1, 2, -1, -1, FUSION_EA , 0, "Llano X2" }, + { 15, 1, -1, 18, 1, 3, -1, -1, FUSION_EA , 0, "Llano X3" }, + { 15, 1, -1, 18, 1, 4, -1, -1, FUSION_EA , 0, "Llano X4" }, /* Family 14h: Bobcat Architecture (2011) */ - { 15, 2, -1, 20, -1, 1, 512, -1, FUSION_C , 0, "Brazos Ontario" }, - { 15, 2, -1, 20, -1, 2, 512, -1, FUSION_C , 0, "Brazos Ontario (Dual-core)" }, - { 15, 1, -1, 20, -1, 1, 512, -1, FUSION_E , 0, "Brazos Zacate" }, - { 15, 1, -1, 20, -1, 2, 512, -1, FUSION_E , 0, "Brazos Zacate (Dual-core)" }, - { 15, 2, -1, 20, -1, 2, 512, -1, FUSION_Z , 0, "Brazos Desna (Dual-core)" }, + { 15, 2, -1, 20, -1, 1, -1, -1, FUSION_C , 0, "Brazos Ontario" }, + { 15, 2, -1, 20, -1, 2, -1, -1, FUSION_C , 0, "Brazos Ontario (Dual-core)" }, + { 15, 1, -1, 20, -1, 1, -1, -1, FUSION_E , 0, "Brazos Zacate" }, + { 15, 1, -1, 20, -1, 2, -1, -1, FUSION_E , 0, "Brazos Zacate (Dual-core)" }, + { 15, 2, -1, 20, -1, 2, -1, -1, FUSION_Z , 0, "Brazos Desna (Dual-core)" }, /* Family 15h: Bulldozer Architecture (2011) */ - { 15, -1, -1, 21, 0, 4, 2048, -1, NO_CODE , 0, "Bulldozer X2" }, - { 15, -1, -1, 21, 1, 4, 2048, -1, NO_CODE , 0, "Bulldozer X2" }, - { 15, -1, -1, 21, 1, 6, 2048, -1, NO_CODE , 0, "Bulldozer X3" }, - { 15, -1, -1, 21, 1, 8, 2048, -1, NO_CODE , 0, "Bulldozer X4" }, + { 15, -1, -1, 21, 0, 4, -1, -1, NO_CODE , 0, "Bulldozer X2" }, + { 15, -1, -1, 21, 1, 4, -1, -1, NO_CODE , 0, "Bulldozer X2" }, + { 15, -1, -1, 21, 1, 6, -1, -1, NO_CODE , 0, "Bulldozer X3" }, + { 15, -1, -1, 21, 1, 8, -1, -1, NO_CODE , 0, "Bulldozer X4" }, /* 2nd-gen, Piledriver core (2012): */ - { 15, -1, -1, 21, 2, 4, 2048, -1, NO_CODE , 0, "Vishera X2" }, - { 15, -1, -1, 21, 2, 6, 2048, -1, NO_CODE , 0, "Vishera X3" }, - { 15, -1, -1, 21, 2, 8, 2048, -1, NO_CODE , 0, "Vishera X4" }, - { 15, 0, -1, 21, 16, 2, 1024, -1, FUSION_A , 0, "Trinity X2" }, - { 15, 0, -1, 21, 16, 4, 1024, -1, FUSION_A , 0, "Trinity X4" }, - { 15, 3, -1, 21, 19, 2, 1024, -1, FUSION_A , 0, "Richland X2" }, - { 15, 3, -1, 21, 19, 4, 1024, -1, FUSION_A , 0, "Richland X4" }, + { 15, -1, -1, 21, 2, 4, -1, -1, NO_CODE , 0, "Vishera X2" }, + { 15, -1, -1, 21, 2, 6, -1, -1, NO_CODE , 0, "Vishera X3" }, + { 15, -1, -1, 21, 2, 8, -1, -1, NO_CODE , 0, "Vishera X4" }, + { 15, 0, -1, 21, 16, 2, -1, -1, FUSION_A , 0, "Trinity X2" }, + { 15, 0, -1, 21, 16, 4, -1, -1, FUSION_A , 0, "Trinity X4" }, + { 15, 3, -1, 21, 19, 2, -1, -1, FUSION_A , 0, "Richland X2" }, + { 15, 3, -1, 21, 19, 4, -1, -1, FUSION_A , 0, "Richland X4" }, /* 3rd-gen, Steamroller core (2014): */ - { 15, 0, -1, 21, 48, 2, 1024, -1, FUSION_A , 0, "Kaveri X2" }, - { 15, 0, -1, 21, 48, 4, 1024, -1, FUSION_A , 0, "Kaveri X4" }, - { 15, 8, -1, 21, 56, 4, 1024, -1, FUSION_A , 0, "Godavari X4" }, + { 15, 0, -1, 21, 48, 2, -1, -1, FUSION_A , 0, "Kaveri X2" }, + { 15, 0, -1, 21, 48, 4, -1, -1, FUSION_A , 0, "Kaveri X4" }, + { 15, 8, -1, 21, 56, 4, -1, -1, FUSION_A , 0, "Godavari X4" }, /* 4th-gen, Excavator core (2015): */ - { 15, 1, -1, 21, 96, 2, 1024, -1, FUSION_A , 0, "Carrizo X2" }, - { 15, 1, -1, 21, 96, 4, 1024, -1, FUSION_A , 0, "Carrizo X4" }, - { 15, 5, -1, 21, 101, 2, 1024, -1, FUSION_A , 0, "Bristol Ridge X2" }, - { 15, 5, -1, 21, 101, 4, 1024, -1, FUSION_A , 0, "Bristol Ridge X4" }, - { 15, 0, -1, 21, 112, 2, 1024, -1, FUSION_A , 0, "Stoney Ridge X2" }, - { 15, 0, -1, 21, 112, 2, 1024, -1, FUSION_E , 0, "Stoney Ridge X2" }, + { 15, 1, -1, 21, 96, 2, -1, -1, FUSION_A , 0, "Carrizo X2" }, + { 15, 1, -1, 21, 96, 4, -1, -1, FUSION_A , 0, "Carrizo X4" }, + { 15, 5, -1, 21, 101, 2, -1, -1, FUSION_A , 0, "Bristol Ridge X2" }, + { 15, 5, -1, 21, 101, 4, -1, -1, FUSION_A , 0, "Bristol Ridge X4" }, + { 15, 0, -1, 21, 112, 2, -1, -1, FUSION_A , 0, "Stoney Ridge X2" }, + { 15, 0, -1, 21, 112, 2, -1, -1, FUSION_E , 0, "Stoney Ridge X2" }, /* Family 16h: Jaguar Architecture (2013) */ - { 15, 0, -1, 22, 0, 2, 1024, -1, FUSION_A , 0, "Kabini X2" }, - { 15, 0, -1, 22, 0, 4, 1024, -1, FUSION_A , 0, "Kabini X4" }, + { 15, 0, -1, 22, 0, 2, -1, -1, FUSION_A , 0, "Kabini X2" }, + { 15, 0, -1, 22, 0, 4, -1, -1, FUSION_A , 0, "Kabini X4" }, /* 2nd-gen, Puma core (2013): */ - { 15, 0, -1, 22, 48, 2, 1024, -1, FUSION_E , 0, "Mullins X2" }, - { 15, 0, -1, 22, 48, 4, 1024, -1, FUSION_A , 0, "Mullins X4" }, + { 15, 0, -1, 22, 48, 2, -1, -1, FUSION_E , 0, "Mullins X2" }, + { 15, 0, -1, 22, 48, 4, -1, -1, FUSION_A , 0, "Mullins X4" }, /* Family 17h: Zen Architecture (2017) */ //{ 15, -1, -1, 23, 1, 8, -1, -1, NO_CODE , 0, "Ryzen 7" }, //FIXME