The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e409e51f83963beaeb95eec82c5f43e44545d6b9
commit e409e51f83963beaeb95eec82c5f43e44545d6b9 Author: Ali Mashtizadeh <[email protected]> AuthorDate: 2026-02-20 21:05:41 +0000 Commit: Warner Losh <[email protected]> CommitDate: 2026-03-07 15:17:43 +0000 hwpmc: Remove left over k7, xscale and p4 references pmc Support for these processors was removed a few years ago, but a few references remain that should be removed. Sponsored by: Netflix Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/2039 --- sys/amd64/include/pmc_mdep.h | 1 - sys/i386/include/pmc_mdep.h | 4 +--- sys/sys/pmc.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/amd64/include/pmc_mdep.h b/sys/amd64/include/pmc_mdep.h index 24b785312a16..c44dd066f827 100644 --- a/sys/amd64/include/pmc_mdep.h +++ b/sys/amd64/include/pmc_mdep.h @@ -65,7 +65,6 @@ struct pmc_mdep; * TSC The timestamp counter * K8 AMD Athlon64 and Opteron PMCs in 64 bit mode. * IBS AMD IBS - * PIV Intel P4/HTT and P4/EMT64 * IAP Intel Core/Core2/Atom CPUs in 64 bits mode. * IAF Intel fixed-function PMCs in Core2 and later CPUs. * UCP Intel Uncore programmable PMCs. diff --git a/sys/i386/include/pmc_mdep.h b/sys/i386/include/pmc_mdep.h index 31eded611a1e..618df8daebef 100644 --- a/sys/i386/include/pmc_mdep.h +++ b/sys/i386/include/pmc_mdep.h @@ -41,7 +41,6 @@ struct pmc_mdep; * On the i386 platform we support the following PMCs. * * TSC The timestamp counter - * K7 AMD Athlon XP/MP and other 32 bit processors. * K8 AMD Athlon64 and Opteron PMCs in 32 bit mode. * IBS AMD IBS * IAP Intel Core/Core2/Atom programmable PMCs. @@ -50,7 +49,7 @@ struct pmc_mdep; * UCF Intel Uncore fixed-function PMCs. */ -#include <dev/hwpmc/hwpmc_amd.h> /* K7 and K8 */ +#include <dev/hwpmc/hwpmc_amd.h> #include <dev/hwpmc/hwpmc_ibs.h> #include <dev/hwpmc/hwpmc_core.h> #include <dev/hwpmc/hwpmc_tsc.h> @@ -62,7 +61,6 @@ struct pmc_mdep; * IAF, IAP, UCF and UCP. */ #define PMC_MDEP_CLASS_INDEX_TSC 1 -#define PMC_MDEP_CLASS_INDEX_K7 2 #define PMC_MDEP_CLASS_INDEX_K8 2 #define PMC_MDEP_CLASS_INDEX_IBS 3 #define PMC_MDEP_CLASS_INDEX_IAP 2 diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h index 28484eed187e..7640a9b96c84 100644 --- a/sys/sys/pmc.h +++ b/sys/sys/pmc.h @@ -110,7 +110,6 @@ extern char pmc_cpuid[PMC_CPUID_LEN]; __PMC_CPU(INTEL_EMERALD_RAPIDS, 0xA0, "Intel Emerald Rapids") \ __PMC_CPU(INTEL_ALDERLAKEN, 0xA1, "Intel AlderlakeN") \ __PMC_CPU(INTEL_GRANITE_RAPIDS, 0xA2, "Intel Granite Rapids") \ - __PMC_CPU(INTEL_XSCALE, 0x100, "Intel XScale") \ __PMC_CPU(PPC_7450, 0x300, "PowerPC MPC7450") \ __PMC_CPU(PPC_E500, 0x340, "PowerPC e500 Core") \ __PMC_CPU(PPC_970, 0x380, "IBM PowerPC 970") \ @@ -146,7 +145,6 @@ enum pmc_cputype { __PMC_CLASS(IAP, 0x07, "Intel Core...Atom, programmable") \ __PMC_CLASS(UCF, 0x08, "Intel Uncore fixed function") \ __PMC_CLASS(UCP, 0x09, "Intel Uncore programmable") \ - __PMC_CLASS(XSCALE, 0x0A, "Intel XScale counters") \ __PMC_CLASS(PPC7450, 0x0D, "Motorola MPC7450 class") \ __PMC_CLASS(PPC970, 0x0E, "IBM PowerPC 970 class") \ __PMC_CLASS(SOFT, 0x0F, "Software events") \
